diff --git a/solr/contrib/dataimporthandler/build.xml b/solr/contrib/dataimporthandler/build.xml
index 9f295ab993e..8c18c01ec5f 100644
--- a/solr/contrib/dataimporthandler/build.xml
+++ b/solr/contrib/dataimporthandler/build.xml
@@ -55,6 +55,8 @@
+
+
@@ -65,6 +67,8 @@
+
+
diff --git a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
index 5a5220e3761..cc3c806f510 100644
--- a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
@@ -17,6 +17,8 @@
package org.apache.solr.handler.dataimport;
import junit.framework.Assert;
+
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrInputDocument;
import org.junit.Ignore;
import org.junit.Test;
@@ -45,7 +47,7 @@ import java.util.Map;
* @see org.apache.solr.handler.dataimport.MailEntityProcessor
* @since solr 1.4
*/
-public class TestMailEntityProcessor {
+public class TestMailEntityProcessor extends SolrTestCaseJ4 {
// Credentials
private static final String user = "user";
diff --git a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
index d2adc5a2ee8..863329039b6 100644
--- a/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
@@ -23,7 +23,7 @@ import org.junit.Before;
* @version $Id$
* @since solr 1.5
*/
-public class TestTikaEntityProcessor extends AbstractDataImportHandlerTest {
+public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
@Before
public void setUp() throws Exception {
diff --git a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
similarity index 99%
rename from solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java
rename to solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
index 2572a10427f..a814e02d10e 100644
--- a/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTest.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
@@ -37,7 +37,7 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public abstract class AbstractDataImportHandlerTest extends
+public abstract class AbstractDataImportHandlerTestCase extends
AbstractSolrTestCase {
@Override
diff --git a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
index 391eb6f8a7e..718385495f5 100644
--- a/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
+import org.apache.solr.SolrTestCaseJ4;
import org.junit.Assert;
import org.junit.Test;
@@ -32,24 +33,24 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestCachedSqlEntityProcessor {
+public class TestCachedSqlEntityProcessor extends SolrTestCaseJ4 {
@Test
public void withoutWhereClause() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTest.createMap("column", "id"));
- fields.add(AbstractDataImportHandlerTest.createMap("column", "desc"));
+ fields.add(AbstractDataImportHandlerTestCase.createMap("column", "id"));
+ fields.add(AbstractDataImportHandlerTestCase.createMap("column", "desc"));
String q = "select * from x where id=${x.id}";
- Map entityAttrs = AbstractDataImportHandlerTest.createMap(
+ Map entityAttrs = AbstractDataImportHandlerTestCase.createMap(
"query", q);
MockDataSource ds = new MockDataSource();
VariableResolverImpl vr = new VariableResolverImpl();
- vr.addNamespace("x", AbstractDataImportHandlerTest.createMap("id", 1));
- Context context = AbstractDataImportHandlerTest.getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
+ vr.addNamespace("x", AbstractDataImportHandlerTestCase.createMap("id", 1));
+ Context context = AbstractDataImportHandlerTestCase.getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
List