Index: pom.xml
===================================================================
--- pom.xml	(revision 453055)
+++ pom.xml	(working copy)
@@ -73,6 +73,12 @@
       <email>joakim@erdfelt.com</email>
     </contributor>
   </contributors>
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+    </repository>
+  </repositories>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
Index: src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
===================================================================
--- src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java	(revision 453055)
+++ src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java	(working copy)
@@ -561,8 +561,19 @@
             }
             else if ( junitArtifact != null )
             {
-                surefireBooter.addTestSuite( "org.apache.maven.surefire.junit.JUnitDirectoryTestSuite",
-                                             new Object[]{testClassesDirectory, includes, excludes} );
+                String junitDirectoryTestSuite;
+
+                if ( junitArtifact.getBaseVersion().startsWith( "4" ) )
+                {
+                    junitDirectoryTestSuite = "org.apache.maven.surefire.junit4.JUnit4DirectoryTestSuite";
+                }
+                else
+                {
+                    junitDirectoryTestSuite = "org.apache.maven.surefire.junit.JUnitDirectoryTestSuite";
+                }
+
+                surefireBooter.addTestSuite( junitDirectoryTestSuite, new Object[] { testClassesDirectory, includes,
+                    excludes } );
             }
             else
             {