diff --git a/basis/tools/test/test.factor b/basis/tools/test/test.factor
index 4a82a9eed4..b559bf3977 100644
--- a/basis/tools/test/test.factor
+++ b/basis/tools/test/test.factor
@@ -1,14 +1,13 @@
 ! Copyright (C) 2003, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators compiler.units
-continuations debugger effects fry generalizations
-sequences.generalizations io io.files io.styles kernel lexer
-locals macros math.parser namespaces parser vocabs.parser
-prettyprint quotations sequences source-files splitting
-stack-checker summary unicode.case vectors vocabs vocabs.loader
-vocabs.files vocabs.metadata words tools.errors
-source-files.errors source-files.errors.debugger io.streams.string
-make compiler.errors ;
+USING: accessors arrays assocs combinators command-line
+compiler.units continuations debugger effects fry
+generalizations io kernel lexer locals macros namespaces parser
+prettyprint quotations sequences sequences.generalizations
+source-files source-files.errors source-files.errors.debugger
+splitting stack-checker summary tools.errors unicode.case vocabs
+vocabs.files vocabs.metadata vocabs.parser words ;
+FROM: vocabs.hierarchy => load ;
 IN: tools.test
 
 TUPLE: test-failure < source-file-error continuation ;
@@ -171,3 +170,7 @@ M: test-failure error. ( error -- )
 
 : test-all ( -- ) vocabs filter-don't-test test-vocabs ;
 
+: test-main ( -- )
+    command-line get [ [ load ] [ test ] bi ] each ;
+
+MAIN: test-main