diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java
index 873b8d61fe..d8fef64df5 100644
--- a/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java
+++ b/source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java
@@ -33,12 +33,12 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.alfresco.abdera.ext.cmis.CMISConstants;
 import org.alfresco.util.Content;
 import org.alfresco.web.scripts.FormatReader;
 import org.alfresco.web.scripts.WebScriptException;
 import org.alfresco.web.scripts.WebScriptRequest;
 import org.alfresco.web.scripts.WebScriptResponse;
-import org.apache.abdera.ext.cmis.CMISConstants;
 
 
 /**
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java b/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java
index ad02317b91..4ff446ec75 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java
@@ -40,6 +40,11 @@ import javax.xml.validation.Validator;
 
 import junit.framework.Test;
 
+import org.alfresco.abdera.ext.cmis.CMISCapabilities;
+import org.alfresco.abdera.ext.cmis.CMISConstants;
+import org.alfresco.abdera.ext.cmis.CMISExtensionFactory;
+import org.alfresco.abdera.ext.cmis.CMISObject;
+import org.alfresco.abdera.ext.cmis.CMISRepositoryInfo;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.cmis.rest.xsd.CMISValidator;
 import org.alfresco.repo.web.scripts.BaseWebScriptTest;
@@ -52,11 +57,6 @@ import org.alfresco.web.scripts.TestWebScriptServer.Request;
 import org.alfresco.web.scripts.TestWebScriptServer.Response;
 import org.alfresco.web.scripts.atom.AbderaService;
 import org.alfresco.web.scripts.atom.AbderaServiceImpl;
-import org.apache.abdera.ext.cmis.CMISCapabilities;
-import org.apache.abdera.ext.cmis.CMISConstants;
-import org.apache.abdera.ext.cmis.CMISExtensionFactory;
-import org.apache.abdera.ext.cmis.CMISObject;
-import org.apache.abdera.ext.cmis.CMISRepositoryInfo;
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Collection;
 import org.apache.abdera.model.Entry;
@@ -383,7 +383,7 @@ public class BaseCMISWebScriptTest extends BaseWebScriptTest
             assertNotNull(repoInfo);
             CMISCapabilities capabilities = repoInfo.getCapabilities();
             assertNotNull(repoInfo);
-            queryCapability = capabilities.getJoin();
+            queryCapability = capabilities.getQuery();
             assertNotNull(queryCapability);
         }
         return queryCapability;
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java
index 87398e5cac..58c57a6a76 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java
@@ -27,6 +27,10 @@ package org.alfresco.repo.cmis.rest.test;
 import java.io.StringReader;
 import java.util.List;
 
+import org.alfresco.abdera.ext.cmis.CMISConstants;
+import org.alfresco.abdera.ext.cmis.CMISObject;
+import org.alfresco.abdera.ext.cmis.CMISProperties;
+import org.alfresco.abdera.ext.cmis.CMISProperty;
 import org.alfresco.util.GUID;
 import org.alfresco.web.scripts.Format;
 import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest;
@@ -35,10 +39,6 @@ import org.alfresco.web.scripts.TestWebScriptServer.PatchRequest;
 import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
 import org.alfresco.web.scripts.TestWebScriptServer.PutRequest;
 import org.alfresco.web.scripts.TestWebScriptServer.Response;
-import org.apache.abdera.ext.cmis.CMISConstants;
-import org.apache.abdera.ext.cmis.CMISObject;
-import org.apache.abdera.ext.cmis.CMISProperties;
-import org.apache.abdera.ext.cmis.CMISProperty;
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
index 7ba9457dd8..0dff7ee5a7 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
@@ -32,6 +32,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.alfresco.abdera.ext.cmis.CMISAllowableAction;
+import org.alfresco.abdera.ext.cmis.CMISAllowableActions;
+import org.alfresco.abdera.ext.cmis.CMISConstants;
+import org.alfresco.abdera.ext.cmis.CMISObject;
 import org.alfresco.util.GUID;
 import org.alfresco.web.scripts.Format;
 import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest;
@@ -40,10 +44,6 @@ import org.alfresco.web.scripts.TestWebScriptServer.PatchRequest;
 import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
 import org.alfresco.web.scripts.TestWebScriptServer.PutRequest;
 import org.alfresco.web.scripts.TestWebScriptServer.Response;
-import org.apache.abdera.ext.cmis.CMISAllowableAction;
-import org.apache.abdera.ext.cmis.CMISAllowableActions;
-import org.apache.abdera.ext.cmis.CMISConstants;
-import org.apache.abdera.ext.cmis.CMISObject;
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Entry;
@@ -1160,7 +1160,7 @@ public class CMISTest extends BaseCMISWebScriptTest
         // retrieve query request document
         String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml");
 
-        if (queryCapability.equals("metadataonly") || queryCapability.equals("bothseperate"))
+        if (queryCapability.equals("metadataonly") || queryCapability.equals("bothseperate") || queryCapability.equals("bothcombined"))
         {
             {
                 // meta data only query against folder
@@ -1204,7 +1204,7 @@ public class CMISTest extends BaseCMISWebScriptTest
             }
         }
         
-        if (queryCapability.equals("fulltextonly") || queryCapability.equals("bothseperate"))
+        if (queryCapability.equals("fulltextonly") || queryCapability.equals("bothseperate") || queryCapability.equals("bothcombined"))
         {
             // full text only query
             String query = "SELECT ObjectId, ObjectTypeId, Name FROM Document " +