diff --git a/source/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java b/source/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java
index 55c7838d5d..53b2353e73 100644
--- a/source/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java
+++ b/source/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java
@@ -67,7 +67,7 @@ public class PublicApiTenantWebScriptServletRuntime extends TenantWebScriptServl
         }
         else
         {
-        	if(!pathInfo.substring(0, 5).toLowerCase().equals("/cmis"))
+        	if(!pathInfo.substring(0, 6).toLowerCase().equals("/cmis/"))
         	{
 		        // remove tenant
 		        int idx = pathInfo.indexOf('/', 1);
diff --git a/source/test-java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java b/source/test-java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
index c07c5c8529..122101c3a1 100644
--- a/source/test-java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
+++ b/source/test-java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
@@ -12,7 +12,7 @@ public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
 		"rest-api-test-context.xml"
     };
 
-	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene"};
+	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
 	   
     private static EnterprisePublicApiTestFixture instance;
 
diff --git a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java b/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
index 68b6ee9bcf..a2ecf8b0c0 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
@@ -12,7 +12,7 @@ public class TCKEnterpriseTestFixture extends EnterpriseTestFixture
 		"rest-api-test-context.xml"
     };
 
-	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/solr"};
+	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/solr/"};
 
     private static TCKEnterpriseTestFixture instance;
 
diff --git a/source/test-resources/publicapi/lucene/alfresco-global.properties b/source/test-resources/publicapi/lucene/alfresco-global.properties
index fed7f6a376..31eff36d32 100644
--- a/source/test-resources/publicapi/lucene/alfresco-global.properties
+++ b/source/test-resources/publicapi/lucene/alfresco-global.properties
@@ -1,2 +1,2 @@
 index.subsystem.name=lucene
-index.recovery.mode=FULL
\ No newline at end of file
+index.recovery.mode=AUTO
\ No newline at end of file