diff --git a/src/test/java/org/alfresco/rest/BaseRestTest.java b/src/test/java/org/alfresco/rest/BaseRestTest.java
index af6669d371..64fccd8a31 100644
--- a/src/test/java/org/alfresco/rest/BaseRestTest.java
+++ b/src/test/java/org/alfresco/rest/BaseRestTest.java
@@ -41,21 +41,21 @@ import org.testng.annotations.BeforeClass;
  * @since 1.0
  */
 @Configuration
-@PropertySource("classpath:config.properties")
+@PropertySource("classpath:default.properties")
 @PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true)
 public class BaseRestTest extends RestTest
 {
-    @Value ("${alfresco.rm.scheme}")
+    @Value ("${alfresco.scheme}")
     private String scheme;
 
-    @Value ("${alfresco.rm.host}")
-    private String host;
+    @Value ("${alfresco.server}")
+    private String server;
 
-    @Value ("${alfresco.rm.port}")
+    @Value ("${alfresco.port}")
     private String port;
 
-    @Value ("${alfresco.rm.basePath}")
-    private String basePath;
+    @Value ("${rest.rmPath}")
+    private String restRmPath;
 
     @Autowired
     public RMSiteAPI rmSiteAPI;
@@ -75,9 +75,9 @@ public class BaseRestTest extends RestTest
     @BeforeClass(alwaysRun = true)
     public void checkServerHealth() throws Exception
     {
-        RestAssured.baseURI = scheme + "://" + host;
+        RestAssured.baseURI = scheme + "://" + server;
         RestAssured.port = parseInt(port);
-        RestAssured.basePath = basePath;
+        RestAssured.basePath = restRmPath;
 
         //create RM Site if not exist
         createRMSiteIfNotExists();
diff --git a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java b/src/test/java/org/alfresco/rest/site/RMSiteTests.java
similarity index 98%
rename from src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java
rename to src/test/java/org/alfresco/rest/site/RMSiteTests.java
index 858e82efab..4ebd4a9589 100644
--- a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java
+++ b/src/test/java/org/alfresco/rest/site/RMSiteTests.java
@@ -9,7 +9,7 @@
  * agreement is prohibited.
  * #L%
  */
-package org.alfresco.rest.fileplancomponents;
+package org.alfresco.rest.site;
 
 import static org.alfresco.com.site.RMSiteCompliance.DOD5015;
 import static org.alfresco.com.site.RMSiteCompliance.STANDARD;
@@ -33,6 +33,7 @@ import com.google.gson.JsonObject;
 import org.alfresco.dataprep.UserService;
 import org.alfresco.rest.BaseRestTest;
 import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.fileplancomponents.RecordCategoryTest;
 import org.alfresco.rest.model.site.RMSite;
 import org.alfresco.utility.model.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/resources/config.properties b/src/test/resources/config.properties
deleted file mode 100644
index 899f737db2..0000000000
--- a/src/test/resources/config.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-alfresco.rm.scheme=http
-alfresco.rm.host=localhost
-alfresco.rm.port=8080
-alfresco.rm.basePath=alfresco/api/-default-/public/ig/versions/1
\ No newline at end of file
diff --git a/src/test/resources/default.properties b/src/test/resources/default.properties
new file mode 100644
index 0000000000..47fa27dcf0
--- /dev/null
+++ b/src/test/resources/default.properties
@@ -0,0 +1,20 @@
+#########################################################################
+#           Original property values from default.properties            #
+#########################################################################
+
+# dataprep related
+alfresco.scheme=http
+alfresco.server=localhost
+alfresco.port=8080
+
+# credentials
+admin.user=admin
+admin.password=admin
+
+# rest related
+rest.basePath=alfresco/api/-default-/public/alfresco/versions/1
+rest.workflowPath=alfresco/api/-default-/public/workflow/versions/1
+
+#########################################################################
+
+rest.rmPath=alfresco/api/-default-/public/ig/versions/1
\ No newline at end of file