diff --git a/src/test/org/apache/lucene/index/store/FSDirectoryTest.java b/src/test/org/apache/lucene/index/store/TestFSDirectory.java
similarity index 99%
rename from src/test/org/apache/lucene/index/store/FSDirectoryTest.java
rename to src/test/org/apache/lucene/index/store/TestFSDirectory.java
index 2fd1106d62d..fce50673207 100644
--- a/src/test/org/apache/lucene/index/store/FSDirectoryTest.java
+++ b/src/test/org/apache/lucene/index/store/TestFSDirectory.java
@@ -37,7 +37,7 @@ import org.apache.lucene.index.IndexWriter;
  * @author Michael Goddard
  */
 
-public class FSDirectoryTest extends TestCase {
+public class TestFSDirectory extends TestCase {
 
     /**
      * What happens if the Lucene lockDir doesn't exist?
diff --git a/src/test/org/apache/lucene/util/StringHelperTest.java b/src/test/org/apache/lucene/util/TestStringHelper.java
similarity index 86%
rename from src/test/org/apache/lucene/util/StringHelperTest.java
rename to src/test/org/apache/lucene/util/TestStringHelper.java
index d5e5d13fad3..fe681c57586 100644
--- a/src/test/org/apache/lucene/util/StringHelperTest.java
+++ b/src/test/org/apache/lucene/util/TestStringHelper.java
@@ -18,20 +18,9 @@ package org.apache.lucene.util;
 
 import junit.framework.TestCase;
 
-public class StringHelperTest extends TestCase {
+public class TestStringHelper extends TestCase {
 
 
-  public StringHelperTest(String s) {
-    super(s);
-  }
-
-  protected void setUp() {
-  }
-
-  protected void tearDown() {
-
-  }
-
   public void testStringDifference() {
     String test1 = "test";
     String test2 = "testing";