diff --git a/src/main/scala/sbt/ProjectPaths.scala b/src/main/scala/sbt/ProjectPaths.scala
index 2891571eb..855ba85cd 100644
--- a/src/main/scala/sbt/ProjectPaths.scala
+++ b/src/main/scala/sbt/ProjectPaths.scala
@@ -156,8 +156,8 @@ trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
 		testResourcesPath ::
 		Nil
 		
-	def mainSourceRoots = mainJavaSourcePath +++ mainScalaSourcePath
-	def testSourceRoots = testJavaSourcePath +++ testScalaSourcePath
+	def mainSourceRoots = (mainJavaSourcePath##) +++ (mainScalaSourcePath##)
+	def testSourceRoots = (testJavaSourcePath##) +++ (testScalaSourcePath##)
 }
 
 trait BasicPackagePaths extends ScalaPaths with PackagePaths
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 30a246ef8..a6e42e9b2 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -256,12 +256,17 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			val setup, cleanup = new ListBuffer[() => Option[String]]
 			val testListeners = new ListBuffer[TestReportListener]
 			
-			options.foreach {
-				case TestFilter(include) => testFilters += include
-				case ExcludeTests(exclude) => excludeTestsSet ++= exclude
-				case TestListeners(listeners) => testListeners ++= listeners
-				case TestSetup(setupFunction) => setup += setupFunction
-				case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
+			for(option <- options)
+			{
+				option match
+				{
+					case TestFilter(include) => testFilters += include
+					case ExcludeTests(exclude) => excludeTestsSet ++= exclude
+					case TestListeners(listeners) => testListeners ++= listeners
+					case TestSetup(setupFunction) => setup += setupFunction
+					case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
+				}
+				() // 2.8.0-SNAPSHOT bug in type inference
 			}
 			
 			if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))