diff --git a/jvm/src/test/scala/scala/util/parsing/combinator/t9010.scala b/jvm/src/test/scala/scala/util/parsing/combinator/t9010.scala
index 61fafd3d..38ccdbfa 100644
--- a/jvm/src/test/scala/scala/util/parsing/combinator/t9010.scala
+++ b/jvm/src/test/scala/scala/util/parsing/combinator/t9010.scala
@@ -7,42 +7,19 @@ class t9010 {
   @Test
   def test: Unit = {
     val p = new grammar
-    val lastNoSuccessVar = getLastNoSuccessVar(p)
     import p._
 
     val res1 = parse(x, "x")
     assert(res1.successful)
-    assert(lastNoSuccessVar.value == None)
 
     val res2 = parse(x, "y")
     assert(!res2.successful)
-    assert(lastNoSuccessVar.value == None)
 
     val res3 = parseAll(x, "x")
     assert(res3.successful)
-    assert(lastNoSuccessVar.value == None)
 
     val res4 = parseAll(x, "y")
     assert(!res4.successful)
-    assert(lastNoSuccessVar.value == None)
-  }
-
-  private def getLastNoSuccessVar(p: Parsers): DynamicVariable[Option[_]] = {
-    // use java reflection instead of scala (see below) because of
-    // https://issues.scala-lang.org/browse/SI-9306
-    val fn = "scala$util$parsing$combinator$Parsers$$lastNoSuccessVar"
-    val f = p.getClass.getDeclaredMethod(fn)
-    f.setAccessible(true)
-    f.invoke(p).asInstanceOf[DynamicVariable[Option[_]]]
-
-    /*
-    val ru = scala.reflect.runtime.universe
-    val mirror = ru.runtimeMirror(getClass.getClassLoader)
-    val lastNoSuccessVarField =
-      ru.typeOf[Parsers].decl(ru.TermName("lastNoSuccessVar")).asTerm.accessed.asTerm
-    mirror.reflect(p).reflectField(lastNoSuccessVarField).get.
-      asInstanceOf[DynamicVariable[Option[_]]]
-    */
   }
 
   private final class grammar extends RegexParsers {
diff --git a/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala
index 67e29cdc..fe27627b 100644
--- a/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala
+++ b/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala
@@ -156,20 +156,10 @@ trait Parsers {
     val successful = true
   }
 
-  /* two layers of Option:
-   *  outer Option is None if lastNoSuccess tracking is disabled (outside of
-   *               phrase) and Some if tracking is enabled
-   *  inner Option is None if NoSuccess hasn't been seen yet, Some otherwise
-   * this is necessary to avoid leaking NoSuccesses in thread locals */
-  private lazy val lastNoSuccessVar = new DynamicVariable[Option[Option[NoSuccess]]](None)
-
   /** A common super-class for unsuccessful parse results. */
   sealed abstract class NoSuccess(val msg: String, override val next: Input) extends ParseResult[Nothing] { // when we don't care about the difference between Failure and Error
     val successful = false
 
-    if (lastNoSuccessVar.value exists (_ forall (v => !(next.pos < v.next.pos))))
-      lastNoSuccessVar.value = Some(Some(this))
-
     def map[U](f: Nothing => U) = this
     def mapPartial[U](f: PartialFunction[Nothing, U], error: Nothing => String): ParseResult[U] = this
 
@@ -913,15 +903,11 @@ trait Parsers {
    *           if `p` consumed all the input.
    */
   def phrase[T](p: Parser[T]) = new Parser[T] {
-    def apply(in: Input) = lastNoSuccessVar.withValue(Some(None)) {
-      p(in) match {
-        case s @ Success(out, in1) =>
-          if (in1.atEnd)
-            s
-          else
-            lastNoSuccessVar.value flatMap (_ filterNot { _.next.pos < in1.pos }) getOrElse Failure("end of input expected", in1)
-        case ns => lastNoSuccessVar.value.flatten.getOrElse(ns)
-      }
+    def apply(in: Input) = p(in) match {
+      case s @ Success(out, in1) =>
+        if (in1.atEnd) s
+        else Failure("end of input expected", in1)
+      case ns => ns
     }
   }
 
diff --git a/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala
index 2a18ac67..8db4b19f 100644
--- a/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala
+++ b/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala
@@ -47,6 +47,7 @@ class JavaTokenParsersTest {
     parseSuccess("with_")
     parseSuccess("_with")
 
+    parseFailure("", 1)
     parseFailure("3start", 1)
     parseFailure("-start", 1)
     parseFailure("with-s", 5)
@@ -72,8 +73,9 @@ class JavaTokenParsersTest {
     val parseResult1 = parseAll(p, "start start")
     parseResult1 match {
       case e @ Failure(message, next) =>
+        assertEquals(next.pos.line, 1)
         assertEquals(next.pos.column, 7)
-        assert(message.endsWith("string matching regex '(?i)AND' expected but 's' found"))
+        assert(message.endsWith(s"end of input expected"))
       case _ => sys.error(parseResult1.toString)
     }
 
@@ -97,7 +99,7 @@ class JavaTokenParsersTest {
       case Failure(message, next) =>
         assertEquals(next.pos.line, 1)
         assertEquals(next.pos.column, 1)
-        assert(message.endsWith(s"identifier expected but '-' found"))
+        assert(message.endsWith(s"end of input expected"))
       case _ => sys.error(parseResult.toString)
     }