diff --git a/source/test-java/org/alfresco/opencmis/OpenCMISClientContext.java b/source/test-java/org/alfresco/opencmis/OpenCMISClientContext.java
index ee6009edfe..e454f5c224 100644
--- a/source/test-java/org/alfresco/opencmis/OpenCMISClientContext.java
+++ b/source/test-java/org/alfresco/opencmis/OpenCMISClientContext.java
@@ -23,10 +23,12 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 import org.apache.chemistry.opencmis.commons.SessionParameter;
 import org.apache.chemistry.opencmis.commons.enums.BindingType;
 import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
+import org.springframework.context.ApplicationContext;
 
 /**
  * Encapsulates Chemistry OpenCMIS client connection details and creates a parameters file for running the
@@ -39,7 +41,7 @@ public class OpenCMISClientContext
 {
 	private Map<String, String> cmisParameters;
 	
-	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters) throws IOException
+	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters, ApplicationContext ctx) throws IOException
 	{
     	cmisParameters = new HashMap<String, String>();
     	cmisParameters.putAll(parameters);
@@ -54,8 +56,20 @@ public class OpenCMISClientContext
     	}
     	cmisParameters.put(SessionParameter.USER, username);
     	cmisParameters.put(SessionParameter.PASSWORD, password);
+    	
+    	if (ctx != null)
+    	{
+    		Properties properties =  (Properties)ctx.getBean("global-properties");
+        	cmisParameters.put(SessionParameter.CONNECT_TIMEOUT, properties.getProperty("opencmis.tck.connecttimeout"));
+        	cmisParameters.put(SessionParameter.READ_TIMEOUT, properties.getProperty("opencmis.tck.readtimeout"));
+    	}
     	createCMISParametersFile();
 	}
+	
+	public OpenCMISClientContext(BindingType bindingType, String url, String username, String password, Map<String, String> parameters) throws IOException
+	{
+    	this(bindingType, url, username, password, parameters, null);
+	}
 
 	protected void createCMISParametersFile() throws IOException
 	{
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java b/source/test-java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java
index bf44ee0d5c..6740ff536a 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java
@@ -124,7 +124,7 @@ public class TestEnterpriseAtomPubTCK extends AbstractEnterpriseOpenCMIS10TCKTes
     	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
     	cmisParameters.put(TestParameters.DEFAULT_TEST_FOLDER_PARENT, "/" + name);
     	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
-    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco"), "admin", "admin", cmisParameters);
+    			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco"), "admin", "admin", cmisParameters, jetty.getApplicationContext());
 
         overrideVersionableAspectProperties(jetty.getApplicationContext());
 	}
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java
index 1705618763..5e363f6d1a 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java
@@ -47,7 +47,7 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe
     	cmisParameters.put(TestParameters.DEFAULT_RELATIONSHIP_TYPE, "R:cm:replaces");
     	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
     			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
-    			"admin@" + network.getId(), "admin", cmisParameters);
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
         overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
 	}
 
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java
index 52f535cc9d..64088a4016 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub11TCK.java
@@ -35,7 +35,7 @@ public class TestPublicApiAtomPub11TCK extends AbstractEnterpriseOpenCMIS11TCKTe
         cmisParameters.put(TestParameters.DEFAULT_ITEM_TYPE, "I:cm:cmobject");
     	clientContext = new OpenCMISClientContext(BindingType.ATOMPUB,
     			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
-    			"admin@" + network.getId(), "admin", cmisParameters);
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
         overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
 	}
 
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java
index 095a025483..b61851da87 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiBrowser11TCK.java
@@ -34,7 +34,7 @@ public class TestPublicApiBrowser11TCK extends AbstractEnterpriseOpenCMIS11TCKTe
         cmisParameters.put(TestParameters.DEFAULT_ITEM_TYPE, "I:cm:cmobject");
     	clientContext = new OpenCMISClientContext(BindingType.BROWSER,
     			MessageFormat.format(CMIS_URL, "localhost", String.valueOf(port), "alfresco", network.getId(), "public"),
-    			"admin@" + network.getId(), "admin", cmisParameters);
+    			"admin@" + network.getId(), "admin", cmisParameters, getTestFixture().getJettyComponent().getApplicationContext());
         overrideVersionableAspectProperties(getTestFixture().getJettyComponent().getApplicationContext());
 	}
 }
\ No newline at end of file
diff --git a/source/test-resources/alfresco-global.properties b/source/test-resources/alfresco-global.properties
new file mode 100644
index 0000000000..a9754d1e0d
--- /dev/null
+++ b/source/test-resources/alfresco-global.properties
@@ -0,0 +1,2 @@
+opencmis.tck.readtimeout=10000
+opencmis.tck.connecttimeout=10000
\ No newline at end of file