diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java
index 4e82b3250ea7..23b49f3f98cf 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java
@@ -15,13 +15,21 @@
  */
 package com.intellij.codeInsight.daemon.quickFix;
 
+import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.accessStaticViaInstance.AccessStaticViaInstance;
+import org.jetbrains.annotations.NotNull;
 
 public class AccessStaticViaInstanceTest extends LightQuickFixTestCase {
+  @NotNull
+  @Override
+  protected LocalInspectionTool[] configureLocalInspectionTools() {
+    return new LocalInspectionTool[] {new AccessStaticViaInstance()};
+  }
+
   @Override
   protected String getBasePath() {
     return "/codeInsight/daemonCodeAnalyzer/quickFix/accessStaticViaInstance";
   }
 
-  public void test() throws Exception { enableInspectionTool(new AccessStaticViaInstance()); doAllTests(); }
+  public void test() throws Exception {  doAllTests(); }
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java
index f6de85ebe4e4..2814eb8b6b20 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java
@@ -6,9 +6,12 @@ import com.intellij.pom.java.LanguageLevel;
 
 
 public class ChangeParameterClassTest extends LightQuickFix15TestCase {
+  @Override
+  protected LanguageLevel getLanguageLevel() {
+    return LanguageLevel.JDK_1_5;
+  }
 
   public void test() throws Exception {
-    setLanguageLevel(LanguageLevel.JDK_1_5);
     doAllTests();
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java
index a73f222be45f..41372397f0e1 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java
@@ -15,14 +15,21 @@
  */
 package com.intellij.codeInsight.daemon.quickFix;
 
+import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Danila Ponomarenko
  */
 public class CreateGetterOrSetterTest extends LightQuickFixTestCase {
+  @NotNull
+  @Override
+  protected LocalInspectionTool[] configureLocalInspectionTools() {
+    return new LocalInspectionTool[] {new UnusedSymbolLocalInspection()};
+  }
+
   public void test() throws Exception {
-    enableInspectionTool(new UnusedSymbolLocalInspection());
     doAllTests();
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java
index e79fbae73f45..5ea75661258a 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java
@@ -1,12 +1,19 @@
 
 package com.intellij.codeInsight.daemon.quickFix;
 
+import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.unneededThrows.RedundantThrowsDeclaration;
+import org.jetbrains.annotations.NotNull;
 
 
 public class MethodThrowsTest extends LightQuickFixTestCase {
+  @NotNull
+  @Override
+  protected LocalInspectionTool[] configureLocalInspectionTools() {
+    return new LocalInspectionTool[] {new RedundantThrowsDeclaration()};
+  }
 
-  public void test() throws Exception { enableInspectionTool(new RedundantThrowsDeclaration()); doAllTests(); }
+  public void test() throws Exception { doAllTests(); }
 
   @Override
   protected String getBasePath() {