diff --git a/src/test/org/apache/solr/HighlighterTest.java b/src/test/org/apache/solr/highlight/HighlighterTest.java
similarity index 97%
rename from src/test/org/apache/solr/HighlighterTest.java
rename to src/test/org/apache/solr/highlight/HighlighterTest.java
index 7619ac033e2..f8251c4ce60 100755
--- a/src/test/org/apache/solr/HighlighterTest.java
+++ b/src/test/org/apache/solr/highlight/HighlighterTest.java
@@ -15,33 +15,34 @@
  * limitations under the License.
  */
 
-package org.apache.solr;
-
-import org.apache.solr.request.*;
-import org.apache.solr.util.*;
-import org.apache.solr.schema.*;
+package org.apache.solr.highlight;
 
 import java.util.HashMap;
 
+import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.util.TestHarness;
+
 /**
  * Tests some basic functionality of Solr while demonstrating good
  * Best Practices for using AbstractSolrTestCase
  */
 public class HighlighterTest extends AbstractSolrTestCase {
 
-  public String getSchemaFile() { return "schema.xml"; }
-  public String getSolrConfigFile() { return "solrconfig.xml"; }
+  @Override public String getSchemaFile() { return "schema.xml"; }
+  @Override public String getSolrConfigFile() { return "solrconfig.xml"; }
 
+  @Override 
   public void setUp() throws Exception {
     // if you override setUp or tearDown, you better call
     // the super classes version
     super.setUp();
   }
+  
+  @Override 
   public void tearDown() throws Exception {
     // if you override setUp or tearDown, you better call
     // the super classes version
     super.tearDown();
-
   }
 
   public void testTermVecHighlight() {