diff --git a/community-tests/src/tests/testGroups.properties b/community-tests/src/tests/testGroups.properties
index eee771707459..598ddc48ce04 100644
--- a/community-tests/src/tests/testGroups.properties
+++ b/community-tests/src/tests/testGroups.properties
@@ -87,6 +87,10 @@ com.android.tools.idea.wizard.DynamicWizardPathTest
 com.android.tools.idea.wizard.DynamicWizardStepTest
 com.android.tools.idea.rendering.FlagManagerTest
 com.android.tools.idea.rendering.ResourceFolderRepositoryTest
+com.android.tools.idea.javadoc.AndroidJavaDocRendererTest
+com.android.tools.idea.editors.strings.StringResourceDataTest
+com.android.tools.idea.rendering.ClassConverterTest
+com.android.tools.idea.gradle.service.notification.errors.UnknownHostErrorHandlerTest
 
 [GRADLE_INTEGRATION_TESTS]
 org.jetbrains.plugins.gradle.importing.*
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java
index 5c41a8965b7e..a9c077080c08 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java
@@ -42,10 +42,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -625,8 +622,12 @@ public class FrameVariablesTree extends DebuggerTree {
             if (myVisibleLocals.contains(var.getName())) {
               myVars.add(var.getName());
             }
-            else if (var instanceof PsiLocalVariable) {
-              myExpressions.add(new TextWithImportsImpl(reference));
+            else {
+              // fix for variables used in inner classes
+              if (!Comparing.equal(PsiTreeUtil.getParentOfType(reference, PsiClass.class),
+                                   PsiTreeUtil.getParentOfType(var, PsiClass.class))) {
+                myExpressions.add(new TextWithImportsImpl(reference));
+              }
             }
           }
         }
diff --git a/plugins/coverage/coverage.iml b/plugins/coverage/coverage.iml
index c6cf45e25c90..6b579f5102aa 100644
--- a/plugins/coverage/coverage.iml
+++ b/plugins/coverage/coverage.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
index ecc7baafbe93..c71869c385d1 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
@@ -66,7 +66,7 @@ public abstract class AbstractModelBuilderTest {
 
   public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {
     {"1.9"}, {"1.10"}, {"1.11"}, {"1.12"},
-    {"2.0"}, {"2.1"}, {"2.2"} , {"2.3"}
+    {"2.0"}, {"2.1"}, {"2.2"} , {"2.3"}, {"2.4"}, {"2.5"}
   };
   public static final String BASE_GRADLE_VERSION = String.valueOf(SUPPORTED_GRADLE_VERSIONS[SUPPORTED_GRADLE_VERSIONS.length - 1][0]);