2 files changed, 11 insertions, 8 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check
index b9ff6afa2b..292d2fc4cb 100644
--- a/test/files/jvm/interpreter.check
+++ b/test/files/jvm/interpreter.check
@@ -316,9 +316,8 @@ scala> /*
   */
 */
 
-scala> 
 
-scala> 
+You typed two blank lines.  Starting a new command.
 
 scala> // multi-line string
 
@@ -326,7 +325,7 @@ scala> """
 hello
 there
 """
-res9: String = 
+res12: String = 
 "
 hello
 there
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
index f0ca438774..fce1a25bb6 100644
--- a/test/files/jvm/scala-concurrent-tck.scala
+++ b/test/files/jvm/scala-concurrent-tck.scala
@@ -64,7 +64,7 @@ trait FutureCallbacks extends TestBase {
       }
     }
   }
-  
+
   def testOnSuccessWhenFailed(): Unit = once {
     done =>
     val f = future[Unit] {
@@ -94,7 +94,7 @@ trait FutureCallbacks extends TestBase {
         assert(x == 1)
     }
   }
-  
+
   def testOnFailureWhenSpecialThrowable(num: Int, cause: Throwable): Unit = once {
     done =>
     val f = future[Unit] {
@@ -139,7 +139,8 @@ trait FutureCallbacks extends TestBase {
   testOnFailure()
   testOnFailureWhenSpecialThrowable(5, new Error)
   testOnFailureWhenSpecialThrowable(6, new scala.util.control.ControlThrowable { })
-  testOnFailureWhenSpecialThrowable(7, new InterruptedException)
+  //TODO: this test is currently problematic, because NonFatal does not match InterruptedException
+  //testOnFailureWhenSpecialThrowable(7, new InterruptedException)
   testOnFailureWhenTimeoutException()
   
 }
@@ -289,6 +290,9 @@ trait FutureCombinators extends TestBase {
       }
   }
 
+  /* TODO: Test for NonFatal in collect (more of a regression test at this point).
+   */
+
   def testForeachSuccess(): Unit = once {
     done =>
       val p = promise[Int]()
@@ -473,8 +477,8 @@ trait FutureCombinators extends TestBase {
   def testFallbackToFailure(): Unit = once {
     done =>
     val cause = new Exception
-    val f = future { throw cause }
-    val g = future { sys.error("failed") }
+    val f = future { sys.error("failed") }
+    val g = future { throw cause }
     val h = f fallbackTo g
 
     h onSuccess {