diff --git a/sbt/src/sbt-test/project/scripted-plugin/build.sbt b/sbt/src/sbt-test/project/scripted-plugin/build.sbt
new file mode 100644
index 000000000..1d931d8ac
--- /dev/null
+++ b/sbt/src/sbt-test/project/scripted-plugin/build.sbt
@@ -0,0 +1 @@
+ScriptedPlugin.scriptedSettings
diff --git a/sbt/src/sbt-test/project/scripted-plugin/changes/Fail.scala b/sbt/src/sbt-test/project/scripted-plugin/changes/Fail.scala
new file mode 100644
index 000000000..f3301e5fd
--- /dev/null
+++ b/sbt/src/sbt-test/project/scripted-plugin/changes/Fail.scala
@@ -0,0 +1 @@
+object Fail {
diff --git a/sbt/src/sbt-test/project/scripted-plugin/changes/Success.scala b/sbt/src/sbt-test/project/scripted-plugin/changes/Success.scala
new file mode 100644
index 000000000..9eef61db0
--- /dev/null
+++ b/sbt/src/sbt-test/project/scripted-plugin/changes/Success.scala
@@ -0,0 +1 @@
+object Success
diff --git a/sbt/src/sbt-test/project/scripted-plugin/changes/fail b/sbt/src/sbt-test/project/scripted-plugin/changes/fail
new file mode 100644
index 000000000..f814d1615
--- /dev/null
+++ b/sbt/src/sbt-test/project/scripted-plugin/changes/fail
@@ -0,0 +1 @@
+-> compile
diff --git a/sbt/src/sbt-test/project/scripted-plugin/changes/test b/sbt/src/sbt-test/project/scripted-plugin/changes/test
new file mode 100644
index 000000000..038c7ba4e
--- /dev/null
+++ b/sbt/src/sbt-test/project/scripted-plugin/changes/test
@@ -0,0 +1,4 @@
+$ copy-file changes/Success.scala Success.scala
+> compile
+$ copy-file changes/Fail.scala Fail.scala
+-> compile
diff --git a/sbt/src/sbt-test/project/scripted-plugin/project/plugins.sbt b/sbt/src/sbt-test/project/scripted-plugin/project/plugins.sbt
new file mode 100644
index 000000000..8cbc845fd
--- /dev/null
+++ b/sbt/src/sbt-test/project/scripted-plugin/project/plugins.sbt
@@ -0,0 +1,3 @@
+libraryDependencies <+= sbtVersion { sv =>
+  "org.scala-sbt" % "scripted-plugin" % sv
+}
diff --git a/sbt/src/sbt-test/project/scripted-plugin/test b/sbt/src/sbt-test/project/scripted-plugin/test
new file mode 100644
index 000000000..ee1685ab1
--- /dev/null
+++ b/sbt/src/sbt-test/project/scripted-plugin/test
@@ -0,0 +1,6 @@
+$ copy-file changes/test src/sbt-test/group/demo/test
+$ copy-file changes/Fail.scala src/sbt-test/group/demo/changes/Fail.scala
+$ copy-file changes/Success.scala src/sbt-test/group/demo/changes/Success.scala
+$ copy-file changes/fail src/sbt-test/group/fail/test
+> scripted group/demo
+-> scripted group/fail
diff --git a/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala b/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
index d00bc1e44..e32ff2c34 100644
--- a/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
+++ b/scripted/plugin/src/main/scala/sbt/ScriptedPlugin.scala
@@ -32,7 +32,7 @@ object ScriptedPlugin extends Plugin {
 
 	def scriptedRunTask: Initialize[Task[Method]] = (scriptedTests) map {
 		(m) =>
-		m.getClass.getMethod("run", classOf[File], classOf[Boolean], classOf[String], classOf[String], classOf[String], classOf[Array[String]], classOf[File], classOf[Array[String]])
+		m.getClass.getMethod("run", classOf[File], classOf[Boolean], classOf[Array[String]], classOf[File], classOf[Array[String]])
 	}
 
 	def scriptedTask: Initialize[InputTask[Unit]] = Def.inputTask {
diff --git a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
index 93a6209e1..b5d2f1c3a 100644
--- a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
+++ b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
@@ -119,7 +119,7 @@ object ScriptedTests
 	}
 	def runAll(tests: Seq[() => Option[String]])
 	{
-		val errors = for(test <- tests.par; err <- test()) yield err
+		val errors = for(test <- tests; err <- test()) yield err
 		if(errors.nonEmpty)
 			sys.error(errors.mkString("Failed tests:\n\t", "\n\t", "\n"))
 	}