diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index 1e85bcee90..02d055c54d 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -954,8 +954,8 @@
     <!-- OpenCMIS -->
 
     <bean id="publicApiCMISServiceFactory" class="org.alfresco.opencmis.PublicApiAlfrescoCmisServiceFactory" init-method="init">
-        <property name="memoryThreshold"        value="${opencmis.memoryThreshold}" />
-        <property name="maxContentSize"         value="${opencmis.maxContentSize}" />
+        <property name="memoryThreshold"        value="${opencmis.memoryThresholdKB}" />
+        <property name="maxContentSize"         value="${opencmis.maxContentSizeMB}" />
         <property name="cmisConnector"          ref="CMISConnector" />
         <property name="cmisTransactions"       ref="CMISService_Transactions" />
         <property name="cmisExceptions"         ref="CMISService_Exceptions" />
diff --git a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java
index 88fa17de1c..8ccfa469c6 100644
--- a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java
+++ b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java
@@ -288,7 +288,7 @@ public class TestCMIS extends EnterpriseTestApi
         properties.put(PropertyIds.NAME, fileName);
 
         // change maxContentSize so that the file will be to big
-        long maxContentSize = 5242880L;  // 5MB
+        double maxContentSize = 5.8;  // 5MB
         PublicApiAlfrescoCmisServiceFactory publicApiAlfrescoCmisServiceFactory = (PublicApiAlfrescoCmisServiceFactory) ctx.getBean("publicApiCMISServiceFactory");
         publicApiAlfrescoCmisServiceFactory.setMaxContentSize(maxContentSize);
 
@@ -320,7 +320,7 @@ public class TestCMIS extends EnterpriseTestApi
         }
 
         // increase maxContensize so that the file is not to big
-        maxContentSize = 10485760L; // 10MB
+        maxContentSize = 10.6; // 10MB
         publicApiAlfrescoCmisServiceFactory.setMaxContentSize(maxContentSize);
 
         // for atom
@@ -334,7 +334,7 @@ public class TestCMIS extends EnterpriseTestApi
         assertNotNull(result);
 
         // ignore the size check
-        maxContentSize = -1L;
+        maxContentSize = -1;
         publicApiAlfrescoCmisServiceFactory.setMaxContentSize(maxContentSize);
 
         // for atom