diff --git a/src/sbt-test/tests/test-failed/changes/Fail.scala b/src/sbt-test/tests/test-failed/changes/Fail.scala
new file mode 100644
index 000000000..1fa4e4bdd
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/changes/Fail.scala
@@ -0,0 +1,7 @@
+import org.scalatest._
+
+class TestQuickSuite extends FunSuite {
+	test("a test") {
+		throw new IllegalStateException
+	}
+}
diff --git a/src/sbt-test/tests/test-failed/changes/Success.scala b/src/sbt-test/tests/test-failed/changes/Success.scala
new file mode 100644
index 000000000..85489d7e6
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/changes/Success.scala
@@ -0,0 +1,7 @@
+import org.scalatest._
+
+class TestQuickSuite extends FunSuite {
+	test("a test") {
+		true
+	}
+}
diff --git a/src/sbt-test/tests/test-failed/project/build.properties b/src/sbt-test/tests/test-failed/project/build.properties
new file mode 100644
index 000000000..2b68418d4
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/project/build.properties
@@ -0,0 +1,2 @@
+project.version=1.0
+project.name=Test Failed
\ No newline at end of file
diff --git a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
new file mode 100644
index 000000000..b8f8efd3d
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
@@ -0,0 +1,5 @@
+import sbt._
+
+class TestQuickProject(info: ProjectInfo) extends DefaultProject(info) {
+    val scalatest = "org.scalatest" % "scalatest" % "0.9.3"
+}
diff --git a/src/sbt-test/tests/test-failed/test b/src/sbt-test/tests/test-failed/test
new file mode 100644
index 000000000..244aea8ac
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/test
@@ -0,0 +1,26 @@
+> update
+[success]
+
+$ copy-file changes/Fail.scala src/test/scala/TestQuickSuite.scala
+[success]
+
+> test-failed
+[failure]
+
+> test-failed *
+[failure]
+
+> test-failed TestQuickSuite
+[failure]
+
+$ copy-file changes/Success.scala src/test/scala/TestQuickSuite.scala
+[success]
+
+> test-failed
+[success]
+
+> test-failed *
+[success]
+
+> test-failed TestQuickSuite
+[success]
\ No newline at end of file