diff --git a/build.sbt b/build.sbt
index a8d4083..8d6967a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,13 +13,13 @@ crossScalaVersions         := {
   if (java.startsWith("1.6."))
     Seq("2.11.7", "2.12.0-M1")
   else if (java.startsWith("1.8."))
-    Seq("2.12.0-M2", "2.12.0-M3")
+    Seq("2.12.0-M3")
   else
     sys.error(s"don't know what Scala versions to build on $java")
 }
 
 scalaXmlVersion            := {
-  if(scalaVersion.value == "2.12.0-M3") "1.0.5" else "1.0.4"
+  if(scalaVersion.value.startsWith("2.11.") || scalaVersion.value == "2.12.0-M2") "1.0.4" else "1.0.5"
 }
 
 scalaCheckVersion          := "1.11.6"
diff --git a/src/main/scala/scala/tools/partest/nest/SBTRunner.scala b/src/main/scala/scala/tools/partest/nest/SBTRunner.scala
index 46006e1..acc956f 100644
--- a/src/main/scala/scala/tools/partest/nest/SBTRunner.scala
+++ b/src/main/scala/scala/tools/partest/nest/SBTRunner.scala
@@ -36,7 +36,7 @@ class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, log
   }
 
   override val suiteRunner = new SuiteRunner(
-    testSourcePath = Option(srcDir) getOrElse PartestDefaults.sourcePath,
+    testSourcePath = optSourcePath orElse Option(srcDir) getOrElse PartestDefaults.sourcePath,
     new FileManager(testClassLoader = testClassLoader),
     updateCheck = optUpdateCheck,
     failed  = optFailed,