diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index 43fe4370b4..ab99e46c1e 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -14,6 +14,8 @@
    <properties>
       <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
       <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
+      <tas.restapi.version>5.2.0-0</tas.restapi.version>
+      <fluent.json.version>2.0.0</fluent.json.version>
    </properties>
 
    <build>
@@ -34,18 +36,18 @@
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
-         <version>2.0.0</version>
+         <version>${tas.restapi.version}</version>
       </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
-         <version>2.0.0</version>
+         <version>${tas.restapi.version}</version>
          <type>test-jar</type>
       </dependency>
       <dependency>
          <groupId>org.jglue.fluent-json</groupId>
          <artifactId>fluent-json</artifactId>
-         <version>2.0.0</version>
+         <version>${fluent.json.version}</version>
       </dependency>
    </dependencies>
 </project>
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
index 99711dd7fb..1dad063780 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
@@ -61,7 +61,8 @@ import org.testng.annotations.BeforeClass;
  * @since 2.6
  */
 @Configuration
-@PropertySource("classpath:default.properties")
+@PropertySource(value = {"classpath:default.properties", "classpath:config.properties"})
+@PropertySource(value = "classpath:module.properties", ignoreResourceNotFound = true)
 @PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true)
 public class BaseRestTest extends RestTest
 {
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties b/rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties
new file mode 100644
index 0000000000..e376e2c0d3
--- /dev/null
+++ b/rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties
@@ -0,0 +1,2 @@
+alfresco.server=localhost
+rest.rmPath=alfresco/api/-default-/public/ig/versions/1
\ No newline at end of file
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties b/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties
deleted file mode 100644
index 911f2a44fc..0000000000
--- a/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#########################################################################
-#           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
-
-# Database Section
-db.url = jdbc:mysql://${alfresco.server}:3306/alfresco
-db.username = alfresco
-db.password = alfresco
-
-#########################################################################
-
-rest.rmPath=alfresco/api/-default-/public/ig/versions/1
\ No newline at end of file