diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java
deleted file mode 100644
index f95b69b54c5..00000000000
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package test;
-
-public abstract class ClassWithTypePExtendsIterableP<P> implements java.lang.Iterable<P> {
-}
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen
new file mode 100644
index 00000000000..8996b9583d3
--- /dev/null
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java.pen
@@ -0,0 +1,4 @@
+package test;
+
+public abstract class ClassTypeTypePRefSuper<P> implements java.lang.Iterable<P> {
+}
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
index a5d3f9cb3d2..46d39265bf0 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
@@ -1,4 +1,4 @@
 package test
 
-public abstract class ClassWithTypePExtendsIterableP<P>() : java.lang.Iterable<P> {
+public abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
 }
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
index 1aee85160f5..b08ca86de8e 100644
--- a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
@@ -1,6 +1,6 @@
 namespace test
 
-public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : java.lang.Iterable<P> {
-    public abstract override /*1*/ fun iterator(): java.util.Iterator<P>?
-    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
+public abstract class test.ClassTypeTypePRefSuper</*0*/ P : jet.Any?> : java.lang.Iterable<P> {
+    public abstract override /*1*/ fun iterator(): java.util.Iterator<P>
+    public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassTypeTypePRefSuper<P>
 }
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
index 83c5724fa99..f75236817c6 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
@@ -64,8 +64,7 @@ public class CliTest {
     private void executeCompilerCompareOutput(@NotNull String[] args) {
         try {
             String actual = normalize(executeCompilerGrabOutput(args))
-                    .replace(new File("compiler/testData/cli/").getAbsolutePath(), "$TESTDATA_DIR$")
-                    .replace("\\", "/");
+                    .replace(new File("compiler/testData/cli/").getAbsolutePath(), "$TESTDATA_DIR$");
 
             String expected = normalize(FileUtil.loadFile(new File("compiler/testData/cli/" + testName.getMethodName() + ".out")));
 
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
index eba90eb7c73..e5808c00175 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
@@ -40,7 +40,7 @@ import java.util.Collections;
 /**
  * @author abreslav
  */
-public abstract class AbstractLazyResolveTest {
+public class AbstractLazyResolveTest {
     private final Disposable rootDisposable = new Disposable() {
         @Override
         public void dispose() {
@@ -48,7 +48,7 @@ public abstract class AbstractLazyResolveTest {
     };
 
     protected final CompilerDependencies
-              compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.JDK_HEADERS, true);
+              compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true);
     protected final JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(rootDisposable, compilerDependencies);
     protected final Project project = jetCoreEnvironment.getProject();