9 files changed, 18 insertions, 18 deletions
diff --git a/test/files/res/bug597.res b/test/files/res/bug597.res
index 0db355cd0f..1314e7b40b 100644
--- a/test/files/res/bug597.res
+++ b/test/files/res/bug597.res
@@ -1,2 +1,2 @@
-bug597/Test.scala
-bug597/Main.scala
+files/res/bug597/Test.scala
+files/res/bug597/Main.scala
diff --git a/test/files/res/bug687.check b/test/files/res/bug687.check
index 92e5e4e75d..8d3d3178cd 100644
--- a/test/files/res/bug687.check
+++ b/test/files/res/bug687.check
@@ -1,6 +1,6 @@
 
 nsc> 
-nsc> bug687/QueryB.scala:3: error: name clash between defined and inherited member:
+nsc> files/res/bug687/QueryB.scala:3: error: name clash between defined and inherited member:
 method equals:(java.lang.Object)Boolean and
 method equals:(Any)Boolean in class Any
 have same type after erasure: (java.lang.Object)Boolean
diff --git a/test/files/res/bug687.res b/test/files/res/bug687.res
index ba8ba76995..4421977bdc 100644
--- a/test/files/res/bug687.res
+++ b/test/files/res/bug687.res
@@ -1,3 +1,3 @@
-bug687/QueryA.scala
-bug687/QueryB.scala
-bug687/QueryA.scala
+files/res/bug687/QueryA.scala
+files/res/bug687/QueryB.scala
+files/res/bug687/QueryA.scala
diff --git a/test/files/res/bug722.res b/test/files/res/bug722.res
index dbc785c171..bc72066285 100644
--- a/test/files/res/bug722.res
+++ b/test/files/res/bug722.res
@@ -1,2 +1,2 @@
-bug722/Parser.scala bug722/IfElse.scala
-bug722/Parser.scala bug722/IfElse.scala
+files/res/bug722/Parser.scala files/res/bug722/IfElse.scala
+files/res/bug722/Parser.scala files/res/bug722/IfElse.scala
diff --git a/test/files/res/bug735.res b/test/files/res/bug735.res
index d477e6fd47..fa544ad080 100644
--- a/test/files/res/bug735.res
+++ b/test/files/res/bug735.res
@@ -1,2 +1,2 @@
-bug735/ScalaTyper.scala
-bug735/ScalaTyper.scala
+files/res/bug735/ScalaTyper.scala
+files/res/bug735/ScalaTyper.scala
diff --git a/test/files/res/bug743.res b/test/files/res/bug743.res
index f1dd2462e4..c8312a69bd 100644
--- a/test/files/res/bug743.res
+++ b/test/files/res/bug743.res
@@ -1,2 +1,2 @@
-bug743/ParserXXX.scala
-bug743/BracesXXX.scala
+files/res/bug743/ParserXXX.scala
+files/res/bug743/BracesXXX.scala
diff --git a/test/files/res/bug785.res b/test/files/res/bug785.res
index 7e5da1c453..6abf7ed236 100644
--- a/test/files/res/bug785.res
+++ b/test/files/res/bug785.res
@@ -1,2 +1,2 @@
-bug785/ScalaTrees.scala
-bug785/ScalaTrees.scala
+files/res/bug785/ScalaTrees.scala
+files/res/bug785/ScalaTrees.scala
diff --git a/test/files/res/bug831.res b/test/files/res/bug831.res
index 0cc6c398ab..807455d7da 100644
--- a/test/files/res/bug831.res
+++ b/test/files/res/bug831.res
@@ -1,2 +1,2 @@
-bug831/NewScalaTestXXX.scala
-bug831/NewScalaTestXXX.scala
+files/res/bug831/NewScalaTestXXX.scala
+files/res/bug831/NewScalaTestXXX.scala
diff --git a/test/scalatest b/test/scalatest
index 663a55b891..38bf934d94 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -248,8 +248,8 @@ test_run_neg() {
 test_run_res() {
     rm -rf "$dstbase".obj &&
     mkdir -p "$dstbase".obj &&
-    (cd "$srcdir" && cat "$testname".res | $SCALAC -d "$os_dstbase".obj -Xresident -sourcepath . "$@"; );
-    #(cat "$srcdir/$testname".res | $SCALAC -d "$os_dstbase".obj -Xresident -sourcepath "$srcdir" "$@"; );
+    #(cd "$srcdir" && cat "$testname".res | $SCALAC -d "$os_dstbase".obj -Xresident -sourcepath . "$@"; );
+    (cd "$TESTROOT" && cat "$srcdir/$testname".res | $SCALAC -d "$os_dstbase".obj -Xresident -sourcepath "$srcdir" "$@"; );
     rm -rf "$dstbase".obj;
 }