diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
index 5dea89858da..bf7f13c40b2 100755
--- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
@@ -40,8 +40,7 @@ import org.apache.lucene.util._TestUtil;
  * Test that norms info is preserved during index life - including
  * separate norms, addDocument, addIndexes, forceMerge.
  */
-// nocommit put SimpleText back in suppress list:
-@SuppressCodecs({ "Memory", "Direct" })
+@SuppressCodecs({ "Memory", "Direct", "SimpleText" })
 @Slow
 public class TestNorms extends LuceneTestCase {
   final String byteTestField = "normsTestByte";
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
index 76b8fe69d46..91b2528a398 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
@@ -254,8 +254,7 @@ public class TestOmitTf extends LuceneTestCase {
         newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).
             setMaxBufferedDocs(2).
             setSimilarity(new SimpleSimilarity()).
-            setMergePolicy(newLogMergePolicy(2)).
-        setMergeScheduler(new SerialMergeScheduler())  // nocommit
+            setMergePolicy(newLogMergePolicy(2))
     );
         
     StringBuilder sb = new StringBuilder(265);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
index 6812b119f68..a25121b3138 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
@@ -162,8 +162,7 @@ public class TestBooleanOr extends LuceneTestCase {
 
   public void testBooleanScorerMax() throws IOException {
     Directory dir = newDirectory();
-    // nocommit remove SMS:
-    RandomIndexWriter riw = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergeScheduler(new SerialMergeScheduler()));
+    RandomIndexWriter riw = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
 
     int docCount = atLeast(10000);
 
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
index e12c4077845..80907540c34 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
@@ -40,8 +40,6 @@ import org.apache.lucene.util.LuceneTestCase;
  * In the example, a docvalues field is used as a per-document boost (separate from the norm)
  * @lucene.experimental
  */
-// nocommit Lucene40 doesn't yet impl SimpleDV:
-@SuppressCodecs("Lucene40")
 public class TestDocValuesScoring extends LuceneTestCase {
   private static final float SCORE_EPSILON = 0.001f; /* for comparing floats */
 
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSort.java b/lucene/core/src/test/org/apache/lucene/search/TestSort.java
index 298b425710b..1694ae6cc28 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSort.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSort.java
@@ -74,8 +74,6 @@ import org.junit.BeforeClass;
  * @since   lucene 1.4
  */
 
-// nocommit unsuppress this once Lucene40 impls DV 2.0:
-@SuppressCodecs({"Lucene40"})
 public class TestSort extends LuceneTestCase {
   private static int NUM_STRINGS;
   private IndexSearcher full;
@@ -200,10 +198,7 @@ public class TestSort extends LuceneTestCase {
 
     IndexReader reader = writer.getReader();
     writer.close ();
-    // nocommit back to newSearcher(true)? problem is this
-    // sometimes uses slow reader wrapper which does not
-    // provide DV 2.0
-    IndexSearcher s = newSearcher(reader, false);
+    IndexSearcher s = newSearcher(reader);
     return s;
   }
 
@@ -277,10 +272,7 @@ public class TestSort extends LuceneTestCase {
     //System.out.println(writer.getSegmentCount());
     writer.close();
     IndexReader reader = DirectoryReader.open(indexStore);
-    // nocommit back to newSearcher(true)? problem is this
-    // sometimes uses slow reader wrapper which does not
-    // provide DV 2.0
-    IndexSearcher searcher = newSearcher(reader, false);
+    IndexSearcher searcher = newSearcher(reader);
 
     /*
     for(int docID=0;docID<reader.maxDoc();docID++) {