diff --git a/pom.xml b/pom.xml
index 150f561907..431fb38819 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,13 +69,17 @@
       <id>acegi-snapshot</id>
       <name>Acegi snapshot repository</name>
       <url>http://acegisecurity.sourceforge.net/repository/snapshots</url>
-      <layout>default</layout>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
     </repository>
     <repository>
       <id>apache-maven-snapshots</id>
       <name>Apache snapshot repository</name>
-      <url>http://svn.apache.org/maven-snapshot-repository/</url>
-      <layout>default</layout>
+      <url>http://svn.apache.org/maven-snapshot-repository</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
     </repository>
   </repositories>
 
@@ -237,8 +241,8 @@
   <reporting>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>surefire-report-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>