diff --git a/src/test/org/apache/lucene/analysis/TestAnalyzers.java b/src/test/org/apache/lucene/analysis/TestAnalyzers.java
index 19ce96efa0b..6df51d8da7a 100644
--- a/src/test/org/apache/lucene/analysis/TestAnalyzers.java
+++ b/src/test/org/apache/lucene/analysis/TestAnalyzers.java
@@ -101,7 +101,7 @@ public class TestAnalyzers extends TestCase {
   }
 
   public void testNull() throws Exception {
-    Analyzer a = new NullAnalyzer();
+    Analyzer a = new WhitespaceAnalyzer();
     assertAnalyzesTo(a, "foo bar FOO BAR", 
                      new String[] { "foo", "bar", "FOO", "BAR" });
     assertAnalyzesTo(a, "foo      bar .  FOO <> BAR", 
diff --git a/src/test/org/apache/lucene/queryParser/TestQueryParser.java b/src/test/org/apache/lucene/queryParser/TestQueryParser.java
index 19e158ff1b5..2f198463ee0 100644
--- a/src/test/org/apache/lucene/queryParser/TestQueryParser.java
+++ b/src/test/org/apache/lucene/queryParser/TestQueryParser.java
@@ -178,7 +178,7 @@ public class TestQueryParser extends TestCase {
   }
 
   public void testPunct() throws Exception {
-    Analyzer a = new NullAnalyzer();
+    Analyzer a = new WhitespaceAnalyzer();
     assertQueryEquals("a&b", a, "a&b");
     assertQueryEquals("a&&b", a, "a&&b");
     assertQueryEquals(".NET", a, ".NET");