diff --git a/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
index ff593f1..dbea3dc 100644
--- a/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
+++ b/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
@@ -17,6 +17,7 @@
 package org.apache.solr.handler.dataimport;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.DirectXmlRequest;
@@ -184,6 +185,10 @@ private JettySolrRunner createAndStartJetty(SolrInstance instance) throws Except
     return jetty;
   }
 
+  private static JettyConfig buildJettyConfig(String context) {
+    return JettyConfig.builder().setContext(context).stopAtShutdown(true).build();
+  }
+
   static String xml = "<root>\n"
           + "<b>\n"
           + "  <id>1</id>\n"
diff --git a/src/test/java/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java b/src/test/java/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
index 56079fb..a12b64d 100644
--- a/src/test/java/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
+++ b/src/test/java/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
@@ -32,6 +32,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.lucene.util.IOUtils;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.embedded.JettyConfig;
 import org.apache.solr.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.common.SolrInputDocument;
@@ -371,4 +372,8 @@ private JettySolrRunner createAndStartJetty(SolrInstance instance) throws Except
     return jetty;
   }
 
+  private static JettyConfig buildJettyConfig(String context) {
+    return JettyConfig.builder().setContext(context).stopAtShutdown(true).build();
+  }
+
 }
diff --git a/src/test/resources/dih/solr/collection1/conf/contentstream-solrconfig.xml b/src/test/resources/dih/solr/collection1/conf/contentstream-solrconfig.xml
index d3ee34c..3242dd3 100644
--- a/src/test/resources/dih/solr/collection1/conf/contentstream-solrconfig.xml
+++ b/src/test/resources/dih/solr/collection1/conf/contentstream-solrconfig.xml
@@ -20,6 +20,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <indexConfig>
     <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+    <lockType>${solr.lock.type:single}</lockType>
   </indexConfig>
 
   <!-- Used to specify an alternate directory to hold all index data
diff --git a/src/test/resources/dih/solr/collection1/conf/dataimport-solrconfig.xml b/src/test/resources/dih/solr/collection1/conf/dataimport-solrconfig.xml
index ec6e6a9..a3a159c 100644
--- a/src/test/resources/dih/solr/collection1/conf/dataimport-solrconfig.xml
+++ b/src/test/resources/dih/solr/collection1/conf/dataimport-solrconfig.xml
@@ -20,6 +20,7 @@
   <luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
   <indexConfig>
     <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+    <lockType>${solr.lock.type:single}</lockType>
   </indexConfig>
 
   <!-- Used to specify an alternate directory to hold all index data