diff --git a/.circleci/config.yml b/.circleci/config.yml
index 94c9f2226..ed067ddfc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,6 +112,6 @@ workflows:
       - unit-tests:
           matrix:
             parameters:
-              index: [10, 20, 30, 40, 50, 60]
+              index: [10, 20, 30, 40, 50, 60, 70, 80, 90]
           requires:
             - build
diff --git a/tests/unit/20_nginx-vhosts_1.bats b/tests/unit/70_nginx-vhosts_1.bats
similarity index 100%
rename from tests/unit/20_nginx-vhosts_1.bats
rename to tests/unit/70_nginx-vhosts_1.bats
diff --git a/tests/unit/40_nginx-vhosts_2.bats b/tests/unit/70_nginx-vhosts_2.bats
similarity index 100%
rename from tests/unit/40_nginx-vhosts_2.bats
rename to tests/unit/70_nginx-vhosts_2.bats
diff --git a/tests/unit/40_nginx-vhosts_3.bats b/tests/unit/70_nginx-vhosts_3.bats
similarity index 100%
rename from tests/unit/40_nginx-vhosts_3.bats
rename to tests/unit/70_nginx-vhosts_3.bats
diff --git a/tests/unit/10_ps-dockerfile.bats b/tests/unit/80_ps-dockerfile.bats
similarity index 100%
rename from tests/unit/10_ps-dockerfile.bats
rename to tests/unit/80_ps-dockerfile.bats
diff --git a/tests/unit/10_ps-general.bats b/tests/unit/80_ps-general.bats
similarity index 100%
rename from tests/unit/10_ps-general.bats
rename to tests/unit/80_ps-general.bats
diff --git a/tests/unit/10_ps-herokuish.bats b/tests/unit/80_ps-herokuish.bats
similarity index 100%
rename from tests/unit/10_ps-herokuish.bats
rename to tests/unit/80_ps-herokuish.bats
diff --git a/tests/unit/30_core_1.bats b/tests/unit/90_core_1.bats
similarity index 100%
rename from tests/unit/30_core_1.bats
rename to tests/unit/90_core_1.bats
diff --git a/tests/unit/40_core_2.bats b/tests/unit/90_core_2.bats
similarity index 100%
rename from tests/unit/40_core_2.bats
rename to tests/unit/90_core_2.bats