diff --git a/pom.xml b/pom.xml
index 2129d43dc7..1ffaa7c765 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,10 +199,6 @@
                   </systemPropertyVariables>
                </configuration>
             </plugin>
-            <plugin>
-               <artifactId>maven-surefire-plugin-report</artifactId>
-               <version>2.16</version>
-            </plugin>
             <plugin>
                <artifactId>maven-javadoc-plugin</artifactId>
                <version>2.9.1</version>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index d8b57e8e7a..af919e4d73 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -40,22 +40,6 @@
                        </sources>
                    </configuration>
                </execution>
-               <execution>
-                  <id>attach-distribution</id>
-                  <phase>package</phase>
-                  <goals>
-                     <goal>attach-artifact</goal>
-                  </goals>
-                  <configuration>
-                     <artifacts>
-                        <artifact>
-                           <file>${project.build.directory}/${project.build.finalName}.amp</file>
-                           <type>amp</type>
-                           <classifier>amp</classifier>
-                        </artifact>
-                     </artifacts>
-                  </configuration>
-               </execution>
             </executions>
          </plugin>
          <plugin>
@@ -87,17 +71,6 @@
                </includes>
             </configuration>
          </plugin>
-         <plugin>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-            <executions>
-               <execution>
-                  <phase>test</phase>
-                  <goals>
-                     <goal>report</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
          <plugin>
             <groupId>org.alfresco.maven.plugin</groupId>
             <artifactId>alfresco-maven-plugin</artifactId>
@@ -114,6 +87,7 @@
                <backup>true</backup>
                <ampLocation>${project.build.directory}/${project.build.finalName}.amp</ampLocation>
                <warLocation>${project.build.directory}/alfresco.war</warLocation>
+               <classifier>amp</classifier>
             </configuration>
          </plugin>
          <plugin>