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 37315b957e..7ba9457dd8 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
@@ -70,6 +70,7 @@ public class CMISTest extends BaseCMISWebScriptTest
 //        server.username = "admin";
 //        server.password = "admin";
 //        setRemoteServer(server);
+//        setServiceUrl("http://localhost:8080/alfresco/service/api/cmis");
 //        setValidateResponse(false);
 //        setListener(new CMISTestListener(System.out));
 //        setTraceReqRes(true);
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java
index 965ee2243e..f25ecc7e87 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunner.java
@@ -177,6 +177,7 @@ public class CMISTestRunner
             CMISTest test = (CMISTest)allSuite.testAt(i);
             if (match == null || match.equals("*") || test.getName().matches(match.replace("*", "[A-Za-z0-9]*")))
             {
+                test.setValidateResponse(validateResponse);
                 if (listener != null)
                 {
                     test.setListener(listener);
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java
index 3c00cbf125..765cd81cf3 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISTestRunnerWebScript.java
@@ -64,15 +64,11 @@ public class CMISTestRunnerWebScript extends AbstractWebScript
             runner.setUserPass(userpass);
         }
         String validate = req.getParameter("validate");
-        if (validate != null && validate.length() > 0)
-        {
-            runner.setValidateResponse(Boolean.valueOf(validate));
-        }
+        runner.setValidateResponse(Boolean.valueOf(validate));
+            
         String trace = req.getParameter("trace");
-        if (trace != null && trace.length() > 0)
-        {
-            runner.setTraceReqRes(Boolean.valueOf(trace));
-        }
+        runner.setTraceReqRes(Boolean.valueOf(trace));
+
         String match = req.getParameter("tests");
         if (match != null && match.length() > 0)
         {
diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
index 15bb38cd6b..d1966119d9 100644
--- a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
+++ b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java
@@ -352,7 +352,10 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
         cmisTypeDefinition.setQueryName(typeDefinition.getQueryName());
         cmisTypeDefinition.setDisplayName(typeDefinition.getDisplayName());
         cmisTypeDefinition.setBaseType(EnumBaseObjectType.fromValue(typeDefinition.getBaseType().getTypeId().getId()));
-        cmisTypeDefinition.setParentId(typeDefinition.getParentType().getTypeId().getId());
+        if (typeDefinition.getParentType() != null)
+        {
+            cmisTypeDefinition.setParentId(typeDefinition.getParentType().getTypeId().getId());
+        }
         cmisTypeDefinition.setBaseTypeQueryName(typeDefinition.getBaseType().getQueryName());
         cmisTypeDefinition.setDescription(typeDefinition.getDescription());
         cmisTypeDefinition.setCreatable(typeDefinition.isCreatable());
@@ -381,11 +384,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
      */
     private CmisTypeDefinitionType getCmisTypeDefinition(CMISTypeDefinition typeDef, boolean includeProperties) throws CmisException
     {
-        if (typeDef.getParentType() == null)
-        {
-            return null;
-        }
-
         if (typeDef == null)
         {
             throw cmisObjectsUtils.createCmisException("Type not found", EnumServiceException.OBJECT_NOT_FOUND);
diff --git a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
index 80391e26ca..30646ac199 100644
--- a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
@@ -230,7 +230,10 @@ public abstract class BaseWebScriptTest extends TestCase
         {
             httpClient = new HttpClient();
             httpClient.getParams().setBooleanParameter(HttpClientParams.PREEMPTIVE_AUTHENTICATION, true);
-            httpClient.getState().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT), new UsernamePasswordCredentials(remoteServer.username, remoteServer.password));
+            if (remoteServer.username != null)
+            {
+                httpClient.getState().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT), new UsernamePasswordCredentials(remoteServer.username, remoteServer.password));
+            }
         }
     }