diff --git a/pom.xml b/pom.xml
index a729d72ee..8863b968c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,19 @@
                <showDeprecation>true</showDeprecation>
             </configuration>
          </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>2.22.2</version>
+            <executions>
+               <execution>
+                  <goals>
+                     <goal>integration-test</goal>
+                     <goal>verify</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
       </plugins>
    </build>
    <dependencies>
diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 1a041e2f9..f5285a7cf 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -292,7 +292,7 @@
 						</goals>
 						<configuration>
 							<excludes>
-								<exclude>**/AnnotationWriter.*</exclude>
+								<exclude>**/libs/*</exclude>
 							</excludes>
 							<!-- Sets the path to the file which contains the execution data. -->
 							<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedIT.java
index 7fcef7193..33a0761e4 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedIT.java
@@ -87,7 +87,7 @@ import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_VERSI
  * @author Michael Suzuki 
  */
 @ThreadLeakLingering(linger = 5000)
-public abstract class AbstractAlfrescoDistributedTest extends SolrTestInitializer
+public abstract class AbstractAlfrescoDistributedIT extends SolrITInitializer
 {
     protected static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     
@@ -760,8 +760,6 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestInitialize
             params.remove("distrib");
             setDistributedParams(params);
             QueryResponse rsp = queryRandomShard(json, params);
-            System.out.println("Cluster Response:"+rsp);
-            System.out.println("Control Response:"+controlRsp);
             solrComparator.compareResponses(rsp, controlRsp);
             return rsp;
         }
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoSolrTests.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoSolrIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoSolrTests.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoSolrIT.java
index a7647a399..d9ee37eaa 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoSolrTests.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoSolrIT.java
@@ -27,7 +27,6 @@ import org.alfresco.solr.client.NodeMetaData;
 import org.alfresco.solr.client.SOLRAPIQueueClient;
 import org.alfresco.solr.client.Transaction;
 import org.alfresco.solr.tracker.Tracker;
-import org.alfresco.util.SearchLanguageConversion;
 import org.apache.chemistry.opencmis.commons.impl.json.JSONArray;
 import org.apache.chemistry.opencmis.commons.impl.json.JSONObject;
 import org.apache.chemistry.opencmis.commons.impl.json.JSONValue;
@@ -84,17 +83,17 @@ import static org.junit.Assert.assertEquals;
 
 /**
  * Base class that provides the solr test harness.
- * This is used to manage the embedded solr used for unit and integration testing.
+ * This is used to manage the embedded solr used for integration testing.
  * The abstract also provides helper method that interacts with the 
  * embedded solr.
  * 
  * @author Michael Suzuki
  *
  */
-public abstract class AbstractAlfrescoSolrTests implements SolrTestFiles, AlfrescoSolrConstants
+public abstract class AbstractAlfrescoSolrIT implements SolrTestFiles, AlfrescoSolrConstants
 {
     static AlfrescoCoreAdminHandler admin;
-    private static Log LOG = LogFactory.getLog(AbstractAlfrescoSolrTests.class);
+    private static Log LOG = LogFactory.getLog(AbstractAlfrescoSolrIT.class);
     private static boolean CORE_NOT_YET_CREATED = true;
 
     /**
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedIT.java
similarity index 96%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedIT.java
index 95b98db09..2a9fe6aca 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerDistributedIT.java
@@ -43,7 +43,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.*;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class AdminHandlerDistributedTest extends AbstractAlfrescoDistributedTest
+public class AdminHandlerDistributedIT extends AbstractAlfrescoDistributedIT
 {
     private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     final String JETTY_SERVER_ID = this.getClass().getSimpleName();
@@ -52,7 +52,7 @@ public class AdminHandlerDistributedTest extends AbstractAlfrescoDistributedTest
     @BeforeClass
     private static void initData() throws Throwable
     {
-        initSolrServers(2, "AdminHandlerDistributedTest", null);
+        initSolrServers(2, "AdminHandlerDistributedIT", null);
     }
 
     @AfterClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerIT.java
similarity index 96%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerIT.java
index 872fea72c..140b6b1db 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AdminHandlerIT.java
@@ -11,7 +11,8 @@ import org.junit.Test;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class AdminHandlerTest extends AbstractAlfrescoSolrTests {
+public class AdminHandlerIT extends AbstractAlfrescoSolrIT
+{
 
     static CoreAdminHandler admin;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoCoreAdminHandlerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoCoreAdminHandlerIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoCoreAdminHandlerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoCoreAdminHandlerIT.java
index 955f365b5..5e264adb3 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoCoreAdminHandlerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoCoreAdminHandlerIT.java
@@ -60,7 +60,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 /** Unit tests for {@link org.alfresco.solr.AlfrescoCoreAdminHandler}. */
 @RunWith(MockitoJUnitRunner.class)
-public class AlfrescoCoreAdminHandlerTest
+public class AlfrescoCoreAdminHandlerIT
 {
     /** The string representing a transaction report. */
     private static final String TXREPORT = "TXREPORT";
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java
index c56138ed0..70500adf6 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java
@@ -37,8 +37,9 @@ import org.quartz.SchedulerException;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class AlfrescoSolrReloadTest extends AbstractAlfrescoSolrTests {
-    private static Log logger = LogFactory.getLog(org.alfresco.solr.tracker.AlfrescoSolrTrackerTest.class);
+public class AlfrescoSolrReloadIT extends AbstractAlfrescoSolrIT
+{
+    private static Log logger = LogFactory.getLog(org.alfresco.solr.tracker.AlfrescoSolrTrackerIT.class);
 
     @BeforeClass
     public static void beforeClass() throws Exception {
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
index 174939124..03f55926f 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
@@ -77,7 +77,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.solr.AbstractAlfrescoSolrTests.SolrServletRequest;
+import org.alfresco.solr.AbstractAlfrescoSolrIT.SolrServletRequest;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationIT.java
similarity index 96%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationIT.java
index cbb1c1e36..b679ec5fe 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationIT.java
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SolrTestCaseJ4.SuppressSSL
-public class AlfrescoTrackerRegistrationTest extends AbstractAlfrescoSolrTests
+public class AlfrescoTrackerRegistrationIT extends AbstractAlfrescoSolrIT
 {
     @BeforeClass
     public static void beforeClass() throws Exception {
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedIT.java
index 2081c770f..feb54a648 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateUpdateDistributedIT.java
@@ -51,7 +51,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getCore;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class CoresCreateUpdateDistributedTest extends AbstractAlfrescoDistributedTest
+public class CoresCreateUpdateDistributedIT extends AbstractAlfrescoDistributedIT
 {
     private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     final static String JETTY_SERVER_ID = "CoresCreateUpdateDistributedTest";
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateViaPropertyTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateViaPropertyIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateViaPropertyTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateViaPropertyIT.java
index 2bc699dd5..82d128394 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateViaPropertyTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/CoresCreateViaPropertyIT.java
@@ -40,7 +40,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getCore;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class CoresCreateViaPropertyTest extends AbstractAlfrescoDistributedTest
+public class CoresCreateViaPropertyIT extends AbstractAlfrescoDistributedIT
 {
     private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     final static String JETTY_SERVER_ID = "CoresCreateViaPropertyTest";
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrDataModelTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrDataModelTest.java
index 17bc9ee73..0f46bbed4 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrDataModelTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrDataModelTest.java
@@ -72,79 +72,4 @@ public class SolrDataModelTest
         Long actualId = AlfrescoSolrDataModel.parseTransactionId(id);
         assertEquals(expectedId, actualId);
     }
-    
-    @Test
-    public void smokeTestCMISModel()
-    {
-        AlfrescoSolrDataModel dataModel = new AlfrescoSolrDataModel();
-        
-        // load test model containing content properties multiple
-        ClassLoader cl = SolrDataModelTest.class.getClassLoader();
-        InputStream modelStream = cl.getResourceAsStream("alfresco/model/dictionaryModel.xml");
-        
-        assertNotNull(modelStream);
-        M2Model model = M2Model.createModel(modelStream);
-        dataModel.putModel(model);
-        
-        modelStream = cl.getResourceAsStream("alfresco/model/cmisModel.xml");
-        assertNotNull(modelStream);
-        model = M2Model.createModel(modelStream);
-        dataModel.putModel(model);
-        
-        assertEquals(2, dataModel.getAlfrescoModels().size());
-        
-        assertEquals(1, dataModel.getIndexedFieldNamesForProperty(OBJECT_ID).getFields().size());
-        assertEquals(4, dataModel.getIndexedFieldNamesForProperty(NAME).getFields().size());
-        assertEquals(1, dataModel.getIndexedFieldNamesForProperty(CREATION_DATE).getFields().size());
-        assertEquals(0, dataModel.getIndexedFieldNamesForProperty(IS_IMMUTABLE).getFields().size());
-        assertEquals(0, dataModel.getIndexedFieldNamesForProperty(IS_PRIVATE_WOKING_COPY).getFields().size());
-        assertEquals(1, dataModel.getIndexedFieldNamesForProperty(CONTENT_STREAM_LENGTH).getFields().size());
-        
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.COMPLETION).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.FTS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.ID).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.MULTI_FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.SORT).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.STATS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(OBJECT_ID, null, FieldUse.SUGGESTION).getFields().size());
-        
-        assertEquals(1, dataModel .getQueryableFields(NAME, null, FieldUse.FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(NAME, null, FieldUse.COMPLETION).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(NAME, null, FieldUse.FTS).getFields().size());
-        assertEquals(2, dataModel .getQueryableFields(NAME, null, FieldUse.ID).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(NAME, null, FieldUse.MULTI_FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(NAME, null, FieldUse.SORT).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(NAME, null, FieldUse.STATS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(NAME, null, FieldUse.SUGGESTION).getFields().size());
-        
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.COMPLETION).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.FTS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.ID).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.MULTI_FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.SORT).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.STATS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CREATION_DATE, null, FieldUse.SUGGESTION).getFields().size());
-        
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.COMPLETION).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.FTS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.ID).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.MULTI_FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.SORT).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.STATS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(IS_PRIVATE_WOKING_COPY, null, FieldUse.SUGGESTION).getFields().size());
-        
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.COMPLETION).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.FTS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.ID).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.MULTI_FACET).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.SORT).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.STATS).getFields().size());
-        assertEquals(1, dataModel .getQueryableFields(CONTENT_STREAM_LENGTH, null, FieldUse.SUGGESTION).getFields().size());
-        
-        
-    }
 }
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrTestInitializer.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrTestInitializer.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java
index e9019df77..08be29603 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrTestInitializer.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java
@@ -69,7 +69,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.createCoreUsingTemplate;
  * @author Michael Suzuki 
  */
 @ThreadLeakLingering(linger = 5000)
-public abstract class SolrTestInitializer extends SolrTestCaseJ4
+public abstract class SolrITInitializer extends SolrTestCaseJ4
 {
     private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedIT.java
index 6ed551911..b7db5c77a 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/TemplatesDistributedIT.java
@@ -40,7 +40,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.*;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class TemplatesDistributedTest extends AbstractAlfrescoDistributedTest
+public class TemplatesDistributedIT extends AbstractAlfrescoDistributedIT
 {
     private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     final static String JETTY_SERVER_ID = "TemplatesDistributedTest";
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedIT.java
similarity index 96%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedIT.java
index 62c0397d8..4eb9cae4c 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighligherDistributedIT.java
@@ -18,7 +18,7 @@
  */
 package org.alfresco.solr.highlight;
 
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.util.LuceneTestCase;
@@ -35,9 +35,9 @@ import org.junit.Test;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class AlfrescoHighligherDistributedTest extends AbstractAlfrescoDistributedTest
+public class AlfrescoHighligherDistributedIT extends AbstractAlfrescoDistributedIT
 {
-    private static Log logger = LogFactory.getLog(AlfrescoHighligherDistributedTest.class);
+    private static Log logger = LogFactory.getLog(AlfrescoHighligherDistributedIT.class);
     
     @BeforeClass
     private static void initData() throws Throwable
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java
similarity index 95%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java
index b63746f64..c19a8ee68 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java
@@ -22,13 +22,9 @@ package org.alfresco.solr.highlight;
 import java.util.Map;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
-import org.alfresco.solr.AlfrescoCoreAdminHandler;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.client.*;
-import org.alfresco.solr.dataload.TestDataProvider;
-import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.lucene.index.Term;
@@ -37,39 +33,27 @@ import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.LegacyNumericRangeQuery;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.params.HighlightParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.response.BasicResultContext;
-import org.apache.solr.response.SolrQueryResponse;
-import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Random;
 
 import static com.google.common.collect.ImmutableMap.of;
 import static java.util.Arrays.asList;
-import static java.util.stream.IntStream.range;
+
 import static junit.framework.TestCase.assertTrue;
-import static org.alfresco.model.ContentModel.PROP_CREATOR;
-import static org.alfresco.model.ContentModel.PROP_RATING_SCHEME;
-import static org.alfresco.model.ContentModel.TYPE_CONTENT;
 import static org.alfresco.solr.AlfrescoSolrUtils.*;
-import static org.apache.solr.SolrJettyTestBase.jetty;
 import static org.junit.Assert.assertNotNull;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class AlfrescoHighlighterTest extends AbstractAlfrescoSolrTests
+public class AlfrescoHighlighterIT extends AbstractAlfrescoSolrIT
 {
-    private static Log logger = LogFactory.getLog(AlfrescoHighlighterTest.class);
+    private static Log logger = LogFactory.getLog(AlfrescoHighlighterIT.class);
     private static long MAX_WAIT_TIME = 80000;
 
     @BeforeClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/TestPostingsSolrHighlighter.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/TestPostingsSolrHighlighter.java
deleted file mode 100644
index bc50a73c1..000000000
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/TestPostingsSolrHighlighter.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.alfresco.solr.highlight;
-
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.handler.component.AlfrescoSolrHighlighter;
-import org.apache.solr.handler.component.HighlightComponent;
-import org.apache.solr.highlight.PostingsSolrHighlighter;
-import org.apache.solr.highlight.SolrHighlighter;
-import org.apache.solr.schema.IndexSchema;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static junit.framework.TestCase.*;
-
-@LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class TestPostingsSolrHighlighter extends AbstractAlfrescoSolrTests
-{
-  @BeforeClass
-  public static void beforeClass() throws Exception
-  {
-    initAlfrescoCore("schema.xml");
-    // test our config is sane, just to be sure:
-
-    // postingshighlighter should be used
-    SolrHighlighter highlighter = HighlightComponent.getHighlighter(getCore());
-    assertTrue("wrong highlighter: " + highlighter.getClass(), highlighter instanceof AlfrescoSolrHighlighter);
-
-    // 'text' and 'text3' should have offsets, 'text2' should not
-    IndexSchema schema = getCore().getLatestSchema();
-    assertTrue(schema.getField("text").storeOffsetsWithPositions());
-    assertTrue(schema.getField("text3").storeOffsetsWithPositions());
-    assertFalse(schema.getField("text2").storeOffsetsWithPositions());
-  }
-
-  @Before
-  public void setUp() throws Exception
-  {
-
-    // if you override setUp or tearDown, you better call
-    // the super classes version
-    clearIndex();
-    assertU(adoc("text", "document one", "text2", "document one", "text3", "crappy document", "id", "101"));
-    assertU(adoc("text", "second document", "text2", "second document", "text3", "crappier document", "id", "102"));
-    assertU(commit());
-  }
-
-  @Test
-  public void testSimple() {
-    assertQ("simplest test", 
-        req("q", "text:document", "sort", "id asc", "hl", "true"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='<em>document</em> one'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second <em>document</em>'");
-  }
-  
-  public void testPagination() {
-    assertQ("pagination test", 
-        req("q", "text:document", "sort", "id asc", "hl", "true", "rows", "1", "start", "1"),
-        "count(//lst[@name='highlighting']/*)=1",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second <em>document</em>'");
-  }
-  
-  public void testEmptySnippet() {
-    assertQ("null snippet test", 
-      req("q", "text:one OR *:*", "sort", "id asc", "hl", "true"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='document <em>one</em>'",
-        "count(//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/*)=0");
-  }
-  
-  public void testDefaultSummary() {
-    assertQ("null snippet test", 
-      req("q", "text:one OR *:*", "sort", "id asc", "hl", "true", "hl.defaultSummary", "true"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='document <em>one</em>'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second document'");
-  }
-  
-  public void testDifferentField() {
-    assertQ("highlighting text3", 
-        req("q", "text3:document", "sort", "id asc", "hl", "true", "hl.fl", "text3"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text3']/str='crappy <em>document</em>'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text3']/str='crappier <em>document</em>'");
-  }
-  
-  public void testTwoFields() {
-    assertQ("highlighting text and text3", 
-        req("q", "text:document text3:document", "sort", "id asc", "hl", "true", "hl.fl", "text,text3"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='<em>document</em> one'",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text3']/str='crappy <em>document</em>'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second <em>document</em>'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text3']/str='crappier <em>document</em>'");
-  }
-  /**
-  public void testMisconfiguredField() {
-    ignoreException("was indexed without offsets");
-    try {
-      assertQ("should fail, has no offsets",
-        req("q", "text2:document", "sort", "id asc", "hl", "true", "hl.fl", "text2"));
-      fail();
-    } catch (Exception expected) {
-      // expected
-    }
-    resetExceptionIgnores();
-  }
-  **/
-  public void testTags() {
-    assertQ("different pre/post tags", 
-        req("q", "text:document", "sort", "id asc", "hl", "true", "hl.tag.pre", "[", "hl.tag.post", "]"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='[document] one'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second [document]'");
-  }
-  
-  public void testTagsPerField() {
-    assertQ("highlighting text and text3", 
-        req("q", "text:document text3:document", "sort", "id asc", "hl", "true", "hl.fl", "text,text3", "f.text3.hl.tag.pre", "[", "f.text3.hl.tag.post", "]"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='<em>document</em> one'",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text3']/str='crappy [document]'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second <em>document</em>'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text3']/str='crappier [document]'");
-  }
-  
-  public void testBreakIterator() {
-    assertQ("different breakiterator", 
-        req("q", "text:document", "sort", "id asc", "hl", "true", "hl.bs.type", "WORD"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='<em>document</em>'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='<em>document</em>'");
-  }
-  
-  public void testBreakIterator2() {
-    assertU(adoc("text", "Document one has a first sentence. Document two has a second sentence.", "id", "103"));
-    assertU(commit());
-    assertQ("different breakiterator", 
-        req("q", "text:document", "sort", "id asc", "hl", "true", "hl.bs.type", "WHOLE"),
-        "//lst[@name='highlighting']/lst[@name='103']/arr[@name='text']/str='<em>Document</em> one has a first sentence. <em>Document</em> two has a second sentence.'");
-  }
-  
-  public void testEncoder() {
-    assertU(adoc("text", "Document one has a first <i>sentence</i>.", "id", "103"));
-    assertU(commit());
-    assertQ("html escaped", 
-        req("q", "text:document", "sort", "id asc", "hl", "true", "hl.encoder", "html"),
-        "//lst[@name='highlighting']/lst[@name='103']/arr[@name='text']/str='<em>Document</em>&#32;one&#32;has&#32;a&#32;first&#32;&lt;i&gt;sentence&lt;&#x2F;i&gt;&#46;'");
-  }
-  
-  public void testWildcard() {
-    assertQ("simplest test", 
-        req("q", "text:doc*ment", "sort", "id asc", "hl", "true", "hl.highlightMultiTerm", "true"),
-        "count(//lst[@name='highlighting']/*)=2",
-        "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='<em>document</em> one'",
-        "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second <em>document</em>'");
-  }
-}
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginIT.java
index 34d1a2d6b..1797a5c17 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginIT.java
@@ -22,7 +22,7 @@ package org.alfresco.solr.query;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.NamedList;
@@ -38,7 +38,7 @@ import org.junit.Test;
 
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
+public class AlfrescoReRankQParserPluginIT extends AbstractAlfrescoSolrIT
 {
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java
index 96e1285c0..d9f0694e2 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java
@@ -21,7 +21,7 @@ package org.alfresco.solr.query;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -51,7 +51,7 @@ import static java.util.Collections.singletonList;
 import static java.util.stream.IntStream.range;
 import static org.alfresco.solr.AlfrescoSolrUtils.*;
 
-public class AlfrescoSolrFingerprintTest extends AbstractAlfrescoSolrTests
+public class AlfrescoSolrFingerprintIT extends AbstractAlfrescoSolrIT
 {
     private static long MAX_WAIT_TIME = 80000;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrSpellcheckerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrSpellcheckerIT.java
similarity index 88%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrSpellcheckerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrSpellcheckerIT.java
index 98a723d2a..4d6ad4257 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrSpellcheckerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrSpellcheckerIT.java
@@ -19,31 +19,17 @@
 
 package org.alfresco.solr.query;
 
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.RefCount;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.NamedList;
 import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.response.ResultContext;
-import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.search.DocIterator;
-import org.apache.solr.search.DocList;
-import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.util.RefCounted;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class AlfrescoSolrSpellcheckerTest extends AbstractAlfrescoSolrTests
+public class AlfrescoSolrSpellcheckerIT extends AbstractAlfrescoSolrIT
 {
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthDataLoad.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthDataLoad.java
index 3a201b545..0b86af558 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthDataLoad.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthDataLoad.java
@@ -34,7 +34,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.client.ContentPropertyValue;
 import org.alfresco.solr.client.MLTextPropertyValue;
 import org.alfresco.solr.client.PropertyValue;
@@ -46,7 +46,7 @@ import org.junit.BeforeClass;
  * @author Michael Suzuki
  *
  */
-public class AuthDataLoad extends AbstractAlfrescoSolrTests
+public class AuthDataLoad extends AbstractAlfrescoSolrIT
 {
     static int count = 100;
     static long maxReader = 1000;
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryIT.java
index 00cc9c06a..82d9d70a6 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AuthQueryIT.java
@@ -39,7 +39,7 @@ import org.junit.Test;
  * @author Michael Suzuki
  *
  */
-public class AuthQueryTest extends AuthDataLoad
+public class AuthQueryIT extends AuthDataLoad
 {
     @Test
     public void checkAuth()
@@ -109,7 +109,6 @@ public class AuthQueryTest extends AuthDataLoad
             searchParameters.setQuery(queryString);
             Query query = dataModel.getFTSQuery(new Pair<SearchParameters, Boolean>(searchParameters, Boolean.FALSE),
                     solrQueryRequest, FTSQueryParser.RerankPhase.SINGLE_PASS);
-            System.out.println("##################### Query:"+query);
             TopDocs docs = solrIndexSearcher.search(query, count * 2 + 10);
         
             Assert.assertEquals(count, docs.totalHits);
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFacetingTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFacetingIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFacetingTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFacetingIT.java
index 457497cd1..13f28d874 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFacetingTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFacetingIT.java
@@ -18,7 +18,7 @@
  */
 package org.alfresco.solr.query;
 
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.response.FacetField;
@@ -37,12 +37,12 @@ import static org.hamcrest.core.Is.is;
 
 @SolrTestCaseJ4.SuppressSSL @LuceneTestCase.SuppressCodecs({ "Appending", "Lucene3x", "Lucene40", "Lucene41",
     "Lucene42", "Lucene43", "Lucene44", "Lucene45", "Lucene46", "Lucene47", "Lucene48",
-    "Lucene49" }) public class DistributedAlfrescoSolrFacetingTest extends AbstractAlfrescoDistributedTest
+    "Lucene49" }) public class DistributedAlfrescoSolrFacetingIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     private static void initData() throws Throwable
     {
-        initSolrServers(2, "DistributedAlfrescoSolrFacetingTest", null);
+        initSolrServers(2, "DistributedAlfrescoSolrFacetingIT", null);
         indexSampleDocumentsForFacetingMincount();
         
     }
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintIT.java
index 980ad45db..dfd4326c8 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrFingerPrintIT.java
@@ -34,7 +34,7 @@ import java.util.Random;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -61,7 +61,7 @@ import org.junit.Test;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedAlfrescoSolrFingerPrintTest extends AbstractAlfrescoDistributedTest
+public class DistributedAlfrescoSolrFingerPrintIT extends AbstractAlfrescoDistributedIT
 {
     private static long MAX_WAIT_TIME = 80000;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerIT.java
similarity index 96%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerIT.java
index ea05e052a..1561564ed 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/DistributedAlfrescoSolrSpellcheckerIT.java
@@ -18,7 +18,7 @@
  */
 package org.alfresco.solr.query;
 
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -32,7 +32,7 @@ import org.junit.Test;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedAlfrescoSolrSpellcheckerTest extends AbstractAlfrescoDistributedTest
+public class DistributedAlfrescoSolrSpellcheckerIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     private static void initData() throws Throwable
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthIT.java
similarity index 95%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthIT.java
index 2b4b28fe1..0491c2f4a 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/SolrAuthIT.java
@@ -20,19 +20,18 @@
 package org.alfresco.solr.query;
 
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runners.Parameterized.Parameters;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
 
-public class SolrAuthTest extends AbstractAlfrescoSolrTests 
+public class SolrAuthIT extends AbstractAlfrescoSolrIT
 {
 
     @BeforeClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/UntokenisedFieldTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/UntokenisedFieldIT.java
similarity index 94%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/UntokenisedFieldTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/UntokenisedFieldIT.java
index 0bfbf3614..694364efd 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/UntokenisedFieldTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/UntokenisedFieldIT.java
@@ -18,9 +18,7 @@
  */
 package org.alfresco.solr.query;
 
-import org.alfresco.model.ContentModel;
-import org.alfresco.service.cmr.search.GeneralHighlightParameters;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -32,7 +30,7 @@ import org.junit.Test;
  * @author Michael Suzuki
  *
  */
-public class UntokenisedFieldTest extends AbstractAlfrescoSolrTests
+public class UntokenisedFieldIT extends AbstractAlfrescoSolrIT
 {
     String nodeRef = "workspace://SpacesStore/00000000-0000-1-4731-76966678";
     String nodeRefS = "noderef@s_@mytest" ;
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/AbstractQParserPluginTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/AbstractQParserPluginIT.java
similarity index 74%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/AbstractQParserPluginTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/AbstractQParserPluginIT.java
index 177760071..35520530a 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/AbstractQParserPluginTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/AbstractQParserPluginIT.java
@@ -18,25 +18,16 @@
  */
 package org.alfresco.solr.query.afts.qparser;
 
-import static java.util.Arrays.asList;
-import static java.util.stream.IntStream.range;
-
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.junit.BeforeClass;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 
 /**
  * Supertype layer for all AFTS QParser tests.
  *
  * @author Andrea Gazzarini
  */
-public abstract class AbstractQParserPluginTest extends AbstractAlfrescoSolrTests
+public abstract class AbstractQParserPluginIT extends AbstractAlfrescoSolrIT
 {
     @BeforeClass
     public static void spinUpSolr() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingIT.java
similarity index 94%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingIT.java
index 6485fd022..f2d103787 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/FieldNameEscapingIT.java
@@ -24,7 +24,7 @@ import org.alfresco.util.ISO9075;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class FieldNameEscapingTest extends AbstractQParserPluginTest implements QueryConstants
+public class FieldNameEscapingIT extends AbstractQParserPluginIT implements QueryConstants
 {
     private static TestDataProvider DATASETS_PROVIDER;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginIT.java
index 32c889d30..9a15161c8 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/qparser/QParserPluginIT.java
@@ -43,7 +43,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SolrTestCaseJ4.SuppressSSL
-public class QParserPluginTest extends AbstractQParserPluginTest implements QueryConstants
+public class QParserPluginIT extends AbstractQParserPluginIT implements QueryConstants
 {
     /** The UTC time zone. */
     private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDefaultTextQueryTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDefaultTextQueryIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDefaultTextQueryTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDefaultTextQueryIT.java
index 6791bbf32..e4d3ad755 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDefaultTextQueryTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDefaultTextQueryIT.java
@@ -49,7 +49,7 @@ import static com.google.common.collect.ImmutableMap.of;
  * This test set checks that in all these query types the default fields are involved in the search.
  *
  */
-public class AFTSDefaultTextQueryTest extends AbstractRequestHandlerTest
+public class AFTSDefaultTextQueryIT extends AbstractRequestHandlerIT
 {
 
     @BeforeClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDisjunctionTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDisjunctionIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDisjunctionTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDisjunctionIT.java
index 8462d00e3..3037a3e2d 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDisjunctionTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSDisjunctionIT.java
@@ -39,7 +39,7 @@ import org.junit.Test;
  *
  * @author msuzuki
  */
-public class AFTSDisjunctionTest extends AbstractRequestHandlerTest
+public class AFTSDisjunctionIT extends AbstractRequestHandlerIT
 {
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSIdentifierFieldsTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSIdentifierFieldsIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSIdentifierFieldsTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSIdentifierFieldsIT.java
index 2dc910b8c..e4eac23b2 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSIdentifierFieldsTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSIdentifierFieldsIT.java
@@ -43,7 +43,7 @@ import java.util.Map;
  * @author eporciani
  * @author agazzarini
  */
-public class AFTSIdentifierFieldsTest extends AbstractRequestHandlerTest
+public class AFTSIdentifierFieldsIT extends AbstractRequestHandlerIT
 {
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRangeQueryTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRangeQueryIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRangeQueryTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRangeQueryIT.java
index ed38a5006..ba7dc7f13 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRangeQueryTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRangeQueryIT.java
@@ -41,7 +41,7 @@ import java.util.Map;
  *
  * @author elia
  */
-public class AFTSRangeQueryTest extends AbstractRequestHandlerTest
+public class AFTSRangeQueryIT extends AbstractRequestHandlerIT
 {
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerIT.java
index b6f818791..131bd8dce 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AFTSRequestHandlerIT.java
@@ -20,7 +20,7 @@ import java.util.Locale;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class AFTSRequestHandlerTest extends AbstractRequestHandlerTest implements QueryConstants
+public class AFTSRequestHandlerIT extends AbstractRequestHandlerIT implements QueryConstants
 {
     private static TestDataProvider DATASETS_PROVIDER;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AbstractRequestHandlerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AbstractRequestHandlerIT.java
similarity index 95%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AbstractRequestHandlerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AbstractRequestHandlerIT.java
index 3a4bf2681..929b0d30e 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AbstractRequestHandlerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/AbstractRequestHandlerIT.java
@@ -1,6 +1,6 @@
 package org.alfresco.solr.query.afts.requestHandler;
 
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.junit.BeforeClass;
 
 import java.util.ArrayList;
@@ -12,7 +12,7 @@ import java.util.stream.Stream;
 import static java.util.Arrays.asList;
 import static java.util.stream.IntStream.range;
 
-public abstract class AbstractRequestHandlerTest extends AbstractAlfrescoSolrTests
+public abstract class AbstractRequestHandlerIT extends AbstractAlfrescoSolrIT
 {
     @BeforeClass
     public static void spinUpSolr() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/MNTTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/MNTIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/MNTTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/MNTIT.java
index a7b0dd5df..613e2da1e 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/MNTTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/afts/requestHandler/MNTIT.java
@@ -9,7 +9,7 @@ import org.junit.Test;
  *
  * @author Andrea Gazzarini
  */
-public class MNTTest extends AbstractRequestHandlerTest
+public class MNTIT extends AbstractRequestHandlerIT
 {
     @BeforeClass
     public static void loadData() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginIT.java
index b98fe72b0..e5803fe88 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/AlfrescoCMISQParserPluginIT.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class AlfrescoCMISQParserPluginTest extends LoadCMISData implements QueryConstants 
+public class AlfrescoCMISQParserPluginIT extends LoadCMISData implements QueryConstants
 {
     @Test
     public void cmisBasic() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/CmisTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/CmisIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/CmisTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/CmisIT.java
index 570a88cc9..6b05203f2 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/CmisTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/CmisIT.java
@@ -31,7 +31,7 @@ import org.junit.Test;
  * @author Michael Suzuki
  *
  */
-public class CmisTest extends LoadCMISData
+public class CmisIT extends LoadCMISData
 {
     @Before
     public void setup() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java
index 46082dac9..f64efe0a5 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java
@@ -37,7 +37,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.AlfrescoSolrDataModel;
 import org.alfresco.solr.client.ContentPropertyValue;
 import org.alfresco.solr.client.MLTextPropertyValue;
@@ -51,7 +51,7 @@ import org.junit.BeforeClass;
  * @author Michael Suzuki
  *
  */
-public class LoadCMISData extends AbstractAlfrescoSolrTests
+public class LoadCMISData extends AbstractAlfrescoSolrIT
 {
     protected static NodeRef testCMISContent00NodeRef;
     protected static NodeRef testCMISRootNodeRef;
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AclModCountRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AclModCountRouterIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AclModCountRouterTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AclModCountRouterIT.java
index c903cd8f3..451b29ed6 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AclModCountRouterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AclModCountRouterIT.java
@@ -39,7 +39,7 @@ import java.util.Map;
 import java.util.Properties;
 
 @RunWith(MockitoJUnitRunner.class)
-public class AclModCountRouterTest
+public class AclModCountRouterIT
 {
     private DocRouter router;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java
index 8a728a519..43d779f8f 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java
@@ -36,7 +36,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -62,9 +62,9 @@ import org.junit.Test;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class AlfrescoSolrTrackerExceptionTest extends AbstractAlfrescoSolrTests
+public class AlfrescoSolrTrackerExceptionIT extends AbstractAlfrescoSolrIT
 {
-    private static Log logger = LogFactory.getLog(AlfrescoSolrTrackerTest.class);
+    private static Log logger = LogFactory.getLog(AlfrescoSolrTrackerExceptionIT.class);
     private static long MAX_WAIT_TIME = 80000;
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java
index c1e8c70fb..749e82c03 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java
@@ -37,7 +37,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -64,9 +64,9 @@ import org.junit.Test;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class AlfrescoSolrTrackerTest extends AbstractAlfrescoSolrTests
+public class AlfrescoSolrTrackerIT extends AbstractAlfrescoSolrIT
 {
-    private static Log logger = LogFactory.getLog(AlfrescoSolrTrackerTest.class);
+    private static Log logger = LogFactory.getLog(AlfrescoSolrTrackerIT.class);
     private static long MAX_WAIT_TIME = 80000;
     @BeforeClass
     public static void beforeClass() throws Exception 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java
index d2ea46e05..2313586ac 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java
@@ -32,7 +32,7 @@ import java.util.Collection;
 
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
 
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.AlfrescoCoreAdminHandler;
 
 import org.alfresco.solr.client.Acl;
@@ -58,9 +58,9 @@ import org.junit.Test;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class AlfrescoSolrTrackerRollbackTest extends AbstractAlfrescoSolrTests
+public class AlfrescoSolrTrackerRollbackIT extends AbstractAlfrescoSolrIT
 {
-    private static Log logger = LogFactory.getLog(AlfrescoSolrTrackerTest.class);
+    private static Log logger = LogFactory.getLog(AlfrescoSolrTrackerIT.class);
     private static long MAX_WAIT_TIME = 80000;
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java
index d37d8ab99..119aab737 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotEquals;
 
 import org.alfresco.repo.index.shard.ShardState;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.AlfrescoCoreAdminHandler;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -70,7 +70,7 @@ import java.util.stream.Collectors;
  *
  * @author agazzarini
  */
-public class AlfrescoSolrTrackerStateTest extends AbstractAlfrescoSolrTests
+public class AlfrescoSolrTrackerStateIT extends AbstractAlfrescoSolrIT
 {
     @BeforeClass
     public static void beforeClass() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerIT.java
index 16f1b0c56..00c34cfa4 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadeTrackerIT.java
@@ -35,7 +35,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.solr.AbstractAlfrescoSolrTests;
+import org.alfresco.solr.AbstractAlfrescoSolrIT;
 import org.alfresco.solr.client.*;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.*;
@@ -52,7 +52,7 @@ import java.util.List;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class CascadeTrackerTest extends AbstractAlfrescoSolrTests
+public class CascadeTrackerIT extends AbstractAlfrescoSolrIT
 {
     private static long MAX_WAIT_TIME = 80000;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ContentTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ContentTrackerIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ContentTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ContentTrackerIT.java
index e3d6112da..517a5f241 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ContentTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ContentTrackerIT.java
@@ -38,7 +38,7 @@ import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ContentTrackerTest
+public class ContentTrackerIT
 {
     private ContentTracker contentTracker;
     
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DateMonthRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DateMonthRouterIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DateMonthRouterTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DateMonthRouterIT.java
index 2432966d5..03cf95823 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DateMonthRouterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DateMonthRouterIT.java
@@ -46,7 +46,7 @@ import java.util.Properties;
 import java.util.Random;
 
 @RunWith(MockitoJUnitRunner.class)
-public class DateMonthRouterTest
+public class DateMonthRouterIT
 {
     private Random randomizer = new Random();
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerIT.java
index f177f915d..8c268e01a 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerIT.java
@@ -19,7 +19,7 @@
 package org.alfresco.solr.tracker;
 
 import org.alfresco.repo.index.shard.ShardMethodEnum;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.SolrInformationServer;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -57,7 +57,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.list;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedAclIdAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedAclIdAlfrescoSolrTrackerIT extends AbstractAlfrescoDistributedIT
 {
 
     @BeforeClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonIT.java
index 1a86633e2..c0d0c14ec 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrJsonIT.java
@@ -19,7 +19,7 @@
 package org.alfresco.solr.tracker;
 
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.Node;
@@ -50,7 +50,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getTransaction;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedAlfrescoSolrJsonTest extends AbstractAlfrescoDistributedTest
+public class DistributedAlfrescoSolrJsonIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     private static void initData() throws Throwable
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerIT.java
index b80d8793e..8b0f610f9 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerIT.java
@@ -19,7 +19,7 @@
 package org.alfresco.solr.tracker;
 
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -56,7 +56,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.list;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedAlfrescoSolrTrackerIT extends AbstractAlfrescoDistributedIT
 {
 
     @BeforeClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceIT.java
index 65bab2295..01290fcc7 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerRaceIT.java
@@ -19,7 +19,7 @@
 package org.alfresco.solr.tracker;
 
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -54,7 +54,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedAlfrescoSolrTrackerRaceTest extends AbstractAlfrescoDistributedTest
+public class DistributedAlfrescoSolrTrackerRaceIT extends AbstractAlfrescoDistributedIT
 {
 
     @BeforeClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateIT.java
index 58e697c9d..e33447951 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedAlfrescoSolrTrackerStateIT.java
@@ -33,7 +33,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet;
 
 import org.alfresco.repo.index.shard.ShardState;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.AlfrescoCoreAdminHandler;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -68,7 +68,7 @@ import java.util.stream.Collectors;
  * @author agazzarini
  */
 @SolrTestCaseJ4.SuppressSSL
-public class DistributedAlfrescoSolrTrackerStateTest extends AbstractAlfrescoDistributedTest
+public class DistributedAlfrescoSolrTrackerStateIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     private static void initData() throws Throwable
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerIT.java
index cba592b86..6e5fbe39f 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedCascadeTrackerIT.java
@@ -30,7 +30,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet;
 import static org.carrot2.shaded.guava.common.collect.ImmutableList.of;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -55,7 +55,7 @@ import java.util.Properties;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedCascadeTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedCascadeTrackerIT extends AbstractAlfrescoDistributedIT
 {
     private Node parentFolder;
     private NodeMetaData parentFolderMetadata;
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateAbstractSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateAbstractSolrTrackerIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateAbstractSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateAbstractSolrTrackerIT.java
index 6aacd0282..1cdaa1cc2 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateAbstractSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateAbstractSolrTrackerIT.java
@@ -21,7 +21,7 @@ package org.alfresco.solr.tracker;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.AlfrescoSolrDataModel;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -63,7 +63,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public abstract class DistributedDateAbstractSolrTrackerTest extends AbstractAlfrescoDistributedTest
+public abstract class DistributedDateAbstractSolrTrackerIT extends AbstractAlfrescoDistributedIT
 {
     @Test
     public void testDateMonth() throws Exception
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerIT.java
index e0a569b4a..8dcbf6e5e 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerIT.java
@@ -33,7 +33,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.index.shard.ShardMethodEnum;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.AlfrescoSolrDataModel;
 import org.alfresco.solr.SolrInformationServer;
 import org.alfresco.solr.client.Acl;
@@ -63,13 +63,13 @@ import java.util.Properties;
 import java.util.TimeZone;
 
 @SolrTestCaseJ4.SuppressSSL
-public class DistributedDateMonthAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedDateMonthAlfrescoSolrTrackerIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     @SuppressWarnings("unused")
     public static void initData() throws Throwable
     {
-        initSolrServers(5, DistributedDateMonthAlfrescoSolrTrackerTest.class.getSimpleName(), getShardMethod());
+        initSolrServers(5, DistributedDateMonthAlfrescoSolrTrackerIT.class.getSimpleName(), getShardMethod());
     }
 
     @AfterClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateQuarterAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateQuarterAlfrescoSolrTrackerIT.java
similarity index 95%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateQuarterAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateQuarterAlfrescoSolrTrackerIT.java
index 0c8c061f3..f2dc207c6 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateQuarterAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateQuarterAlfrescoSolrTrackerIT.java
@@ -33,7 +33,7 @@ import java.util.Properties;
 
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedDateQuarterAlfrescoSolrTrackerTest extends DistributedDateAbstractSolrTrackerTest
+public class DistributedDateQuarterAlfrescoSolrTrackerIT extends DistributedDateAbstractSolrTrackerIT
 {
 
     @BeforeClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateSplitYearAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateSplitYearAlfrescoSolrTrackerIT.java
similarity index 93%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateSplitYearAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateSplitYearAlfrescoSolrTrackerIT.java
index faa7618c0..ff488c138 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateSplitYearAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateSplitYearAlfrescoSolrTrackerIT.java
@@ -33,12 +33,12 @@ import java.util.Properties;
 
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedDateSplitYearAlfrescoSolrTrackerTest extends DistributedDateAbstractSolrTrackerTest
+public class DistributedDateSplitYearAlfrescoSolrTrackerIT extends DistributedDateAbstractSolrTrackerIT
 {
     @BeforeClass
     private static void initData() throws Throwable
     {
-        initSolrServers(3, "DistributedDateSplitYearAlfrescoSolrTrackerTest", getShardMethod());
+        initSolrServers(3, "DistributedDateSplitYearAlfrescoSolrTrackerIT", getShardMethod());
     }
 
     @AfterClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerIT.java
similarity index 96%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerIT.java
index 8d8655728..f683c0ce1 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDbidRangeAlfrescoSolrTrackerIT.java
@@ -18,7 +18,7 @@
  */
 package org.alfresco.solr.tracker;
 
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.SolrInformationServer;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -53,12 +53,12 @@ import static org.alfresco.solr.AlfrescoSolrUtils.list;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedDbidRangeAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedDbidRangeAlfrescoSolrTrackerIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     private static void initData() throws Throwable
     {
-        initSolrServers(2, "DistributedDbidRangeAlfrescoSolrTrackerTest", getShardMethod());
+        initSolrServers(2, "DistributedDbidRangeAlfrescoSolrTrackerIT", getShardMethod());
     }
 
     @AfterClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerIT.java
index cf6ca9dbd..07c07f0b7 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExpandDbidRangeAlfrescoSolrTrackerIT.java
@@ -18,7 +18,7 @@
  */
 package org.alfresco.solr.tracker;
 
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.SolrInformationServer;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -56,12 +56,12 @@ import static org.alfresco.solr.AlfrescoSolrUtils.list;
  */
 @SolrTestCaseJ4.SuppressSSL
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedExpandDbidRangeAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedExpandDbidRangeAlfrescoSolrTrackerIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     private static void initData() throws Throwable
     {
-        initSolrServers(2, "DistributedExpandDbidRangeAlfrescoSolrTrackerTest", getShardMethod());
+        initSolrServers(2, "DistributedExpandDbidRangeAlfrescoSolrTrackerIT", getShardMethod());
     }
 
     @AfterClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardIdWithStaticPropertyRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardIdWithStaticPropertyRouterIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardIdWithStaticPropertyRouterTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardIdWithStaticPropertyRouterIT.java
index 115d81029..7ccf1792e 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardIdWithStaticPropertyRouterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardIdWithStaticPropertyRouterIT.java
@@ -21,7 +21,7 @@ package org.alfresco.solr.tracker;
 import java.util.Properties;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.index.shard.ShardMethodEnum;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -53,7 +53,7 @@ import static org.carrot2.shaded.guava.common.collect.ImmutableList.of;
 @SolrTestCaseJ4.SuppressSSL
 @SolrTestCaseJ4.SuppressObjectReleaseTracker (bugUrl = "RAMDirectory")
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedExplicitShardIdWithStaticPropertyRouterTest extends AbstractAlfrescoDistributedTest
+public class DistributedExplicitShardIdWithStaticPropertyRouterIT extends AbstractAlfrescoDistributedIT
 {
     private static long MAX_WAIT_TIME = 80000;
     private final int timeout = 100000;
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerIT.java
index b10bdc275..bd7c5f325 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedExplicitShardRoutingTrackerIT.java
@@ -20,7 +20,7 @@ package org.alfresco.solr.tracker;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.index.shard.ShardMethodEnum;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.SolrInformationServer;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -62,12 +62,12 @@ import static org.alfresco.solr.tracker.DocRouterFactory.SHARD_KEY_KEY;
 @SolrTestCaseJ4.SuppressSSL
 @SolrTestCaseJ4.SuppressObjectReleaseTracker (bugUrl = "RAMDirectory")
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedExplicitShardRoutingTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedExplicitShardRoutingTrackerIT extends AbstractAlfrescoDistributedIT
 {
     @BeforeClass
     private static void initData() throws Throwable
     {
-        initSolrServers(3, "DistributedExplicitShardRoutingTrackerTest", getProperties());
+        initSolrServers(3, "DistributedExplicitShardRoutingTrackerIT", getProperties());
     }
 
     @AfterClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerIT.java
similarity index 97%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerIT.java
index ac01034b2..1e7c8b8f4 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerIT.java
@@ -41,7 +41,7 @@ import com.carrotsearch.randomizedtesting.RandomizedContext;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.index.shard.ShardMethodEnum;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.SolrInformationServer;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
@@ -66,7 +66,7 @@ import org.junit.Test;
 @SolrTestCaseJ4.SuppressSSL
 @SolrTestCaseJ4.SuppressObjectReleaseTracker (bugUrl = "RAMDirectory")
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
-public class DistributedPropertyBasedAlfrescoSolrTrackerTest extends AbstractAlfrescoDistributedTest
+public class DistributedPropertyBasedAlfrescoSolrTrackerIT extends AbstractAlfrescoDistributedIT
 {
     private static final String[] DOMAINS = {"alfresco.com", "king.com", "gmail.com", "yahoo.com", "cookie.es"};
     private static final Map<String,Integer> domainsCount = new HashMap<>();
@@ -78,7 +78,7 @@ public class DistributedPropertyBasedAlfrescoSolrTrackerTest extends AbstractAlf
         {
             domainsCount.put(domain,0);
         }
-        initSolrServers(4, "DistributedPropertyBasedAlfrescoSolrTrackerTest", getProperties());
+        initSolrServers(4, "DistributedPropertyBasedAlfrescoSolrTrackerIT", getProperties());
     }
 
     @AfterClass
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDRouterIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDRouterTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDRouterIT.java
index dd9a04333..0800301f8 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDRouterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDRouterIT.java
@@ -41,7 +41,7 @@ import java.util.Map;
 import java.util.Properties;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ExplicitIDRouterTest
+public class ExplicitIDRouterIT
 {
     private DocRouter router;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDWithLRISRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDWithLRISRouterIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDWithLRISRouterTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDWithLRISRouterIT.java
index 2cbdd138c..0cebbbac3 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDWithLRISRouterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ExplicitIDWithLRISRouterIT.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ExplicitIDWithLRISRouterTest
+public class ExplicitIDWithLRISRouterIT
 {
     private DocRouter router;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java
similarity index 96%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java
index 71ee93280..b0a64fe97 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerIT.java
@@ -56,7 +56,7 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class ModelTrackerTest
+public class ModelTrackerIT
 {
     private ModelTracker modelTracker;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/PropertyRouterTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/PropertyRouterIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/PropertyRouterTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/PropertyRouterIT.java
index 67fbdd076..ac233df7a 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/PropertyRouterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/PropertyRouterIT.java
@@ -42,7 +42,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @RunWith(MockitoJUnitRunner.class)
-public class PropertyRouterTest
+public class PropertyRouterIT
 {
     private PropertyRouter router;
 
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/CachedDocTransformerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/CachedDocTransformerIT.java
similarity index 98%
rename from search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/CachedDocTransformerTest.java
rename to search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/CachedDocTransformerIT.java
index ce8889489..4d0314e3c 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/CachedDocTransformerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/transformer/CachedDocTransformerIT.java
@@ -21,7 +21,7 @@ package org.alfresco.solr.transformer;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.alfresco.solr.AbstractAlfrescoDistributedTest;
+import org.alfresco.solr.AbstractAlfrescoDistributedIT;
 import org.alfresco.solr.client.Acl;
 import org.alfresco.solr.client.AclChangeSet;
 import org.alfresco.solr.client.AclReaders;
@@ -58,14 +58,14 @@ import static org.alfresco.solr.AlfrescoSolrUtils.list;
 
 @LuceneTestCase.SuppressCodecs({"Appending","Lucene3x","Lucene40","Lucene41","Lucene42","Lucene43", "Lucene44", "Lucene45","Lucene46","Lucene47","Lucene48","Lucene49"})
 @SolrTestCaseJ4.SuppressSSL
-public class CachedDocTransformerTest extends AbstractAlfrescoDistributedTest
+public class CachedDocTransformerIT extends AbstractAlfrescoDistributedIT
 {
     public static final String ALFRESCO_JSON = "{\"locales\":[\"en\"], \"templates\": [{\"name\":\"t1\", \"template\":\"%cm:content\"}]}";
     
     @BeforeClass
     private static void initData() throws Throwable
     {
-        initSolrServers(1, "CachedDocTransformerTest", null);
+        initSolrServers(1, "CachedDocTransformerIT", null);
         populateAlfrescoData();
     }
 
diff --git a/search-services/alfresco-search/src/test/java/org/apache/lucene/analysis/minhash/MinHashFilterTest.java b/search-services/alfresco-search/src/test/java/org/apache/lucene/analysis/minhash/MinHashFilterIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/apache/lucene/analysis/minhash/MinHashFilterTest.java
rename to search-services/alfresco-search/src/test/java/org/apache/lucene/analysis/minhash/MinHashFilterIT.java
index be21a6d53..c936e639d 100644
--- a/search-services/alfresco-search/src/test/java/org/apache/lucene/analysis/minhash/MinHashFilterTest.java
+++ b/search-services/alfresco-search/src/test/java/org/apache/lucene/analysis/minhash/MinHashFilterIT.java
@@ -56,7 +56,7 @@ import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.apache.lucene.util.automaton.RegExp;
 import org.junit.Test;
 
-public class MinHashFilterTest extends BaseTokenStreamTestCase
+public class MinHashFilterIT extends BaseTokenStreamTestCase
 {
     @Test
     public void testIntHash() {
diff --git a/search-services/alfresco-search/src/test/java/org/apache/solr/handler/component/AlfrescoLukeRequestHandlerTest.java b/search-services/alfresco-search/src/test/java/org/apache/solr/handler/component/AlfrescoLukeRequestHandlerIT.java
similarity index 99%
rename from search-services/alfresco-search/src/test/java/org/apache/solr/handler/component/AlfrescoLukeRequestHandlerTest.java
rename to search-services/alfresco-search/src/test/java/org/apache/solr/handler/component/AlfrescoLukeRequestHandlerIT.java
index 7236adddb..9c2a2dfe4 100644
--- a/search-services/alfresco-search/src/test/java/org/apache/solr/handler/component/AlfrescoLukeRequestHandlerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/apache/solr/handler/component/AlfrescoLukeRequestHandlerIT.java
@@ -43,7 +43,7 @@ import org.mockito.Mock;
 /**
  * Unit tests for the {@link AlfrescoLukeRequestHandler}.
  */
-public class AlfrescoLukeRequestHandlerTest
+public class AlfrescoLukeRequestHandlerIT
 {
     /** The reference to text for a search term. */
     private static final BytesRef TERM_TEXT = new BytesRef("TermText");
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index ed5fca082..b210f0634 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -40,19 +40,6 @@
     <build>
         <finalName>alfresco-search-services-${project.version}</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>