diff --git a/pom.xml b/pom.xml
index 183e70459f..f370a7ce7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,20 +102,6 @@
    </properties>
 
    <build>
-      <!-- Non standard folder layout -->
-      <sourceDirectory>source/java</sourceDirectory>
-      <testSourceDirectory>test/java</testSourceDirectory>
-      <resources>
-         <resource>
-            <directory>config</directory>
-         </resource>
-      </resources>
-      <testResources>
-         <testResource>
-            <directory>test/resources</directory>
-         </testResource>
-      </testResources>
-
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index b377d52369..fa712f4677 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -10,6 +10,8 @@
    <artifactId>alfresco-rm-server</artifactId>
    <name>Alfresco RM Server</name>
    <build>
+      <sourceDirectory>source/java</sourceDirectory>
+      <testSourceDirectory>test/java</testSourceDirectory>
       <resources>
          <resource>
             <directory>config</directory>
@@ -28,6 +30,11 @@
             <filtering>${app.filtering.enabled}</filtering>
          </resource>
       </resources>
+      <testResources>
+         <testResource>
+            <directory>test/resources</directory>
+         </testResource>
+      </testResources>
       <plugins>
          <!-- Additional source folder to be added: source/compatibility -->
          <plugin>
@@ -122,7 +129,7 @@
                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                           <sqlCommand>drop database if exists alfresco</sqlCommand>
+                           <sqlCommand>drop database if exists ${db.name}</sqlCommand>
                         </configuration>
                      </execution>
                      <execution>
@@ -132,7 +139,7 @@
                            <goal>execute</goal>
                         </goals>
                         <configuration>
-                           <sqlCommand>create database alfresco</sqlCommand>
+                           <sqlCommand>create database ${db.name}</sqlCommand>
                         </configuration>
                      </execution>
                   </executions>