diff --git a/tests/androidmk_test.sh b/tests/androidmk_test.sh
index d0d382b4f..b81828ba6 100755
--- a/tests/androidmk_test.sh
+++ b/tests/androidmk_test.sh
@@ -133,6 +133,4 @@ function run_androidmk_test {
   echo "Succeeded"
 }
 
-test_rewrite_license_property_inside_current_directory
-
-test_rewrite_license_property_outside_current_directory
+scan_and_run_tests
diff --git a/tests/mixed_mode_test.sh b/tests/mixed_mode_test.sh
index 8949b428a..7b3151bfd 100755
--- a/tests/mixed_mode_test.sh
+++ b/tests/mixed_mode_test.sh
@@ -63,5 +63,4 @@ EOF
   fi
 }
 
-test_add_irrelevant_file
-test_bazel_smoke
+scan_and_run_tests
\ No newline at end of file
diff --git a/tests/soong_test.sh b/tests/soong_test.sh
index 905d70823..f7bee4008 100755
--- a/tests/soong_test.sh
+++ b/tests/soong_test.sh
@@ -19,4 +19,4 @@ function test_m_clean_works {
   run_soong clean
 }
 
-test_m_clean_works
+scan_and_run_tests
\ No newline at end of file