diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeEnum_1.7.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeEnumJava1.7.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeEnum_1.7.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/explicit2diamond/beforeEnumJava1.7.java
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java
index cb835706d496..b06186f1624a 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java
@@ -64,10 +64,7 @@ public class Simplify2DiamondInspectionsTest extends LightQuickFixParameterizedT
   }
 
   @Override
-  protected LanguageLevel getLanguageLevel() {
-    if (getTestName(false).endsWith("_1.7.java")){
-      return LanguageLevel.JDK_1_7;
-    }
+  protected LanguageLevel getDefaultLanguageLevel() {
     return LanguageLevel.JDK_1_8;
   }
 }
\ No newline at end of file