diff --git a/java/compiler/impl/src/com/intellij/compiler/PsiClassWriter.java b/java/compiler/impl/src/com/intellij/compiler/PsiClassWriter.java
index 0fcb82684bf0..0b9150d63086 100644
--- a/java/compiler/impl/src/com/intellij/compiler/PsiClassWriter.java
+++ b/java/compiler/impl/src/com/intellij/compiler/PsiClassWriter.java
@@ -46,7 +46,7 @@ public class PsiClassWriter extends ClassWriter {
     final Sdk projectJdk = ModuleRootManager.getInstance(module).getSdk();
     if (projectJdk == null) return false;
     String versionString = projectJdk.getVersionString();
-    return versionString.contains("1.6") || versionString.contains("6.0");
+    return versionString.contains("1.6") || versionString.contains("6.0") || versionString.contains("1.7") || versionString.contains("7.0");
   }
 
   protected String getCommonSuperClass(final String type1, final String type2) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
index 2806a0f18843..05f4f39dde9b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
@@ -948,7 +948,7 @@ public class BackendCompilerWrapper {
     if (jdk != null) {
       final String versionString = jdk.getVersionString();
       if (versionString != null) {
-        isJDK16 = versionString.contains("1.6") || versionString.contains("6.0");
+        isJDK16 = versionString.contains("1.6") || versionString.contains("6.0") || versionString.contains("1.7") || versionString.contains("7.0");
       }
     }
     return isJDK16;
diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/compiler/AnnotationBasedInstrumentingCompiler.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/compiler/AnnotationBasedInstrumentingCompiler.java
index 390375f727c8..7dd93dbd53d9 100644
--- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/compiler/AnnotationBasedInstrumentingCompiler.java
+++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/pattern/compiler/AnnotationBasedInstrumentingCompiler.java
@@ -108,7 +108,7 @@ public abstract class AnnotationBasedInstrumentingCompiler implements ClassInstr
       final boolean jdk6;
       if (jdk != null) {
         final String versionString = jdk.getVersionString();
-        jdk6 = versionString != null && (versionString.contains("1.6") || versionString.contains("6.0"));
+        jdk6 = versionString != null && (versionString.contains("1.6") || versionString.contains("6.0") || versionString.contains("1.7") || versionString.contains("7.0"));
       }
       else {
         jdk6 = false;