diff --git a/extra/singleton/singleton-tests.factor b/extra/singleton/singleton-tests.factor
new file mode 100644
index 0000000000..1698181ed3
--- /dev/null
+++ b/extra/singleton/singleton-tests.factor
@@ -0,0 +1,9 @@
+USING: kernel singleton tools.test ;
+IN: singleton.tests
+
+[ ] [ SINGLETON: bzzt ] unit-test
+[ t ] [ bzzt bzzt? ] unit-test
+[ t ] [ bzzt bzzt eq? ] unit-test
+GENERIC: zammo ( obj -- )
+[ ] [ M: bzzt zammo drop "yes!" ; ] unit-test
+[ "yes!" ] [ bzzt zammo ] unit-test