diff --git a/bin/test/bundler-app b/bin/test/bundler-app
index 1a49ef4..456c222 100755
--- a/bin/test/bundler-app
+++ b/bin/test/bundler-app
@@ -4,10 +4,10 @@ FOLDER="features/bundler-app"
 
 bundle install
 bundle exec rake build
-cp -R features/support features/bundler-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} "$FOLDER/retest.gem"
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
 
-if [[ "$1" == "--no-build" ]]; then
+if [[ "$1" == "--nobuild" ]]; then
 	docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
 else
 	docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
diff --git a/bin/test/git-ruby b/bin/test/git-ruby
index ac4ecfa..1198397 100755
--- a/bin/test/git-ruby
+++ b/bin/test/git-ruby
@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/git-ruby"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/git-ruby/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/git-ruby/retest.gem
-docker compose -f features/git-ruby/docker-compose.yml up --build --exit-code-from retest
\ No newline at end of file
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi
diff --git a/bin/test/hanami-app b/bin/test/hanami-app
index 0338bfc..cc8389e 100755
--- a/bin/test/hanami-app
+++ b/bin/test/hanami-app
@@ -1,9 +1,17 @@
 #!/usr/bin/env bash
 
+FOLDER="features/hanami-app"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/hanami-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/hanami-app/retest.gem
-docker compose -f features/hanami-app/docker-compose.yml build
-docker compose -f features/hanami-app/docker-compose.yml run retest sh bin/test_setup
-docker compose -f features/hanami-app/docker-compose.yml up --exit-code-from retest
\ No newline at end of file
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f $FOLDER/docker-compose.yml run retest sh bin/test_setup
+  docker compose -f $FOLDER/docker-compose.yml up --exit-code-from retest
+else
+  docker compose -f $FOLDER/docker-compose.yml build
+  docker compose -f $FOLDER/docker-compose.yml run retest sh bin/test_setup
+  docker compose -f $FOLDER/docker-compose.yml up --exit-code-from retest
+fi
diff --git a/bin/test/rails-app b/bin/test/rails-app
index b3161bd..6b7e66c 100755
--- a/bin/test/rails-app
+++ b/bin/test/rails-app
@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/rails-app"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/rails-app/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rails-app/retest.gem
-docker compose -f features/rails-app/docker-compose.yml up --build --exit-code-from retest
\ No newline at end of file
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi
diff --git a/bin/test/rspec-rails b/bin/test/rspec-rails
index 6790d7d..c889322 100755
--- a/bin/test/rspec-rails
+++ b/bin/test/rspec-rails
@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/rspec-rails"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/rspec-rails/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rspec-rails/retest.gem
-docker compose -f features/rspec-rails/docker-compose.yml up --build --exit-code-from retest
\ No newline at end of file
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi
diff --git a/bin/test/rspec-ruby b/bin/test/rspec-ruby
index a067e8a..702392d 100755
--- a/bin/test/rspec-ruby
+++ b/bin/test/rspec-ruby
@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/rspec-ruby"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/rspec-ruby/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rspec-ruby/retest.gem
-docker compose -f features/rspec-ruby/docker-compose.yml up --build --exit-code-from retest
\ No newline at end of file
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi
diff --git a/bin/test/ruby-app b/bin/test/ruby-app
index 2284770..8a9d8db 100755
--- a/bin/test/ruby-app
+++ b/bin/test/ruby-app
@@ -4,8 +4,8 @@ FOLDER="features/ruby-app"
 
 bundle install
 bundle exec rake build
-cp -R features/support "$FOLDER/retest"
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-app/retest.gem
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
 
 if [[ "$1" == "--nobuild" ]]; then
   docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
diff --git a/bin/test/ruby-bare b/bin/test/ruby-bare
index 2e0e844..f091e18 100755
--- a/bin/test/ruby-bare
+++ b/bin/test/ruby-bare
@@ -1,7 +1,14 @@
 #!/usr/bin/env bash
 
+FOLDER="features/ruby-bare"
+
 bundle install
 bundle exec rake build
-cp -R features/support features/ruby-bare/retest
-ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-bare/retest.gem
-docker compose -f features/ruby-bare/docker-compose.yml up --build --exit-code-from retest
\ No newline at end of file
+cp -R features/support $FOLDER/retest
+ls -t pkg | head -n1 | xargs -I {} mv pkg/{} $FOLDER/retest.gem
+
+if [[ "$1" == "--nobuild" ]]; then
+  docker compose -f "$FOLDER/docker-compose.yml" up --exit-code-from retest
+else
+  docker compose -f "$FOLDER/docker-compose.yml" up --build --exit-code-from retest
+fi