diff --git a/pom.xml b/pom.xml
index 3c823a6f24..55ca734a50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,8 +149,9 @@
             <extensions>true</extensions>
             <configuration>
                <backup>true</backup>
-               <ampLocation>${project.build.directory}/${project.build.finalName}.amp</ampLocation>
+               <ampLocation>${project.build.directory}/${project.build.finalName}-amp.amp</ampLocation>
                <warLocation>${project.build.directory}/${webapp.id}.war</warLocation>
+               <classifier>amp</classifier>
             </configuration>
          </plugin>
          <plugin>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index b86bddfd7a..0618b2fef5 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -8,6 +8,7 @@
       <version>2.2-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
+   <!-- FIXME: Remove the "-test" suffix form the artifact id -->
    <artifactId>alfresco-rm-server-test</artifactId>
    <name>Alfresco RM Server</name>
    <properties>