diff --git a/project/Scripted.scala b/project/Scripted.scala
index a2df1d7bc6..bc291aaf91 100644
--- a/project/Scripted.scala
+++ b/project/Scripted.scala
@@ -75,6 +75,7 @@ object Scripted {
                  bufferLog: Boolean,
                  prescripted: File => Unit): Unit = {
     System.err.println(s"About to run tests: ${args.mkString("\n * ", "\n * ", "\n")}")
+    sys.props(org.apache.logging.log4j.util.LoaderUtil.IGNORE_TCCL_PROPERTY) = "true"
     val noJLine = new classpath.FilteredLoader(scriptedSbtInstance.loader, "jline." :: Nil)
     val loader = classpath.ClasspathUtilities.toLoader(scriptedSbtClasspath.files, noJLine)
     val bridgeClass = Class.forName("sbt.internal.inc.IncScriptedRunner", true, loader)
diff --git a/zinc/src/sbt-test/source-dependencies/value-class-underlying/C.scala b/zinc/src/sbt-test/source-dependencies/value-class-underlying/C.scala
index 0c09ea764f..9a6a975330 100644
--- a/zinc/src/sbt-test/source-dependencies/value-class-underlying/C.scala
+++ b/zinc/src/sbt-test/source-dependencies/value-class-underlying/C.scala
@@ -1,6 +1,6 @@
 object C {
   def main(args: Array[String]): Unit = {
-    val x = B.foo
-    println("x: " + x) // Need to use x in an expression to see if it crashes or not
+    val duck = B.foo
+    println("duck: " + duck) // Need to use duck in an expression to see if it crashes or not
   }
 }