diff --git a/extra/builder/test/test.factor b/extra/builder/test/test.factor
index 21734bf18c..e401b689c4 100644
--- a/extra/builder/test/test.factor
+++ b/extra/builder/test/test.factor
@@ -15,26 +15,26 @@ IN: builder.test
     [ bootstrap-time get . ]
   with-stream ;
 
-: try-everything* ( -- vocabs ) try-everything [ first vocab-link-name ] map ;
+! : try-everything* ( -- vocabs ) try-everything [ first vocab-link-name ] map ;
 
 ! : do-load ( -- )
-!   [ try-everything* ] "../load-everything-time" log-runtime
+!   [
+!     "../load-everything-log" <file-writer>
+!       [ try-everything keys ]
+!     with-stream
+!   ] "../load-everything-time" log-runtime
 !   dup empty?
 !     [ drop ]
-!     [ "../load-everything-log" log-object ]
-!   if ;
+!     [ "../load-everything-vocabs" log-object ]
+!   if
+!   "../load-everything-log" delete-file ;
 
 : do-load ( -- )
-  [
-    "../load-everything-log" <file-writer>
-      [ try-everything* ]
-    with-stream
-  ] "../load-everything-time" log-runtime
+  [ try-everything keys ] "../load-everything-time" log-runtime
   dup empty?
     [ drop ]
     [ "../load-everything-vocabs" log-object ]
-  if
-  "../load-everything-log" delete-file ;
+  if ;
 
 ! : do-tests ( -- )
 !   run-all-tests keys
@@ -43,21 +43,33 @@ IN: builder.test
 !   [ "../failing-tests" log-object ]
 !   if ;
 
+! : do-tests ( -- )
+!   [
+!     "../test-all-log" <file-writer>
+!       [ run-all-tests keys ]
+!     with-stream
+!   ] "../test-all-time" log-runtime
+!   dup empty?
+!     [ drop ]
+!     [ "../test-all-vocabs" log-object ]
+!   if
+!   "../test-all-log" delete-file ;
+
 : do-tests ( -- )
-  [
-    "../test-all-log" <file-writer>
-      [ run-all-tests keys ]
-    with-stream
-  ] "../test-all-time" log-runtime
+  [ run-all-tests keys ] "../test-all-time" log-runtime
   dup empty?
     [ drop ]
     [ "../test-all-vocabs" log-object ]
-  if
-  "../test-all-log" delete-file ;
+  if ;
+
+! : do-all ( -- )
+!   record-bootstrap-time
+!   [ do-load ]  [ drop ] recover
+!   [ do-tests ] [ drop ] recover ;
 
 : do-all ( -- )
   record-bootstrap-time
-  [ do-load ]  [ drop ] recover
-  [ do-tests ] [ drop ] recover ;
+  do-load
+  do-tests ;
 
 MAIN: do-all
\ No newline at end of file