diff --git a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
index 764ad7916..d2164dfd6 100644
--- a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
+++ b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
@@ -40,7 +40,7 @@ final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, launc
             None
           } else {
             try { scriptedTest(str, testDirectory, prescripted, log); None }
-            catch { case e: xsbt.test.TestException => Some(str) }
+            catch { case _: xsbt.test.TestException | _: PendingTestSuccessException => Some(str) }
           }
         }
       }
@@ -92,6 +92,7 @@ final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, launc
           if (!pending) throw e
         case e: PendingTestSuccessException =>
           testFailed()
+          buffered.error("  Mark as passing to remove this failure.")
           throw e
         case e: Exception =>
           testFailed()