diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java b/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java
index c36b89ac98..c9bd270765 100644
--- a/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java
@@ -39,7 +39,7 @@ public abstract class AbstractEnterpriseOpenCMISTCKTest extends EnterpriseTestAp
    @Override
     protected TestFixture getTestFixture() throws Exception
     {
-        return TCKEnterpriseTestFixture.getInstance();
+        return EnterprisePublicApiTestFixture.getInstance();
     }
    
     protected void overrideVersionableAspectProperties(ApplicationContext ctx)
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 d2dac62340..065be71769 100644
--- a/source/test-java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
+++ b/source/test-java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
@@ -30,7 +30,7 @@ public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
     	return instance;
     }
 
-	public synchronized static EnterprisePublicApiTestFixture getInstance() throws Exception
+	public static EnterprisePublicApiTestFixture getInstance() throws Exception
 	{
 		return getInstance(true);
 	}
diff --git a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java b/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
deleted file mode 100644
index 58a7b57840..0000000000
--- a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.alfresco.rest.api.tests;
-
-import org.alfresco.repo.web.util.JettyComponent;
-
-public class TCKEnterpriseTestFixture extends EnterpriseTestFixture
-{
-	public final static String[] CONFIG_LOCATIONS = new String[]
-    {
-		"classpath:alfresco/application-context.xml",
-		"classpath:alfresco/web-scripts-application-context.xml",
-		"classpath:alfresco/web-scripts-application-context-test.xml",
-		"rest-api-test-context.xml"
-    };
-
-	public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
-
-    private static TCKEnterpriseTestFixture instance;
-
-	/*
-	 * Note: synchronized for multi-threaded test access
-	 */
-    public synchronized static TCKEnterpriseTestFixture getInstance() throws Exception
-    {
-    	if(instance == null)
-    	{
-    		instance = new TCKEnterpriseTestFixture();
-    		instance.setup();
-    	}
-    	return instance;
-    }
-
-    private TCKEnterpriseTestFixture()
-	{
-		super(CONFIG_LOCATIONS, CLASS_LOCATIONS, PORT, CONTEXT_PATH, PUBLIC_API_SERVLET_NAME, DEFAULT_NUM_MEMBERS_PER_SITE, false);
-	}
-    
-	@Override
-	protected JettyComponent makeJettyComponent()
-	{
-		JettyComponent jettyComponent = new EnterpriseJettyComponent(port, contextPath, configLocations, classLocations);
-		return jettyComponent;
-	}
-
-	@Override
-	protected RepoService makeRepoService() throws Exception
-	{
-		return new RepoService(applicationContext);
-	}
-}
\ No newline at end of file