diff --git a/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
index 7e0b4768ab4..37bd93afc40 100644
--- a/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
+++ b/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
@@ -49,11 +49,10 @@ public class TestPrefixRandom extends LuceneTestCase {
     super.setUp();
     random = newRandom();
     dir = new MockRAMDirectory();
-    // TODO: fix mocktokenizer to not extend chartokenizer, so you can have an 'empty' keyword.
     RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockAnalyzer(MockTokenizer.KEYWORD, false));
     
     Document doc = new Document();
-    Field field = new Field("field", "", Field.Store.NO, Field.Index.ANALYZED);
+    Field field = new Field("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
     doc.add(field);
 
     int num = 2000 * RANDOM_MULTIPLIER;
diff --git a/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
index c209b0c3749..7d69a14103e 100644
--- a/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
+++ b/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
@@ -57,13 +57,10 @@ public class TestRegexpRandom2 extends LuceneTestCase {
     super.setUp();
     random = newRandom();
     dir = new MockRAMDirectory();
-    // TODO: fix mocktokenizer to not extend chartokenizer, so you can have an 'empty' keyword.
-    // currently, this means 'empty tokens' arent created/tested in the enumeration:
-    // <mikemccand> it's like having a big hairy scary monster in the basement but being upset that it doesn't have fangs
     RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockAnalyzer(MockTokenizer.KEYWORD, false));
     
     Document doc = new Document();
-    Field field = new Field("field", "", Field.Store.NO, Field.Index.ANALYZED);
+    Field field = new Field("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
     doc.add(field);
     List<String> terms = new ArrayList<String>();
     int num = 2000 * RANDOM_MULTIPLIER;