4 files changed, 7 insertions, 15 deletions

diff --git a/test/files/pos/bug210.scala b/test/files/pos/bug210.scala
index 20450335f4..efcad531d9 100644
--- a/test/files/pos/bug210.scala
+++ b/test/files/pos/bug210.scala
@@ -1,13 +1,13 @@
 trait Lang1 {
   trait Exp;
   trait Visitor { def f(left: Exp): unit; }
-  class Eval1: Visitor extends Visitor {
+  class Eval1 requires Visitor extends Visitor {
     def f(left: Exp) = ();
   }
 }
 
 trait Lang2 extends Lang1 {
-  class Eval2: Visitor extends Eval1;
+  class Eval2 requires Visitor extends Eval1;
 }
 /*
 object Main with Application {
diff --git a/test/files/pos/bug85.scala b/test/files/pos/bug85.scala
deleted file mode 100644
index e018afb6ee..0000000000
--- a/test/files/pos/bug85.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object A {
-  case class B(c: C) {
-    class C;
-  }
-  class C;
-  val b: B = new B(new C());
-  val c: C = b.c;
-}
diff --git a/test/files/pos/context.scala b/test/files/pos/context.scala
index ada6a57463..327f3261be 100644
--- a/test/files/pos/context.scala
+++ b/test/files/pos/context.scala
@@ -13,7 +13,7 @@ abstract class SymbolWrapper {
   val context: Context;
   import context._;
 
-  class Symbols: context.symbols.type {
+  class Symbols requires context.symbols.type {
     abstract class Symbol {
       def typ: types.Type;
       def sym: Symbol = typ.sym;
@@ -25,7 +25,7 @@ abstract class TypeWrapper {
   val context: Context;
   import context._;
 
-  class Types: context.types.type {
+  class Types requires context.types.type {
     abstract class Type {
       def sym: symbols.Symbol;
       def typ: Type = sym.typ;
diff --git a/test/files/pos/expressions-current.scala b/test/files/pos/expressions-current.scala
index b343dbf68b..b383ad949d 100644
--- a/test/files/pos/expressions-current.scala
+++ b/test/files/pos/expressions-current.scala
@@ -15,7 +15,7 @@ abstract class Lang {
     def visit(v: visitor): unit = v.caseNum(n);
   }
 
-  class Eval(result: Ref[int]): visitor extends Visitor {
+  class Eval(result: Ref[int]) requires visitor extends Visitor {
     def caseNum(n: int) = result.elem = n;
   }
 }
@@ -31,12 +31,12 @@ abstract class Lang2 extends Lang {
     def visit(v: visitor): unit = v.casePlus(l, r);
   }
 
-  class Eval2(result: Ref[int]): visitor extends Eval(result) with Visitor2 {
+  class Eval2(result: Ref[int]) requires visitor extends Eval(result) with Visitor2 {
     def casePlus(l: Exp, r: Exp) =
       result.elem = { l.visit(this); result.elem } + { r.visit(this); result.elem }
   }
 
-  class Show2(result: Ref[String]): visitor extends Visitor2 {
+  class Show2(result: Ref[String]) requires visitor extends Visitor2 {
     def caseNum(n: int) = result.elem = n.toString();
     def casePlus(l: Exp, r: Exp) =
 	result.elem =