diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
index 29179d4f0f..9898fe7bca 100644
--- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala
@@ -3,6 +3,8 @@
  */
 package akka.testkit
 
+import org.scalactic.Constraint
+
 import language.{ postfixOps, reflectiveCalls }
 import org.scalatest.{ WordSpecLike, BeforeAndAfterAll }
 import org.scalatest.Matchers
@@ -14,7 +16,6 @@ import com.typesafe.config.{ Config, ConfigFactory }
 import akka.dispatch.Dispatchers
 import akka.testkit.TestEvent._
 import org.scalautils.ConversionCheckedTripleEquals
-import org.scalautils.Constraint
 
 object AkkaSpec {
   val testConf: Config = ConfigFactory.parseString("""
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 59fc58862e..da0f3134ff 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,7 +11,7 @@ object Dependencies {
     val crossScala = Seq("2.11.5", "2.10.4")
     val scalaVersion = crossScala.head
     val scalaStmVersion  = sys.props.get("akka.build.scalaStmVersion").getOrElse("0.7")
-    val scalaTestVersion = sys.props.get("akka.build.scalaTestVersion").getOrElse("2.1.3")
+    val scalaTestVersion = sys.props.get("akka.build.scalaTestVersion").getOrElse("2.2.4")
     val scalaCheckVersion = sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.11.3")
   }
 
diff --git a/project/ValidatePullRequest.scala b/project/ValidatePullRequest.scala
index 7cd4174ce8..54696e700e 100644
--- a/project/ValidatePullRequest.scala
+++ b/project/ValidatePullRequest.scala
@@ -50,9 +50,9 @@ object ValidatePullRequest extends AutoPlugin {
   override def trigger = allRequirements
 
   override lazy val projectSettings = inConfig(ValidatePR)(Defaults.testTasks) ++ Seq(
-    testOptions in ValidatePR += Tests.Argument("-l akka.testkit.PerformanceTest"),
-    testOptions in ValidatePR += Tests.Argument("-l akka.testkit.LongRunningTest"),
-    testOptions in ValidatePR += Tests.Argument("-l akka.testkit.TimingTest"),
+    testOptions in ValidatePR += Tests.Argument(TestFrameworks.ScalaTest, "-l", "performance"),
+    testOptions in ValidatePR += Tests.Argument(TestFrameworks.ScalaTest, "-l", "long-running"),
+    testOptions in ValidatePR += Tests.Argument(TestFrameworks.ScalaTest, "-l", "timing"),
 
     targetBranch in ValidatePR := {
         sys.env.get(TargetBranchEnvVarName) orElse
@@ -161,7 +161,7 @@ object ValidatePullRequest extends AutoPlugin {
       val theVoid = Def.task { () } // when you stare into the void, the void stares back at you
 
       if ((projectIsAffectedByChanges in ValidatePR).value) {
-        log.info(s"Changes in PR are affecting project [${name.value}] - proceeding with test:test")
+        log.info(s"Changes in PR are affecting project [${name.value}] - proceeding with pr-validation:test")
         theVoid.dependsOn(test in ValidatePR)
       } else {
         log.info(s"Skipping validation of [${name.value}], as PR does NOT affect this project...")