diff --git a/maven-plugins/maven-surefire-plugin/pom.xml b/maven-plugins/maven-surefire-plugin/pom.xml
index e035a081a3..7eacb4c42d 100644
--- a/maven-plugins/maven-surefire-plugin/pom.xml
+++ b/maven-plugins/maven-surefire-plugin/pom.xml
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>surefire</groupId>
       <artifactId>surefire</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>1.4</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>surefire</groupId>
       <artifactId>surefire-booter</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>1.4</version>
       <exclusions>
         <exclusion>
           <groupId>plexus</groupId>
diff --git a/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java b/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
index 1b0ba48ed2..e2d0002210 100644
--- a/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
+++ b/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
@@ -176,6 +176,13 @@ public class SurefirePlugin
             return;
         }
 
+        if ( !testClassesDirectory.exists() )
+        {
+            getLog().info( "No tests to run." );
+
+            return;
+        }
+
         // ----------------------------------------------------------------------
         // Setup the surefire booter
         // ----------------------------------------------------------------------