diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6644597541905938bec3751a89be1c41739fe837..cb7f062ab7319b72787c8e68b2b3b41932e76ab8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,7 +81,7 @@ pre vars:
 .deploy_bigbang: &deploy_bigbang
   - |
     set -e
-    for deploy_script in $(find ./scripts/deploy -type f -name '*.sh' | sort); do
+    for deploy_script in $(find ./tests/deploy -type f -name '*.sh' | sort); do
       chmod +x ${deploy_script}
       echo "Executing ${deploy_script}..."
       ./${deploy_script}
@@ -90,7 +90,7 @@ pre vars:
 .test_bigbang: &test_bigbang
   - |
     set -e
-    for test_script in $(find ./tests -type f -name '*.sh' | sort); do
+    for test_script in $(find ./tests/tests -type f -name '*.sh' | sort); do
       chmod +x ${test_script}
       echo "Executing ${test_script}..."
       ./${test_script}
diff --git a/scripts/deploy/00_deploy_flux.sh b/tests/deploy/00_deploy_flux.sh
similarity index 100%
rename from scripts/deploy/00_deploy_flux.sh
rename to tests/deploy/00_deploy_flux.sh
diff --git a/scripts/deploy/01_deploy_bigbang.sh b/tests/deploy/01_deploy_bigbang.sh
similarity index 100%
rename from scripts/deploy/01_deploy_bigbang.sh
rename to tests/deploy/01_deploy_bigbang.sh
diff --git a/scripts/deploy/02_wait_for_helmreleases.sh b/tests/deploy/02_wait_for_helmreleases.sh
similarity index 100%
rename from scripts/deploy/02_wait_for_helmreleases.sh
rename to tests/deploy/02_wait_for_helmreleases.sh
diff --git a/tests/bash/01_virtualservices.sh b/tests/tests/01_virtualservices.sh
similarity index 100%
rename from tests/bash/01_virtualservices.sh
rename to tests/tests/01_virtualservices.sh
diff --git a/tests/bash/02_non_ironbank.sh b/tests/tests/02_non_ironbank.sh
similarity index 100%
rename from tests/bash/02_non_ironbank.sh
rename to tests/tests/02_non_ironbank.sh
diff --git a/tests/bash/03_cypress.sh b/tests/tests/03_cypress.sh
similarity index 100%
rename from tests/bash/03_cypress.sh
rename to tests/tests/03_cypress.sh