diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 8c486cda4e..55e9cca00b 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -1199,7 +1199,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
     JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br>
   endif
   JCOV_REPORT_TITLE += Tests: $(TEST)
-	
+
   jcov-gen-report: jcov-stop-grabber
 	$(call LogWarn, Generating JCov report ...)
 	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 76efac149a..a65911b1d4 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -337,6 +337,10 @@ SPEC := $(NEW_SPEC)
 default: all
 
 run-test-prebuilt:
+        # Need to make sure the failure logs output dir exists since
+        # ExecuteWithLog is called in RunTests.gmk. The PrepareFailureLogs macro
+        # is unfortunately not available at this point.
+	$(call MakeDir, $(MAKESUPPORT_OUTPUTDIR)/failure-logs)
 	@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
         # The lazy initialization of the cache file in FindTests.gmk does not
         # always work with RunTests.gmk. To guarantee that the jtreg test groups