diff --git a/make/RunTestsPrebuiltFindTests.gmk b/make/GenerateFindTests.gmk
similarity index 100%
rename from make/RunTestsPrebuiltFindTests.gmk
rename to make/GenerateFindTests.gmk
diff --git a/make/Init.gmk b/make/Init.gmk
index 6da2fb985b6..2a8f6399a18 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -37,11 +37,9 @@ include MakeFileStart.gmk
 include $(TOPDIR)/make/InitSupport.gmk
 include LogUtils.gmk
 
-# Force early generation of module-deps.gmk and find-tests.gmk
+# Force early generation of module-deps.gmk
 GENERATE_MODULE_DEPS_FILE := true
 include Modules.gmk
-GENERATE_FIND_TESTS_FILE := true
-include FindTests.gmk
 
 # Inclusion of this pseudo-target will cause make to execute this file
 # serially, regardless of -j.
diff --git a/make/PreInitSupport.gmk b/make/PreInitSupport.gmk
index 66bcbd2209c..668363d8725 100644
--- a/make/PreInitSupport.gmk
+++ b/make/PreInitSupport.gmk
@@ -267,6 +267,9 @@ define DefineMainTargets
 
   $$(main_targets_file):
 	@( cd $$(TOPDIR) && \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
+	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) )
+	@( cd $$(TOPDIR) && \
 	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
 	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index ea38e73d49c..ba9731789b0 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -298,7 +298,7 @@ test-prebuilt:
 	@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
         # We need to fill the FindTest cache before entering RunTests.gmk.
 	@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) SPEC=$(SPEC) \
-	    -f RunTestsPrebuiltFindTests.gmk
+	    -f GenerateFindTests.gmk
 	@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
 	    TEST="$(TEST)"