diff --git a/basis/tools/coverage/coverage-tests.factor b/basis/tools/coverage/coverage-tests.factor
new file mode 100644
index 0000000000..6e03bced33
--- /dev/null
+++ b/basis/tools/coverage/coverage-tests.factor
@@ -0,0 +1,75 @@
+! Copyright (C) 2014 Jon Harper.
+! See http://factorcode.org/license.txt for BSD license.
+USING: arrays kernel sequences sorting tools.coverage
+tools.coverage.private tools.coverage.testvocab tools.coverage.testvocab.child
+tools.coverage.testvocab.private tools.test vocabs.loader ;
+IN: tools.coverage.tests
+
+{ "foo.private" } [ "foo" private-vocab-name ] unit-test
+{ "foo.private" } [ "foo.private" private-vocab-name ] unit-test
+
+{
+  { halftested mconcat testcond testfry testif testifprivate testmacro untested
+}
+} [ "tools.coverage.testvocab" [ ] map-words natural-sort ] unit-test
+
+{ t } [
+  "tools.coverage.testvocab"
+    [ V{ } clone [ [ push ] curry each-word ] keep >array ]
+    [ [ ] map-words ] bi =
+] unit-test
+
+{
+  { testifprivate }
+} [ "tools.coverage.testvocab.private" [ ] map-words natural-sort ] unit-test
+
+{ t } [
+  "tools.coverage.testvocab.private"
+    [ V{ } clone [ [ push ] curry each-word ] keep >array ]
+    [ [ ] map-words ] bi =
+] unit-test
+
+{ 3 } [ \ testif count-callables ] unit-test
+
+! Need to reload to flush macro cache
+! and have correct coverage statistics
+{
+  {
+    { halftested { [ ] } }
+    { mconcat { } }
+    { testcond { } }
+    { testfry { } }
+    { testif { } }
+    { testifprivate { } }
+    { testmacro { } }
+    { untested { [ ] } }
+  }
+} [ "tools.coverage.testvocab" [ reload ] [ test-coverage natural-sort ] bi ] unit-test
+
+{ 0.75 } [ "tools.coverage.testvocab.child" [ reload ] [ %coverage ] bi ] unit-test
+
+{
+  {
+    {
+        "tools.coverage.testvocab"
+        {
+            { halftested { [ ] } }
+            { mconcat { } }
+            { testcond { } }
+            { testfry { } }
+            { testif { } }
+            { testifprivate { } }
+            { testmacro { } }
+            { untested { [ ] } }
+        }
+    }
+    {
+        "tools.coverage.testvocab.child"
+        { { child-halftested { [ ] } } { foo { } } }
+    }
+}
+} [
+  "tools.coverage.testvocab.child" reload
+  "tools.coverage.testvocab" [ reload ] [ test-coverage-recursively ] bi natural-sort
+  [ first2 natural-sort 2array ] map
+] unit-test
diff --git a/basis/tools/coverage/testvocab/authors.txt b/basis/tools/coverage/testvocab/authors.txt
new file mode 100644
index 0000000000..2c5e05bdac
--- /dev/null
+++ b/basis/tools/coverage/testvocab/authors.txt
@@ -0,0 +1 @@
+Jon Harper
diff --git a/basis/tools/coverage/testvocab/child/authors.txt b/basis/tools/coverage/testvocab/child/authors.txt
new file mode 100644
index 0000000000..2c5e05bdac
--- /dev/null
+++ b/basis/tools/coverage/testvocab/child/authors.txt
@@ -0,0 +1 @@
+Jon Harper
diff --git a/basis/tools/coverage/testvocab/child/child-tests.factor b/basis/tools/coverage/testvocab/child/child-tests.factor
new file mode 100644
index 0000000000..1745dc9629
--- /dev/null
+++ b/basis/tools/coverage/testvocab/child/child-tests.factor
@@ -0,0 +1,7 @@
+! Copyright (C) 2014 Jon Harper.
+! See http://factorcode.org/license.txt for BSD license.
+USING: tools.test tools.coverage.testvocab.child ;
+IN: tools.coverage.testvocab.child.tests
+
+{ } [ foo ] unit-test
+{ } [ t child-halftested ] unit-test
diff --git a/basis/tools/coverage/testvocab/child/child.factor b/basis/tools/coverage/testvocab/child/child.factor
new file mode 100644
index 0000000000..ea9f86580e
--- /dev/null
+++ b/basis/tools/coverage/testvocab/child/child.factor
@@ -0,0 +1,7 @@
+! Copyright (C) 2014 Jon Harper.
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel ;
+IN: tools.coverage.testvocab.child
+
+: foo ( -- ) ;
+: child-halftested ( ? -- ) [ ] [ ] if ;
diff --git a/basis/tools/coverage/testvocab/testvocab-docs.factor b/basis/tools/coverage/testvocab/testvocab-docs.factor
new file mode 100644
index 0000000000..d197d15f8f
--- /dev/null
+++ b/basis/tools/coverage/testvocab/testvocab-docs.factor
@@ -0,0 +1,10 @@
+! Copyright (C) 2014 Jon Harper.
+! See http://factorcode.org/license.txt for BSD license.
+USING: help.markup help.syntax kernel quotations sequences ;
+IN: tools.coverage.testvocab
+
+ARTICLE: "tools.coverage.testvocab" "tools.coverage.testvocab"
+"The " { $vocab-link "tools.coverage.testdata" } " vocabulary is just a dummy vocabulary to test " { $vocab-link "tools.coverage" } "." ;
+
+ABOUT: "tools.coverage.testvocab"
+
diff --git a/basis/tools/coverage/testvocab/testvocab-tests.factor b/basis/tools/coverage/testvocab/testvocab-tests.factor
new file mode 100644
index 0000000000..847dcabd32
--- /dev/null
+++ b/basis/tools/coverage/testvocab/testvocab-tests.factor
@@ -0,0 +1,18 @@
+! Copyright (C) 2014 Jon Harper.
+! See http://factorcode.org/license.txt for BSD license.
+USING: tools.test tools.coverage.testvocab tools.coverage.testvocab.private ;
+IN: tools.coverage.testvocab.tests
+
+{ } [ t testifprivate ] unit-test
+{ } [ f testifprivate ] unit-test
+{ } [ t testif ] unit-test
+{ } [ f testif ] unit-test
+{ } [ f halftested ] unit-test
+{ 0 } [ 0 testcond ] unit-test
+{ 1 } [ 1 testcond ] unit-test
+{ 2 } [ 2 testcond ] unit-test
+{ 1 2 3 } [ { [ 1 ] [ 2 3 ] } mconcat ] unit-test
+{ } [ 1 2 testmacro ] unit-test
+{ } [ 2 1 testmacro ] unit-test
+{ } [ t testfry ] unit-test
+{ } [ f testfry ] unit-test
diff --git a/basis/tools/coverage/testvocab/testvocab.factor b/basis/tools/coverage/testvocab/testvocab.factor
new file mode 100644
index 0000000000..d6f83c2eb7
--- /dev/null
+++ b/basis/tools/coverage/testvocab/testvocab.factor
@@ -0,0 +1,29 @@
+! Copyright (C) 2014 Jon Harper.
+! See http://factorcode.org/license.txt for BSD license.
+USING: combinators fry kernel macros math sequences ;
+IN: tools.coverage.testvocab
+
+<PRIVATE
+
+: testifprivate ( ? -- ) [ ] [ ] if ;
+
+PRIVATE>
+
+: halftested ( ? -- ) [ ] [ ] if ;
+: testif ( ? -- ) [ ] [ ] if ;
+: testcond ( n -- n ) {
+  { [ dup 0 = ] [ ] }
+  { [ dup 1 = ] [ ] }
+  [ ]
+} cond ;
+
+MACRO: mconcat ( seq -- quot ) concat ;
+: testmacro ( a b -- )
+    { [ 2dup ] [ <= [ ] [ ] if ] [ > [ ] [ ] if ] } mconcat ;
+
+: testfry ( ? -- )
+  '[ _ [ ] [ ] if ] call ;
+
+: untested ( -- ) ;
+
+SYMBOL: not-a-coverage-word