diff --git a/core/classes/classes-tests.factor b/core/classes/classes-tests.factor
index 38ca796384..640439312d 100755
--- a/core/classes/classes-tests.factor
+++ b/core/classes/classes-tests.factor
@@ -56,8 +56,8 @@ UNION: c a b ;
 [ t ] [ \ c \ tuple class< ] unit-test
 [ f ] [ \ tuple \ c class< ] unit-test
 
-DEFER: bah
-FORGET: bah
+! DEFER: bah
+! FORGET: bah
 UNION: bah fixnum alien ;
 [ bah ] [ \ bah? "predicating" word-prop ] unit-test
 
diff --git a/core/generic/generic.factor b/core/generic/generic.factor
index dbff82777f..f73579661d 100755
--- a/core/generic/generic.factor
+++ b/core/generic/generic.factor
@@ -25,8 +25,6 @@ GENERIC: make-default-method ( generic combination -- method )
 
 PREDICATE: word generic "combination" word-prop >boolean ;
 
-M: generic definer drop f f ;
-
 M: generic definition drop f ;
 
 : make-generic ( word -- )
diff --git a/core/words/words-tests.factor b/core/words/words-tests.factor
index 97ce86d38a..06f3c7a782 100755
--- a/core/words/words-tests.factor
+++ b/core/words/words-tests.factor
@@ -141,7 +141,7 @@ SYMBOL: quot-uses-b
 
 [ { + } ] [ \ quot-uses-b uses ] unit-test
 
-[ "IN: words.tests : undef-test ; << undef-test >>" eval ]
+[ "IN: words.tests FORGET: undef-test : undef-test ; << undef-test >>" eval ]
 [ [ undefined? ] is? ] must-fail-with
 
 [ ] [
diff --git a/extra/tools/crossref/crossref-tests.factor b/extra/tools/crossref/crossref-tests.factor
index a277a68ed7..0717763ed0 100755
--- a/extra/tools/crossref/crossref-tests.factor
+++ b/extra/tools/crossref/crossref-tests.factor
@@ -8,5 +8,5 @@ M: integer foo + ;
 
 "resource:extra/tools/crossref/test/foo.factor" run-file
 
-[ t ] [ integer \ foo method method-word \ + usage member? ] unit-test
+[ t ] [ integer \ foo method \ + usage member? ] unit-test
 [ t ] [ \ foo usage [ pathname? ] contains? ] unit-test