diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
index 2f46c443a28..285fab07adb 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithWithJava;
+import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithJava;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -34,7 +34,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTestWithWithJava<Void, Void> {
+public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTestWithJava<Void, Void> {
     @Override
     @NotNull
     protected CompilerConfiguration createCompilerConfiguration(File javaFilesDir) {
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
index f2184ce7b54..762a94dcf1b 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
@@ -47,8 +47,8 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public abstract class BaseDiagnosticsTest extends
-                                          KotlinMultiFileTestWithWithJava<BaseDiagnosticsTest.TestModule, BaseDiagnosticsTest.TestFile> {
+public abstract class BaseDiagnosticsTest
+        extends KotlinMultiFileTestWithJava<BaseDiagnosticsTest.TestModule, BaseDiagnosticsTest.TestFile> {
 
     public static final String DIAGNOSTICS_DIRECTIVE = "DIAGNOSTICS";
     public static final Pattern DIAGNOSTICS_PATTERN = Pattern.compile("([\\+\\-!])(\\w+)\\s*");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
similarity index 98%
rename from compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java
rename to compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
index bce8685174c..9bd15f6a938 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
@@ -41,7 +41,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public abstract class KotlinMultiFileTestWithWithJava<M, F> extends KotlinLiteFixture {
+public abstract class KotlinMultiFileTestWithJava<M, F> extends KotlinLiteFixture {
     protected class ModuleAndDependencies {
         final M module;
         final List<String> dependencies;