diff --git a/test/helpers b/test/helpers
index 91669328..24af3f49 100644
--- a/test/helpers
+++ b/test/helpers
@@ -2,7 +2,7 @@
 
 ### Helpers functions
 
-test::helpers::test_deploy() {
+test::helpers::deploy() {
     # Deploys a PHP app step by step and tests that everything is working as
     # expected.
     # To do so, this function runs the buildpack scripts and mimicks the
@@ -24,17 +24,17 @@ test::helpers::test_deploy() {
     local version="${2}"
 
     # Test that bin/detect works as expected:
-    test::helpers::test_detect "${detect_expectation}"
+    test::helpers::detect "${detect_expectation}"
 
     # Test that bin/compile works as expected:
-    test::helpers::test_compile "${version}"
+    test::helpers::compile "${version}"
 
     # Test that all default PHP modules are available:
-    test::helpers::test_default_modules
+    test::helpers::default_modules
 }
 
 test::helpers::detect() {
-    # Runs the `bin/detect`script of the buildpack and then:
+    # Runs the `bin/detect` script of the buildpack and then:
     # - Asserts that it succeeded
     # - Asserts that the output equals what's expected.
     #
diff --git a/test/tests b/test/tests
index 21282fe9..5bd34bfc 100755
--- a/test/tests
+++ b/test/tests
@@ -21,7 +21,7 @@ test::classic::defaults() {
     # With default settings
 
     test::utils::setupFixture "classic_default"
-    test::helpers::test_deploy "PHP (classic)" "8.1."
+    test::helpers::deploy "PHP (classic)" "8.1."
 }
 
 test::classic::php80() {
@@ -38,7 +38,7 @@ test::classic::php80() {
     fi
 
     test::utils::setupFixture "classic_default"
-    test::helpers::test_deploy "PHP (classic)" "8.0."
+    test::helpers::deploy "PHP (classic)" "8.0."
 }
 
 test::classic::php81() {
@@ -49,7 +49,7 @@ test::classic::php81() {
     export PHP_VERSION
 
     test::utils::setupFixture "classic_default"
-    test::helpers::test_deploy "PHP (classic)" "8.1."
+    test::helpers::deploy "PHP (classic)" "8.1."
 }
 
 test::classic::php82() {
@@ -60,7 +60,7 @@ test::classic::php82() {
     export PHP_VERSION
 
     test::utils::setupFixture "classic_default"
-    test::helpers::test_deploy "PHP (classic)" "8.2."
+    test::helpers::deploy "PHP (classic)" "8.2."
 }
 
 test::classic::php83() {
@@ -71,7 +71,7 @@ test::classic::php83() {
     export PHP_VERSION
 
     test::utils::setupFixture "classic_default"
-    test::helpers::test_deploy "PHP (classic)" "8.3."
+    test::helpers::deploy "PHP (classic)" "8.3."
 }
 
 test::composer::defaults() {
@@ -79,7 +79,7 @@ test::composer::defaults() {
     # With default settings
 
     test::utils::setupFixture "composer_default"
-    test::helpers::test_deploy "PHP (composer.json)" "8.1."
+    test::helpers::deploy "PHP (composer.json)" "8.1."
 }
 
 test::composer::php80() {
@@ -93,7 +93,7 @@ test::composer::php80() {
     fi
 
     test::utils::setupFixture "composer_php80"
-    test::helpers::test_deploy "PHP (composer.json)" "8.0."
+    test::helpers::deploy "PHP (composer.json)" "8.0."
 }
 
 test::composer::php81() {
@@ -101,7 +101,7 @@ test::composer::php81() {
     # Specifying we want PHP 8.1.x in composer.json
 
     test::utils::setupFixture "composer_php81"
-    test::helpers::test_deploy "PHP (composer.json)" "8.1."
+    test::helpers::deploy "PHP (composer.json)" "8.1."
 }
 
 test::composer::php82() {
@@ -109,7 +109,7 @@ test::composer::php82() {
     # Specifying we want PHP 8.2.x in composer.json
 
     test::utils::setupFixture "composer_php82"
-    test::helpers::test_deploy "PHP (composer.json)" "8.2."
+    test::helpers::deploy "PHP (composer.json)" "8.2."
 }
 
 test::composer::php83() {
@@ -117,7 +117,7 @@ test::composer::php83() {
     # Specifying we want PHP 8.3.x in composer.json
 
     test::utils::setupFixture "composer_php83"
-    test::helpers::test_deploy "PHP (composer.json)" "8.3."
+    test::helpers::deploy "PHP (composer.json)" "8.3."
 }
 
 test::composer::php_version_defaults() {
@@ -128,7 +128,7 @@ test::composer::php_version_defaults() {
     export PHP_VERSION
 
     test::utils::setupFixture "composer_default"
-    test::helpers::test_compile "8.3."
+    test::helpers::compile "8.3."
 }
 
 test::composer::php_version_lower_than_env() {
@@ -142,7 +142,7 @@ test::composer::php_version_lower_than_env() {
     export PHP_VERSION
 
     test::utils::setupFixture "composer_php83"
-    test::helpers::test_compile "8.3."
+    test::helpers::compile "8.3."
 }
 
 test::composer::php_version_greater_than_env() {
@@ -156,7 +156,7 @@ test::composer::php_version_greater_than_env() {
     export PHP_VERSION
 
     test::utils::setupFixture "composer_php82"
-    test::helpers::test_compile "8.2."
+    test::helpers::compile "8.2."
 }
 
 
@@ -174,7 +174,7 @@ suite_addTest test::composer::php81
 suite_addTest test::composer::php82
 suite_addTest test::composer::php83
 
-suite_addTest test::composer::over_defaults
-suite_addTest test::composer::over_lower_env
-suite_addTest test::composer::over_greater_env
+suite_addTest test::composer::php_version_over_defaults
+suite_addTest test::composer::php_version_over_lower_env
+suite_addTest test::composer::php_version_over_greater_env