5 files changed, 10 insertions, 1 deletions
diff --git a/test/files/run/constrained-types.scala b/test/files/run/constrained-types.scala
index 56fbd749c0..59fd0b1b8c 100644
--- a/test/files/run/constrained-types.scala
+++ b/test/files/run/constrained-types.scala
@@ -90,6 +90,8 @@ object Test {
     settings.Xexperimental.value = true
     settings.selfInAnnots.value = true
     settings.deprecation.value = true
+    // when running that compiler, give it a scala-library to the classpath
+    settings.classpath.value = System.getProperty("java.class.path")
 
     val interp = new Interpreter(settings)
 
diff --git a/test/files/run/docgenerator.scala b/test/files/run/docgenerator.scala
index f3738f4fc0..59f90ba415 100644
--- a/test/files/run/docgenerator.scala
+++ b/test/files/run/docgenerator.scala
@@ -113,6 +113,8 @@ object Foo2 {
     var reporter: ConsoleReporter = _
     def process(args: Array[String]) {
       val docSettings = new scala.tools.nsc.doc.Settings(error)
+      // when running that compiler, give it a scala-library to the classpath
+      docSettings.classpath.value = System.getProperty("java.class.path")
       reporter = new ConsoleReporter(docSettings)
       val command = new CompilerCommand(args.toList, docSettings, error, false)
       try {
diff --git a/test/files/run/lisp.scala b/test/files/run/lisp.scala
index 014990fc37..fe3941d0db 100644
--- a/test/files/run/lisp.scala
+++ b/test/files/run/lisp.scala
@@ -332,7 +332,7 @@ object LispAny extends Lisp {
     val result = eval1(x, env);
     if (trace) {
       indent -= 1;
-      for (val x <- range(1, indent)) Console.print(" ");
+      for (x <- range(1, indent)) Console.print(" ");
       Console.println("<=== " + result);
     }
     curexp = prevexp;
diff --git a/test/files/run/t1500.scala b/test/files/run/t1500.scala
index 58adea221c..de79b84e75 100644
--- a/test/files/run/t1500.scala
+++ b/test/files/run/t1500.scala
@@ -20,6 +20,8 @@ object Test {
 
     val tool = new Interpreter(new Settings())
     val global = tool.compiler
+    // when running that compiler, give it a scala-library to the classpath
+    global.settings.classpath.value = System.getProperty("java.class.path")
 
     import global._
     import definitions._
diff --git a/test/files/run/t1501.scala b/test/files/run/t1501.scala
index 2a29a6c5a5..851daae0bb 100644
--- a/test/files/run/t1501.scala
+++ b/test/files/run/t1501.scala
@@ -31,6 +31,9 @@ object Test {
 
     val tool = new Interpreter(new Settings())
     val global = tool.compiler
+    // when running that compiler, give it a scala-library to the classpath
+    global.settings.classpath.value = System.getProperty("java.class.path")
+
 
     import global._
     import definitions._