diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor
index 95a2f7e0d0..c126b956be 100644
--- a/basis/help/lint/lint.factor
+++ b/basis/help/lint/lint.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs combinators continuations fry help
-help.lint.checks help.topics io kernel namespaces parser
-sequences source-files.errors vocabs.hierarchy vocabs words
-classes locals tools.errors listener ;
+USING: assocs classes combinators command-line continuations fry
+help help.lint.checks help.topics io kernel listener locals
+namespaces parser sequences source-files.errors system
+tools.errors vocabs vocabs.hierarchy ;
 IN: help.lint
 
 SYMBOL: lint-failures
@@ -97,3 +97,12 @@ PRIVATE>
     [ word-help ] reject
     [ article-parent ] filter
     [ predicate? ] reject ;
+
+: test-lint-main ( -- )
+    command-line get [ load ] each
+    help-lint-all
+    lint-failures get assoc-empty?
+    [ [ "==== FAILING LINT" print :lint-failures flush ] unless ]
+    [ 0 1 ? exit ] bi ;
+
+MAIN: test-lint-main
diff --git a/basis/tools/test/test.factor b/basis/tools/test/test.factor
index 06e5be435b..dcbb99b219 100644
--- a/basis/tools/test/test.factor
+++ b/basis/tools/test/test.factor
@@ -213,7 +213,7 @@ M: test-failure error. ( error -- )
 : test-main ( -- )
     command-line get [ [ load ] [ test ] bi ] each
     test-failures get empty?
-    [ [ "==== FAILING TESTS" print :test-failures ] unless ]
+    [ [ "==== FAILING TESTS" print flush :test-failures ] unless ]
     [ 0 1 ? exit ] bi ;
 
 MAIN: test-main