diff --git a/build.sbt b/build.sbt
index 071b73a9a..185971e18 100644
--- a/build.sbt
+++ b/build.sbt
@@ -352,7 +352,7 @@ def otherRootSettings =
     scriptedUnpublished := scriptedUnpublishedTask.evaluated,
     scriptedSource := (sourceDirectory in sbtProj).value / "sbt-test",
     // scriptedPrescripted := { addSbtAlternateResolver _ },
-    scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx1G"),
+    scriptedLaunchOpts := List("-XX:MaxPermSize=256M", "-Xmx360M"),
     publishAll := { val _ = (publishLocal).all(ScopeFilter(inAnyProject)).value },
     publishLocalBinAll := { val _ = (publishLocalBin).all(ScopeFilter(inAnyProject)).value },
     aggregate in bintrayRelease := false
@@ -363,7 +363,7 @@ def otherRootSettings =
       },
       scriptedLaunchOpts := {
         List("-XX:MaxPermSize=256M",
-             "-Xmx1G",
+             "-Xmx512M",
              "-Dsbt.override.build.repos=true",
              s"""-Dsbt.repository.config=${scriptedSource.value / "repo.config"}""")
       },
diff --git a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
index c77d21a13..f6b5e7f43 100644
--- a/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
+++ b/scripted/sbt/src/main/scala/sbt/test/ScriptedTests.scala
@@ -79,7 +79,7 @@ final class ScriptedTests(resourceBaseDirectory: File,
     val pendingMark = if (pending) PendingLabel else ""
     def testFailed(t: Throwable): Option[String] = {
       if (pending) buffered.clear() else buffered.stop()
-      buffered.error(s"x $label $pendingMark" + label + pendingMark)
+      buffered.error(s"x $label $pendingMark")
       if (!NonFatal(t)) throw t // We make sure fatal errors are rethrown
       if (t.isInstanceOf[TestException]) {
         t.getCause match {