diff --git a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java
index 6bb2291197..da46073fca 100644
--- a/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java
+++ b/source/test-java/org/alfresco/rest/api/tests/client/PublicApiHttpClient.java
@@ -70,7 +70,7 @@ import org.springframework.core.type.classreading.MetadataReaderFactory;
  * A http client for talking to the rest apis. The caller can pass in a rest api
  * implementation class to the http method (get, post, put, delete supported)
  * and the url will be generated.
- * 
+ *
  * @author steveglover
  */
 public class PublicApiHttpClient
@@ -79,7 +79,7 @@ public class PublicApiHttpClient
 
     private static final String OLD_BASE_URL = "{0}://{1}:{2}{3}{4}{5}/api/";
     private static final String INDEX_URL = "{0}://{1}:{2}{3}{4}";
-    private static final String BASE_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/{7}/versions/{8}/";
+    private static final String BASE_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/{7}/versions/{8}";
     private static final String PUBLICAPI_CMIS_SERVICE_URL = "{0}://{1}:{2}{3}{4}cmis/versions/{5}/{6}";
     private static final String PUBLICAPI_CMIS_URL = "{0}://{1}:{2}{3}{4}{5}/{6}/cmis/versions/{7}/{8}";
     private static final String PUBLICAPI_CMIS_URL_SUFFIX = "{0}/{1}/cmis/versions/{2}/{3}";
@@ -624,20 +624,21 @@ public class PublicApiHttpClient
                 String relationEntityIdString = encodeToString(relationEntityId);
                 String collectionEntityIdString = encodeToString(collectionEntityId);
 
+                sb.append('/');
                 sb.append(entityCollectionName);
-                sb.append("/");
+                sb.append('/');
                 if (collectionEntityIdString != null)
                 {
                     sb.append(collectionEntityIdString);
-                    sb.append("/");
+                    sb.append('/');
                 }
 
                 sb.append(relationshipCollectionName);
-                sb.append("/");
+                sb.append('/');
                 if (relationEntityIdString != null)
                 {
                     sb.append(relationEntityIdString);
-                    sb.append("/");
+                    sb.append('/');
                 }
             }
             else
@@ -647,12 +648,13 @@ public class PublicApiHttpClient
                 {
                     String collectionEntityIdString = encodeToString(collectionEntityId);
 
+                    sb.append('/');
                     sb.append(entityCollectionName);
-                    sb.append("/");
+                    sb.append('/');
                     if (collectionEntityIdString != null)
                     {
                         sb.append(collectionEntityIdString);
-                        sb.append("/");
+                        sb.append('/');
                     }
                 }
                 else
@@ -698,6 +700,7 @@ public class PublicApiHttpClient
 
             if (collectionName != null)
             {
+                sb.append('/');
                 sb.append(collectionName);
                 if (collectionEntityId != null)
                 {
@@ -708,10 +711,7 @@ public class PublicApiHttpClient
 
             if (relationName != null)
             {
-                if (!sb.toString().endsWith("/"))
-                {
-                    sb.append('/');
-                }
+                sb.append('/');
                 sb.append(relationName);
                 if (relationEntityId != null)
                 {