diff --git a/RegExpSupport/test/org/intellij/lang/regexp/RegExpCompletionTest.java b/RegExpSupport/test/org/intellij/lang/regexp/RegExpCompletionTest.java
index 51060fb1324e..037e9cc06f4b 100644
--- a/RegExpSupport/test/org/intellij/lang/regexp/RegExpCompletionTest.java
+++ b/RegExpSupport/test/org/intellij/lang/regexp/RegExpCompletionTest.java
@@ -48,7 +48,7 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase {
                                  "KISSING FACE WITH SMILING EYES"), strings);
     }
 
-    public void testBackSlashVariants() throws Throwable {
+    public void testBackSlashVariants() {
         List<String> nameList =
           new ArrayList<>(Arrays.asList("d", "D", "s", "S", "w", "W", "b", "B", "A", "G", "Z", "z", "Q", "E",
                                         "t", "n", "r", "f", "a", "e", "h", "H", "v", "V", "R", "X", "b{g}"));
@@ -58,7 +58,7 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase {
         myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), ArrayUtil.toStringArray(nameList));
     }
 
-    public void testPropertyVariants() throws Throwable {
+    public void testPropertyVariants() {
         List<String> nameList = new ArrayList<>();
         for (String[] stringArray : DefaultRegExpPropertiesProvider.getInstance().getAllKnownProperties()) {
             nameList.add("{" + stringArray[0] + "}");
@@ -66,13 +66,13 @@ public class RegExpCompletionTest extends CodeInsightFixtureTestCase {
         myFixture.testCompletionVariants(getInputDataFileName(getTestName(true)), ArrayUtil.toStringArray(nameList));
     }
 
-    public void testPropertyAlpha() throws Throwable {
+    public void testPropertyAlpha() {
       myFixture.configureByText(RegExpFileType.INSTANCE, "\\P{Alp<caret>}");
       myFixture.completeBasic();
       myFixture.checkResult("\\P{Alpha<caret>}");
     }
 
-    public void doTest() throws Throwable {
+    public void doTest() {
         String inputDataFileName = getInputDataFileName(getTestName(true));
         String expectedResultFileName = getExpectedResultFileName(getTestName(true));
         myFixture.testCompletion(inputDataFileName, expectedResultFileName);
diff --git a/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java b/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java
index 90c382a3f115..0d3679a3d926 100644
--- a/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java
+++ b/java/compiler/impl/testSrc/com/intellij/compiler/BaseCompilerTestCase.java
@@ -344,7 +344,7 @@ public abstract class BaseCompilerTestCase extends ModuleTestCase {
     PlatformTestCase.myFilesToDelete.add(moduleFile);
     return new WriteAction<Module>() {
       @Override
-      protected void run(@NotNull Result<Module> result) throws Throwable {
+      protected void run(@NotNull Result<Module> result) {
         Module module = ModuleManager.getInstance(myProject)
           .newModule(FileUtil.toSystemIndependentName(moduleFile.getAbsolutePath()), getModuleType().getId());
         module.getModuleFile();
diff --git a/java/compiler/impl/testSrc/com/intellij/compiler/artifacts/ArtifactCompilerTestCase.java b/java/compiler/impl/testSrc/com/intellij/compiler/artifacts/ArtifactCompilerTestCase.java
index ad0318964a92..33088e7721fc 100644
--- a/java/compiler/impl/testSrc/com/intellij/compiler/artifacts/ArtifactCompilerTestCase.java
+++ b/java/compiler/impl/testSrc/com/intellij/compiler/artifacts/ArtifactCompilerTestCase.java
@@ -19,7 +19,6 @@ import com.intellij.util.io.TestFileSystemItem;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.io.IOException;
 
 import static com.intellij.compiler.artifacts.ArtifactsTestCase.commitModel;
 
@@ -71,7 +70,7 @@ public abstract class ArtifactCompilerTestCase extends BaseCompilerTestCase {
     return make(getArtifactManager().getArtifacts());
   }
 
-  protected void changeFileInJar(String jarPath, String pathInJar) throws Exception {
+  protected void changeFileInJar(String jarPath, String pathInJar) {
     final VirtualFile jarFile = LocalFileSystem.getInstance().findFileByPath(jarPath);
     assertNotNull(jarFile);
     final VirtualFile jarRoot = JarFileSystem.getInstance().getJarRootForLocalFile(jarFile);
@@ -96,7 +95,7 @@ public abstract class ArtifactCompilerTestCase extends BaseCompilerTestCase {
     assertFalse(new File(FileUtil.toSystemDependentName(outputPath)).exists());
   }
 
-  public static void assertEmptyOutput(Artifact a1) throws IOException {
+  public static void assertEmptyOutput(Artifact a1) {
     assertOutput(a1, ArtifactCompilerTestCase.fs());
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java
index 5c718cf91086..733b387e9a27 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java
@@ -832,7 +832,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
     doItemTest();
   }
 
-  public void testInsertOverride() throws Exception {
+  public void testInsertOverride() {
     JavaCodeStyleSettings styleSettings = CodeStyleSettingsManager.getSettings(getProject()).getCustomSettings(JavaCodeStyleSettings.class);
     styleSettings.INSERT_OVERRIDE_ANNOTATION = true;
     doItemTest();
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/JavaEditingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/JavaEditingTest.java
index aec659f0685e..e8aaf64ac7fb 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/JavaEditingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/JavaEditingTest.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import com.intellij.testFramework.TestFileType;
 
 public class JavaEditingTest extends AbstractEditorTest {
-  public void testSmartHomeInJavadoc() throws Exception {
+  public void testSmartHomeInJavadoc() {
     init("/**\n" +
          " * some text<caret>\n" +
          " */\n" +
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/MoveElementLeftRightTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/MoveElementLeftRightTest.java
index f8e370ea7634..7ae41c618a7b 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/MoveElementLeftRightTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/editorActions/MoveElementLeftRightTest.java
@@ -133,7 +133,7 @@ public class MoveElementLeftRightTest extends AbstractMoveElementLeftRightTest {
   }
 
   @Override
-  protected void configureEditor(String contents) throws Exception {
+  protected void configureEditor(String contents) {
     init(contents, TestFileType.JAVA);
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/java/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java b/java/java-tests/testSrc/com/intellij/java/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java
index 456d93ef2d85..480259274def 100644
--- a/java/java-tests/testSrc/com/intellij/java/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.testFramework.TestFileType;
 
-import java.io.IOException;
 import java.util.Arrays;
 
 /**
@@ -33,7 +32,7 @@ import java.util.Arrays;
  */
 public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorTest {
   
-  public void testUnexpectedClassLevelJavadocExpandingOnClassSignatureChange() throws IOException {
+  public void testUnexpectedClassLevelJavadocExpandingOnClassSignatureChange() {
     // Inspired by IDEA-61275
 
     String text =
@@ -60,7 +59,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT
     assertFalse(foldRegion.isExpanded());
   }
   
-  public void testCollapseAllHappensBeforeFirstCodeFoldingPass() throws Exception {
+  public void testCollapseAllHappensBeforeFirstCodeFoldingPass() {
     init("class Foo {\n" +
          "    void m() {\n" +
          "        System.out.println();\n" +
@@ -74,7 +73,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT
     assertEquals(1, myEditor.getFoldingModel().getAllFoldRegions().length);
   }
   
-  public void testSurvivingBrokenPsi() throws Exception {
+  public void testSurvivingBrokenPsi() {
     openJavaEditor("class Foo {\n" +
                    "    void m() {\n" +
                    "\n" +
@@ -98,7 +97,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT
     checkFoldingState("[FoldRegion +(25:33), placeholder='{}']");
   }
   
-  public void testInvalidRegionIsRemovedOnExpanding() throws Exception {
+  public void testInvalidRegionIsRemovedOnExpanding() {
     openJavaEditor("class Foo {\n" +
                    "    void m() {\n" +
                    "\n" +
@@ -120,7 +119,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT
     checkFoldingState("[FoldRegion -(0:37), placeholder='/.../']");
   }
   
-  public void testEditingNearRegionExpandsIt() throws Exception {
+  public void testEditingNearRegionExpandsIt() {
     openJavaEditor("class Foo {\n" +
                    "    void m() <caret>{\n" +
                    "\n" +
@@ -131,7 +130,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT
     checkFoldingState("[]");
   }
   
-  private void openJavaEditor(String text) throws Exception {
+  private void openJavaEditor(String text) {
     init(text, TestFileType.JAVA);
     buildInitialFoldRegions();
     runFoldingPass(true);
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaAutoIndentLinesTest.java b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaAutoIndentLinesTest.java
index 97b9cb629536..ba9b9cbba06c 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaAutoIndentLinesTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaAutoIndentLinesTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import com.intellij.testFramework.TestFileType;
 
 public class JavaAutoIndentLinesTest extends AbstractEditorTest {
-  public void testSelection() throws Exception {
+  public void testSelection() {
     init("class C {\n" +
          "int <selection>a<caret></selection> = 1;\n" +
          "}",
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterTest.java b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterTest.java
index 76396e024022..f39a161e1dea 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterTest.java
@@ -41,20 +41,20 @@ import org.jetbrains.annotations.NonNls;
 @SuppressWarnings({"Deprecation"})
 public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
-  public void testForEach() throws Exception {
+  public void testForEach() {
     doTest("ForEach.java", "ForEach_after.java");
   }
 
-  public void testDoubleCast() throws Exception {
+  public void testDoubleCast() {
     doTest("DoubleCast.java", "DoubleCast_after.java");
   }
 
-  public void test1() throws Exception {
+  public void test1() {
     myTextRange = new TextRange(35, 46);
     doTest("1.java", "1_after.java");
   }
 
-  public void testLabel1() throws Exception {
+  public void testLabel1() {
     CommonCodeStyleSettings settings = getSettings();
 
     settings.LABELED_STATEMENT_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS;
@@ -64,12 +64,12 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest("Label.java", "Label_after1.java");
   }
 
-  public void testTryCatch() throws Exception {
+  public void testTryCatch() {
     myTextRange = new TextRange(38, 72);
     doTest("TryCatch.java", "TryCatch_after.java");
   }
 
-  public void testNullMethodParameter() throws Exception {
+  public void testNullMethodParameter() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS;
     settings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
@@ -122,28 +122,28 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     );
   }
 
-  public void testNew() throws Exception {
+  public void testNew() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.getRootSettings().getIndentOptions(StdFileTypes.JAVA).CONTINUATION_INDENT_SIZE = 8;
     doTest("New.java", "New_after.java");
   }
 
-  public void testJavaDoc() throws Exception {
+  public void testJavaDoc() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.BLANK_LINES_AROUND_FIELD = 1;
     doTest("JavaDoc.java", "JavaDoc_after.java");
   }
 
-  public void testBreakInsideIf() throws Exception {
+  public void testBreakInsideIf() {
     doTest("BreakInsideIf.java", "BreakInsideIf_after.java");
   }
 
-  public void testAssert() throws Exception {
+  public void testAssert() {
     LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.HIGHEST);
     doTest();
   }
 
-  public void testCastInsideElse() throws Exception {
+  public void testCastInsideElse() {
     final CommonCodeStyleSettings settings = getSettings();
     final CommonCodeStyleSettings.IndentOptions indentOptions = settings.getRootSettings().getIndentOptions(StdFileTypes.JAVA);
     indentOptions.CONTINUATION_INDENT_SIZE = 2;
@@ -156,18 +156,18 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest();
   }
 
-  public void testAlignMultiLine() throws Exception {
+  public void testAlignMultiLine() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION = true;
     settings.ALIGN_MULTILINE_BINARY_OPERATION = true;
     doTest();
   }
 
-  public void testInnerClassAsParameter() throws Exception {
+  public void testInnerClassAsParameter() {
     doTest();
   }
 
-  public void testSynchronizedBlock() throws Exception {
+  public void testSynchronizedBlock() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.SPACE_BEFORE_SYNCHRONIZED_PARENTHESES = false;
     settings.SPACE_WITHIN_SYNCHRONIZED_PARENTHESES = false;
@@ -175,25 +175,25 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest();
   }
 
-  public void testMethodCallInAssignment() throws Exception {
+  public void testMethodCallInAssignment() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.getRootSettings().getIndentOptions(StdFileTypes.JAVA).CONTINUATION_INDENT_SIZE = 8;
     doTest();
   }
 
-  public void testAnonymousInnerClasses() throws Exception {
+  public void testAnonymousInnerClasses() {
     doTest();
   }
 
-  public void testAnonymousInner2() throws Exception {
+  public void testAnonymousInner2() {
     doTest();
   }
 
-  public void testWrapAssertion() throws Exception {
+  public void testWrapAssertion() {
     doTest();
   }
   
-  public void testIfElse() throws Exception {
+  public void testIfElse() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.IF_BRACE_FORCE = CommonCodeStyleSettings.DO_NOT_FORCE;
     settings.FOR_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_IF_MULTILINE;
@@ -220,7 +220,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest();
   }
 
-  public void testIfBraces() throws Exception {
+  public void testIfBraces() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
     settings.BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
@@ -228,7 +228,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest();
   }
 
-  public void testTernaryExpression() throws Exception {
+  public void testTernaryExpression() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_TERNARY_OPERATION = true;
     doTest();
@@ -238,29 +238,29 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testAlignAssignment() throws Exception {
+  public void testAlignAssignment() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_ASSIGNMENT = true;
     settings.ALIGN_MULTILINE_BINARY_OPERATION = true;
     doTest();
   }
 
-  public void testAlignFor() throws Exception {
+  public void testAlignFor() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_BINARY_OPERATION = true;
     settings.ALIGN_MULTILINE_FOR = true;
     doTest();
   }
 
-  public void testSwitch() throws Exception {
+  public void testSwitch() {
     doTest();
   }
 
-  public void testContinue() throws Exception {
+  public void testContinue() {
     doTest();
   }
 
-  public void testIf() throws Exception {
+  public void testIf() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
     doTest();
@@ -272,13 +272,13 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void test2() throws Exception {
+  public void test2() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
     doTest();
   }
 
-  public void testBlocks() throws Exception {
+  public void testBlocks() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.KEEP_LINE_BREAKS = false;
     doTest();
@@ -359,17 +359,17 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testWhile() throws Exception {
+  public void testWhile() {
     doTextTest("class A{\n" + "void a(){\n" + "do x++ while (b);\n" + "}\n}",
                "class A {\n" + "    void a() {\n" + "        do x++ while (b);\n" + "    }\n" + "}");
   }
 
-  public void testFor() throws Exception {
+  public void testFor() {
     doTextTest("class A{\n" + "void b(){\n" + "for (c) {\n" + "d();\n" + "}\n" + "}\n" + "}",
                "class A {\n" + "    void b() {\n" + "        for (c) {\n" + "            d();\n" + "        }\n" + "    }\n" + "}");
   }
 
-  public void testClassComment() throws Exception {
+  public void testClassComment() {
     String before = "/**\n" +
                   "* @author smbd\n" +
                   "* @param <T> some param\n" +
@@ -386,7 +386,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTextTest(before,after);
   }
 
-  public void testStringBinaryOperation() throws Exception {
+  public void testStringBinaryOperation() {
     final CommonCodeStyleSettings settings = getSettings();
 
     settings.ALIGN_MULTILINE_ASSIGNMENT = false;
@@ -403,16 +403,16 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void test3() throws Exception {
+  public void test3() {
     doTest();
   }
 
-  public void test4() throws Exception {
+  public void test4() {
     myLineRange = new TextRange(2, 8);
     doTest();
   }
 
-  public void testBraces() throws Exception {
+  public void testBraces() {
     final CommonCodeStyleSettings settings = getSettings();
 
     @NonNls final String text =
@@ -489,18 +489,18 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testExtendsList() throws Exception {
+  public void testExtendsList() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_EXTENDS_LIST = true;
     doTextTest("class A extends B, \n" + "C {}", "class A extends B,\n" + "                C {\n}");
   }
 
-  public void testBlockWithoutBraces() throws Exception {
+  public void testBlockWithoutBraces() {
     doTextTest("class A {\n" + "void foo(){\n" + "if(a)\n" + "return;\n" + "}\n" + "}",
                "class A {\n" + "    void foo() {\n" + "        if (a)\n" + "            return;\n" + "    }\n" + "}");
   }
 
-  public void testNestedCalls() throws Exception {
+  public void testNestedCalls() {
     doTextTest("class A {\n" + "void foo(){\n" + "foo(\nfoo(\nfoo()\n)\n);\n" + "}\n" + "}", "class A {\n" +
                                                                                              "    void foo() {\n" +
                                                                                              "        foo(\n" +
@@ -513,12 +513,12 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testSpacesAroundMethod() throws Exception {
+  public void testSpacesAroundMethod() {
     doTextTest("class Foo {\n" + "    abstract void a();\n" + "    {\n" + "        a();\n" + "    }\n" + "}",
                "class Foo {\n" + "    abstract void a();\n" + "\n" + "    {\n" + "        a();\n" + "    }\n" + "}");
   }
 
-  public void testSpaceInIf() throws Exception {
+  public void testSpaceInIf() {
     doTextTest("class foo {\n" +
                "    {\n" +
                "        if (a) {\n" +
@@ -538,13 +538,13 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testIf2() throws Exception {
+  public void testIf2() {
     doTextTest(
       "public class Test {\n" + "    public boolean equals(Object o) {\n" + "        if(this == o)return true;\n" + "    }\n" + "}",
       "public class Test {\n" + "    public boolean equals(Object o) {\n" + "        if (this == o) return true;\n" + "    }\n" + "}");
   }
 
-  public void testSpaceAroundField() throws Exception {
+  public void testSpaceAroundField() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.BLANK_LINES_AROUND_FIELD = 1;
 
@@ -570,7 +570,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testArray() throws Exception {
+  public void testArray() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.SPACE_WITHIN_ARRAY_INITIALIZER_BRACES = true;
     settings.SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE = true;
@@ -578,7 +578,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                "class a {\n" + "    void f() {\n" + "        final int[] i = new int[] { 0 };\n" + "    }\n" + "}");
   }
 
-  public void testEmptyArray() throws Exception {
+  public void testEmptyArray() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.SPACE_WITHIN_ARRAY_INITIALIZER_BRACES = true;
     settings.SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE = true;
@@ -587,7 +587,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                "class a {\n" + "    void f() {\n" + "        final int[] i = new int[] {};\n" + "    }\n" + "}");
   }
 
-  public void testEmptyArrayIsntWrapped() throws Exception {
+  public void testEmptyArrayIsntWrapped() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE = true;
     settings.ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE = true;
@@ -596,12 +596,12 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                "class a {\n" + "    void f() {\n" + "        final int[] i = new int[]{ };\n" + "    }\n" + "}");
   }
 
-  public void testTwoJavaDocs() throws Exception {
+  public void testTwoJavaDocs() {
     doTextTest("/**\n" + " * \n" + " */\n" + "        class Test {\n" + "    /**\n" + "     */\n" + "     public void foo();\n" + "}",
                "/**\n" + " *\n" + " */\n" + "class Test {\n" + "    /**\n" + "     */\n" + "    public void foo();\n" + "}");
   }
 
-  public void testJavaDocLinksWithParameterNames() throws Exception {
+  public void testJavaDocLinksWithParameterNames() {
     // See IDEADEV-8332
     doTextTest("/**\n" +
                "* @return if ( x1 == x1 ) then return {@link #cmp(String y1,int y2)}\n" +
@@ -616,11 +616,11 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                       "}\n");
   }
 
-  public void testIncompleteField() throws Exception {
+  public void testIncompleteField() {
     doTextTest("public class Test {\n" + "    String s =;\n" + "}", "public class Test {\n" + "    String s = ;\n" + "}");
   }
 
-  public void testIf3() throws Exception {
+  public void testIf3() {
     getSettings().KEEP_CONTROL_STATEMENT_IN_ONE_LINE = false;
     doTextTest("public abstract class A {\n" +
                "    abstract void f(boolean b);\n" +
@@ -653,12 +653,12 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testDocComment() throws Exception {
+  public void testDocComment() {
     doTextTest("public class TestClass {\n" + "/**\n" + "* \n" + "*/\n" + "    public void f1() {\n" + "    }\n" + "}",
                "public class TestClass {\n" + "    /**\n" + "     *\n" + "     */\n" + "    public void f1() {\n" + "    }\n" + "}");
   }
 
-  public void testDocComment2() throws Exception {
+  public void testDocComment2() {
     getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true;
     doTextTest("class Test {\n" +
                "/**\n" +
@@ -678,11 +678,11 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testSpaceBeforeFieldName() throws Exception {
+  public void testSpaceBeforeFieldName() {
     doTextTest("class A{\n" + "public   A    myA ;\n" + "}", "class A {\n" + "    public A myA;\n" + "}");
   }
 
-  public void testClass() throws Exception {
+  public void testClass() {
     doTextTest("    class A {\n" +
                "        Logger LOG;\n" +
                "        class C {}\n" +
@@ -704,7 +704,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
          "}");
   }
 
-  public void testDoNotIndentCaseFromSwitch() throws Exception {
+  public void testDoNotIndentCaseFromSwitch() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.INDENT_CASE_FROM_SWITCH = false;
     doTextTest("class A {\n" + "void foo() {\n" + "switch(a){\n" + "case 1: \n" + "break;\n" + "}\n" + "}\n" + "}", "class A {\n" +
@@ -717,26 +717,26 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                                                                                                                     "}");
   }
 
-  public void testClass2() throws Exception {
+  public void testClass2() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.KEEP_FIRST_COLUMN_COMMENT = false;
     doTextTest("class A {\n" + "// comment before\n" + "protected Object a;//  comment after\n" + "}",
                "class A {\n" + "    // comment before\n" + "    protected Object a;//  comment after\n" + "}");
   }
 
-  public void testSplitLiteral() throws Exception {
+  public void testSplitLiteral() {
     doTextTest("class A {\n" + "void foo() {\n" + "  String s = \"abc\" +\n" + "  \"def\";\n" + "}\n" + "}",
                "class A {\n" + "    void foo() {\n" + "        String s = \"abc\" +\n" + "                \"def\";\n" + "    }\n" + "}");
   }
 
-  public void testParametersAlignment() throws Exception {
+  public void testParametersAlignment() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
     settings.RIGHT_MARGIN = 140;
     doTest();
   }
 
-  public void testConditionalExpression() throws Exception {
+  public void testConditionalExpression() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.SPACE_BEFORE_QUEST = true;
     settings.SPACE_AFTER_QUEST = false;
@@ -747,7 +747,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                "class Foo {\n" + "    void foo() {\n" + "        return name != null ?1 :2;\n" + "    }\n" + "}");
   }
 
-  public void testMethodCallChain() throws Exception {
+  public void testMethodCallChain() {
     doTextTest("class Foo{\n" +
                "    void foo(){\n" +
                "       configuration = new Configuration() \n" +
@@ -809,7 +809,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testComment1() throws Exception {
+  public void testComment1() {
     doTextTest(
       "class Foo {\n" +
       "    public boolean mErrorFlage;\n" +
@@ -832,7 +832,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
       "}");
   }
 
-  public void testElseAfterComment() throws Exception {
+  public void testElseAfterComment() {
     doTextTest("public class Foo {\n" +
                "    public int foo() {\n" +
                "        if (a) {\n" +
@@ -852,7 +852,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testLBraceAfterComment() throws Exception {
+  public void testLBraceAfterComment() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.KEEP_LINE_BREAKS = false;
     doTextTest("public class Foo {\n" +
@@ -874,7 +874,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testSpaces() throws Exception {
+  public void testSpaces() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.SPACE_WITHIN_FOR_PARENTHESES = true;
     settings.SPACE_WITHIN_IF_PARENTHESES = true;
@@ -885,7 +885,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest();
   }
 
-  public void testSpacesBeforeLBrace() throws Exception {
+  public void testSpacesBeforeLBrace() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.SPACE_BEFORE_CLASS_LBRACE = true;
     settings.SPACE_BEFORE_METHOD_LBRACE = true;
@@ -920,7 +920,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest("SpacesBeforeLBrace.java", "SpacesBeforeLBrace.java");
   }
 
-  public void testCommentBeforeField() throws Exception {
+  public void testCommentBeforeField() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.KEEP_LINE_BREAKS = false;
     settings.KEEP_FIRST_COLUMN_COMMENT = false;
@@ -930,7 +930,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTextTest("class Foo{\n" + "    //Foo a\n" + "    Foo a; \n" + "}", "class Foo {\n" + "    //Foo a\n" + "    Foo a;\n" + "}");
   }
 
-  public void testLabel() throws Exception {
+  public void testLabel() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.getRootSettings().getIndentOptions(StdFileTypes.JAVA).LABEL_INDENT_ABSOLUTE = true;
     settings.SPECIAL_ELSE_IF_TREATMENT = true;
@@ -953,7 +953,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testElseOnNewLine() throws Exception {
+  public void testElseOnNewLine() {
     doTextTest("class Foo{\n" + "void foo() {\n" + "if (a)\n" + "return;\n" + "else\n" + "return;\n" + "}\n" + "}", "class Foo {\n" +
                                                                                                                     "    void foo() {\n" +
                                                                                                                     "        if (a)\n" +
@@ -964,11 +964,11 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                                                                                                                     "}");
   }
 
-  public void testTwoClasses() throws Exception {
+  public void testTwoClasses() {
     doTextTest("class A {}\n" + "class B {}", "class A {\n" + "}\n" + "\n" + "class B {\n" + "}");
   }
 
-  public void testBraceOnNewLineIfWrapped() throws Exception {
+  public void testBraceOnNewLineIfWrapped() {
     getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED;
     getSettings().RIGHT_MARGIN = 35;
@@ -995,7 +995,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testFirstArgumentWrapping() throws Exception {
+  public void testFirstArgumentWrapping() {
     getSettings().RIGHT_MARGIN = 20;
     getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     doTextTest("class Foo {\n" + "    void foo() {\n" + "        fooFooFooFoo(1);" + "    }\n" + "}",
@@ -1015,13 +1015,13 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testSpacesInsideWhile() throws Exception {
+  public void testSpacesInsideWhile() {
     getSettings().SPACE_WITHIN_WHILE_PARENTHESES = true;
     doTextTest("class Foo{\n" + "    void foo() {\n" + "        while(x != y) {\n" + "        }\n" + "    }\n" + "}",
                "class Foo {\n" + "    void foo() {\n" + "        while ( x != y ) {\n" + "        }\n" + "    }\n" + "}");
   }
 
-  public void testAssertStatementWrapping() throws Exception {
+  public void testAssertStatementWrapping() {
     getSettings().ASSERT_STATEMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP;
     getSettings().RIGHT_MARGIN = 40;
@@ -1066,7 +1066,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     }
   }
 
-  public void testAssertStatementWrapping2() throws Exception {
+  public void testAssertStatementWrapping2() {
     getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP;
     getSettings().ASSERT_STATEMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().RIGHT_MARGIN = 37;
@@ -1109,7 +1109,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void test() throws Exception {
+  public void test() {
     getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA).INDENT_SIZE = 2;
     getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA).CONTINUATION_INDENT_SIZE = 2;
     getSettings().RIGHT_MARGIN = 37;
@@ -1147,14 +1147,14 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     }
   }
 
-  public void testLBrace() throws Exception {
+  public void testLBrace() {
     getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
     getSettings().RIGHT_MARGIN = 14;
     doTextTest("class Foo {\n" + "    void foo() {\n" + "        \n" + "    }\n" + "}",
                "class Foo {\n" + "    void foo() {\n" + "\n" + "    }\n" + "}");
   }
 
-  public void testJavaDocLeadingAsterisksAreDisabled() throws Exception {
+  public void testJavaDocLeadingAsterisksAreDisabled() {
     getJavaSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = false;
     doTextTest("class Foo {\n" +
                "    /**\n" +
@@ -1173,7 +1173,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testBinaryExpression() throws Exception {
+  public void testBinaryExpression() {
     getSettings().ALIGN_MULTILINE_BINARY_OPERATION = true;
     doTextTest("class Foo {\n" +
                "    void foo() {\n" +
@@ -1192,7 +1192,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testCaseBraces() throws Exception {
+  public void testCaseBraces() {
     doTextTest("class Foo{\n" +
                "    void foo() {\n" +
                "        switch (a) {\n" +
@@ -1210,7 +1210,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testFormatCodeFragment() throws Exception {
+  public void testFormatCodeFragment() {
     final JavaCodeFragmentFactory factory = JavaCodeFragmentFactory.getInstance(getProject());
     final PsiCodeFragment fragment = factory.createCodeBlockCodeFragment("a=1;int b=2;", null, true);
     final PsiElement[] result = new PsiElement[1];
@@ -1227,7 +1227,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     assertEquals("a = 1;\n" + "int b = 2;", result[0].getText());
   }
 
-  public void testNewLineAfterJavaDocs() throws Exception {
+  public void testNewLineAfterJavaDocs() {
     String before = "/** @noinspection InstanceVariableNamingConvention*/class Foo{\n" +
                     "/** @noinspection InstanceVariableNamingConvention*/int myFoo;\n" +
                     "/** @noinspection InstanceVariableNamingConvention*/ void foo(){}}";
@@ -1251,7 +1251,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTextTest(before, after);
   }
 
-  public void testArrayInitializerWrapping() throws Exception {
+  public void testArrayInitializerWrapping() {
     getSettings().ARRAY_INITIALIZER_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION = false;
     getSettings().RIGHT_MARGIN = 37;
@@ -1293,7 +1293,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testJavaDocIndentation() throws Exception {
+  public void testJavaDocIndentation() {
     getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA).INDENT_SIZE = 2;
     getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA).CONTINUATION_INDENT_SIZE = 2;
     getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA).TAB_SIZE = 4;
@@ -1325,7 +1325,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testRemoveLineBreak() throws Exception {
+  public void testRemoveLineBreak() {
     getSettings().KEEP_LINE_BREAKS = true;
     getSettings().CLASS_BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
     getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
@@ -1340,7 +1340,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testBlankLines() throws Exception {
+  public void testBlankLines() {
     getSettings().KEEP_BLANK_LINES_IN_DECLARATIONS = 0;
     getSettings().KEEP_BLANK_LINES_IN_CODE = 0;
     getSettings().KEEP_BLANK_LINES_BEFORE_RBRACE = 0;
@@ -1426,7 +1426,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testStaticBlockBraces() throws Exception {
+  public void testStaticBlockBraces() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
     doTextTest("class Foo {\n" + "    static {\n" + "        //comment\n" + "        i = foo();\n" + "    }\n" + "}",
                "class Foo {\n" + "    static {\n" + "        //comment\n" + "        i = foo();\n" + "    }\n" + "}");
@@ -1457,7 +1457,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testBraces2() throws Exception {
+  public void testBraces2() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED;
     doTextTest("class Foo {\n" +
                "    void foo() {\n" +
@@ -1536,7 +1536,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testSynchronized() throws Exception {
+  public void testSynchronized() {
 
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
     doTextTest("class Foo {\n" + "    void foo() {\n" + "synchronized (this) {foo();\n" + "}\n" + "    }\n" + "}", "class Foo {\n" +
@@ -1580,19 +1580,19 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testNextLineShiftedForBlockStatement() throws Exception {
+  public void testNextLineShiftedForBlockStatement() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_SHIFTED;
 
     doTextTest("class Foo {\n" + "    void foo() {\n" + "        if (a)\n" + "        foo();\n" + "    }\n" + "}",
                "class Foo {\n" + "    void foo() {\n" + "        if (a)\n" + "            foo();\n" + "    }\n" + "}");
   }
 
-  public void testFieldWithJavadocAndAnnotation() throws Exception {
+  public void testFieldWithJavadocAndAnnotation() {
     doTextTest("class Foo {\n" + "    /**\n" + "     * java doc\n" + "     */\n" + "    @NoInspection\n" + "    String field;\n" + "}",
                "class Foo {\n" + "    /**\n" + "     * java doc\n" + "     */\n" + "    @NoInspection\n" + "    String field;\n" + "}");
   }
 
-  public void testLongCallChainAfterElse() throws Exception {
+  public void testLongCallChainAfterElse() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
     getSettings().KEEP_CONTROL_STATEMENT_IN_ONE_LINE = true;
     getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true;
@@ -1616,7 +1616,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
      "}");
   }
 
-  public void testSpacesIncode() throws Exception {
+  public void testSpacesIncode() {
 
     final JavaPsiFacade facade = getJavaFacade();
     final LanguageLevel level = LanguageLevelProjectExtension.getInstance(facade.getProject()).getLanguageLevel();
@@ -1671,7 +1671,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
   }
 
   ///IDEA-7761
-  public void testKeepBlankLineInCodeBeforeComment() throws Exception {
+  public void testKeepBlankLineInCodeBeforeComment() {
     getSettings().KEEP_BLANK_LINES_IN_CODE = 1;
     getSettings().KEEP_BLANK_LINES_IN_DECLARATIONS = 0;
     getSettings().KEEP_FIRST_COLUMN_COMMENT = false;
@@ -1735,7 +1735,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testSpaceBeforeTryBrace() throws Exception {
+  public void testSpaceBeforeTryBrace() {
     getSettings().SPACE_BEFORE_TRY_LBRACE = false;
     getSettings().SPACE_BEFORE_FINALLY_LBRACE = true;
     doTextTest("class Foo{\n" + "    void foo() {\n" + "        try {\n" + "        } finally {\n" + "        }\n" + "    }\n" + "}",
@@ -1749,7 +1749,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testFormatComments() throws Exception {
+  public void testFormatComments() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     doTextTest("public class Test {\n" + "\n" + "    /**\n" + "     * The s property.\n" + "     */\n" + "    private String s;\n" + "}",
                "public class Test {\n" + "\n" + "    /**\n" + "     * The s property.\n" + "     */\n" + "    private String s;\n" + "}");
@@ -1822,12 +1822,12 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                "class Foo {\n" + "    @MyAnnotation\n" + "    Foo() {\n" + "    }\n" + "}");
   }
 
-  public void testLongAnnotationsAreNotWrapped() throws Exception {
+  public void testLongAnnotationsAreNotWrapped() {
     getSettings().ARRAY_INITIALIZER_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     doTest();
   }
 
-  public void testWrapExtendsList() throws Exception {
+  public void testWrapExtendsList() {
     getSettings().RIGHT_MARGIN = 50;
     getSettings().EXTENDS_LIST_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM;
     getSettings().EXTENDS_KEYWORD_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
@@ -1838,7 +1838,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                "        ParameterDataEventListener {\n}");
   }
 
-  public void testWrapLongExpression() throws Exception {
+  public void testWrapLongExpression() {
     getSettings().RIGHT_MARGIN = 80;
     getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().ALIGN_MULTILINE_BINARY_OPERATION = true;
@@ -1856,7 +1856,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                     "}");
   }
 
-  public void testDoNotWrapCallChainIfParametersWrapped() throws Exception {
+  public void testDoNotWrapCallChainIfParametersWrapped() {
     getSettings().RIGHT_MARGIN = 87;
     getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
@@ -1874,7 +1874,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     );
   }
 
-  public void testAlignTernaryOperation() throws Exception {
+  public void testAlignTernaryOperation() {
     getSettings().ALIGN_MULTILINE_TERNARY_OPERATION = true;
     doMethodTest("String s = x == 0 ? \"hello\" :\n" +
                  "                x == 5 ? \"something else\" :\n" +
@@ -1890,7 +1890,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
                  "int someVariable = a ?\n" + "                   x :\n" + "                   y;");
   }
 
-  public void testRightMargin_2() throws Exception {
+  public void testRightMargin_2() {
     getSettings().RIGHT_MARGIN = 65;
     getSettings().ASSIGNMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE = true;
@@ -1903,7 +1903,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
       "        = variableValue;");
   }
 
-  public void testRightMargin_3() throws Exception {
+  public void testRightMargin_3() {
     getSettings().RIGHT_MARGIN = 65;
     getSettings().ASSIGNMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE = false;
@@ -1959,7 +1959,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
       "}");
   }
 
-  public void testWrapParamsOnEveryItem() throws Exception {
+  public void testWrapParamsOnEveryItem() {
     CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(getProject());
 
     int oldMargin = codeStyleSettings.getCommonSettings(JavaLanguage.INSTANCE).RIGHT_MARGIN;
@@ -1999,7 +1999,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testCommentAfterDeclaration() throws Exception {
+  public void testCommentAfterDeclaration() {
     CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(getProject());
     CommonCodeStyleSettings javaSettings = codeStyleSettings.getCommonSettings(JavaLanguage.INSTANCE);
 
@@ -2026,12 +2026,12 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
   //              Tickets-implied tests
   // ------------------------------------------------
 
-  public void testSCR915() throws Exception {
+  public void testSCR915() {
     getSettings().SPACE_AROUND_ADDITIVE_OPERATORS = false;
     doTest("SCR915.java", "SCR915_after.java");
   }
 
-  public void testSCR429() throws Exception {
+  public void testSCR429() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.KEEP_BLANK_LINES_IN_CODE = 2;
     settings.KEEP_BLANK_LINES_BEFORE_RBRACE = 2;
@@ -2039,14 +2039,14 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     doTest();
   }
 
-  public void testSCR548() throws Exception {
+  public void testSCR548() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.getRootSettings().getIndentOptions(StdFileTypes.JAVA).INDENT_SIZE = 4;
     settings.getRootSettings().getIndentOptions(StdFileTypes.JAVA).CONTINUATION_INDENT_SIZE = 2;
     doTest();
   }
 
-  public void testIDEA_16151() throws Exception {
+  public void testIDEA_16151() {
     doClassTest("@ValidateNestedProperties({\n" +
                 "@Validate(field=\"name\", required=true, maxlength=Trip.NAME),\n" +
                 "@Validate(field=\"name\", required=true, maxlength=Trip.NAME)\n" +
@@ -2061,7 +2061,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
 
   }
 
-  public void testIDEA_14324() throws Exception {
+  public void testIDEA_14324() {
     getSettings().ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION = true;
 
     doClassTest(
@@ -2090,7 +2090,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest {
     );
   }
 
-public void testSCR260() throws Exception {
+public void testSCR260() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
     settings.BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
@@ -2098,14 +2098,14 @@ public void testSCR260() throws Exception {
     doTest();
   }
 
-  public void testSCR114() throws Exception {
+  public void testSCR114() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
     settings.CATCH_ON_NEW_LINE = true;
     doTest();
   }
 
-  public void testSCR259() throws Exception {
+  public void testSCR259() {
     myTextRange = new TextRange(36, 60);
     final CommonCodeStyleSettings settings = getSettings();
     settings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
@@ -2113,19 +2113,19 @@ public void testSCR260() throws Exception {
     doTest();
   }
 
-  public void testSCR279() throws Exception {
+  public void testSCR279() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.ALIGN_MULTILINE_BINARY_OPERATION = true;
     doTest();
   }
 
-  public void testSCR395() throws Exception {
+  public void testSCR395() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.METHOD_BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
     doTest();
   }
 
-  public void testSCR11799() throws Exception {
+  public void testSCR11799() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.getRootSettings().getIndentOptions(StdFileTypes.JAVA).CONTINUATION_INDENT_SIZE = 4;
     settings.CLASS_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
@@ -2133,13 +2133,13 @@ public void testSCR260() throws Exception {
     doTest();
   }
 
-  public void testSCR501() throws Exception {
+  public void testSCR501() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.KEEP_FIRST_COLUMN_COMMENT = true;
     doTest();
   }
 
-  public void testSCR879() throws Exception {
+  public void testSCR879() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
     doTest();
@@ -2147,7 +2147,7 @@ public void testSCR260() throws Exception {
 
   
 
-  public void testSCR547() throws Exception {
+  public void testSCR547() {
     doTextTest("class Foo { \n" +
                "    Object[] objs = { \n" +
                "            new Object() { \n" +
@@ -2167,7 +2167,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR479() throws Exception {
+  public void testSCR479() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.RIGHT_MARGIN = 80;
     settings.TERNARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
@@ -2184,7 +2184,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR190() throws Exception {
+  public void testSCR190() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.KEEP_LINE_BREAKS = false;
     doTextTest("public class EntityObject \n" +
@@ -2213,7 +2213,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR1535() throws Exception {
+  public void testSCR1535() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
     settings.CLASS_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
@@ -2236,7 +2236,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR970() throws Exception {
+  public void testSCR970() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.THROWS_KEYWORD_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS;
     settings.THROWS_LIST_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
@@ -2244,7 +2244,7 @@ public void testSCR260() throws Exception {
     doTest();
   }
 
-  public void testSCR1486() throws Exception {
+  public void testSCR1486() {
     doTextTest("public class Test {\n" + "  private BigDecimal\n" + "}", "public class Test {\n" + "    private BigDecimal\n" + "}");
 
     doTextTest("public class Test {\n" + "  @NotNull private BigDecimal\n" + "}",
@@ -2252,7 +2252,7 @@ public void testSCR260() throws Exception {
 
   }
 
-  public void test1607() throws Exception {
+  public void test1607() {
     getSettings().RIGHT_MARGIN = 30;
     getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
     getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true;
@@ -2262,7 +2262,7 @@ public void testSCR260() throws Exception {
                "class TEst {\n" + "    void foo(A a, B b)\n" + "    { /* compiled code */ }\n" + "}");
   }
 
-  public void testSCR1615() throws Exception {
+  public void testSCR1615() {
     getSettings().CLASS_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_SHIFTED;
     getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_SHIFTED;
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_SHIFTED;
@@ -2288,12 +2288,12 @@ public void testSCR260() throws Exception {
       "    }");
   }
 
-  public void testSCR1047() throws Exception {
+  public void testSCR1047() {
     doTextTest("class Foo{\n" + "    void foo(){\n" + "        String field1, field2;\n" + "    }\n" + "}",
                "class Foo {\n" + "    void foo() {\n" + "        String field1, field2;\n" + "    }\n" + "}");
   }
 
-  public void testSCR524() throws Exception {
+  public void testSCR524() {
     getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_SHIFTED;
     getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true;
     getSettings().KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = false;
@@ -2326,7 +2326,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR3062() throws Exception {
+  public void testSCR3062() {
     getSettings().KEEP_LINE_BREAKS = false;
     getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
     getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
@@ -2370,22 +2370,22 @@ public void testSCR260() throws Exception {
 
   }
 
-  public void testSCR1658() throws Exception {
+  public void testSCR1658() {
     doTextTest("/** \n" + " * @author\tMike\n" + " */\n" + "public class Foo {\n" + "}",
                "/**\n" + " * @author Mike\n" + " */\n" + "public class Foo {\n" + "}");
   }
 
-  public void testSCR1699() throws Exception {
+  public void testSCR1699() {
     doTextTest("class Test {\n" + "    Test(String t1 , String t2) {\n" + "    }\n" + "}",
                "class Test {\n" + "    Test(String t1, String t2) {\n" + "    }\n" + "}");
   }
 
-  public void testSCR1700() throws Exception {
+  public void testSCR1700() {
     doTextTest("class Test {\n" + "    Test(String      t1 , String      t2) {\n" + "    }\n" + "}",
                "class Test {\n" + "    Test(String t1, String t2) {\n" + "    }\n" + "}");
   }
 
-  public void testSCR1701() throws Exception {
+  public void testSCR1701() {
     getSettings().SPACE_WITHIN_METHOD_CALL_PARENTHESES = true;
     getSettings().SPACE_WITHIN_METHOD_PARENTHESES = false;
     getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP;
@@ -2395,7 +2395,7 @@ public void testSCR260() throws Exception {
                "class Foo {\n" + "    void foo() {\n" + "        foo( a, b );\n" + "    }\n" + "}");
   }
 
-  public void testSCR1703() throws Exception {
+  public void testSCR1703() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE;
     doTextTest("class Foo{\n" +
                "    void foo() {\n" +
@@ -2413,7 +2413,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR1804() throws Exception {
+  public void testSCR1804() {
     getSettings().ALIGN_MULTILINE_ASSIGNMENT = true;
     doTextTest(
       "class Foo {\n" + "    void foo() {\n" + "        int i;\n" + "        i = \n" + "                1 + 2;\n" + "    }\n" + "}",
@@ -2424,7 +2424,7 @@ public void testSCR260() throws Exception {
 
   }
 
-  public void testSCR1795() throws Exception {
+  public void testSCR1795() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED;
     doTextTest("public class Test {\n" +
                "    public static void main(String[] args) {\n" +
@@ -2441,7 +2441,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR1936() throws Exception {
+  public void testSCR1936() {
     getSettings().BLANK_LINES_AFTER_CLASS_HEADER = 4;
     doTextTest("/**\n" + " * Foo - test class\n" + " */\n" + "class Foo{\n" + "}",
                "/**\n" + " * Foo - test class\n" + " */\n" + "class Foo {\n" + "\n" + "\n" + "\n" + "\n" + "}");
@@ -2451,7 +2451,7 @@ public void testSCR260() throws Exception {
 
   }
 
-  public void test1980() throws Exception {
+  public void test1980() {
     getSettings().RIGHT_MARGIN = 144;
     getSettings().TERNARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM;
     getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
@@ -2470,7 +2470,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-    public void testSCR2089() throws Exception {
+    public void testSCR2089() {
     doTextTest("class Test { \n" +
                "    void test(int i) { \n" +
                "        switch (i) { \n" +
@@ -2504,7 +2504,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testSCR2132() throws Exception {
+  public void testSCR2132() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED;
     getSettings().ELSE_ON_NEW_LINE = true;
 
@@ -2531,7 +2531,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testIDEADEV1047() throws Exception {
+  public void testIDEADEV1047() {
     doTextTest("class Foo{\n" + "String field1\n" + ",\n" + "field2\n" + ";" + "}",
                "class Foo {\n" + "    String field1,\n" + "            field2;\n" + "}");
 
@@ -2540,7 +2540,7 @@ public void testSCR260() throws Exception {
 
   }
 
-  public void testIDEADEV1047_2() throws Exception {
+  public void testIDEADEV1047_2() {
     doTextTest(
       "class Foo{\n" +
       "String field1\n" +
@@ -2555,7 +2555,7 @@ public void testSCR260() throws Exception {
     );
   }
 
-  public void testSCR2241() throws Exception {
+  public void testSCR2241() {
     getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_SHIFTED;
     getSettings().SPECIAL_ELSE_IF_TREATMENT = true;
     getSettings().ELSE_ON_NEW_LINE = true;
@@ -2764,7 +2764,7 @@ public void testSCR260() throws Exception {
 
   }
 
-  public void testSCR3115() throws Exception {
+  public void testSCR3115() {
     final CommonCodeStyleSettings.IndentOptions indentOptions = getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA);
     indentOptions.USE_TAB_CHARACTER = true;
     indentOptions.SMART_TABS = true;
@@ -2788,7 +2788,7 @@ public void testSCR260() throws Exception {
      "}");
   }
 
-  public void testIDEADEV_6239() throws Exception {
+  public void testIDEADEV_6239() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     doTextTest("public class Test {\n" +
                "\n" +
@@ -3007,7 +3007,7 @@ public void testSCR260() throws Exception {
                "public interface TestInterface {\n" + "    @Deprecated\n" + "    <T> void parametrizedAnnotated(T data);\n" + "}");
   }
 
-  public void testIDEA_54406() throws Exception {
+  public void testIDEA_54406() {
     doTextTest("public class Test1 {\n" +
                "void func() {\n" +
                "new Thread(new Runnable() {\n" +
@@ -3062,13 +3062,13 @@ public void testSCR260() throws Exception {
 
 
 
-  public void testFormatterOnOffTags() throws Exception {
+  public void testFormatterOnOffTags() {
     getSettings().getRootSettings().FORMATTER_TAGS_ENABLED = true;
     getSettings().IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
     doTest();
   }
 
-  public void testFormatterOnOffTagsWithRegexp() throws Exception {
+  public void testFormatterOnOffTagsWithRegexp() {
     CodeStyleSettings settings = getSettings().getRootSettings();
     settings.FORMATTER_TAGS_ENABLED = true;
     settings.FORMATTER_TAGS_ACCEPT_REGEXP = true;
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.java b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.java
index 9cd71b5f3ace..b0e70ea1dafd 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavadocFormatterTest.java
@@ -28,7 +28,7 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
  */
 public class JavadocFormatterTest extends AbstractJavaFormatterTest {
 
-  public void testRightMargin() throws Exception {
+  public void testRightMargin() {
     getSettings().WRAP_LONG_LINES = true;
     getSettings().RIGHT_MARGIN = 35;
     doTextTest(
@@ -65,7 +65,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
   }
   
 
-  public void testDoNotWrapLink() throws Exception {
+  public void testDoNotWrapLink() {
     getSettings().WRAP_LONG_LINES = true;
     getSettings().RIGHT_MARGIN = 70;
     doTextTest(
@@ -104,7 +104,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
   }
 
 
-  public void testPackageJavadoc() throws Exception {
+  public void testPackageJavadoc() {
     doTextTest(
       "/**\n" +
       " *              super auper\n" +
@@ -172,7 +172,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     );
   }
 
-  public void testEA49739() throws Exception {
+  public void testEA49739() {
     getSettings().WRAP_LONG_LINES = true;
     getSettings().RIGHT_MARGIN = 35;
     getSettings().WRAP_COMMENTS = true;
@@ -195,7 +195,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
                "}");
   }
 
-  public void testOneLineCommentWrappedByRightMarginIntoMultiLine() throws Exception {
+  public void testOneLineCommentWrappedByRightMarginIntoMultiLine() {
     getSettings().getRootSettings().WRAP_COMMENTS = true;
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getJavaSettings().JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = true;
@@ -235,7 +235,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     );
   }
   
-  public void testSCR11296() throws Exception {
+  public void testSCR11296() {
     final CommonCodeStyleSettings settings = getSettings();
     settings.RIGHT_MARGIN = 50;
     settings.getRootSettings().WRAP_COMMENTS = true;
@@ -245,7 +245,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doTest();
   }
 
-  public void testSCR2632() throws Exception {
+  public void testSCR2632() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getSettings().getRootSettings().WRAP_COMMENTS = true;
     getSettings().RIGHT_MARGIN = 20;
@@ -327,7 +327,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     );
   }
 
-  public void testParameterDescriptionNotOnNewLine() throws Exception {
+  public void testParameterDescriptionNotOnNewLine() {
     // IDEA-107383
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getJavaSettings().JD_ALIGN_PARAM_COMMENTS = true;
@@ -351,7 +351,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
       "}");
   }
 
-  public void testWrappedParameterDescription() throws Exception {
+  public void testWrappedParameterDescription() {
     // Inspired by IDEA-13072
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getSettings().getRootSettings().WRAP_COMMENTS = true;
@@ -421,7 +421,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doTextTest(before, after);
   }
 
-  public void testDoNotWrapMultiLineCommentIntoOneLine() throws Exception {
+  public void testDoNotWrapMultiLineCommentIntoOneLine() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getJavaSettings().JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = true;
     String test = "/**\n" +
@@ -433,7 +433,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doClassTest(test, test);
   }
 
-  public void testLeaveOneLineComment() throws Exception {
+  public void testLeaveOneLineComment() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getJavaSettings().JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = true;
     String test = "/** foo */\n" +
@@ -443,7 +443,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doClassTest(test, test);
   }
 
-  public void testWrapOneLineComment() throws Exception {
+  public void testWrapOneLineComment() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getJavaSettings().JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = false;
     String test = "/** foo */\n" +
@@ -459,7 +459,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doClassTest(test, after);
   }
 
-  public void testWrapStrangeComment() throws Exception {
+  public void testWrapStrangeComment() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getJavaSettings().JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = false;
     String test = "/** foo" +
@@ -476,7 +476,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doClassTest(test, after);
   }
 
-  public void testWrapStrangeCommentIfNotWrapOneLines() throws Exception {
+  public void testWrapStrangeCommentIfNotWrapOneLines() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getJavaSettings().JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = true;
     String test = "/** foo\n" +
@@ -494,7 +494,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
   }
 
 
-  public void testReturnTagAlignment() throws Exception {
+  public void testReturnTagAlignment() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getSettings().RIGHT_MARGIN = 80;
     getJavaSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true;
@@ -522,7 +522,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
   }
 
 
-  public void testReturnTagAlignmentWithPreTagOnFirstLine() throws Exception {
+  public void testReturnTagAlignmentWithPreTagOnFirstLine() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getSettings().RIGHT_MARGIN = 80;
     getJavaSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true;
@@ -574,7 +574,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     );
   }
 
-  public void testSeeTagAlignment() throws Exception {
+  public void testSeeTagAlignment() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getSettings().RIGHT_MARGIN = 80;
     getJavaSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true;
@@ -601,7 +601,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doClassTest(before, after);
   }
 
-  public void testDummySinceTagAlignment() throws Exception {
+  public void testDummySinceTagAlignment() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getSettings().RIGHT_MARGIN = 80;
     getJavaSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true;
@@ -628,7 +628,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doClassTest(before, after);
   }
 
-  public void testDummyDeprecatedTagAlignment() throws Exception {
+  public void testDummyDeprecatedTagAlignment() {
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     getSettings().RIGHT_MARGIN = 80;
     getJavaSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true;
@@ -818,7 +818,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doTextTest(before, after);
   }
 
-  public void testDoNotWrapLongLineCommentWithSpaceInStart() throws Exception {
+  public void testDoNotWrapLongLineCommentWithSpaceInStart() {
     getSettings().KEEP_FIRST_COLUMN_COMMENT = true;
     getSettings().WRAP_LONG_LINES = true;
     getSettings().RIGHT_MARGIN = 200;
@@ -832,7 +832,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
   }
 
 
-  public void testNotGenerateSelfClosingPTagIfLanguageLevelJava8() throws Exception {
+  public void testNotGenerateSelfClosingPTagIfLanguageLevelJava8() {
     getJavaSettings().JD_P_AT_EMPTY_LINES = true;
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     String before = "/**\n" +
@@ -852,7 +852,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest {
     doClassTest(before, after);
   }
 
-  public void testPTagIfLanguageLevelNotJava8() throws Exception {
+  public void testPTagIfLanguageLevelNotJava8() {
     getJavaSettings().JD_P_AT_EMPTY_LINES = true;
     getJavaSettings().ENABLE_JAVADOC_FORMATTING = true;
     LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_7);
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/InplaceIntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/InplaceIntroduceVariableTest.java
index 272af0323d0b..e8dced7dc2a6 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/InplaceIntroduceVariableTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/InplaceIntroduceVariableTest.java
@@ -62,7 +62,7 @@ public class InplaceIntroduceVariableTest extends AbstractJavaInplaceIntroduceTe
      });
   }
 
-  public void testConflictingInnerClassName() throws Exception {
+  public void testConflictingInnerClassName() {
     final JavaCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).getCustomSettings(JavaCodeStyleSettings.class);
     final boolean oldOption = settings.INSERT_INNER_CLASS_IMPORTS;
     try {
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/MakeClassStaticTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/MakeClassStaticTest.java
index 9c0a5052a106..50bc744d2cb2 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/MakeClassStaticTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/MakeClassStaticTest.java
@@ -63,7 +63,7 @@ public class MakeClassStaticTest extends LightRefactoringTestCase {
     perform();
   }
 
-  public void testFieldWithMyPrefix() throws Exception {
+  public void testFieldWithMyPrefix() {
     final JavaCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).getCustomSettings(JavaCodeStyleSettings.class);
     String oldPrefix = settings.FIELD_NAME_PREFIX;
     settings.FIELD_NAME_PREFIX = "my";
diff --git a/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java b/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java
index 88b67ebaf3d7..53b747823ef0 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/ConvertToAtomicIntentionTest.java
@@ -37,7 +37,7 @@ public class ConvertToAtomicIntentionTest extends LightQuickFixParameterizedTest
     super.tearDown();
   }
 
-  public void test() throws Exception {
+  public void test() {
     doAllTests();
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/test/com/intellij/codeInsight/ConvertToLongAdderIntentionTest.java b/java/typeMigration/test/com/intellij/codeInsight/ConvertToLongAdderIntentionTest.java
index 5b4d36009497..9c7f3519575e 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/ConvertToLongAdderIntentionTest.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/ConvertToLongAdderIntentionTest.java
@@ -39,7 +39,7 @@ public class ConvertToLongAdderIntentionTest extends LightQuickFixParameterizedT
     return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
-  public void test() throws Exception {
+  public void test() {
     doAllTests();
   }
 }
diff --git a/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntention6Test.java b/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntention6Test.java
index 6b65b2c745dc..09dfb947b05d 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntention6Test.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntention6Test.java
@@ -32,7 +32,7 @@ public class ConvertToThreadLocalIntention6Test extends LightQuickFixParameteriz
     return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
-  public void test() throws Exception {
+  public void test() {
     doAllTests();
   }
 
diff --git a/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java b/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java
index 6a358bbbb2d1..a89dcca3ba3d 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/ConvertToThreadLocalIntentionTest.java
@@ -19,7 +19,7 @@ public class ConvertToThreadLocalIntentionTest extends LightQuickFixParameterize
     return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
-  public void test() throws Exception {
+  public void test() {
     doAllTests();
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java b/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
index f83021ba9d4f..2b646ff8aa75 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
@@ -54,7 +54,7 @@ public class GuavaInspectionTest extends JavaCodeInsightFixtureTestCase {
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.setLanguageLevel(LanguageLevel.JDK_1_8);
     moduleBuilder.addLibraryJars("guava", getTestDataPath() + "/", "guava-stubs.jar");
     moduleBuilder.addLibraryJars("jsr305", PathManager.getHomePathFor(Assert.class) + "/lib/", "jsr305.jar");
diff --git a/java/typeMigration/test/com/intellij/codeInsight/inspections/MigrateAssertToMatcherAssertTest.java b/java/typeMigration/test/com/intellij/codeInsight/inspections/MigrateAssertToMatcherAssertTest.java
index 9d405e9ae6bb..12c8000dd3ac 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/inspections/MigrateAssertToMatcherAssertTest.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/inspections/MigrateAssertToMatcherAssertTest.java
@@ -35,7 +35,7 @@ public class MigrateAssertToMatcherAssertTest extends JavaCodeInsightFixtureTest
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addLibraryJars("test-env", PathManager.getHomePathFor(Assert.class) + "/lib", "junit-4.12.jar", "hamcrest-core-1.3.jar");
   }
 
diff --git a/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java b/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java
index c01576fd5dab..fefd04423b84 100644
--- a/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/ChangeTypeSignatureTest.java
@@ -34,7 +34,7 @@ public class ChangeTypeSignatureTest extends LightCodeInsightTestCase {
     return PlatformTestUtil.getCommunityPath() + "/java/typeMigration/testData";
   }
 
-  private void doTest(boolean success, String migrationTypeText) throws Exception {
+  private void doTest(boolean success, String migrationTypeText) {
     String dataPath = "/refactoring/changeTypeSignature/";
     configureByFile(dataPath + getTestName(false) + ".java");
     final PsiFile file = getFile();
@@ -68,91 +68,91 @@ public class ChangeTypeSignatureTest extends LightCodeInsightTestCase {
     }
   }
 
-  private void doTest(boolean success) throws Exception {
+  private void doTest(boolean success) {
     doTest(success, CommonClassNames.JAVA_LANG_OBJECT);
   }
 
-  public void testListTypeArguments() throws Exception {
+  public void testListTypeArguments() {
     doTest(true);
   }
 
-  public void testFieldUsage() throws Exception {
+  public void testFieldUsage() {
     doTest(true);
   }
 
-  public void testFieldUsage1() throws Exception {
+  public void testFieldUsage1() {
     doTest(true);
   }
 
-  public void testReturnType() throws Exception {
+  public void testReturnType() {
     doTest(true);
   }
 
-  public void testReturnType1() throws Exception {
+  public void testReturnType1() {
     doTest(true);
   }
 
-  public void testReturnType2() throws Exception {
+  public void testReturnType2() {
     doTest(true);
   }
 
-  public void testPassedParameter() throws Exception {
+  public void testPassedParameter() {
     doTest(true);
   }
 
-  public void testPassedParameter1() throws Exception {
+  public void testPassedParameter1() {
     doTest(true, "java.lang.Integer");
   }
 
-  public void testPassedParameter2() throws Exception {
+  public void testPassedParameter2() {
     doTest(true);
   }
 
-  public void testUsedInSuper() throws Exception {
+  public void testUsedInSuper() {
     doTest(true);
   }
 
-  public void testCompositeReturnType() throws Exception {
+  public void testCompositeReturnType() {
     doTest(true);
   }
 
-  public void testTypeHierarchy() throws Exception {
+  public void testTypeHierarchy() {
     doTest(true);
   }
 
-  public void testTypeHierarchy1() throws Exception {
+  public void testTypeHierarchy1() {
     doTest(true);
   }
 
-  public void testTypeHierarchy2() throws Exception {
+  public void testTypeHierarchy2() {
     doTest(true);
   }
 
-  public void testTypeHierarchyFieldUsage() throws Exception {
+  public void testTypeHierarchyFieldUsage() {
     doTest(true);
   }
 
-  public void testTypeHierarchyFieldUsageConflict() throws Exception {
+  public void testTypeHierarchyFieldUsageConflict() {
     doTest(true);
   }
 
-  public void testParameterMigration() throws Exception {
+  public void testParameterMigration() {
     doTest(true);
   }
 
-  public void testParameterMigration1() throws Exception {
+  public void testParameterMigration1() {
     doTest(true, "java.lang.Integer");
   }
 
-  public void testParameterMigration2() throws Exception {
+  public void testParameterMigration2() {
     doTest(true, "java.lang.Integer");
   }
 
-  public void testFieldTypeMigration() throws Exception {
+  public void testFieldTypeMigration() {
     doTest(true, "java.lang.String");
   }
 
-  public void testMethodReturnTypeMigration() throws Exception {
+  public void testMethodReturnTypeMigration() {
     doTest(true, "java.lang.Integer");
   }
 }
\ No newline at end of file
diff --git a/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java b/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java
index c2e442fac6b7..81b8099e5557 100644
--- a/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/MigrateTypeSignatureTest.java
@@ -12,494 +12,494 @@ public class MigrateTypeSignatureTest extends TypeMigrationTestBase {
     return "/refactoring/migrateTypeSignature/";
   }
 
-  public void testExprAccess2Lvalue() throws Exception {
+  public void testExprAccess2Lvalue() {
     doTestFieldType("myForAccess", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null));
   }
 
-  public void testExprAccess2Rvalue() throws Exception {
+  public void testExprAccess2Rvalue() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassGrandChild", null));
   }
 
-  public void testExprAccessParent2Lvalue() throws Exception {
+  public void testExprAccessParent2Lvalue() {
     doTestFieldType("myForSuperAccess", "Ession",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null));
   }
 
-  public void testExprAccessParent2Rvalue() throws Exception {
+  public void testExprAccessParent2Rvalue() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassGrandChild", null));
   }
 
-  public void testExprArrayAccessNegative() throws Exception {
+  public void testExprArrayAccessNegative() {
     doTestFirstParamType("meth", "Expr", PsiType.DOUBLE);
   }
 
-  public void testExprArrayAccessPositive() throws Exception {
+  public void testExprArrayAccessPositive() {
     doTestFirstParamType("meth", "Expr", PsiType.CHAR);
   }
 
-  public void testExprCalcBooleanBoolean() throws Exception {
+  public void testExprCalcBooleanBoolean() {
     doTestFirstParamType("meth", "Expr", PsiType.INT);
   }
 
-  public void testExprCalcBooleanNumeric() throws Exception {
+  public void testExprCalcBooleanNumeric() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null));
   }
 
-  public void testExprCalcBooleanReference() throws Exception {
+  public void testExprCalcBooleanReference() {
     doTestFirstParamType("meth", "Expr",
                          PsiType.DOUBLE);
   }
 
-  public void testExprCalcNumeric2Boolean() throws Exception {
+  public void testExprCalcNumeric2Boolean() {
     doTestFirstParamType("meth", "Expr", PsiType.BOOLEAN);
   }
 
-  public void testExprCalcNumeric2Floating() throws Exception {
+  public void testExprCalcNumeric2Floating() {
     doTestFirstParamType("meth", "Expr", PsiType.FLOAT);
   }
 
-  public void testExprCalcNumeric2Int() throws Exception {
+  public void testExprCalcNumeric2Int() {
     doTestFirstParamType("meth", "Expr", PsiType.LONG);
   }
 
-  public void testExprCalcNumeric2String() throws Exception {
+  public void testExprCalcNumeric2String() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-  public void testExprCast2LvalueNeg() throws Exception {
+  public void testExprCast2LvalueNeg() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-  public void testExprCast2LvaluePos() throws Exception {
+  public void testExprCast2LvaluePos() {
     doTestFirstParamType("meth", "Expr", PsiType.INT);
   }
 
-  public void testExprConcatNumeric2Reference() throws Exception {
+  public void testExprConcatNumeric2Reference() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null));
   }
 
-  public void testExprConcatNumeric2String() throws Exception {
+  public void testExprConcatNumeric2String() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-  public void testExprConcatString2Numeric() throws Exception {
+  public void testExprConcatString2Numeric() {
     doTestFirstParamType("meth", "Expr",
                          PsiType.INT);
   }
 
-  public void testExprConcatString2Reference() throws Exception {
+  public void testExprConcatString2Reference() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null));
   }
 
-  public void testExprInstanceofNeg() throws Exception {
+  public void testExprInstanceofNeg() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_LIST, null));
   }
 
-  public void testExprInstanceofPos() throws Exception {
+  public void testExprInstanceofPos() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.AbstractMap", null));
   }
 
-  public void testExprLiteralBoolean() throws Exception {
+  public void testExprLiteralBoolean() {
     doTestFieldType("myField", "Expr",
                     PsiType.BOOLEAN);
   }
 
-  public void testExprLiteralByte() throws Exception {
+  public void testExprLiteralByte() {
     doTestFieldType("myField", "Expr",
                     PsiType.BYTE);
   }
 
-  public void testExprLiteralChar() throws Exception {
+  public void testExprLiteralChar() {
     doTestFieldType("myField", "Expr",
                     PsiType.CHAR);
   }
 
-  public void testExprLiteralClassExtends() throws Exception {
+  public void testExprLiteralClassExtends() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<? extends java.util.Collection[]>", null));
   }
 
-  public void testExprLiteralClassPrimitive() throws Exception {
+  public void testExprLiteralClassPrimitive() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<Integer>", null));
   }
 
-  public void testExprLiteralClassPrimitiveArray() throws Exception {
+  public void testExprLiteralClassPrimitiveArray() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<int[]>", null));
   }
 
-  public void testExprLiteralClassRaw() throws Exception {
+  public void testExprLiteralClassRaw() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class", null));
   }
 
-  public void testExprLiteralClassReference() throws Exception {
+  public void testExprLiteralClassReference() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<java.util.Set>", null));
   }
 
-  public void testExprLiteralClassReferenceArray() throws Exception {
+  public void testExprLiteralClassReferenceArray() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<java.util.Set[]>", null));
   }
 
-  public void testExprLiteralClassSuper() throws Exception {
+  public void testExprLiteralClassSuper() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.Class<? super java.util.AbstractSet[]>", null));
   }
 
-  public void testExprLiteralDouble() throws Exception {
+  public void testExprLiteralDouble() {
     doTestFieldType("myField", "Expr",
                     PsiType.DOUBLE);
   }
 
-  public void testExprLiteralFloat() throws Exception {
+  public void testExprLiteralFloat() {
     doTestFieldType("myField", "Expr",
                     PsiType.FLOAT);
   }
 
-  public void testExprLiteralInt() throws Exception {
+  public void testExprLiteralInt() {
     doTestFieldType("myField", "Expr",
                     PsiType.INT);
   }
 
-  public void testExprLiteralLong() throws Exception {
+  public void testExprLiteralLong() {
     doTestFieldType("myField", "Expr",
                     PsiType.LONG);
   }
 
-  public void testExprLiteralShort() throws Exception {
+  public void testExprLiteralShort() {
     doTestFieldType("myField", "Expr",
                     PsiType.SHORT);
   }
 
-  public void testExprLiteralString() throws Exception {
+  public void testExprLiteralString() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-  public void testExprNewArrayArray2Lvalue() throws Exception {
+  public void testExprNewArrayArray2Lvalue() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null).createArrayType());
   }
 
-  public void testExprNewArrayArray2Rvalue() throws Exception {
+  public void testExprNewArrayArray2Rvalue() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null).createArrayType().createArrayType().createArrayType());
   }
 
-  public void testExprNewArrayGen2Rvalue() throws Exception {
+  public void testExprNewArrayGen2Rvalue() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<java.lang.Integer>", null).createArrayType());
   }
 
-  public void testExprNewArrayPrimitive2Lvalue() throws Exception {
+  public void testExprNewArrayPrimitive2Lvalue() {
     doTestFirstParamType("meth", "Expr", PsiType.INT);
   }
 
-  public void testExprNewArrayPrimitive2Rvalue() throws Exception {
+  public void testExprNewArrayPrimitive2Rvalue() {
     doTestFieldType("myField", "Expr",
                     PsiType.INT.createArrayType().createArrayType());
   }
 
-  public void testExprNewArrayReftype2Lvalue() throws Exception {
+  public void testExprNewArrayReftype2Lvalue() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null));
   }
 
-  public void testExprNewArrayReftype2Rvalue() throws Exception {
+  public void testExprNewArrayReftype2Rvalue() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null).createArrayType().createArrayType());
   }
 
-  public void testExprNewGen() throws Exception {
+  public void testExprNewGen() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Subject>", null));
   }
 
-  public void testExprNewGenExtends() throws Exception {
+  public void testExprNewGenExtends() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? extends Subject>", null));
   }
 
-  public void testExprNewGenSuper() throws Exception {
+  public void testExprNewGenSuper() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? super Subject>", null));
   }
 
-  public void testExprNewReference() throws Exception {
+  public void testExprNewReference() {
     doTestFieldType("myField", "Expr",
                     myJavaFacade.getElementFactory().createTypeFromText("Expr.Subject", null));
   }
 
-  public void testExprReturn2Lvalue() throws Exception {
+  public void testExprReturn2Lvalue() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-  public void testExprReturn2Rvalue() throws Exception {
+  public void testExprReturn2Rvalue() {
     doTestMethodType("meth", "Expr",
                      myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-  public void testExprTernary() throws Exception {
+  public void testExprTernary() {
     doTestFirstParamType("meth", "Expr",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-  public void testOverridingDown() throws Exception {
+  public void testOverridingDown() {
     doTestMethodType("getInt", "Parent", PsiType.BYTE);
   }
 
-  public void testOverridingUp() throws Exception {
+  public void testOverridingUp() {
     doTestMethodType("getInt", "Child", PsiType.BYTE);
   }
 
-  public void testSpecJavadoc() throws Exception {
+  public void testSpecJavadoc() {
     JavaCodeStyleSettings settings = getCurrentCodeStyleSettings().getCustomSettings(JavaCodeStyleSettings.class);
     settings.CLASS_NAMES_IN_JAVADOC = JavaCodeStyleSettings.FULLY_QUALIFY_NAMES_ALWAYS;
     doTestFirstParamType("meth", "Spec",
                          myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null));
   }
 
-  public void testSpecNotUsed() throws Exception {
+  public void testSpecNotUsed() {
     doTestFieldType("myField", "Spec", PsiType.BOOLEAN);
   }
 
-  public void testTypeArrayReftype2Lvalue() throws Exception {
+  public void testTypeArrayReftype2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("Subject", null).createArrayType());
   }
 
-  public void testTypeArrayReftype2Rvalue() throws Exception {
+  public void testTypeArrayReftype2Rvalue() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("Subject", null).createArrayType().createArrayType());
   }
 
-  public void testTypeArrayRoots2Lvalue() throws Exception {
+  public void testTypeArrayRoots2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("Holder", null).createArrayType());
   }
 
-  public void testTypeArrayVararg2Lvalue() throws Exception {
+  public void testTypeArrayVararg2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          new PsiEllipsisType(myJavaFacade.getElementFactory().createTypeFromText("Subject", null)));
   }
 
-  public void testTypeArrayVararg2RvalueNeg() throws Exception {
+  public void testTypeArrayVararg2RvalueNeg() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("Descendant", null).createArrayType());
   }
 
-  public void testTypeArrayVararg2RvaluePos() throws Exception {
+  public void testTypeArrayVararg2RvaluePos() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("Subject", null).createArrayType());
   }
 
-  public void testTypeAutoboxBoolean2Lvalue() throws Exception {
+  public void testTypeAutoboxBoolean2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Boolean", null));
   }
 
-  public void testTypeAutoboxBoolean2Rvalue() throws Exception {
+  public void testTypeAutoboxBoolean2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.BOOLEAN);
   }
 
-  public void testTypeAutoboxByte2Lvalue() throws Exception {
+  public void testTypeAutoboxByte2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Byte", null));
   }
 
-  public void testTypeAutoboxByte2Rvalue() throws Exception {
+  public void testTypeAutoboxByte2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.BYTE);
   }
 
-  public void testTypeAutoboxChar2Lvalue() throws Exception {
+  public void testTypeAutoboxChar2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Character", null));
   }
 
-  public void testTypeAutoboxChar2Rvalue() throws Exception {
+  public void testTypeAutoboxChar2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.CHAR);
   }
 
-  public void testTypeAutoboxDouble2Lvalue() throws Exception {
+  public void testTypeAutoboxDouble2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Double", null));
   }
 
-  public void testTypeAutoboxDouble2Rvalue() throws Exception {
+  public void testTypeAutoboxDouble2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.DOUBLE);
   }
 
-  public void testTypeAutoboxFloat2Lvalue() throws Exception {
+  public void testTypeAutoboxFloat2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Float", null));
   }
 
-  public void testTypeAutoboxFloat2Rvalue() throws Exception {
+  public void testTypeAutoboxFloat2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.FLOAT);
   }
 
-  public void testTypeAutoboxInt2Lvalue() throws Exception {
+  public void testTypeAutoboxInt2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null));
   }
 
-  public void testTypeAutoboxInt2Rvalue() throws Exception {
+  public void testTypeAutoboxInt2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.INT);
   }
 
-  public void testTypeAutoboxLong2Lvalue() throws Exception {
+  public void testTypeAutoboxLong2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Long", null));
   }
 
-  public void testTypeAutoboxLong2Rvalue() throws Exception {
+  public void testTypeAutoboxLong2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.LONG);
   }
 
-  public void testTypeAutoboxShort2Lvalue() throws Exception {
+  public void testTypeAutoboxShort2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Short", null));
   }
 
-  public void testTypeAutoboxShort2Rvalue() throws Exception {
+  public void testTypeAutoboxShort2Rvalue() {
     doTestFieldType("myField", "Type",
                     PsiType.SHORT);
   }
 
-  public void testTypeGenAncestor2Lvalue() throws Exception {
+  public void testTypeGenAncestor2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Subject>", null));
   }
 
-  public void testTypeGenAncestorWildcard2Lvalue() throws Exception {
+  public void testTypeGenAncestorWildcard2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? extends Subject>", null));
   }
 
-  public void testTypeGenDescendant2Rvalue() throws Exception {
+  public void testTypeGenDescendant2Rvalue() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<Subject>", null));
   }
 
-  public void testTypeGenDescendantWildcard2Rvalue() throws Exception {
+  public void testTypeGenDescendantWildcard2Rvalue() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? super Subject>", null));
   }
 
-  public void testTypeGenRaw2Lvalue() throws Exception {
+  public void testTypeGenRaw2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null));
   }
 
-  public void testTypeGenRaw2Rvalue() throws Exception {
+  public void testTypeGenRaw2Rvalue() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_UTIL_SET, null));
   }
 
-  public void testTypePrimsubBoolean2Lvalue() throws Exception {
+  public void testTypePrimsubBoolean2Lvalue() {
     doTestFirstParamType("meth", "Type", PsiType.BOOLEAN);
   }
 
-  public void testTypePrimsubBoolean2Rvalue() throws Exception {
+  public void testTypePrimsubBoolean2Rvalue() {
     doTestFieldType("myField", "Type", PsiType.BOOLEAN);
   }
 
-  public void testTypePrimsubByte2Rvalue() throws Exception {
+  public void testTypePrimsubByte2Rvalue() {
     doTestFieldType("myField", "Type", PsiType.BYTE);
   }
 
-  public void testTypePrimsubChar2Lvalue() throws Exception {
+  public void testTypePrimsubChar2Lvalue() {
     doTestFirstParamType("meth", "Type", PsiType.CHAR);
   }
 
-  public void testTypePrimsubChar2Rvalue() throws Exception {
+  public void testTypePrimsubChar2Rvalue() {
     doTestFieldType("myField", "Type", PsiType.CHAR);
   }
 
-  public void testTypePrimsubDouble2Lvalue() throws Exception {
+  public void testTypePrimsubDouble2Lvalue() {
     doTestFirstParamType("meth", "Type", PsiType.DOUBLE);
   }
 
-  public void testTypePrimsubFloat2Lvalue() throws Exception {
+  public void testTypePrimsubFloat2Lvalue() {
     doTestFirstParamType("meth", "Type", PsiType.FLOAT);
   }
 
-  public void testTypePrimsubFloat2Rvalue() throws Exception {
+  public void testTypePrimsubFloat2Rvalue() {
     doTestFieldType("myField", "Type", PsiType.FLOAT);
   }
 
-  public void testTypePrimsubInt2Lvalue() throws Exception {
+  public void testTypePrimsubInt2Lvalue() {
     doTestFirstParamType("meth", "Type", PsiType.INT);
   }
 
-  public void testTypePrimsubInt2Rvalue() throws Exception {
+  public void testTypePrimsubInt2Rvalue() {
     doTestFieldType("myField", "Type", PsiType.INT);
   }
 
-  public void testTypePrimsubLong2Lvalue() throws Exception {
+  public void testTypePrimsubLong2Lvalue() {
     doTestFirstParamType("meth", "Type", PsiType.LONG);
   }
 
-  public void testTypePrimsubLong2Rvalue() throws Exception {
+  public void testTypePrimsubLong2Rvalue() {
     doTestFieldType("myField", "Type", PsiType.LONG);
   }
 
-  public void testTypePrimsubShort2Lvalue() throws Exception {
+  public void testTypePrimsubShort2Lvalue() {
     doTestFirstParamType("meth", "Type", PsiType.SHORT);
   }
 
-  public void testTypePrimsubShort2Rvalue() throws Exception {
+  public void testTypePrimsubShort2Rvalue() {
     doTestFieldType("myField", "Type", PsiType.SHORT);
   }
 
-  public void testTypeRefClassChild2Rvalue() throws Exception {
+  public void testTypeRefClassChild2Rvalue() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassChild", null));
   }
 
-  public void testTypeRefClassParent2Lvalue() throws Exception {
+  public void testTypeRefClassParent2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null));
   }
 
-  public void testTypeRefClassParent2Rvalue() throws Exception {
+  public void testTypeRefClassParent2Rvalue() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("ClassParent", null));
   }
 
-  public void testTypeRefFaceChild2Lvalue() throws Exception {
+  public void testTypeRefFaceChild2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null));
   }
 
-  public void testTypeRefFaceChild2Rvalue() throws Exception {
+  public void testTypeRefFaceChild2Rvalue() {
     doTestFieldType("myField", "Type",
                     myJavaFacade.getElementFactory().createTypeFromText("FaceChild", null));
   }
 
-  public void testTypeRefFaceParent2Lvalue() throws Exception {
+  public void testTypeRefFaceParent2Lvalue() {
     doTestFirstParamType("meth", "Type",
                          myJavaFacade.getElementFactory().createTypeFromText("FaceParent", null));
   }
@@ -518,7 +518,7 @@ public class MigrateTypeSignatureTest extends TypeMigrationTestBase {
                                             final PsiType toType) {
     final RulesProvider provider = new RulesProvider() {
       @Override
-      public PsiType migrationType(PsiElement context) throws Exception {
+      public PsiType migrationType(PsiElement context) {
         return toType;
       }
 
diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByAtomicRuleTest.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByAtomicRuleTest.java
index 9e781175898f..78bb35e1fe92 100644
--- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByAtomicRuleTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByAtomicRuleTest.java
@@ -3,8 +3,8 @@ package com.intellij.refactoring;
 import com.intellij.psi.PsiType;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.concurrent.atomic.AtomicReferenceArray;
 import java.util.concurrent.atomic.AtomicIntegerArray;
+import java.util.concurrent.atomic.AtomicReferenceArray;
 
 public class TypeMigrationByAtomicRuleTest extends TypeMigrationTestBase{
   @NotNull
@@ -13,86 +13,86 @@ public class TypeMigrationByAtomicRuleTest extends TypeMigrationTestBase{
     return "/refactoring/typeMigrationByAtomic/";
   }
 
-  private void doTestDirectMigration() throws Exception {
+  private void doTestDirectMigration() {
     doTestFieldType("i", myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicInteger", null));
   }
 
 
-  public void testDirectIncrementDecrement() throws Exception {
+  public void testDirectIncrementDecrement() {
     doTestDirectMigration();
   }
 
-  public void testDirectAssignments() throws Exception {
+  public void testDirectAssignments() {
     doTestDirectMigration();
   }
 
-  public void testDirectConditions() throws Exception {
+  public void testDirectConditions() {
     doTestFieldType("b", myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicBoolean", null));
   }
 
-  public void testDirectConditionalExpression() throws Exception {
+  public void testDirectConditionalExpression() {
     doTestFieldType("s",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.lang.String>", null));
   }
 
 
-  public void testDirectByte() throws Exception {
+  public void testDirectByte() {
     doTestFieldType("b",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.lang.Byte>", null));
   }
 
-  public void testDirectString() throws Exception {
+  public void testDirectString() {
     doTestFieldType("s",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.lang.String>", null));
   }
 
-  public void testDirectForeach() throws Exception {
+  public void testDirectForeach() {
     doTestFieldType("lst",
                     myJavaFacade.getElementFactory().createTypeFromText("java.util.concurrent.atomic.AtomicReference<java.util.List<java.lang.String>>", null));
   }
 
-  public void testDirectStringArray() throws Exception {
+  public void testDirectStringArray() {
     doTestFieldType("s",
                     myJavaFacade.getElementFactory().createTypeFromText(AtomicReferenceArray.class.getName() + "<java.lang.String>", null));
   }
 
-  public void testDirectIntArray() throws Exception {
+  public void testDirectIntArray() {
     doTestFieldType("a",
                     myJavaFacade.getElementFactory().createTypeFromText(AtomicIntegerArray.class.getName(), null));
   }
 
-  private void doTestReverseMigration() throws Exception {
+  private void doTestReverseMigration() {
     doTestFieldType("i", PsiType.INT);
   }
 
 
-  public void testReverseIncrementDecrement() throws Exception {
+  public void testReverseIncrementDecrement() {
     doTestReverseMigration();
   }
 
-  public void testReverseAssignments() throws Exception {
+  public void testReverseAssignments() {
     doTestReverseMigration();
   }
 
-  public void testReverseConditions() throws Exception {
+  public void testReverseConditions() {
     doTestFieldType("b", PsiType.BOOLEAN);
   }
 
-  public void testReverseByte() throws Exception {
+  public void testReverseByte() {
     doTestFieldType("b", PsiType.BYTE);
   }
 
-   public void testReverseString() throws Exception {
+   public void testReverseString() {
     doTestFieldType("s",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null));
   }
 
-   public void testReverseStringArray() throws Exception {
+   public void testReverseStringArray() {
     doTestFieldType("s",
                     myJavaFacade.getElementFactory().createTypeFromText("java.lang.String", null).createArrayType());
   }
 
-  public void testReverseIntArray() throws Exception {
+  public void testReverseIntArray() {
     doTestFieldType("a",
                     PsiType.INT.createArrayType());
   }
diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java
index 7f14f67a7409..397984a8c0b8 100644
--- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationByThreadLocalRuleTest.java
@@ -12,19 +12,19 @@ public class TypeMigrationByThreadLocalRuleTest extends TypeMigrationTestBase{
   }
 
 
-  public void testDirectInt() throws Exception {
+  public void testDirectInt() {
     doTestFieldType("i", myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.Integer>", null));
   }
   
-  public void testDirectByte() throws Exception {
+  public void testDirectByte() {
     doTestFieldType("i", myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.Byte>", null));
   }
 
-  public void testDirectString() throws Exception {
+  public void testDirectString() {
     doTestFieldType("myS", myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.lang.String>", null));
   }
 
-  public void testLanguageLevel() throws Exception {
+  public void testLanguageLevel() {
     final LanguageLevelProjectExtension extension = LanguageLevelProjectExtension.getInstance(getProject());
     final LanguageLevel languageLevel = extension.getLanguageLevel();
     try {
diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
index a7c62f254d75..8cb7a08dd099 100644
--- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTest.java
@@ -877,7 +877,7 @@ public class TypeMigrationTest extends TypeMigrationTestBase {
   private void doTestReturnType(final String methodName, final String migrationType) {
     start(new RulesProvider() {
       @Override
-      public PsiType migrationType(PsiElement context) throws Exception {
+      public PsiType migrationType(PsiElement context) {
         return myFactory.createTypeFromText(migrationType, context);
       }
 
diff --git a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
index 9571f6fac611..4a252efc809f 100644
--- a/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
+++ b/java/typeMigration/test/com/intellij/refactoring/TypeMigrationTestBase.java
@@ -59,7 +59,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase {
                                                     final PsiType toType) {
     final RulesProvider provider = new RulesProvider() {
       @Override
-      public PsiType migrationType(PsiElement context) throws Exception {
+      public PsiType migrationType(PsiElement context) {
         return toType;
       }
 
@@ -90,7 +90,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase {
   protected void doTestFieldsType(@NotNull String className, @NotNull final PsiType migrationType, final String... fieldNames) {
     final RulesProvider provider = new RulesProvider() {
       @Override
-      public PsiType migrationType(PsiElement context) throws Exception {
+      public PsiType migrationType(PsiElement context) {
         return migrationType;
       }
 
@@ -116,7 +116,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase {
                                   final PsiType migrationType) {
     final RulesProvider provider = new RulesProvider() {
       @Override
-      public PsiType migrationType(PsiElement context) throws Exception {
+      public PsiType migrationType(PsiElement context) {
         return migrationType;
       }
 
@@ -136,7 +136,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase {
   protected void doTestFirstParamType(@NonNls final String methodName, String className, final PsiType migrationType) {
     final RulesProvider provider = new RulesProvider() {
       @Override
-      public PsiType migrationType(PsiElement context) throws Exception {
+      public PsiType migrationType(PsiElement context) {
         return migrationType;
       }
 
@@ -215,7 +215,7 @@ public abstract class TypeMigrationTestBase extends MultiFileTestCase {
   }
 
   interface RulesProvider {
-    PsiType migrationType(PsiElement context) throws Exception;
+    PsiType migrationType(PsiElement context);
 
     default PsiElement victim(PsiClass aClass) {
       fail("You need to override one of victim(PsiClass) or victims(PsiClass) methods");
diff --git a/java/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java b/java/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java
index f3b0a588f524..3b6f73dfb9bf 100644
--- a/java/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java
+++ b/java/typeMigration/test/com/intellij/refactoring/WildcardTypeMigrationTest.java
@@ -10,134 +10,134 @@ public class WildcardTypeMigrationTest extends TypeMigrationTestBase{
     return "/refactoring/wildcard/";
   }
 
-  public void testProducerExtends() throws Exception {
+  public void testProducerExtends() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Number>", null));
   }
 
-  public void testProducerSuper() throws Exception {
+  public void testProducerSuper() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Integer>", null));
   }
 
-  public void testProducerUnbounded() throws Exception {
+  public void testProducerUnbounded() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null));
   }
 
-  public void testProducerCollectionChanged() throws Exception {
+  public void testProducerCollectionChanged() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? super java.lang.Integer>", null));
   }
 
-  public void testProducerExtendsCollectionChanged() throws Exception {
+  public void testProducerExtendsCollectionChanged() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.Set<? extends java.lang.Object>", null));
   }
 
-  public void testProducerStopAtWildcard() throws Exception {
+  public void testProducerStopAtWildcard() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? super java.lang.Number>", null));
   }
 
-  public void testProducerFailToStopAtWildcard() throws Exception {
+  public void testProducerFailToStopAtWildcard() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? super java.lang.Integer>", null));
   }
 
-  public void testProducerExtendsFailToStopAtWildcard() throws Exception {
+  public void testProducerExtendsFailToStopAtWildcard() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.List<? extends java.lang.Number>", null));
   }
 
 
-  public void testConsumerExtends() throws Exception {
+  public void testConsumerExtends() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Number>", null));
   }
 
-  public void testConsumerSuper() throws Exception {
+  public void testConsumerSuper() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Number>", null));
   }
 
-  public void testConsumerUnbounded() throws Exception {
+  public void testConsumerUnbounded() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null));
   }
 
   // array -> list
-  public void testAssignmentExtends() throws Exception {
+  public void testAssignmentExtends() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Integer>", null));
   }
 
-  public void testAssignmentSuper() throws Exception {
+  public void testAssignmentSuper() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Integer>", null));
   }
 
-  public void testAssignmentUnbounded() throws Exception {
+  public void testAssignmentUnbounded() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null));
   }
 
-  public void testGetExtends() throws Exception {
+  public void testGetExtends() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? extends java.lang.Integer>", null));
   }
 
-  public void testGetSuper() throws Exception {
+  public void testGetSuper() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<? super java.lang.Integer>", null));
   }
 
-  public void testGetUnbounded() throws Exception {
+  public void testGetUnbounded() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null));
 
   }
 
-  public void testLengthSize() throws Exception {
+  public void testLengthSize() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.util.ArrayList<?>", null));
 
   }
 
   //list -> array
-  public void testGetAssignmentExtendsToType() throws Exception {
+  public void testGetAssignmentExtendsToType() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Number", null).createArrayType());
   }
 
-  public void testGetAssignmentExtendsToSuperType() throws Exception {
+  public void testGetAssignmentExtendsToSuperType() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText(CommonClassNames.JAVA_LANG_OBJECT, null).createArrayType());
   }
 
-  public void testGetAssignmentExtendsToChildType() throws Exception {
+  public void testGetAssignmentExtendsToChildType() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.Integer", null).createArrayType());
   }
 
   // -> threadlocal with wildcard
-  public void testThreadLocalProducerExtends() throws Exception {
+  public void testThreadLocalProducerExtends() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.util.List<? extends String>>", null));
   }
 
   //List<? super String> is not assignable to List<String> though it is possible to pass string where ? super String was   
-  public void _testThreadLocalProducerSuper() throws Exception {
+  public void _testThreadLocalProducerSuper() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<java.util.List<? super String>>", null));
   }
 
-  public void testThreadLocalConsumerSuper() throws Exception {
+  public void testThreadLocalConsumerSuper() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<? super String>", null));
   }
 
-  public void testThreadLocalConsumerExtends() throws Exception {
+  public void testThreadLocalConsumerExtends() {
     doTestFirstParamType("method",
                          myJavaFacade.getElementFactory().createTypeFromText("java.lang.ThreadLocal<? extends String>", null));
   }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/AnnotationTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/AnnotationTest.java
index d80044107f0f..6b7da9985e93 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/AnnotationTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/AnnotationTest.java
@@ -20,63 +20,63 @@ package org.jetbrains.ether;
  * Date: 26.07.11
  */
 public class AnnotationTest extends IncrementalTestCase {
-  public AnnotationTest() throws Exception {
+  public AnnotationTest() {
     super("annotations");
   }
 
-  public void testAddAnnotationTarget() throws Exception {
+  public void testAddAnnotationTarget() {
     doTest();
   }
 
-  public void testAddAnnotationTypeMemberWithDefaultValue() throws Exception {
+  public void testAddAnnotationTypeMemberWithDefaultValue() {
     doTest();
   }
 
-  public void testAddAnnotationTypeMemberWithDefaultValue2() throws Exception {
+  public void testAddAnnotationTypeMemberWithDefaultValue2() {
     doTest();
   }
 
-  public void testAddAnnotationTypeMemberWithoutDefaultValue() throws Exception {
+  public void testAddAnnotationTypeMemberWithoutDefaultValue() {
     doTest();
   }
 
-  public void testAddDefaultToAnnotationMember() throws Exception {
+  public void testAddDefaultToAnnotationMember() {
     doTest();
   }
 
-  public void testChangeAnnotationRetentionPolicy() throws Exception {
+  public void testChangeAnnotationRetentionPolicy() {
     doTest();
   }
 
-  public void testChangeAnnotationRetentionPolicy1() throws Exception {
+  public void testChangeAnnotationRetentionPolicy1() {
     doTest();
   }
 
-  public void testChangeAnnotationRetentionPolicy2() throws Exception {
+  public void testChangeAnnotationRetentionPolicy2() {
     doTest();
   }
 
-  public void testChangeAnnotationRetentionPolicy3() throws Exception {
+  public void testChangeAnnotationRetentionPolicy3() {
     doTest();
   }
 
-  public void testChangeAnnotationRetentionPolicy4() throws Exception {
+  public void testChangeAnnotationRetentionPolicy4() {
     doTest();
   }
 
-  public void testChangeAnnotationTypeMemberType() throws Exception {
+  public void testChangeAnnotationTypeMemberType() {
     doTest();
   }
 
-  public void testChangeAnnotationTypeMemberTypeArray() throws Exception {
+  public void testChangeAnnotationTypeMemberTypeArray() {
     doTest();
   }
 
-  public void testChangeAnnotationTypeMemberTypeEnumArray() throws Exception {
+  public void testChangeAnnotationTypeMemberTypeEnumArray() {
     doTest();
   }
 
-  public void testClassAsArgument() throws Exception {
+  public void testClassAsArgument() {
     doTest();
   }
 
@@ -93,31 +93,31 @@ public class AnnotationTest extends IncrementalTestCase {
      doTest();
  } */
 
-  public void testRemoveAnnotationTarget() throws Exception {
+  public void testRemoveAnnotationTarget() {
     doTest();
   }
 
-  public void testRemoveAnnotationTypeMember() throws Exception {
+  public void testRemoveAnnotationTypeMember() {
     doTest();
   }
 
-  public void testRemoveAnnotationTypeMember1() throws Exception {
+  public void testRemoveAnnotationTypeMember1() {
     doTest();
   }
 
-  public void testRemoveDefaultFromAnnotationMember() throws Exception {
+  public void testRemoveDefaultFromAnnotationMember() {
     doTest();
   }
 
-  public void testConservativeNonIncremental() throws Exception {
+  public void testConservativeNonIncremental() {
     doTest();
   }
 
-  public void testConservativeNonIncremental1() throws Exception {
+  public void testConservativeNonIncremental1() {
     doTest();
   }
 
-  public void testAnnotationsTracker() throws Exception {
+  public void testAnnotationsTracker() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassModifierTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassModifierTest.java
index a7d7f2a85354..b894e64ab4bb 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassModifierTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassModifierTest.java
@@ -20,35 +20,35 @@ package org.jetbrains.ether;
  * Date: 09.08.11
  */
 public class ClassModifierTest extends IncrementalTestCase {
-  public ClassModifierTest() throws Exception {
+  public ClassModifierTest() {
     super("classModifiers");
   }
 
-  public void testAddStatic() throws Exception {
+  public void testAddStatic() {
     doTest();
   }
 
-  public void testRemoveStatic() throws Exception {
+  public void testRemoveStatic() {
     doTest();
   }
 
-  public void testDecAccess() throws Exception {
+  public void testDecAccess() {
     doTest();
   }
 
-  public void testSetAbstract() throws Exception {
+  public void testSetAbstract() {
     doTest();
   }
 
-  public void testDropAbstract() throws Exception {
+  public void testDropAbstract() {
     doTest();
   }
 
-  public void testSetFinal() throws Exception {
+  public void testSetFinal() {
     doTest();
   }
 
-  public void testSetFinal1() throws Exception {
+  public void testSetFinal1() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java
index 5a66395e4cf6..c5c12d488736 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java
@@ -20,47 +20,47 @@ package org.jetbrains.ether;
  * Date: 09.08.11
  */
 public class ClassPropertyTest extends IncrementalTestCase {
-  public ClassPropertyTest() throws Exception {
+  public ClassPropertyTest() {
     super("classProperties");
   }
 
-  public void testAddExtends() throws Exception {
+  public void testAddExtends() {
     doTest();
   }
 
-  public void testAddImplements() throws Exception {
+  public void testAddImplements() {
     doTest();
   }
 
-  public void testChangeExtends() throws Exception {
+  public void testChangeExtends() {
     doTest();
   }
 
-  public void testRemoveExtends() throws Exception {
+  public void testRemoveExtends() {
     doTest();
   }
 
-  public void testRemoveExtendsAffectsFieldAccess() throws Exception {
+  public void testRemoveExtendsAffectsFieldAccess() {
     doTest();
   }
 
-  public void testRemoveExtendsAffectsMethodAccess() throws Exception {
+  public void testRemoveExtendsAffectsMethodAccess() {
     doTest();
   }
 
-  public void testRemoveImplements() throws Exception {
+  public void testRemoveImplements() {
     doTest();
   }
 
-  public void testRemoveImplements2() throws Exception {
+  public void testRemoveImplements2() {
     doTest();
   }
 
-  public void testRemoveImplements3() throws Exception {
+  public void testRemoveImplements3() {
     doTest();
   }
 
-  public void testChangeExtends2() throws Exception {
+  public void testChangeExtends2() {
       doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassRenameTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassRenameTest.java
index 1dde265f8b63..987d342b7d3e 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/ClassRenameTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/ClassRenameTest.java
@@ -20,7 +20,7 @@ package org.jetbrains.ether;
  * Date: 09.08.11
  */
 public class ClassRenameTest extends IncrementalTestCase {
-  public ClassRenameTest() throws Exception {
+  public ClassRenameTest() {
     super("changeName");
   }
 
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
index 21561264f493..03e7f383558d 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
@@ -25,122 +25,122 @@ import org.jetbrains.jps.model.module.JpsModule;
  * Date: 22.09.11
  */
 public class CommonTest extends IncrementalTestCase {
-  public CommonTest() throws Exception {
+  public CommonTest() {
     super("common");
   }
 
-  public void testAnonymous() throws Exception {
+  public void testAnonymous() {
     doTest();
   }
 
-  public void testChangeDefinitionToClass() throws Exception {
+  public void testChangeDefinitionToClass() {
     doTest();
   }
 
-  public void testChangeDefinitionToClass2() throws Exception {
+  public void testChangeDefinitionToClass2() {
     doTest();
   }
 
-  public void testDeleteClass() throws Exception {
+  public void testDeleteClass() {
     doTest();
   }
 
-  public void testDeleteClass1() throws Exception {
+  public void testDeleteClass1() {
     doTest();
   }
 
-  public void testDeleteClass2() throws Exception {
+  public void testDeleteClass2() {
     doTest();
   }
 
-  public void testDeleteClassAfterCompileErrors() throws Exception {
+  public void testDeleteClassAfterCompileErrors() {
     setupInitialProject();
 
     doTestBuild(2);
   }
 
-  public void testDontMarkDependentsAfterCompileErrors() throws Exception {
+  public void testDontMarkDependentsAfterCompileErrors() {
     setupInitialProject();
 
     doTestBuild(2);
   }
 
-  public void testDeleteClassPackageDoesntMatchRoot() throws Exception {
+  public void testDeleteClassPackageDoesntMatchRoot() {
     doTest();
   }
 
-  public void testInner() throws Exception {
+  public void testInner() {
     doTest();
   }
 
-  public void testNoResourceDelete() throws Exception {
+  public void testNoResourceDelete() {
     doTest();
   }
 
-  public void testNoSecondFileCompile() throws Exception {
+  public void testNoSecondFileCompile() {
     doTest();
   }
 
-  public void testNoSecondFileCompile1() throws Exception {
+  public void testNoSecondFileCompile1() {
     doTest();
   }
 
-  public void testDependencyUpdate() throws Exception {
+  public void testDependencyUpdate() {
     doTest();
   }
 
-  public void testClass2Interface1() throws Exception {
+  public void testClass2Interface1() {
     doTest();
   }
 
-  public void testClass2Interface2() throws Exception {
+  public void testClass2Interface2() {
     doTest();
   }
 
-  public void testClass2Interface3() throws Exception {
+  public void testClass2Interface3() {
     doTest();
   }
 
-  public void testDeleteClass3() throws Exception {
+  public void testDeleteClass3() {
     doTest();
   }
 
-  public void testDeleteClass4() throws Exception {
+  public void testDeleteClass4() {
     doTest();
   }
 
-  public void testDeleteInnerClass() throws Exception {
+  public void testDeleteInnerClass() {
     doTest();
   }
 
-  public void testDeleteInnerClass1() throws Exception {
+  public void testDeleteInnerClass1() {
     doTest();
   }
 
-  public void testAddClass() throws Exception {
+  public void testAddClass() {
     doTest();
   }
 
-  public void testAddDuplicateClass() throws Exception {
+  public void testAddDuplicateClass() {
     doTest();
   }
 
-  public void testAddClassHidingImportedClass() throws Exception {
+  public void testAddClassHidingImportedClass() {
     doTest();
   }
 
-  public void testAddClassHidingImportedClass2() throws Exception {
+  public void testAddClassHidingImportedClass2() {
     doTest();
   }
 
-  public void testMoveClassToDependentModule() throws Exception {
+  public void testMoveClassToDependentModule() {
     JpsModule moduleA = addModule("moduleA", "moduleA/src");
     JpsModule moduleB = addModule("moduleB", "moduleB/src");
     JpsModuleRootModificationUtil.addDependency(moduleB, moduleA);
     doTestBuild(1).assertSuccessful();
   }
 
-  public void testMoveClassToDependentModuleWithSameOutput() throws Exception {
+  public void testMoveClassToDependentModuleWithSameOutput() {
     final JpsSdk<JpsDummyElement> sdk = getOrCreateJdk();
     final String commonOutput = getAbsolutePath("out");
     JpsModule moduleA = addModule("moduleA", new String[]{getAbsolutePath("moduleA/src")}, commonOutput, commonOutput, sdk);
@@ -149,32 +149,32 @@ public class CommonTest extends IncrementalTestCase {
     doTestBuild(1).assertSuccessful();
   }
 
-  public void testMoveClassFromJavaFileToDependentModule() throws Exception {
+  public void testMoveClassFromJavaFileToDependentModule() {
     JpsModule moduleA = addModule("moduleA", "moduleA/src");
     JpsModule moduleB = addModule("moduleB", "moduleB/src");
     JpsModuleRootModificationUtil.addDependency(moduleB, moduleA);
     doTestBuild(1).assertSuccessful();
   }
 
-  public void testCompileDependenciesOnMovedClassesInFirstRound() throws Exception {
+  public void testCompileDependenciesOnMovedClassesInFirstRound() {
     doTest().assertSuccessful();
   }
 
-  public void testIntegrateOnSuperclassRemovedAndRestored() throws Exception {
+  public void testIntegrateOnSuperclassRemovedAndRestored() {
     setupInitialProject();
 
     doTestBuild(2);
   }
 
-  public void testMoveToplevelClassToAnotherFile() throws Exception {
+  public void testMoveToplevelClassToAnotherFile() {
     doTest();
   }
 
-  public void testMoveClassToAnotherRoot() throws Exception {
+  public void testMoveClassToAnotherRoot() {
     doTest();
   }
 
-  public void testIntegrateOnNonIncrementalMake() throws Exception {
+  public void testIntegrateOnNonIncrementalMake() {
     doTest();
   }
 }
\ No newline at end of file
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java
index ba288a648f55..811aa358464c 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java
@@ -20,35 +20,35 @@ package org.jetbrains.ether;
  * Date: 23.09.11
  */
 public class FieldModifierTest extends IncrementalTestCase {
-  public FieldModifierTest() throws Exception {
+  public FieldModifierTest() {
     super("fieldModifiers");
   }
 
-  public void testSetFinal() throws Exception {
+  public void testSetFinal() {
     doTest();
   }
 
-  public void testSetPrivate() throws Exception {
+  public void testSetPrivate() {
     doTest();
   }
 
-  public void testSetPrivateToConstantField() throws Exception {
+  public void testSetPrivateToConstantField() {
     doTest();
   }
 
-  public void testSetProtected() throws Exception {
+  public void testSetProtected() {
     doTest();
   }
 
-  public void testSetStatic() throws Exception {
+  public void testSetStatic() {
     doTest();
   }
 
-  public void testUnsetStatic() throws Exception {
+  public void testUnsetStatic() {
     doTest();
   }
 
-  public void testUnsetStaticFinal() throws Exception {
+  public void testUnsetStaticFinal() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java
index 1f8a4c38861a..ee5123c93384 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java
@@ -23,23 +23,23 @@ import org.jetbrains.jps.model.module.JpsModule;
  * Date: 23.09.11
  */
 public class FieldPropertyTest extends IncrementalTestCase {
-  public FieldPropertyTest() throws Exception {
+  public FieldPropertyTest() {
     super("fieldProperties");
   }
 
-  public void testConstantChain() throws Exception {
+  public void testConstantChain() {
     doTest();
   }
 
-  public void testConstantChain1() throws Exception {
+  public void testConstantChain1() {
     doTest();
   }
 
-  public void testConstantChain2() throws Exception {
+  public void testConstantChain2() {
     doTest();
   }
 
-  public void testConstantChainMultiModule() throws Exception {
+  public void testConstantChainMultiModule() {
     JpsModule moduleA = addModule("moduleA", "moduleA/src");
     JpsModule moduleB = addModule("moduleB", "moduleB/src");
     JpsModule moduleC = addModule("moduleC", "moduleC/src");
@@ -48,78 +48,78 @@ public class FieldPropertyTest extends IncrementalTestCase {
     doTestBuild(1).assertSuccessful();
   }
 
-  public void testConstantRemove() throws Exception {
+  public void testConstantRemove() {
     doTest();
   }
 
-  public void testConstantRemove1() throws Exception {
+  public void testConstantRemove1() {
     doTest();
   }
 
-  public void testDoubleConstantChange() throws Exception {
+  public void testDoubleConstantChange() {
     doTest();
   }
 
-  public void testFloatConstantChange() throws Exception {
+  public void testFloatConstantChange() {
     doTest();
   }
 
-  public void testInnerConstantChange() throws Exception {
+  public void testInnerConstantChange() {
     doTest();
   }
 
-  public void testIntConstantChange() throws Exception {
+  public void testIntConstantChange() {
     doTest();
   }
 
-  public void testIntNonStaticConstantChange() throws Exception {
+  public void testIntNonStaticConstantChange() {
     doTest();
   }
 
-  public void testLongConstantChange() throws Exception {
+  public void testLongConstantChange() {
     doTest();
   }
 
-  public void testNonCompileTimeConstant() throws Exception {
+  public void testNonCompileTimeConstant() {
     doTest();
   }
 
-  public void testStringConstantChange() throws Exception {
+  public void testStringConstantChange() {
     doTest();
   }
 
-  public void testStringConstantLessAccessible() throws Exception {
+  public void testStringConstantLessAccessible() {
     doTest();
   }
 
-  public void testTypeChange() throws Exception {
+  public void testTypeChange() {
     doTest();
   }
 
-  public void testTypeChange1() throws Exception {
+  public void testTypeChange1() {
     doTest();
   }
 
-  public void testTypeChange2() throws Exception {
+  public void testTypeChange2() {
     doTest();
   }
 
-  public void testNonIncremental1() throws Exception {
+  public void testNonIncremental1() {
     doTest();
   }
 
-  public void testNonIncremental2() throws Exception {
+  public void testNonIncremental2() {
     doTest();
   }
   //public void testNonIncremental3() throws Exception {
   //    doTest();
   //  }
 
-  public void testNonIncremental4() throws Exception {
+  public void testNonIncremental4() {
     doTest();
   }
 
-  public void testMutualConstants() throws Exception {
+  public void testMutualConstants() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/GenericTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/GenericTest.java
index e20d6c0bdce3..92be753cd2c2 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/GenericTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/GenericTest.java
@@ -20,63 +20,63 @@ package org.jetbrains.ether;
  * Date: 26.09.11
  */
 public class GenericTest extends IncrementalTestCase {
-  public GenericTest() throws Exception {
+  public GenericTest() {
     super("generics");
   }
 
-  public void testAddMethodToBase() throws Exception {
+  public void testAddMethodToBase() {
     doTest();
   }
 
-  public void testAddParameterizedMethodToBase() throws Exception {
+  public void testAddParameterizedMethodToBase() {
     doTest();
   }
 
-  public void testChangeBound() throws Exception {
+  public void testChangeBound() {
     doTest();
   }
 
-  public void testChangeBound1() throws Exception {
+  public void testChangeBound1() {
     doTest();
   }
 
-  public void testChangeBoundClass1() throws Exception {
+  public void testChangeBoundClass1() {
     doTest();
   }
 
-  public void testChangeBoundedClass() throws Exception {
+  public void testChangeBoundedClass() {
     doTest();
   }
 
-  public void testChangeBoundInterface1() throws Exception {
+  public void testChangeBoundInterface1() {
     doTest();
   }
 
-  public void testChangeExtends() throws Exception {
+  public void testChangeExtends() {
     doTest();
   }
 
-  public void testChangeExtends1() throws Exception {
+  public void testChangeExtends1() {
     doTest();
   }
 
-  public void testChangeExtends2() throws Exception {
+  public void testChangeExtends2() {
     doTest();
   }
 
-  public void testChangeImplements() throws Exception {
+  public void testChangeImplements() {
     doTest();
   }
 
-  public void testChangeInterfaceTypeParameter() throws Exception {
+  public void testChangeInterfaceTypeParameter() {
     doTest();
   }
 
-  public void testChangeToCovariantMethodInBase() throws Exception {
+  public void testChangeToCovariantMethodInBase() {
     doTest();
   }
 
-  public void testChangeToCovariantMethodInBase2() throws Exception {
+  public void testChangeToCovariantMethodInBase2() {
     doTest();
   }
 
@@ -85,72 +85,72 @@ public class GenericTest extends IncrementalTestCase {
     doTest();
   }
   */
-  public void testChangeVarargSignature() throws Exception {
+  public void testChangeVarargSignature() {
     doTest();
   }
 
-  public void testChangeVarargSignature1() throws Exception {
+  public void testChangeVarargSignature1() {
     doTest();
   }
 
-  public void testCovariance() throws Exception {
+  public void testCovariance() {
     doTest();
   }
 
-  public void testCovariance1() throws Exception {
+  public void testCovariance1() {
     doTest();
   }
 
-  public void testCovariance2() throws Exception {
+  public void testCovariance2() {
     doTest();
   }
 
-  public void testCovarianceNoChanges() throws Exception {
+  public void testCovarianceNoChanges() {
     doTest();
   }
 
-  public void testDegenerify() throws Exception {
+  public void testDegenerify() {
     doTest();
   }
 
-  public void testDegenerify1() throws Exception {
+  public void testDegenerify1() {
     doTest();
   }
 
-  public void testFieldTypeChange() throws Exception {
+  public void testFieldTypeChange() {
     doTest();
   }
 
-  public void testOverrideAnnotatedAnonymous() throws Exception {
+  public void testOverrideAnnotatedAnonymous() {
     doTest();
   }
 
   /* Not working yet */
-  public void testOverrideAnnotatedAnonymousNotRecompile() throws Exception {
+  public void testOverrideAnnotatedAnonymousNotRecompile() {
     doTest();
   }
 
-  public void testOverrideAnnotatedInner() throws Exception {
+  public void testOverrideAnnotatedInner() {
     doTest();
   }
 
-  public void testParamTypes() throws Exception {
+  public void testParamTypes() {
     doTest();
   }
 
-  public void testReturnType() throws Exception {
+  public void testReturnType() {
     doTest();
   }
 
-  public void testArgumentContainment() throws Exception {
+  public void testArgumentContainment() {
     doTest();
   }
 
-  public void testArgumentContainment2() throws Exception {
+  public void testArgumentContainment2() {
     doTest();
   }
 
-  public void testArgumentContainment3() throws Exception {
+  public void testArgumentContainment3() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/ImportTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/ImportTest.java
index 9777919fa38f..dec62512ed4a 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/ImportTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/ImportTest.java
@@ -23,7 +23,7 @@ package org.jetbrains.ether;
  * To change this template use File | Settings | File Templates.
  */
 public class ImportTest { //extends IncrementalTestCase {
-  public ImportTest() throws Exception {
+  public ImportTest() {
     //super("imports");
   }
 
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
index 3ead48c84226..cf14e7bbca15 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
@@ -72,7 +72,7 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase {
   }
 
   @Override
-  protected File doGetProjectDir() throws IOException {
+  protected File doGetProjectDir() {
     return workDir;
   }
 
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/MarkDirtyTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/MarkDirtyTest.java
index a880e2e8baff..267dd169fb48 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/MarkDirtyTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/MarkDirtyTest.java
@@ -25,7 +25,7 @@ import org.jetbrains.jps.model.module.JpsModule;
  * Date: 04.10.11
  */
 public class MarkDirtyTest extends IncrementalTestCase {
-  public MarkDirtyTest() throws Exception {
+  public MarkDirtyTest() {
     super("markDirty");
   }
 
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/MethodModifierTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/MethodModifierTest.java
index 77136f8a8c31..1fce43338868 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/MethodModifierTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/MethodModifierTest.java
@@ -20,44 +20,44 @@ package org.jetbrains.ether;
  * Date: 04.10.11
  */
 public class MethodModifierTest extends IncrementalTestCase {
-  public MethodModifierTest() throws Exception {
+  public MethodModifierTest() {
     super("methodModifiers");
   }
 
-  public void testDecConstructorAccess() throws Exception {
+  public void testDecConstructorAccess() {
     doTest();
   }
 
-  public void testIncAccess() throws Exception {
+  public void testIncAccess() {
     doTest();
   }
 
-  public void testSetAbstract() throws Exception {
+  public void testSetAbstract() {
     doTest();
   }
 
-  public void testSetFinal() throws Exception {
+  public void testSetFinal() {
     doTest();
   }
 
-  public void testSetPrivate() throws Exception {
+  public void testSetPrivate() {
     doTest();
   }
 
-  public void testSetProtected() throws Exception {
+  public void testSetProtected() {
     doTest();
   }
 
 
-  public void testUnsetFinal() throws Exception {
+  public void testUnsetFinal() {
     doTest();
   }
 
-  public void testUnsetStatic() throws Exception {
+  public void testUnsetStatic() {
     doTest();
   }
 
-  public void testSetStatic() throws Exception {
+  public void testSetStatic() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/MethodPropertyTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/MethodPropertyTest.java
index c890dc497b33..c52a1f679119 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/MethodPropertyTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/MethodPropertyTest.java
@@ -22,19 +22,19 @@ import com.intellij.openapi.util.SystemInfo;
  * Date: 05.10.11
  */
 public class MethodPropertyTest extends IncrementalTestCase {
-  public MethodPropertyTest() throws Exception {
+  public MethodPropertyTest() {
     super("methodProperties");
   }
 
-  public void testAddThrows() throws Exception {
+  public void testAddThrows() {
     doTest();
   }
 
-  public void testChangeReturnType() throws Exception {
+  public void testChangeReturnType() {
     doTest();
   }
 
-  public void testChangeMethodRefReturnType() throws Exception {
+  public void testChangeMethodRefReturnType() {
     if (SystemInfo.isJavaVersionAtLeast("1.8")) {
       doTest();
     }
@@ -43,7 +43,7 @@ public class MethodPropertyTest extends IncrementalTestCase {
     }
   }
 
-  public void testChangeLambdaTargetReturnType() throws Exception {
+  public void testChangeLambdaTargetReturnType() {
     if (SystemInfo.isJavaVersionAtLeast("1.8")) {
       doTest();
     }
@@ -52,7 +52,7 @@ public class MethodPropertyTest extends IncrementalTestCase {
     }
   }
 
-  public void testChangeSAMMethodSignature() throws Exception {
+  public void testChangeSAMMethodSignature() {
     if (SystemInfo.isJavaVersionAtLeast("1.8")) {
       doTest();
     }
@@ -61,7 +61,7 @@ public class MethodPropertyTest extends IncrementalTestCase {
     }
   }
 
-  public void testChangeLambdaSAMMethodSignature() throws Exception {
+  public void testChangeLambdaSAMMethodSignature() {
     if (SystemInfo.isJavaVersionAtLeast("1.8")) {
       doTest();
     }
@@ -70,15 +70,15 @@ public class MethodPropertyTest extends IncrementalTestCase {
     }
   }
 
-  public void testChangeReturnType1() throws Exception {
+  public void testChangeReturnType1() {
     doTest();
   }
 
-  public void testChangeSignature() throws Exception {
+  public void testChangeSignature() {
     doTest();
   }
 
-  public void testChangeSignature1() throws Exception {
+  public void testChangeSignature1() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/PackageInfoTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/PackageInfoTest.java
index 8c72207cfc12..3d1c42050def 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/PackageInfoTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/PackageInfoTest.java
@@ -20,19 +20,19 @@ package org.jetbrains.ether;
  * Date: 04.10.11
  */
 public class PackageInfoTest extends IncrementalTestCase {
-  public PackageInfoTest() throws Exception {
+  public PackageInfoTest() {
     super("packageInfo");
   }
 
-  public void testPackageInfoNoRecompile() throws Exception {
+  public void testPackageInfoNoRecompile() {
     doTest();
   }
 
-  public void testPackageInfoNoRecompile2() throws Exception {
+  public void testPackageInfoNoRecompile2() {
     doTest();
   }
 
-  public void testPackageInfoRecompileOnConstantChange() throws Exception {
+  public void testPackageInfoRecompileOnConstantChange() {
     doTest();
   }
 }
diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTest.java b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTest.java
index 1bac80112e27..71444e853556 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTest.java
@@ -359,7 +359,7 @@ public class ArtifactBuilderTest extends ArtifactBuilderTestCase {
     assertOutput(artifact, fs().file("A.class"));
   }
   
-  public void testClearOutputOnRebuild() throws IOException {
+  public void testClearOutputOnRebuild() {
     String file = createFile("d/a.txt");
     JpsArtifact a = addArtifact(root().parentDirCopy(file));
     buildAll();
@@ -371,7 +371,7 @@ public class ArtifactBuilderTest extends ArtifactBuilderTestCase {
     assertOutput(a, fs().file("a.txt").file("b.txt"));
   }
 
-  public void testDeleteOnlyOutputFileOnRebuildForArchiveArtifact() throws IOException {
+  public void testDeleteOnlyOutputFileOnRebuildForArchiveArtifact() {
     String file = createFile("a.txt");
     JpsArtifact a = addArtifact(archive("a.jar").fileCopy(file));
     buildAll();
diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/IncrementalArtifactBuildingTest.java b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/IncrementalArtifactBuildingTest.java
index cefb3344d9d1..53b5c4bbecfb 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/IncrementalArtifactBuildingTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/IncrementalArtifactBuildingTest.java
@@ -120,7 +120,7 @@ public class IncrementalArtifactBuildingTest extends ArtifactBuilderTestCase {
     buildAllAndAssertUpToDate();
   }
 
-  public void testNonExistentFileRoot() throws IOException {
+  public void testNonExistentFileRoot() {
     String file = getAbsolutePath("a.txt");
     JpsArtifact a = addArtifact(root().fileCopy(file));
     buildArtifacts(a);
@@ -138,7 +138,7 @@ public class IncrementalArtifactBuildingTest extends ArtifactBuilderTestCase {
     buildAllAndAssertUpToDate();
   }
 
-  public void testNonExistentDirectoryRoot() throws IOException {
+  public void testNonExistentDirectoryRoot() {
     String dir = getAbsolutePath("d");
     JpsArtifact a = addArtifact(root().dirCopy(dir));
     buildArtifacts(a);
@@ -267,7 +267,7 @@ public class IncrementalArtifactBuildingTest extends ArtifactBuilderTestCase {
     assertDeletedAndCopied("out/artifacts/a/x.jar", "a/a.txt");
   }
 
-  public void testRenameFile() throws Exception {
+  public void testRenameFile() {
     final String file = createFile("a/a.txt");
     final JpsArtifact a = addArtifact(root().parentDirCopy(file));
     buildAll();
@@ -279,7 +279,7 @@ public class IncrementalArtifactBuildingTest extends ArtifactBuilderTestCase {
   }
 
   //IDEADEV-25840
-  public void testUpdateFileIfCaseOfLetterInNameChanged() throws Exception {
+  public void testUpdateFileIfCaseOfLetterInNameChanged() {
     final String file = createFile("a/a.txt");
     final JpsArtifact a = addArtifact("a", root().parentDirCopy(file));
     buildAll();
@@ -291,7 +291,7 @@ public class IncrementalArtifactBuildingTest extends ArtifactBuilderTestCase {
   }
 
   //IDEADEV-41556
-  public void testDeleteFilesFromSelectedArtifactsOnly() throws Exception {
+  public void testDeleteFilesFromSelectedArtifactsOnly() {
     final String file = createFile("a/a.txt");
     final JpsArtifact a1 = addArtifact("a1", root().parentDirCopy(file));
     final JpsArtifact a2 = addArtifact("a2", root().parentDirCopy(file));
@@ -311,7 +311,7 @@ public class IncrementalArtifactBuildingTest extends ArtifactBuilderTestCase {
   }
 
   //IDEA-51910
-  public void testTwoArtifactsWithSameOutput() throws Exception {
+  public void testTwoArtifactsWithSameOutput() {
     final String res1 = PathUtil.getParentPath(createFile("res1/a.txt", "1"));
     final String res2 = PathUtil.getParentPath(createFile("res2/a.txt", "2"));
     final JpsArtifact a1 = addArtifact("a1", root().dirCopy(res1));
diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/indices/ModuleExcludeIndexTest.java b/jps/jps-builders/testSrc/org/jetbrains/jps/indices/ModuleExcludeIndexTest.java
index be4919647e16..35c95cd2639e 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/indices/ModuleExcludeIndexTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/indices/ModuleExcludeIndexTest.java
@@ -25,7 +25,6 @@ import org.jetbrains.jps.model.module.JpsModule;
 import org.jetbrains.jps.util.JpsPathUtil;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Collection;
 
 /**
@@ -40,7 +39,7 @@ public class ModuleExcludeIndexTest extends JpsJavaModelTestCase {
     myRoot = FileUtil.createTempDirectory("excludes", null);
   }
 
-  public void testProjectOutput() throws IOException {
+  public void testProjectOutput() {
     File out = new File(myRoot, "out");
     getJavaService().getOrCreateProjectExtension(myProject).setOutputUrl(JpsPathUtil.pathToUrl(out.getAbsolutePath()));
     JpsModule module1 = addModule();
diff --git a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsDependenciesEnumeratorTest.java b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsDependenciesEnumeratorTest.java
index 571a0e96b25c..e9036fb38a13 100644
--- a/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsDependenciesEnumeratorTest.java
+++ b/jps/model-impl/testSrc/org/jetbrains/jps/model/JpsDependenciesEnumeratorTest.java
@@ -58,7 +58,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     return jdk;
   }
 
-  public void testLibrary() throws Exception {
+  public void testLibrary() {
     JpsModuleRootModificationUtil.addDependency(myModule, createJDomLibrary());
 
     assertClassRoots(dependencies(myModule), getRtJarJdk17(), getJDomJar());
@@ -109,7 +109,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     return library;
   }
 
-  public void testModuleSources() throws Exception {
+  public void testModuleSources() {
     final String srcRoot = addSourceRoot(myModule, false);
     final String testRoot = addSourceRoot(myModule, true);
     final String output = setModuleOutput(myModule, false);
@@ -124,7 +124,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     assertEnumeratorRoots(dependencies(myModule).withoutSdk().productionOnly().classes().withoutSelfModuleOutput());
   }
 
-  public void testLibraryScope() throws Exception {
+  public void testLibraryScope() {
     JpsLibraryDependency dependency = myModule.getDependenciesList().addLibraryDependency(createJDomLibrary());
     getJavaService().getOrCreateDependencyExtension(dependency).setScope(JpsJavaDependencyScope.RUNTIME);
     JpsModuleRootModificationUtil.addDependency(myModule, createJDomLibrary(), JpsJavaDependencyScope.RUNTIME, false);
@@ -134,7 +134,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     assertClassRoots(dependencies(myModule).withoutSdk().compileOnly());
   }
 
-  public void testModuleDependency() throws Exception {
+  public void testModuleDependency() {
     final JpsModule dep = addModule("dep");
     final String depSrcRoot = addSourceRoot(dep, false);
     final String depTestRoot = addSourceRoot(dep, true);
@@ -171,7 +171,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     assertEnumeratorRoots(dependencies(myModule).productionOnly().withoutModuleSourceEntries().withoutSdk().withoutDepModules().classes());
   }
 
-  public void testModuleJpsJavaDependencyScope() throws Exception {
+  public void testModuleJpsJavaDependencyScope() {
     final JpsModule dep = addModule("dep");
     JpsModuleRootModificationUtil.addDependency(dep, createJDomLibrary(), JpsJavaDependencyScope.COMPILE, true);
     JpsModuleRootModificationUtil.addDependency(myModule, dep, JpsJavaDependencyScope.TEST, true);
@@ -185,7 +185,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     assertClassRoots(dependencies(myProject).withoutSdk().productionOnly(), getJDomJar());
   }
 
-  public void testNotExportedLibrary() throws Exception {
+  public void testNotExportedLibrary() {
     final JpsModule dep = addModule("dep");
     JpsModuleRootModificationUtil.addDependency(dep, createJDomLibrary(), JpsJavaDependencyScope.COMPILE, false);
     JpsModuleRootModificationUtil.addDependency(myModule, createAsmLibrary(), JpsJavaDependencyScope.COMPILE, false);
@@ -209,7 +209,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     assertEnumeratorRoots(dependencies(myModule).annotations(), moduleUrl, libraryUrl);
   }
 
-  public void testJdkIsNotExported() throws Exception {
+  public void testJdkIsNotExported() {
     assertClassRoots(dependencies(myModule).exportedOnly());
   }
 
@@ -222,7 +222,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     assertClassRoots(dependencies(dep).recursively(), getRtJarJdk18());
   }
 
-  public void testProject() throws Exception {
+  public void testProject() {
     JpsModuleRootModificationUtil.addDependency(myModule, createJDomLibrary());
 
     final String srcRoot = addSourceRoot(myModule, false);
@@ -234,7 +234,7 @@ public class JpsDependenciesEnumeratorTest extends JpsJavaModelTestCase {
     assertSourceRoots(dependencies(myProject).withoutSdk(), srcRoot, testRoot, getJDomSources());
   }
 
-  public void testModules() throws Exception {
+  public void testModules() {
     JpsModuleRootModificationUtil.addDependency(myModule, createJDomLibrary());
 
     final String srcRoot = addSourceRoot(myModule, false);
diff --git a/json/tests/test/com/intellij/json/JsonCompletionTest.java b/json/tests/test/com/intellij/json/JsonCompletionTest.java
index e80d81ee7082..661fe34f5435 100644
--- a/json/tests/test/com/intellij/json/JsonCompletionTest.java
+++ b/json/tests/test/com/intellij/json/JsonCompletionTest.java
@@ -21,31 +21,31 @@ public class JsonCompletionTest extends JsonTestCase {
     myFixture.checkResultByFile("completion/" + getTestName(false) + "_after.json" );
   }
 
-  public void testInsideArrayElement1() throws Exception {
+  public void testInsideArrayElement1() {
     doTest(ALL_KEYWORDS);
   }
 
-  public void testInsideArrayElement2() throws Exception {
+  public void testInsideArrayElement2() {
     doTest(ALL_KEYWORDS);
   }
 
-  public void testInsidePropertyKey1() throws Exception {
+  public void testInsidePropertyKey1() {
     doTest(NOTHING);
   }
 
-  public void testInsidePropertyKey2() throws Exception {
+  public void testInsidePropertyKey2() {
     doTest(NOTHING);
   }
 
-  public void testInsideStringLiteral1() throws Exception {
+  public void testInsideStringLiteral1() {
     doTest(NOTHING);
   }
 
-  public void testInsideStringLiteral2() throws Exception {
+  public void testInsideStringLiteral2() {
     doTest(NOTHING);
   }
 
-  public void testInsidePropertyValue() throws Exception {
+  public void testInsidePropertyValue() {
     doTest(ALL_KEYWORDS);
   }
 
diff --git a/json/tests/test/com/intellij/json/JsonHighlightingTest.java b/json/tests/test/com/intellij/json/JsonHighlightingTest.java
index 23c58f041cdd..7c5746a63f56 100644
--- a/json/tests/test/com/intellij/json/JsonHighlightingTest.java
+++ b/json/tests/test/com/intellij/json/JsonHighlightingTest.java
@@ -55,17 +55,17 @@ public class JsonHighlightingTest extends JsonTestCase {
 
   // Moved from JavaScript
 
-  public void testJSON_with_comment() throws Exception {
+  public void testJSON_with_comment() {
     enableStandardComplianceInspection(false, true);
     doTestHighlighting(false, true, true);
   }
 
-  public void testJSON() throws Exception {
+  public void testJSON() {
     enableStandardComplianceInspection(true, true);
     doTestHighlighting(false, true, true);
   }
 
-  public void testSemanticHighlighting() throws Exception {
+  public void testSemanticHighlighting() {
     // WEB-11239
     doTest();
   }
diff --git a/json/tests/test/com/intellij/json/JsonLexerTest.java b/json/tests/test/com/intellij/json/JsonLexerTest.java
index 959abb575e4b..b531af435fe6 100644
--- a/json/tests/test/com/intellij/json/JsonLexerTest.java
+++ b/json/tests/test/com/intellij/json/JsonLexerTest.java
@@ -17,7 +17,7 @@ public class JsonLexerTest extends LexerTestCase {
     return null;
   }
 
-  public void testEscapeSlash() throws Exception {
+  public void testEscapeSlash() {
     // WEB-2803
     doTest("[\"\\/\",-1,\"\\n\", 1]",
            "[ ('[')\n" +
diff --git a/json/tests/test/com/intellij/json/JsonParsingTest.java b/json/tests/test/com/intellij/json/JsonParsingTest.java
index 918000f2d3bf..14f44e2d6a0d 100644
--- a/json/tests/test/com/intellij/json/JsonParsingTest.java
+++ b/json/tests/test/com/intellij/json/JsonParsingTest.java
@@ -22,7 +22,7 @@ public class JsonParsingTest extends ParsingTestCase {
     doTest(true);
   }
 
-  public void testKeywords() throws Exception {
+  public void testKeywords() {
     doTest();
   }
 
diff --git a/json/tests/test/com/intellij/json/JsonPsiUtilTest.java b/json/tests/test/com/intellij/json/JsonPsiUtilTest.java
index b28d77bede30..0d68f4e37c24 100644
--- a/json/tests/test/com/intellij/json/JsonPsiUtilTest.java
+++ b/json/tests/test/com/intellij/json/JsonPsiUtilTest.java
@@ -59,7 +59,7 @@ public class JsonPsiUtilTest extends JsonTestCase {
     myFixture.checkResult(after);
   }
 
-  public void testGetOtherSiblingPropertyNames() throws Exception {
+  public void testGetOtherSiblingPropertyNames() {
     myFixture.configureByText(JsonFileType.INSTANCE, "{\"firs<caret>t\" : 1, \"second\" : 2}");
     PsiElement atCaret = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
     JsonProperty property = PsiTreeUtil.getParentOfType(atCaret, JsonProperty.class);
diff --git a/json/tests/test/com/intellij/json/JsonSmartEnterTest.java b/json/tests/test/com/intellij/json/JsonSmartEnterTest.java
index fd6d35b6b78b..5546008848eb 100644
--- a/json/tests/test/com/intellij/json/JsonSmartEnterTest.java
+++ b/json/tests/test/com/intellij/json/JsonSmartEnterTest.java
@@ -18,7 +18,7 @@ public class JsonSmartEnterTest extends JsonTestCase {
     final List<SmartEnterProcessor> processors = SmartEnterProcessors.INSTANCE.forKey(JsonLanguage.INSTANCE);
     new WriteCommandAction(myFixture.getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Editor editor = myFixture.getEditor();
         for (SmartEnterProcessor processor : processors) {
           processor.process(myFixture.getProject(), editor, myFixture.getFile());
diff --git a/json/tests/test/com/jetbrains/jsonSchema/JsonBySchemaDocumentationBaseTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonBySchemaDocumentationBaseTest.java
index 1cd2dea2fa74..26ddf05cec51 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/JsonBySchemaDocumentationBaseTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/JsonBySchemaDocumentationBaseTest.java
@@ -48,7 +48,7 @@ public abstract class JsonBySchemaDocumentationBaseTest extends JsonSchemaHeavyA
         }
 
         @Override
-        public void configureFiles() throws Exception {
+        public void configureFiles() {
           configureByFiles(null, "/" + getTestName(true) + "." + extension, "/" + getTestName(true) + "Schema.json");
         }
 
diff --git a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaCrossReferencesTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaCrossReferencesTest.java
index 993e48f09a7b..570b02e3a643 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaCrossReferencesTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaCrossReferencesTest.java
@@ -61,7 +61,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/completion.json", "/baseSchema.json", "/inheritedSchema.json");
       }
 
@@ -112,7 +112,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/baseCompletion.json", "/basePropertiesSchema.json");
       }
 
@@ -147,7 +147,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/completion.json", "/baseSchema.json", "/inheritedSchema.json");
       }
 
@@ -208,7 +208,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/referencingSchema.json", "/localRefSchema.json");
       }
 
@@ -250,7 +250,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/referencingGlobalSchema.json");
       }
 
@@ -281,7 +281,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/testFileForBaseProperties.json", "/basePropertiesSchema.json");
       }
 
@@ -320,7 +320,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/refToDefinitionInFileSchema.json", "/definitionsSchema.json");
       }
 
@@ -351,7 +351,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/refToOtherFileSchema.json", "/definitionsSchema.json");
       }
 
@@ -378,7 +378,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/package.json", "/packageJsonSchema.json");
       }
 
@@ -408,7 +408,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/testNestedDefinitionsNavigation.json", "/nestedDefinitionsSchema.json");
       }
 
@@ -438,7 +438,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/testNestedAllOfOneOfDefinitions.json", "/nestedAllOfOneOfDefinitionsSchema.json");
       }
 
@@ -468,7 +468,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, prefix + "testNavigation.json", prefix + "baseSchema.json", prefix + "referentSchema.json");
       }
 
@@ -498,7 +498,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, prefix + "testCompletion.json", prefix + "baseSchema.json", prefix + "referentSchema.json");
       }
 
@@ -522,7 +522,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, prefix + "testHighlighting.json", prefix + "baseSchema.json", prefix + "referentSchema.json");
       }
 
@@ -544,7 +544,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "withReferenceToDefinitionSchema.json");
       }
 
@@ -578,7 +578,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "completionInsideSchemaDefinition.json");
       }
 
@@ -603,7 +603,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "navigateFromSchemaDefinitionToMainSchema.json");
       }
 
@@ -622,7 +622,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
     });
   }
 
-  public void testNavigateToRefInsideMainSchema() throws Exception {
+  public void testNavigateToRefInsideMainSchema() {
     final JsonSchemaService service = JsonSchemaService.Impl.get(myProject);
     final List<JsonSchemaFileProvider> providers = new JsonSchemaProjectSelfProviderFactory().getProviders(myProject);
     Assert.assertEquals(1, providers.size());
@@ -667,7 +667,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "withIncorrectReferenceSchema.json");
       }
 
@@ -710,7 +710,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "insideCycledSchemaNavigationSchema.json");
       }
 
@@ -732,7 +732,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "testNavigationIntoCycled.json", "cycledSchema.json");
       }
 
@@ -754,7 +754,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "navigationWithCompositeDefinitionsObjectSchema.json");
       }
 
@@ -780,7 +780,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "navigationIntoWithCompositeDefinitionsObjectSchema.json",
                          "navigationWithCompositeDefinitionsObjectSchema.json");
       }
@@ -803,7 +803,7 @@ public class JsonSchemaCrossReferencesTest extends JsonSchemaHeavyAbstractTest {
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "completionWithRootRef.json", "cycledWithRootRefSchema.json");
         complete();
       }
diff --git a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java
index 48537b38e9c7..66a07e83638f 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPatternComparatorTest.java
@@ -24,7 +24,7 @@ import org.junit.Assert;
  * @author Irina.Chernushina on 2/17/2016.
  */
 public class JsonSchemaPatternComparatorTest extends LightPlatformCodeInsightFixtureTestCase {
-  public void testPatterns() throws Exception {
+  public void testPatterns() {
     final JsonSchemaPatternComparator comparator = new JsonSchemaPatternComparator(getProject());
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(p("test"), p("test")));
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(p("test"), p("tes*")));
@@ -37,7 +37,7 @@ public class JsonSchemaPatternComparatorTest extends LightPlatformCodeInsightFix
     Assert.assertEquals(ThreeState.UNSURE, comparator.isSimilar(p("two*words"), p("circus")));
   }
 
-  public void test2Files() throws Exception {
+  public void test2Files() {
     final JsonSchemaPatternComparator comparator = new JsonSchemaPatternComparator(getProject());
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(f("test"), f("test")));
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(f("./test"), f("test")));
@@ -46,7 +46,7 @@ public class JsonSchemaPatternComparatorTest extends LightPlatformCodeInsightFix
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(f("one/../one/two"), f("one/two")));
   }
 
-  public void test2Dirs() throws Exception {
+  public void test2Dirs() {
     final JsonSchemaPatternComparator comparator = new JsonSchemaPatternComparator(getProject());
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(d("test"), d("test")));
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(d("./test"), d("test")));
@@ -57,7 +57,7 @@ public class JsonSchemaPatternComparatorTest extends LightPlatformCodeInsightFix
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(d("test/child"), d("test")));
   }
 
-  public void testDirAndFile() throws Exception {
+  public void testDirAndFile() {
     final JsonSchemaPatternComparator comparator = new JsonSchemaPatternComparator(getProject());
     Assert.assertEquals(ThreeState.NO, comparator.isSimilar(d("test"), f("test")));
     Assert.assertEquals(ThreeState.YES, comparator.isSimilar(d("test"), f("test/lower")));
diff --git a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaSelfHighligthingTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaSelfHighligthingTest.java
index b7f9c0fb4afb..5e49551b6cd9 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaSelfHighligthingTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaSelfHighligthingTest.java
@@ -44,7 +44,7 @@ public class JsonSchemaSelfHighligthingTest extends JsonSchemaHeavyAbstractTest
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/patternSchema.json");
       }
 
diff --git a/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java
index be2374f2b7b8..7a8c338ec237 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonBySchemaHeavyCompletionTest.java
@@ -169,7 +169,7 @@ public class JsonBySchemaHeavyCompletionTest extends JsonSchemaHeavyAbstractTest
       }
 
       @Override
-      public void configureFiles() throws Exception {
+      public void configureFiles() {
         configureByFiles(null, "/" + folder + "/" + testFile + ".json", "/" + folder + "/Schema.json");
       }
 
diff --git a/json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java
index b291783490db..f70b9fb7f02e 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java
@@ -55,7 +55,7 @@ public class JsonSchemaReadTest extends CompletionTestCase {
     Assert.assertEquals("#/definitions/positiveIntegerDefault0", minLength.getRef());
   }
 
-  public void testMainSchemaHighlighting() throws Exception {
+  public void testMainSchemaHighlighting() {
     final JsonSchemaService service = JsonSchemaService.Impl.get(myProject);
     final List<JsonSchemaFileProvider> providers = new JsonSchemaProjectSelfProviderFactory().getProviders(myProject);
     Assert.assertEquals(1, providers.size());
diff --git a/platform/configuration-store-impl/testSrc/xml/XmlSerializerWithDefaultJDOMExternalizerCompatibilityTest.java b/platform/configuration-store-impl/testSrc/xml/XmlSerializerWithDefaultJDOMExternalizerCompatibilityTest.java
index 04ab5de4a758..95f3d9d5d71d 100644
--- a/platform/configuration-store-impl/testSrc/xml/XmlSerializerWithDefaultJDOMExternalizerCompatibilityTest.java
+++ b/platform/configuration-store-impl/testSrc/xml/XmlSerializerWithDefaultJDOMExternalizerCompatibilityTest.java
@@ -11,20 +11,20 @@ import static com.intellij.testFramework.assertions.Assertions.assertThat;
 
 @SuppressWarnings({"deprecation"})
 public class XmlSerializerWithDefaultJDOMExternalizerCompatibilityTest extends TestCase {
-  public void testCompatibility() throws Exception {
+  public void testCompatibility() {
     assertCompatibleSerialization(new MyBean());
   }
 
-  private static void assertCompatibleSerialization(final Object data) throws Exception {
+  private static void assertCompatibleSerialization(final Object data) {
     assertThat(serializeWithJDom(data)).isEqualTo(serializeWithXmlSerializer(data));
   }
 
-  private static String serializeWithXmlSerializer(final Object data) throws Exception {
+  private static String serializeWithXmlSerializer(final Object data) {
     Element element = serialize(data);
     return StringUtil.trimStart(JDOMUtil.writeElement(element), "<?xml version=\"1.0\" encoding=\"UTF-8\"?>").trim();
   }
 
-  private static String serializeWithJDom(final Object data) throws Exception {
+  private static String serializeWithJDom(final Object data) {
     final Element jDomRoot = new Element("MyBean");
 
     if (data instanceof com.intellij.openapi.util.JDOMExternalizable) {
diff --git a/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionPointImplTest.java b/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionPointImplTest.java
index c31b142fbe4c..9a6733d70824 100644
--- a/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionPointImplTest.java
+++ b/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionPointImplTest.java
@@ -37,7 +37,7 @@ public class ExtensionPointImplTest {
   private static final TestLogProvider ourTestLog = new TestLogProvider();
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     ourTestLog.errors();
   }
 
diff --git a/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsAreaTest.java b/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsAreaTest.java
index a415f6f740b7..47d5dd1cfba1 100644
--- a/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsAreaTest.java
+++ b/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsAreaTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals;
  */
 public class ExtensionsAreaTest {
   @Test
-  public void testGetComponentAdapterDoesntDuplicateAdapters() throws Exception {
+  public void testGetComponentAdapterDoesntDuplicateAdapters() {
     MutablePicoContainer picoContainer =
       new ExtensionsAreaImpl("foo", null, new DefaultPicoContainer(), new Extensions.SimpleLogProvider()).getPicoContainer();
     picoContainer.registerComponentImplementation("runnable", ExtensionsAreaTest.class);
diff --git a/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsComplexTest.java b/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsComplexTest.java
index 4c622cf188b7..a9e7a973c34e 100644
--- a/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsComplexTest.java
+++ b/platform/extensions/testSrc/com/intellij/openapi/extensions/impl/ExtensionsComplexTest.java
@@ -39,14 +39,14 @@ public class ExtensionsComplexTest {
   private List<MyAreaInstance> myAreasToDispose;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     myAreasToDispose = new ArrayList<>();
     Extensions.registerAreaClass("area", null);
     Extensions.registerAreaClass("child_area", "area");
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     for (MyAreaInstance instance : myAreasToDispose) {
       Extensions.disposeArea(instance);
     }
@@ -59,7 +59,7 @@ public class ExtensionsComplexTest {
   }
 
   @Test
-  public void testPluginInit() throws Exception {
+  public void testPluginInit() {
     initExtensionPoints(
       PLUGIN_NAME, "<extensionPoints>\n" +
                    "  <extensionPoint name=\"extensionPoint\" beanClass=\"com.intellij.openapi.extensions.impl.XMLTestBean\" />\n" +
diff --git a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/service/notification/MessageCounterTest.java b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/service/notification/MessageCounterTest.java
index 3b9b73035b2f..a8b3d17b4506 100644
--- a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/service/notification/MessageCounterTest.java
+++ b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/service/notification/MessageCounterTest.java
@@ -31,7 +31,7 @@ public class MessageCounterTest {
   private static final ProjectSystemId OTHER_BUILD_SYSTEM = new ProjectSystemId("SomeOtherBuildSystem");
 
   @Test
-  public void testIncrement() throws Exception {
+  public void testIncrement() {
     MessageCounter counter = new MessageCounter();
     counter.increment(GROUP1, NotificationSource.PROJECT_SYNC, NotificationCategory.ERROR, OTHER_BUILD_SYSTEM);
     assertEquals(counter.toString(), 1, counter.getCount(GROUP1, NotificationSource.PROJECT_SYNC, NotificationCategory.ERROR, OTHER_BUILD_SYSTEM));
diff --git a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java
index 8a08eeadeecc..d0626fb240b3 100644
--- a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java
+++ b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java
@@ -120,7 +120,7 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase {
     CompilerTestUtil.enableExternalCompiler();
   }
 
-  protected void collectAllowedRoots(List<String> roots) throws IOException {
+  protected void collectAllowedRoots(List<String> roots) {
   }
 
   public static Collection<String> collectRootsInside(String root) {
@@ -253,7 +253,7 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase {
   }
 
   @Override
-  protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
+  protected void invokeTestRunnable(@NotNull Runnable runnable) {
     runnable.run();
   }
 
@@ -288,11 +288,11 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase {
     return FileUtil.toSystemIndependentName(root.getPath() + "/" + relPath);
   }
 
-  protected Module createModule(String name) throws IOException {
+  protected Module createModule(String name) {
     return createModule(name, StdModuleTypes.JAVA);
   }
 
-  protected Module createModule(final String name, final ModuleType type) throws IOException {
+  protected Module createModule(final String name, final ModuleType type) {
     return new WriteCommandAction<Module>(myProject) {
       @Override
       protected void run(@NotNull Result<Module> moduleResult) throws Throwable {
@@ -304,11 +304,11 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase {
     }.execute().getResultObject();
   }
 
-  protected VirtualFile createProjectConfig(@NonNls String config) throws IOException {
+  protected VirtualFile createProjectConfig(@NonNls String config) {
     return myProjectConfig = createConfigFile(myProjectRoot, config);
   }
 
-  protected VirtualFile createConfigFile(final VirtualFile dir, String config) throws IOException {
+  protected VirtualFile createConfigFile(final VirtualFile dir, String config) {
     final String configFileName = getExternalSystemConfigFileName();
     VirtualFile f = dir.findChild(configFileName);
     if (f == null) {
@@ -502,7 +502,7 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase {
     fs.assertFileEqual(file);
   }
 
-  private static void setFileContent(final VirtualFile file, final String content, final boolean advanceStamps) throws IOException {
+  private static void setFileContent(final VirtualFile file, final String content, final boolean advanceStamps) {
     new WriteAction<VirtualFile>() {
       @Override
       protected void run(@NotNull Result<VirtualFile> result) throws Throwable {
diff --git a/platform/lang-api/testSources/com/intellij/psi/codeStyle/arrangement/ArrangementSettingsSerializationTest.java b/platform/lang-api/testSources/com/intellij/psi/codeStyle/arrangement/ArrangementSettingsSerializationTest.java
index c2aaeaa3f263..a2db6721f6e4 100644
--- a/platform/lang-api/testSources/com/intellij/psi/codeStyle/arrangement/ArrangementSettingsSerializationTest.java
+++ b/platform/lang-api/testSources/com/intellij/psi/codeStyle/arrangement/ArrangementSettingsSerializationTest.java
@@ -176,7 +176,7 @@ public class ArrangementSettingsSerializationTest {
   }
 
   @Test
-  public void testEmptyGroupings() throws Exception {
+  public void testEmptyGroupings() {
     final StdArrangementSettings settings = new StdArrangementSettings();
     final ArrangementAtomMatchCondition condition = new ArrangementAtomMatchCondition(FIELD);
     settings.addRule(new StdArrangementMatchRule(new StdArrangementEntryMatcher(condition), BY_NAME));
@@ -192,7 +192,7 @@ public class ArrangementSettingsSerializationTest {
   }
 
   @Test
-  public void testEmptyRules() throws Exception {
+  public void testEmptyRules() {
     final StdArrangementSettings settings = new StdArrangementSettings();
     settings.addGrouping(new ArrangementGroupingRule(OVERRIDDEN_METHODS, BY_NAME));
 
diff --git a/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerUncommittedDocumentTest.java b/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerUncommittedDocumentTest.java
index 6a0e7f7ac127..14c9829ea798 100644
--- a/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerUncommittedDocumentTest.java
+++ b/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerUncommittedDocumentTest.java
@@ -17,10 +17,8 @@ package com.intellij.codeInsight.editorActions;
 
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 
-import java.io.IOException;
-
 public class IndentingBackspaceHandlerUncommittedDocumentTest extends LightPlatformCodeInsightTestCase {
-  public void testSequentialBackspaceInvocation() throws IOException {
+  public void testSequentialBackspaceInvocation() {
     configureFromFileText(getTestName(false) + ".java",
                           "class Foo {\n" +
                           "\n" +
@@ -32,7 +30,7 @@ public class IndentingBackspaceHandlerUncommittedDocumentTest extends LightPlatf
                       "<caret>}");
   }
 
-  public void testMulticaretSequentialBackspaceInvocation() throws IOException {
+  public void testMulticaretSequentialBackspaceInvocation() {
     configureFromFileText(getTestName(false) + ".java",
                           "class Foo {\n" +
                           "    void m1() {\n" +
diff --git a/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerVirtualSpaceTest.java b/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerVirtualSpaceTest.java
index 78cf05abe4cb..5499a4c2d5d6 100644
--- a/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerVirtualSpaceTest.java
+++ b/platform/lang-impl/testSources/com/intellij/codeInsight/editorActions/IndentingBackspaceHandlerVirtualSpaceTest.java
@@ -18,10 +18,8 @@ package com.intellij.codeInsight.editorActions;
 import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 
-import java.io.IOException;
-
 public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCodeInsightTestCase {
-  public void testAfterLargeIndent() throws IOException {
+  public void testAfterLargeIndent() {
     doTest("class Foo {\n" +
            "      \n" +
            "}",
@@ -32,7 +30,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(1, 4));
   }
 
-  public void testAfterProperIndent() throws IOException {
+  public void testAfterProperIndent() {
     doTest("class Foo {\n" +
            "    \n" +
            "}",
@@ -43,7 +41,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(1, 4));
   }
 
-  public void testAfterSmallIndent() throws IOException {
+  public void testAfterSmallIndent() {
     doTest("class Foo {\n" +
            "   \n" +
            "}",
@@ -54,7 +52,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(1, 4));
   }
 
-  public void testAfterEmptyIndent() throws IOException {
+  public void testAfterEmptyIndent() {
     doTest("class Foo {\n" +
            "\n" +
            "}",
@@ -65,7 +63,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(1, 4));
   }
 
-  public void testAtIndent() throws IOException {
+  public void testAtIndent() {
     doTest("class Foo {\n" +
            "   \n" +
            "}",
@@ -75,7 +73,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(0, 11));
   }
 
-  public void testAtIndentOnEmptyLine() throws IOException {
+  public void testAtIndentOnEmptyLine() {
     doTest("class Foo {\n" +
            "\n" +
            "}",
@@ -85,7 +83,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(0, 11));
   }
 
-  public void testBeforeIndent() throws IOException {
+  public void testBeforeIndent() {
     doTest("class Foo {\n" +
            "  \n" +
            "}",
@@ -95,7 +93,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(0, 11));
   }
 
-  public void testDeleteLine() throws IOException {
+  public void testDeleteLine() {
     doTest("class Foo {\n" +
            "\n" +
            "\n" +
@@ -107,7 +105,7 @@ public class IndentingBackspaceHandlerVirtualSpaceTest extends LightPlatformCode
            new LogicalPosition(1, 4));
   }
 
-  private void doTest(String textBefore, LogicalPosition caretBefore, String textAfter, LogicalPosition caretAfter) throws IOException {
+  private void doTest(String textBefore, LogicalPosition caretBefore, String textAfter, LogicalPosition caretAfter) {
     configureFromFileText(getTestName(false) + ".java", textBefore);
     myEditor.getSettings().setVirtualSpace(true);
     myEditor.getCaretModel().moveToLogicalPosition(caretBefore);
diff --git a/platform/lang-impl/testSources/com/intellij/execution/impl/ExecutionManagerTest.java b/platform/lang-impl/testSources/com/intellij/execution/impl/ExecutionManagerTest.java
index 821824a94a49..183747293d4a 100644
--- a/platform/lang-impl/testSources/com/intellij/execution/impl/ExecutionManagerTest.java
+++ b/platform/lang-impl/testSources/com/intellij/execution/impl/ExecutionManagerTest.java
@@ -52,7 +52,7 @@ public class ExecutionManagerTest extends LightPlatformTestCase {
     }
   }
 
-  public void testRerunSingleton() throws Exception {
+  public void testRerunSingleton() {
     Project project = getProject();
     ExecutionManagerImpl executionManager = ExecutionManagerImpl.getInstance(project);
 
diff --git a/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java b/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java
index b77a3b4f9455..db4201c2b771 100644
--- a/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java
+++ b/platform/lang-impl/testSources/com/intellij/execution/impl/FakeRunConfiguration.java
@@ -16,7 +16,6 @@
 package com.intellij.execution.impl;
 
 import com.intellij.execution.DefaultExecutionResult;
-import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.LocatableConfigurationBase;
@@ -54,14 +53,14 @@ public class FakeRunConfiguration extends LocatableConfigurationBase {
 
   @Nullable
   @Override
-  public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment environment) throws ExecutionException {
+  public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment environment) {
     return new FakeRunProfileState();
   }
 
   public class FakeRunProfileState implements RunProfileState {
     @Nullable
     @Override
-    public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) throws ExecutionException {
+    public ExecutionResult execute(Executor executor, @NotNull ProgramRunner runner) {
       return new DefaultExecutionResult(null, new FakeProcessHandler(mySurviveSoftKill));
     }
   }
diff --git a/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java b/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java
index 3c759d054888..54045678621c 100644
--- a/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java
+++ b/platform/lang-impl/testSources/com/intellij/ide/GeneratedSourceFileChangeTrackerTest.java
@@ -24,8 +24,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-
 /**
  * @author nik
  */
@@ -61,7 +59,7 @@ public class GeneratedSourceFileChangeTrackerTest extends CodeInsightFixtureTest
     assertTrue(isEditedGeneratedFile(file));
   }
 
-  public void testChangeGeneratedExternally() throws IOException {
+  public void testChangeGeneratedExternally() {
     PsiFile file = myFixture.configureByText("Gen.txt", "");
     myFixture.saveText(file.getVirtualFile(), "abc");
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
diff --git a/platform/lang-impl/testSources/com/intellij/openapi/wm/impl/ProjectToolWindowTest.java b/platform/lang-impl/testSources/com/intellij/openapi/wm/impl/ProjectToolWindowTest.java
index 6c42a9918ea1..943798e73df2 100644
--- a/platform/lang-impl/testSources/com/intellij/openapi/wm/impl/ProjectToolWindowTest.java
+++ b/platform/lang-impl/testSources/com/intellij/openapi/wm/impl/ProjectToolWindowTest.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.wm.ToolWindowId;
  */
 public class ProjectToolWindowTest extends ToolWindowManagerTestCase {
 
-  public void testProjectViewActivate() throws Exception {
+  public void testProjectViewActivate() {
 
     ToolWindowEP[] extensions = Extensions.getExtensions(ToolWindowEP.EP_NAME);
     for (ToolWindowEP extension : extensions) {
diff --git a/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java b/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java
index 979d10925cbf..ec571b37e7e4 100644
--- a/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/application/BadPluginTest.java
@@ -35,7 +35,7 @@ import java.util.List;
 public class BadPluginTest extends PlatformTestCase {
   private static final String COM_YOUR_COMPANY_UNIQUE_PLUGIN_ID = "com.your.company.unique.plugin.id";
 
-  public void testBadPlugin() throws Exception {
+  public void testBadPlugin() {
     IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId(COM_YOUR_COMPANY_UNIQUE_PLUGIN_ID));
     if (plugin == null) return;
     List<String> disabledPlugins = new ArrayList<>();
diff --git a/platform/platform-tests/testSrc/com/intellij/application/options/ReplacePathToMacroMapTest.java b/platform/platform-tests/testSrc/com/intellij/application/options/ReplacePathToMacroMapTest.java
index b597a6f1fc56..0937e3b21eb1 100644
--- a/platform/platform-tests/testSrc/com/intellij/application/options/ReplacePathToMacroMapTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/application/options/ReplacePathToMacroMapTest.java
@@ -18,12 +18,12 @@ public class ReplacePathToMacroMapTest {
   }
 
   @Test
-  public void testSubstitute_NoSubstitute() throws Exception {
+  public void testSubstitute_NoSubstitute() {
     assertEquals("/foo/bar", substitute("/foo/bar"));
   }
 
   @Test
-  public void testSubstitute_CompleteMatch() throws Exception {
+  public void testSubstitute_CompleteMatch() {
     assertEquals("$MODULE_DIR$", substitute("/tmp/foo"));
     assertEquals("jar:$MODULE_DIR$", substitute("jar:/tmp/foo"));
     assertEquals("jar:/$MODULE_DIR$", substitute("jar://tmp/foo"));
@@ -34,7 +34,7 @@ public class ReplacePathToMacroMapTest {
   }
 
   @Test
-  public void testSubstitute_PrefixMatch() throws Exception {
+  public void testSubstitute_PrefixMatch() {
     assertEquals("$MODULE_DIR$/bar", substitute("/tmp/foo/bar"));
     assertEquals("jar:$MODULE_DIR$/bar", substitute("jar:/tmp/foo/bar"));
     assertEquals("jar:/$MODULE_DIR$/bar", substitute("jar://tmp/foo/bar"));
@@ -45,7 +45,7 @@ public class ReplacePathToMacroMapTest {
   }
 
   @Test
-  public void testSubstitute_JarPrefixMatch() throws Exception {
+  public void testSubstitute_JarPrefixMatch() {
     assertEquals("$MODULE_DIR$!/bar", substitute("/tmp/foo!/bar"));
     assertEquals("jar:$MODULE_DIR$!/bar", substitute("jar:/tmp/foo!/bar"));
     assertEquals("jar:/$MODULE_DIR$!/bar", substitute("jar://tmp/foo!/bar"));
@@ -56,7 +56,7 @@ public class ReplacePathToMacroMapTest {
   }
 
   @Test
-  public void testSubstitute_WindowsRootSubstitution() throws Exception {
+  public void testSubstitute_WindowsRootSubstitution() {
     myMap.put("C:/", "../$MODULE_DIR$/");
 
     assertEquals("../$MODULE_DIR$/", substitute("C:/"));
@@ -64,22 +64,22 @@ public class ReplacePathToMacroMapTest {
   }
 
   @Test
-  public void testSubstitute_NoSubstituteInTheMiddleOccurs() throws Exception {
+  public void testSubstitute_NoSubstituteInTheMiddleOccurs() {
     assertEquals("/bar/tmp/foo/bar", substitute("/bar/tmp/foo/bar"));
   }
 
   @Test
-  public void testSubstitute_NoDoubleSubstitution() throws Exception {
+  public void testSubstitute_NoDoubleSubstitution() {
     assertEquals("$MODULE_DIR$/bar/tmp/foo", substitute("/tmp/foo/bar/tmp/foo"));
   }
 
   @Test
-  public void testSubstitute_NoPartialSubstituteIsPerformed() throws Exception {
+  public void testSubstitute_NoPartialSubstituteIsPerformed() {
     assertEquals("/tmp/foobar", substitute("/tmp/foobar"));
   }
 
   @Test
-  public void testSubstitute_ProperSubstitutionPriorityApplied() throws Exception {
+  public void testSubstitute_ProperSubstitutionPriorityApplied() {
     myMap.put("/root/project/module", "$MODULE_DIR$");
     myMap.put("/root/project", "../$MODULE_DIR$");
     myMap.put("/root", "$APPLICATION_HOME_DIR$");
diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java
index dbb57063e752..7862ab563a3e 100644
--- a/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java
@@ -21,11 +21,9 @@ import com.intellij.openapi.editor.SelectionModel;
 import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import com.intellij.testFramework.TestFileType;
 
-import java.io.IOException;
-
 public class BlockSelectionEditingTest extends AbstractEditorTest {
 
-  public void testBlockRemovalAndCollapsedFoldRegionsBefore() throws IOException {
+  public void testBlockRemovalAndCollapsedFoldRegionsBefore() {
     // Inspired by IDEA-69371
     String initialText =
       "fold line #1\n" +
@@ -59,7 +57,7 @@ public class BlockSelectionEditingTest extends AbstractEditorTest {
     assertEquals(foldEndOffset, foldRegion.getEndOffset());
   }
 
-  public void testBlockSelectionAndCollapsedFolding() throws IOException {
+  public void testBlockSelectionAndCollapsedFolding() {
     String text =
       "class Test {\n" +
       "    private class Inner1 {\n" +
diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java
index 4602ad456d45..5a6ffea0fcc7 100644
--- a/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java
@@ -28,7 +28,7 @@ public class CommentInCustomFileTypesTest extends LightPlatformCodeInsightTestCa
     return PlatformTestUtil.getPlatformTestDataPath();
   }
 
-  public void testBlockComment() throws Exception {
+  public void testBlockComment() {
     configureByFile("/codeInsight/commentInCustomFileType/block1.cs");
     performBlockCommentAction();
     checkResultByFile("/codeInsight/commentInCustomFileType/block1_after.cs");
@@ -38,7 +38,7 @@ public class CommentInCustomFileTypesTest extends LightPlatformCodeInsightTestCa
     checkResultByFile("/codeInsight/commentInCustomFileType/block1_after2.cs");
   }
 
-  public void testLineComment() throws Exception {
+  public void testLineComment() {
     configureByFile("/codeInsight/commentInCustomFileType/line1.cs");
     performLineCommentAction();
     checkResultByFile("/codeInsight/commentInCustomFileType/line1_after.cs");
diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java
index a4b2d126c02e..916a25835e9e 100644
--- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java
@@ -27,7 +27,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.picocontainer.MutablePicoContainer;
 
-import java.io.IOException;
 import java.util.Set;
 
 import static com.intellij.psi.search.GlobalSearchScopesCore.directoryScope;
@@ -74,7 +73,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
     container.registerComponentInstance(componentKey, manager);
   }
 
-  public void testReformatWithoutMask() throws IOException {
+  public void testReformatWithoutMask() {
     TestFileStructure fileTree = new TestFileStructure(getModule(), myWorkingDirectory);
 
     PsiFile java1 = fileTree.addTestFile("Test.java", "empty content");
@@ -88,7 +87,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
     assertWasFormatted(java1, java2, java3, php, js);
   }
 
-  public void testFormatByOnlyOneMask() throws IOException {
+  public void testFormatByOnlyOneMask() {
     TestFileStructure fileTree = new TestFileStructure(getModule(), myWorkingDirectory);
 
     PsiFile java1 = fileTree.addTestFile("Test.java", "empty content");
@@ -108,7 +107,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
 
   }
 
-  public void testFormatByMultiMask() throws IOException {
+  public void testFormatByMultiMask() {
     TestFileStructure fileTree = new TestFileStructure(getModule(), myWorkingDirectory);
 
     PsiFile java1 = fileTree.addTestFile("Test.java", "empty content");
@@ -145,7 +144,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
     assertWasNotFormatted(js1, js2, js3, php1, php2, java1, java2, java3, py1, py2, py3);
   }
 
-  public void testDirectoryScope() throws IOException {
+  public void testDirectoryScope() {
     TestFileStructure fileTree = new TestFileStructure(getModule(), myWorkingDirectory);
     PsiFile java1 = fileTree.addTestFile("Test1.java", "empty content");
     PsiFile php1 = fileTree.addTestFile("Pair1.php", "empty content");
@@ -181,7 +180,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
     assertWasNotFormatted(java2, php2, js2);
   }
 
-  public void testDirectoryScopeWithMask() throws IOException {
+  public void testDirectoryScopeWithMask() {
     TestFileStructure fileTree = new TestFileStructure(getModule(), myWorkingDirectory);
     PsiFile java1 = fileTree.addTestFile("Test1.java", "empty content");
     PsiFile php1 = fileTree.addTestFile("Pair1.php", "empty content");
@@ -211,7 +210,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
     assertWasNotFormatted(java2, php2, js1, js2, js3);
   }
 
-  public void testIDEA126830() throws IOException {
+  public void testIDEA126830() {
     TestFileStructure fileTree = new TestFileStructure(getModule(), myWorkingDirectory);
 
     fileTree.createDirectoryAndMakeItCurrent("src");
diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java
index 81b3691b6eaa..283f7f2f5243 100644
--- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java
@@ -17,7 +17,8 @@ package com.intellij.codeInsight.actions;
 
 import com.intellij.lang.LanguageFormatting;
 import com.intellij.lang.LanguageImportStatements;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.impl.ComponentManagerImpl;
@@ -245,7 +246,7 @@ public class ReformatOnlyVcsChangedTextTest extends LightPlatformTestCase {
     assertFormattedLines(NO_CHANGED_LINES, u1, u2);
   }
 
-  public void testNoChangesNoFormatting() throws IOException {
+  public void testNoChangesNoFormatting() {
     ChangedFilesStructure fs = new ChangedFilesStructure(myWorkingDirectory);
 
     PsiFile u1 = fs.createFile("Test1.java", COMMITTED, COMMITTED);
@@ -257,7 +258,7 @@ public class ReformatOnlyVcsChangedTextTest extends LightPlatformTestCase {
   }
 
 
-  public void testReformatOnlyChanged() throws IOException {
+  public void testReformatOnlyChanged() {
     ChangedFilesStructure fs = new ChangedFilesStructure(myWorkingDirectory);
 
     PsiFile untouched1 = fs.createFile("Test1.java", COMMITTED, COMMITTED);
@@ -294,7 +295,7 @@ public class ReformatOnlyVcsChangedTextTest extends LightPlatformTestCase {
     assertFormattedLines(NO_CHANGED_LINES, modified11, modified12);
   }
 
-  public void testOptimizeImportsInModule() throws IOException {
+  public void testOptimizeImportsInModule() {
     ChangedFilesStructure fs = new ChangedFilesStructure(myWorkingDirectory);
 
     String initialFile = "initial file";
@@ -348,7 +349,7 @@ public class ReformatOnlyVcsChangedTextTest extends LightPlatformTestCase {
     container.registerComponentInstance(key, factory);
   }
 
-  private void doTest(@NotNull String committed, @NotNull String modified, @NotNull ChangedLines... lines) throws IOException {
+  private void doTest(@NotNull String committed, @NotNull String modified, @NotNull ChangedLines... lines) {
     ChangedFilesStructure fs = new ChangedFilesStructure(myWorkingDirectory);
     PsiFile file = fs.createFile("Test.java", committed, modified);
     reformatDirectory(myWorkingDirectory);
@@ -391,15 +392,14 @@ public class ReformatOnlyVcsChangedTextTest extends LightPlatformTestCase {
       myFileStructure = new TestFileStructure(getModule(), directory);
     }
 
-    public void createDirectoryAndMakeItCurrent() throws IOException {
+    public void createDirectoryAndMakeItCurrent() {
       myFileStructure.createDirectoryAndMakeItCurrent("inner");
     }
 
     @NotNull
     public PsiFile createFile(@NotNull String fileName,
                               @NotNull String committedContent,
-                              @NotNull String actualContent) throws IOException
-    {
+                              @NotNull String actualContent) {
       PsiFile file = myFileStructure.addTestFile(fileName, actualContent);
       if (committedContent != actualContent) {
         registerCommittedRevision(committedContent, file);
diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/TestFileStructure.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/TestFileStructure.java
index df44ad105543..d27f602853e3 100644
--- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/TestFileStructure.java
+++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/TestFileStructure.java
@@ -51,7 +51,7 @@ public class TestFileStructure {
   }
 
   @NotNull
-  public PsiFile addTestFile(@NotNull String name, @NotNull String content) throws IOException {
+  public PsiFile addTestFile(@NotNull String name, @NotNull String content) {
     PsiFile createdFile = createFile(myModule, myCurrentLevelDirectory.getVirtualFile(), name, content);
     getCurrentDirectoryFiles().add(createdFile);
     return createdFile;
@@ -68,7 +68,7 @@ public class TestFileStructure {
   }
 
   @NotNull
-  public PsiDirectory createDirectoryAndMakeItCurrent(String name) throws IOException {
+  public PsiDirectory createDirectoryAndMakeItCurrent(String name) {
     myLevel++;
     myFilesForLevel.add(new ArrayList<>());
     myCurrentLevelDirectory = createDirectory(myProject, myCurrentLevelDirectory.getVirtualFile(), name);
@@ -98,7 +98,7 @@ public class TestFileStructure {
     }.execute().getResultObject();
   }
 
-  public static PsiDirectory createDirectory(@NotNull Project project, @NotNull final VirtualFile parent, @NotNull final String name) throws IOException {
+  public static PsiDirectory createDirectory(@NotNull Project project, @NotNull final VirtualFile parent, @NotNull final String name) {
     final VirtualFile[] dir = new VirtualFile[1];
     ApplicationManager.getApplication().runWriteAction(() -> {
       try {
diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/AbstractMoveElementLeftRightTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/AbstractMoveElementLeftRightTest.java
index 7b9871186bc4..447d9a9b996e 100644
--- a/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/AbstractMoveElementLeftRightTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/editorActions/AbstractMoveElementLeftRightTest.java
@@ -45,11 +45,11 @@ public abstract class AbstractMoveElementLeftRightTest extends AbstractEditorTes
     doTestSingle(!moveLeft, current, before);
   }
   
-  private void doTestSingle(boolean moveLeft, String before, String after) throws Exception {
+  private void doTestSingle(boolean moveLeft, String before, String after) {
     configureEditor(before);
     executeAction(moveLeft ? IdeActions.MOVE_ELEMENT_LEFT : IdeActions.MOVE_ELEMENT_RIGHT);
     checkResultByText(after);
   }
   
-  protected abstract void configureEditor(String contents) throws Exception;
+  protected abstract void configureEditor(String contents);
 }
diff --git a/platform/platform-tests/testSrc/com/intellij/concurrency/JobUtilTest.java b/platform/platform-tests/testSrc/com/intellij/concurrency/JobUtilTest.java
index 20688c8054a8..5adc3504fa5a 100644
--- a/platform/platform-tests/testSrc/com/intellij/concurrency/JobUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/concurrency/JobUtilTest.java
@@ -125,7 +125,7 @@ public class JobUtilTest extends PlatformTestCase {
     }
   }
 
-  public void testJobUtilRecursiveStress() throws Exception {
+  public void testJobUtilRecursiveStress() {
     final List<String> list = Collections.nCopies(100, null);
     for (int i=0; i<10; i++) {
       COUNT.set(0);
@@ -187,7 +187,7 @@ public class JobUtilTest extends PlatformTestCase {
   }
 
   private static class MyException extends RuntimeException {}
-  public void testExceptionalCompletion() throws Throwable {
+  public void testExceptionalCompletion() {
     COUNT.set(0);
     try {
       final List<Object> objects = Collections.nCopies(100000000, null);
@@ -204,7 +204,7 @@ public class JobUtilTest extends PlatformTestCase {
       // caught OK
     }
   }
-  public void testNotNormalCompletion() throws Throwable {
+  public void testNotNormalCompletion() {
     COUNT.set(0);
     final List<Object> objects = Collections.nCopies(100000000, null);
     boolean success = JobLauncher.getInstance().invokeConcurrentlyUnderProgress(objects, null, true, o -> {
@@ -217,7 +217,7 @@ public class JobUtilTest extends PlatformTestCase {
     assertFalse(success);
   }
 
-  public void testJobUtilCompletesEvenIfCannotGrabReadAction() throws Throwable {
+  public void testJobUtilCompletesEvenIfCannotGrabReadAction() {
     COUNT.set(0);
     final List<Object> objects = Collections.nCopies(1000000, null);
     ApplicationManager.getApplication().runWriteAction(() -> {
@@ -230,7 +230,7 @@ public class JobUtilTest extends PlatformTestCase {
     });
   }
 
-  public void testJobUtilRecursiveCancel() throws Exception {
+  public void testJobUtilRecursiveCancel() {
     final List<String> list = Collections.nCopies(100, "");
     final List<Integer> ilist = Collections.nCopies(100, 0);
     for (int i=0; i<10; i++) {
@@ -325,7 +325,7 @@ public class JobUtilTest extends PlatformTestCase {
     }
   }
 
-  public void testAfterCancelInTheMiddleOfTheExecutionTaskIsDoneReturnsFalseUntilFinished() throws ExecutionException, InterruptedException {
+  public void testAfterCancelInTheMiddleOfTheExecutionTaskIsDoneReturnsFalseUntilFinished() {
     Random random = new Random();
     for (int i=0; i<100; i++) {
       final AtomicBoolean finished = new AtomicBoolean();
diff --git a/platform/platform-tests/testSrc/com/intellij/execution/filters/CompositeFilterTest.java b/platform/platform-tests/testSrc/com/intellij/execution/filters/CompositeFilterTest.java
index 895d55cbe08e..f6efb338f7d2 100644
--- a/platform/platform-tests/testSrc/com/intellij/execution/filters/CompositeFilterTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/execution/filters/CompositeFilterTest.java
@@ -28,13 +28,13 @@ public class CompositeFilterTest {
   protected CompositeFilter myCompositeFilter;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     myCompositeFilter = new CompositeFilter(new MockDumbService(null));
     myCompositeFilter.setForceUseAllFilters(false);
   }
 
   @Test
-  public void testApplyNextFilter() throws Exception {
+  public void testApplyNextFilter() {
     Assert.assertNull(applyFilter());
 
     myCompositeFilter.addFilter(returnNullFilter());
@@ -62,7 +62,7 @@ public class CompositeFilterTest {
   }
 
   @Test
-  public void testApplyBadFilter() throws Exception {
+  public void testApplyBadFilter() {
     myCompositeFilter.addFilter(throwSOEFilter());
     try {
       Assert.assertNull(applyFilter());
diff --git a/platform/platform-tests/testSrc/com/intellij/execution/impl/ConsoleViewImplTest.java b/platform/platform-tests/testSrc/com/intellij/execution/impl/ConsoleViewImplTest.java
index b873b951b103..2d4c5ee23316 100644
--- a/platform/platform-tests/testSrc/com/intellij/execution/impl/ConsoleViewImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/execution/impl/ConsoleViewImplTest.java
@@ -75,7 +75,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     }
   }
 
-  public void testTypeText() throws Exception {
+  public void testTypeText() {
     ConsoleViewImpl console = myConsole;
     console.print("Initial", ConsoleViewContentType.NORMAL_OUTPUT);
     console.flushDeferredText();
@@ -104,7 +104,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     assertEquals("Test", console.getText());
   }
 
-  public void testConsolePrintsSomethingAfterClearPrintScroll() throws Exception {
+  public void testConsolePrintsSomethingAfterClearPrintScroll() {
     ConsoleViewImpl console = myConsole;
     Alarm alarm = new Alarm(getTestRootDisposable());
     for (int i=0; i<1000/*000*/; i++) {
@@ -149,7 +149,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     }
   }
 
-  public void testTypeInEmptyConsole() throws Exception {
+  public void testTypeInEmptyConsole() {
     ConsoleViewImpl console = myConsole;
     console.clear();
     EditorActionManager actionManager = EditorActionManager.getInstance();
@@ -159,7 +159,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     assertEquals(1, console.getContentSize());
   }
 
-  public void testTypingAfterMultipleCR() throws Exception {
+  public void testTypingAfterMultipleCR() {
     final EditorActionManager actionManager = EditorActionManager.getInstance();
     final TypedAction typedAction = actionManager.getTypedAction();
     final TestDataProvider dataContext = new TestDataProvider(getProject());
@@ -176,7 +176,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     assertEquals("System output\n12", editor.getDocument().getText());
   }
 
-  public void testCRLF() throws Exception {
+  public void testCRLF() {
     ConsoleViewImpl console = myConsole;
     console.clear();
     console.print("Hello\r", ConsoleViewContentType.NORMAL_OUTPUT);
@@ -185,20 +185,20 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     assertEquals("Hello\nWorld", console.getText());
   }
 
-  public void testCRTypeCR() throws Exception {
+  public void testCRTypeCR() {
     myConsole.print("\rHi\rMr\rSmith", ConsoleViewContentType.NORMAL_OUTPUT);
     myConsole.flushDeferredText();
     assertEquals("Smith", myConsole.getText());
   }
 
-  public void testCRTypeTearCR() throws Exception {
+  public void testCRTypeTearCR() {
     myConsole.print("Hi", ConsoleViewContentType.NORMAL_OUTPUT);
 
     myConsole.print("\rMr\rSmith", ConsoleViewContentType.NORMAL_OUTPUT);
     myConsole.flushDeferredText();
     assertEquals("Smith", myConsole.getText());
   }
-  public void testCRTypeFlushCR() throws Exception {
+  public void testCRTypeFlushCR() {
     myConsole.print("Hi", ConsoleViewContentType.NORMAL_OUTPUT);
     myConsole.flushDeferredText();
     assertEquals("Hi", myConsole.getText());
@@ -226,7 +226,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     return console;
   }
 
-  public void testPerformance() throws Exception {
+  public void testPerformance() {
     withCycleConsole(100, console ->
       PlatformTestUtil.startPerformanceTest("console print", 15000, () -> {
         console.clear();
@@ -240,7 +240,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
       }).assertTiming());
   }
 
-  public void testLargeConsolePerformance() throws Exception {
+  public void testLargeConsolePerformance() {
     withCycleConsole(UISettings.getInstance().getConsoleCycleBufferSizeKb(), console ->
       PlatformTestUtil.startPerformanceTest("console print", 9000, () -> {
         console.clear();
@@ -252,7 +252,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
       }).assertTiming());
   }
 
-  public void testPerformanceOfMergeableTokens() throws Exception {
+  public void testPerformanceOfMergeableTokens() {
     withCycleConsole(1000, console ->
       PlatformTestUtil.startPerformanceTest("console print with mergeable tokens", 3500, () -> {
         console.clear();
@@ -354,7 +354,7 @@ public class ConsoleViewImplTest extends LightPlatformTestCase {
     action.actionPerformed(editor, c, dataContext);
   }
 
-  public void testBackspaceDoesDeleteTheLastTypedChar() throws Exception {
+  public void testBackspaceDoesDeleteTheLastTypedChar() {
     final ConsoleViewImpl console = myConsole;
     final Editor editor = console.getEditor();
     console.print("xxxx", ConsoleViewContentType.NORMAL_OUTPUT);
diff --git a/platform/platform-tests/testSrc/com/intellij/execution/process/AnsiEscapeDecoderTest.java b/platform/platform-tests/testSrc/com/intellij/execution/process/AnsiEscapeDecoderTest.java
index 1442e9411a35..b9107fca9807 100644
--- a/platform/platform-tests/testSrc/com/intellij/execution/process/AnsiEscapeDecoderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/execution/process/AnsiEscapeDecoderTest.java
@@ -9,7 +9,10 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -19,26 +22,26 @@ public class AnsiEscapeDecoderTest extends PlatformTestCase {
   private static final String STDOUT_KEY = ProcessOutputTypes.STDOUT.toString();
   private static final String STDERR_KEY = ProcessOutputTypes.STDERR.toString();
 
-  public void testTextWithoutColors() throws Exception {
+  public void testTextWithoutColors() {
     check(new ColoredText(""));
     check(new ColoredText("simple text").addExpected("simple text", STDOUT_KEY));
   }
 
-  public void testSingleColoredChunk() throws Exception {
+  public void testSingleColoredChunk() {
     check(new ColoredText("Chrome 35.0.1916 (Linux): Executed 0 of 1\u001B[32m SUCCESS\u001B[39m (0 secs / 0 secs)\n")
             .addExpected("Chrome 35.0.1916 (Linux): Executed 0 of 1", STDOUT_KEY)
             .addExpected(" SUCCESS", "\u001B[32m")
             .addExpected(" (0 secs / 0 secs)\n", "\u001B[39m"));
   }
 
-  public void testCompoundEscSeq() throws Exception {
+  public void testCompoundEscSeq() {
     check(new ColoredText("E\u001B[41m\u001B[37mE\u001B[0mE")
             .addExpected("E", STDOUT_KEY)
             .addExpected("E", "\u001B[41;37m")
             .addExpected("E", STDOUT_KEY));
   }
 
-  public void testOtherEscSeq() throws Exception {
+  public void testOtherEscSeq() {
     check(new ColoredText("Plain\u001B[32mGreen\u001B[39mNormal\u001B[1A\u001B[2K\u001B[31mRed\u001B[39m")
             .addExpected("Plain", STDOUT_KEY)
             .addExpected("Green", "\u001B[32m")
@@ -46,7 +49,7 @@ public class AnsiEscapeDecoderTest extends PlatformTestCase {
             .addExpected("Red", "\u001B[31m"));
   }
 
-  public void testBackspaceControlSequence() throws Exception {
+  public void testBackspaceControlSequence() {
     check(false, ContainerUtil.newArrayList(
       new ColoredText(" 10% 0/1 build modules\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b 70% 1/1 build modules")
         .addExpected(" 70% 1/1 build modules", STDOUT_KEY),
@@ -56,7 +59,7 @@ public class AnsiEscapeDecoderTest extends PlatformTestCase {
     ));
   }
 
-  public void testIncompleteEscapeSequences() throws Exception {
+  public void testIncompleteEscapeSequences() {
     check(true, ContainerUtil.newArrayList(
       new ColoredText("\u001B"),
       new ColoredText("[33m Hello\u001B[3").addExpected(" Hello", "\u001B[33m"),
@@ -175,7 +178,7 @@ public class AnsiEscapeDecoderTest extends PlatformTestCase {
     };
   }
 
-  public void testPerformance() throws IOException {
+  public void testPerformance() {
     Process testProcess = createTestProcess();
 
     //noinspection CodeBlock2Expr
diff --git a/platform/platform-tests/testSrc/com/intellij/execution/process/BinaryOSProcessHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/execution/process/BinaryOSProcessHandlerTest.java
index 41aeca2a83cc..5f9248199075 100644
--- a/platform/platform-tests/testSrc/com/intellij/execution/process/BinaryOSProcessHandlerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/execution/process/BinaryOSProcessHandlerTest.java
@@ -96,7 +96,7 @@ public class BinaryOSProcessHandlerTest {
     private static final int SEND_TIMEOUT = 500;
 
     @SuppressWarnings("BusyWait")
-    public static void main(String[] args) throws IOException, InterruptedException {
+    public static void main(String[] args) throws InterruptedException {
       System.err.print(TEXT);
 
       for (int offset = 0; offset < BYTES.length; offset += PACKET_SIZE) {
diff --git a/platform/platform-tests/testSrc/com/intellij/history/core/LocalVcsLabelsTest.java b/platform/platform-tests/testSrc/com/intellij/history/core/LocalVcsLabelsTest.java
index 3a82faa89965..0aa835ceedcc 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/core/LocalVcsLabelsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/core/LocalVcsLabelsTest.java
@@ -137,7 +137,7 @@ public class LocalVcsLabelsTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testGettingByteContent() throws Exception {
+  public void testGettingByteContent() {
     LabelImpl l1 = myVcs.putSystemLabel("label", "project", -1);
     add(myVcs, createFile(myRoot, "f", "one"));
 
@@ -158,7 +158,7 @@ public class LocalVcsLabelsTest extends LocalHistoryTestCase {
   }
   
   @Test
-  public void testGettingByteContentInsideChangeSet() throws Exception {
+  public void testGettingByteContentInsideChangeSet() {
     myVcs.beginChangeSet();
     add(myVcs, createFile(myRoot, "f", "one"));
     LabelImpl l1 = myVcs.putSystemLabel("label", "project", -1);
@@ -171,7 +171,7 @@ public class LocalVcsLabelsTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testGettingByteContentAfterRename() throws Exception {
+  public void testGettingByteContentAfterRename() {
     add(myVcs, createFile(myRoot, "f", "one"));
     LabelImpl l1 = myVcs.putSystemLabel("label", "project", -1);
 
diff --git a/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java b/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java
index f8bc13e05aed..029e68c6e645 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/core/PathsTest.java
@@ -71,7 +71,7 @@ public class PathsTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testIsParentOf() throws Exception {
+  public void testIsParentOf() {
     assertTrue(Paths.isParent("foo", "foo"));
     assertTrue(Paths.isParent("foo", "foo/bar"));
     assertTrue(Paths.isParent("foo/bar", "foo/bar"));
@@ -86,7 +86,7 @@ public class PathsTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testIsParentOrChildOf() throws Exception {
+  public void testIsParentOrChildOf() {
     assertTrue(Paths.isParentOrChild("foo/bar", "foo/bar"));
     assertTrue(Paths.isParentOrChild("foo/bar", "foo/bar/baz"));
     assertTrue(Paths.isParentOrChild("foo/bar/baz", "foo/bar"));
@@ -96,7 +96,7 @@ public class PathsTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testSplitting() throws Exception {
+  public void testSplitting() {
     assertEquals(array("/", "foo", "bar"), ContainerUtil.collect(Paths.split("/foo/bar").iterator()));
     assertEquals(array("/", "foo", "bar"), ContainerUtil.collect(Paths.split("/foo/bar/").iterator()));
     assertEquals(array("foo", "bar"), ContainerUtil.collect(Paths.split("foo/bar/").iterator()));
diff --git a/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListCollectingChangesTest.java b/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListCollectingChangesTest.java
index 69e64f41100c..81cb7a136ff8 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListCollectingChangesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListCollectingChangesTest.java
@@ -324,7 +324,7 @@ public class ChangeListCollectingChangesTest extends ChangeListTestCase {
   }
 
   @Test
-  public void testFilteredChanges() throws Exception {
+  public void testFilteredChanges() {
     ChangeSet cs1 = addChangeSet(facade, createDirectory(r, "dir"));
     ChangeSet cs2 = addChangeSet(facade, createFile(r, "dir/FooBar"));
     ChangeSet cs3 = addChangeSet(facade, createFile(r, "dir/BarBaz"));
@@ -338,7 +338,7 @@ public class ChangeListCollectingChangesTest extends ChangeListTestCase {
   }
 
   @Test
-  public void testFilteredChangesDoesnTIncludeChanges() throws Exception {
+  public void testFilteredChangesDoesnTIncludeChanges() {
     ChangeSet cs1 = addChangeSet(facade, createDirectory(r, "dir"));
     ChangeSet cs2 = addChangeSet(facade, createFile(r, "dir/FooBar"));
     ChangeSet cs3 = addChangeSet(facade, createFile(r, "dir/BarBaz"));
diff --git a/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListTest.java b/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListTest.java
index 96382d20e55e..a3fc9cd81fae 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/core/changes/ChangeListTest.java
@@ -118,7 +118,7 @@ public class ChangeListTest extends ChangeListTestCase {
   }
 
   @Test
-  public void testForcesBegin() throws Exception {
+  public void testForcesBegin() {
     facade.beginChangeSet();
     add(facade, createFile(r, "f1"));
     facade.beginChangeSet();
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java
index 7977a349d227..23f44f3d75e2 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.vfs.VirtualFile;
 
-import java.io.IOException;
 import java.util.List;
 
 public class ActionsTest extends IntegrationTestCase {
@@ -79,7 +78,7 @@ public class ActionsTest extends IntegrationTestCase {
 
     CommandProcessor.getInstance().executeCommand(myProject, new RunnableAdapter() {
       @Override
-      public void doRun() throws IOException {
+      public void doRun() {
         setContent(f, "file");
         setDocumentTextFor(f, "doc1");
 
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/BasicsTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/BasicsTest.java
index 3168475375c4..1e97e9691259 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/BasicsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/BasicsTest.java
@@ -35,7 +35,7 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 
 public class BasicsTest extends IntegrationTestCase {
-  public void testProcessingCommands() throws Exception {
+  public void testProcessingCommands() {
     final VirtualFile[] f = new VirtualFile[1];
 
     ApplicationManager.getApplication().runWriteAction(() -> CommandProcessor.getInstance().executeCommand(myProject, new RunnableAdapter() {
@@ -51,7 +51,7 @@ public class BasicsTest extends IntegrationTestCase {
     assertEquals(2, getRevisionsFor(f[0]).size());
   }
 
-  public void testPuttingUserLabel() throws Exception {
+  public void testPuttingUserLabel() {
     VirtualFile f = createChildData(myRoot, "f.txt");
 
     LocalHistory.getInstance().putUserLabel(myProject, "global");
@@ -69,7 +69,7 @@ public class BasicsTest extends IntegrationTestCase {
     assertEquals(-1, rr.get(2).getLabelColor());
   }
 
-  public void testPuttingSystemLabel() throws IOException {
+  public void testPuttingSystemLabel() {
     VirtualFile f = createChildData(myRoot, "file.txt");
 
     assertEquals(2, getRevisionsFor(f).size());
@@ -86,7 +86,7 @@ public class BasicsTest extends IntegrationTestCase {
     assertEquals("label", rr.get(1).getLabel());
   }
 
-  public void testPuttingLabelWithUnsavedDocuments() throws Exception {
+  public void testPuttingLabelWithUnsavedDocuments() {
     VirtualFile f = createChildData(myRoot, "f.txt");
     setContent(f, "1");
 
@@ -111,7 +111,7 @@ public class BasicsTest extends IntegrationTestCase {
     assertEquals("", new String(rr.get(7).findEntry().getContent().getBytes()));
   }
 
-  public void testDoNotRegisterSameUnsavedDocumentContentTwice() throws Exception {
+  public void testDoNotRegisterSameUnsavedDocumentContentTwice() {
     VirtualFile f = createChildData(myRoot, "f.txt");
     setContent(f, "1");
 
@@ -128,7 +128,7 @@ public class BasicsTest extends IntegrationTestCase {
     assertEquals("", new String(rr.get(4).findEntry().getContent().getBytes()));
   }
 
-  public void testIsUnderControl() throws Exception {
+  public void testIsUnderControl() {
     VirtualFile f1 = createChildData(myRoot, "file.txt");
     VirtualFile f2 = createChildData(myRoot, "file.hprof");
 
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ExternalChangesAndRefreshingTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ExternalChangesAndRefreshingTest.java
index 1ff19eabaa4b..f76b6b51af53 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ExternalChangesAndRefreshingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ExternalChangesAndRefreshingTest.java
@@ -144,7 +144,7 @@ public class ExternalChangesAndRefreshingTest extends IntegrationTestCase {
     assertEquals("content", content[0]);
   }
 
-  public void testDeletionOfFilteredDirectoryExternallyDoesNotThrowExceptionDuringRefresh() throws Exception {
+  public void testDeletionOfFilteredDirectoryExternallyDoesNotThrowExceptionDuringRefresh() {
     int before = getRevisionsFor(myRoot).size();
 
     createChildDirectory(myRoot, FILTERED_DIR_NAME);
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java
index 4767ab53ce3c..3790c99eced1 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java
@@ -51,7 +51,7 @@ public class FileListeningTest extends IntegrationTestCase {
     assertEquals(2, getRevisionsFor(f).size());
   }
 
-  public void testCreatingDirectories() throws Exception {
+  public void testCreatingDirectories() {
     VirtualFile f = createDirectory("dir");
     assertEquals(2, getRevisionsFor(f).size());
   }
@@ -63,7 +63,7 @@ public class FileListeningTest extends IntegrationTestCase {
     assertEquals(before, getRevisionsFor(myRoot).size());
   }
 
-  public void testIgnoringFilteredDirectories() throws Exception {
+  public void testIgnoringFilteredDirectories() {
     int before = getRevisionsFor(myRoot).size();
 
     createDirectory(FILTERED_DIR_NAME);
@@ -152,7 +152,7 @@ public class FileListeningTest extends IntegrationTestCase {
 
     addFileListenerDuring(l, new RunnableAdapter() {
       @Override
-      public void doRun() throws IOException {
+      public void doRun() {
         rename(f, "new.txt");
       }
     });
@@ -195,7 +195,7 @@ public class FileListeningTest extends IntegrationTestCase {
     assertEquals(3, getRevisionsFor(f).size());
   }
 
-  public void testRenamingNonFilteredDirectoriesToFiltered() throws Exception {
+  public void testRenamingNonFilteredDirectoriesToFiltered() {
     int before = getRevisionsFor(myRoot).size();
 
     VirtualFile f = createDirectory("not_filtered");
@@ -235,7 +235,7 @@ public class FileListeningTest extends IntegrationTestCase {
     });
   }
 
-  public void testDeletion() throws Exception {
+  public void testDeletion() {
     VirtualFile f = createDirectory("f.txt");
 
     int before = getRevisionsFor(myRoot).size();
@@ -244,7 +244,7 @@ public class FileListeningTest extends IntegrationTestCase {
     assertEquals(before + 1, getRevisionsFor(myRoot).size());
   }
 
-  public void testDeletionOfFilteredDirectoryDoesNotThrowsException() throws Exception {
+  public void testDeletionOfFilteredDirectoryDoesNotThrowsException() {
     int before = getRevisionsFor(myRoot).size();
 
     VirtualFile f = createDirectory(FILTERED_DIR_NAME);
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/GettingContentAtDateTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/GettingContentAtDateTest.java
index c4846103aad6..81c5e1c47a55 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/GettingContentAtDateTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/GettingContentAtDateTest.java
@@ -33,7 +33,7 @@ public class GettingContentAtDateTest extends IntegrationTestCase {
     f = createChildData(myRoot, "f.txt");
   }
 
-  public void testContentAtDate() throws Exception {
+  public void testContentAtDate() {
     setContent(f, "1", TIMESTAMP_INCREMENT);
     setContent(f, "2", TIMESTAMP_INCREMENT * 2);
 
@@ -44,14 +44,14 @@ public class GettingContentAtDateTest extends IntegrationTestCase {
     assertContentAt(TIMESTAMP_INCREMENT * 3, null);
   }
 
-  public void testContentAtDateForFilteredFilesIsNull() throws Exception {
+  public void testContentAtDateForFilteredFilesIsNull() {
     VirtualFile f = createChildData(myRoot, "f.class");
     setContent(f, "1", 1111);
 
     assertContentAt(1111, null);
   }
 
-  public void testGettingFirstAvailableContentAfterPurge() throws Exception {
+  public void testGettingFirstAvailableContentAfterPurge() {
     Clock.setTime(1);
     setContent(f, "1", TIMESTAMP_INCREMENT);
     Clock.setTime(2);
@@ -66,7 +66,7 @@ public class GettingContentAtDateTest extends IntegrationTestCase {
     assertContentAt(TIMESTAMP_INCREMENT * 3, "3");
   }
 
-  public void testGettingMostRecentRevisionContent() throws Exception {
+  public void testGettingMostRecentRevisionContent() {
     setContent(f, "1", TIMESTAMP_INCREMENT);
     setContent(f, "2", TIMESTAMP_INCREMENT * 2);
 
@@ -79,7 +79,7 @@ public class GettingContentAtDateTest extends IntegrationTestCase {
     assertContentAt(c, "2");
   }
 
-  public void testWithUnsavedDocuments() throws Exception {
+  public void testWithUnsavedDocuments() {
     setContent(f, "FILE1", TIMESTAMP_INCREMENT);
 
     Clock.setTime(TIMESTAMP_INCREMENT * 2);
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/IdeaGatewayTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/IdeaGatewayTest.java
index d5b5f78a019a..22780e8cc17e 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/IdeaGatewayTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/IdeaGatewayTest.java
@@ -25,7 +25,7 @@ import java.io.File;
 import java.io.IOException;
 
 public class IdeaGatewayTest extends IntegrationTestCase {
-  public void testFindingFile() throws Exception {
+  public void testFindingFile() {
     assertEquals(myRoot, myGateway.findVirtualFile(myRoot.getPath()));
     assertNull(myGateway.findVirtualFile(myRoot.getPath() + "/nonexistent"));
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java b/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java
index 2fd9341d50c4..1dcc7535be1a 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java
@@ -106,17 +106,17 @@ public abstract class IntegrationTestCase extends PlatformTestCase {
   }
 
   @NotNull
-  protected VirtualFile createDirectory(String name) throws IOException {
+  protected VirtualFile createDirectory(String name) {
     VirtualFile file = LocalFileSystem.getInstance().refreshAndFindFileByPath(createDirectoryExternally(name));
     assertNotNull(name, file);
     return file;
   }
 
-  protected void setContent(VirtualFile f, String content) throws IOException {
+  protected void setContent(VirtualFile f, String content) {
     setContent(f, content, f.getTimeStamp() + TIMESTAMP_INCREMENT);
   }
 
-  protected void setContent(VirtualFile f, String content, long timestamp) throws IOException {
+  protected void setContent(VirtualFile f, String content, long timestamp) {
     setBinaryContent(f, content.getBytes(CharsetToolkit.UTF8_CHARSET), -1, timestamp,this);
   }
 
@@ -132,7 +132,7 @@ public abstract class IntegrationTestCase extends PlatformTestCase {
     return FileUtil.toSystemIndependentName(f.getPath());
   }
 
-  protected String createDirectoryExternally(String name) throws IOException {
+  protected String createDirectoryExternally(String name) {
     File f = new File(myRoot.getPath(), name);
     assertTrue(f.getPath(), f.mkdirs() || f.isDirectory());
     return FileUtil.toSystemIndependentName(f.getPath());
@@ -187,7 +187,7 @@ public abstract class IntegrationTestCase extends PlatformTestCase {
     });
   }
 
-  protected static void addFileListenerDuring(VirtualFileListener l, Runnable r) throws Exception {
+  protected static void addFileListenerDuring(VirtualFileListener l, Runnable r) {
     VirtualFileManager.getInstance().addVirtualFileListener(l);
     try {
       r.run();
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java b/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java
index 963024311ad7..630c2bda3d8e 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java
@@ -26,7 +26,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,7 +39,7 @@ public abstract class PatchingTestCase extends IntegrationTestCase {
     patchFilePath = new File(dir, "patch").getPath();
   }
 
-  protected void clearRoot() throws IOException {
+  protected void clearRoot() {
     for (VirtualFile f : myRoot.getChildren()) {
       delete(f);
     }
@@ -54,7 +53,7 @@ public abstract class PatchingTestCase extends IntegrationTestCase {
     new PatchApplier<BinaryFilePatch>(myProject, myRoot, patches, null, null, null).execute();
   }
 
-  protected static void createChildDataWithContent(@NotNull VirtualFile dir, @NotNull String name) throws IOException {
+  protected static void createChildDataWithContent(@NotNull VirtualFile dir, @NotNull String name) {
     createChildData(dir, name);
     VirtualFile file = dir.findChild(name);
     setFileText(file, "some content");
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/RevisionsAndDiffsTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/RevisionsAndDiffsTest.java
index 61b599784a7f..3fc6db6f4e2a 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/RevisionsAndDiffsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/RevisionsAndDiffsTest.java
@@ -72,7 +72,7 @@ public class RevisionsAndDiffsTest extends IntegrationTestCase {
     assertContent("content", e);
   }
 
-  public void testCurrentRevisionForDirectoryAfterPurge() throws Exception {
+  public void testCurrentRevisionForDirectoryAfterPurge() {
     Clock.setTime(10);
     VirtualFile f = createDirectory("dir");
     getVcs().getChangeListInTests().purgeObsolete(0);
@@ -182,7 +182,7 @@ public class RevisionsAndDiffsTest extends IntegrationTestCase {
     assertNull(rr.get(3).findEntry());
   }
 
-  public void testRevisionForDirectoryWithTheSameNameAsDeletedOne() throws IOException {
+  public void testRevisionForDirectoryWithTheSameNameAsDeletedOne() {
     VirtualFile dir = createDirectory("dir");
     delete(dir);
     dir = createDirectory("dir");
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/TestVirtualFile.java b/platform/platform-tests/testSrc/com/intellij/history/integration/TestVirtualFile.java
index bc5369b9bcb1..44a261d191da 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/TestVirtualFile.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/TestVirtualFile.java
@@ -25,7 +25,6 @@ import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -105,7 +104,7 @@ public class TestVirtualFile extends VirtualFile {
 
   @Override
   @NotNull
-  public byte[] contentsToByteArray() throws IOException {
+  public byte[] contentsToByteArray() {
     return myContent == null ? ArrayUtil.EMPTY_BYTE_ARRAY : myContent.getBytes();
   }
 
@@ -138,7 +137,7 @@ public class TestVirtualFile extends VirtualFile {
 
   @Override
   @NotNull
-  public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException {
+  public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) {
     throw new UnsupportedOperationException();
   }
 
@@ -148,7 +147,7 @@ public class TestVirtualFile extends VirtualFile {
   }
 
   @Override
-  public InputStream getInputStream() throws IOException {
+  public InputStream getInputStream() {
     throw new UnsupportedOperationException();
   }
 }
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/VisitingTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/VisitingTest.java
index 7d11ad65a007..f8e9a659a37b 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/VisitingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/VisitingTest.java
@@ -140,7 +140,7 @@ public class VisitingTest extends IntegrationTestCase {
     assertVisitorLog("begin create end finished ", visitor);
   }
 
-  private void assertVisitorLog(final String expected) throws Exception {
+  private void assertVisitorLog(final String expected) {
     TestVisitor visitor = new TestVisitor();
     assertVisitorLog(expected, visitor);
   }
@@ -159,7 +159,7 @@ public class VisitingTest extends IntegrationTestCase {
     }
 
     @Override
-    public void end(ChangeSet c) throws StopVisitingException {
+    public void end(ChangeSet c) {
       log += "end ";
     }
 
@@ -169,7 +169,7 @@ public class VisitingTest extends IntegrationTestCase {
     }
 
     @Override
-    public void visit(RenameChange c) throws StopVisitingException {
+    public void visit(RenameChange c) {
       log += "rename ";
     }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryChangeModelTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryChangeModelTest.java
index e01a009b6549..5298f7883ae8 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryChangeModelTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryChangeModelTest.java
@@ -29,7 +29,7 @@ import java.util.List;
 
 
 public class DirectoryChangeModelTest extends IntegrationTestCase {
-  public void testNames() throws IOException {
+  public void testNames() {
     VirtualFile f = createDirectory("foo");
     rename(f, "bar");
 
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogModelTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogModelTest.java
index acfe47503925..a9288f816071 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogModelTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogModelTest.java
@@ -28,13 +28,13 @@ import java.util.List;
 public class DirectoryHistoryDialogModelTest extends LocalHistoryUITestCase {
   private DirectoryHistoryDialogModel m;
 
-  public void testTitle() throws IOException {
+  public void testTitle() {
     VirtualFile dir = createDirectory("dir");
     initModelFor(dir);
     assertEquals(FileUtil.toSystemDependentName(dir.getPath()), m.getTitle());
   }
 
-  public void testNoDifference() throws IOException {
+  public void testNoDifference() {
     VirtualFile dir = createDirectory("dir");
 
     getVcs().getChangeListInTests().purgeObsolete(0);
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogTest.java
index b8286c01f3e1..94ac91d45423 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogTest.java
@@ -22,11 +22,10 @@ import com.intellij.history.integration.ui.views.DirectoryChange;
 import com.intellij.history.integration.ui.views.DirectoryHistoryDialog;
 import com.intellij.openapi.util.Disposer;
 
-import java.io.IOException;
 import java.util.Collections;
 
 public class DirectoryHistoryDialogTest extends LocalHistoryUITestCase {
-  public void testDialogWorks() throws IOException {
+  public void testDialogWorks() {
     DirectoryHistoryDialog d = new DirectoryHistoryDialog(myProject, myGateway, myRoot);
     Disposer.dispose(d);
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/FileHistoryDialogTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/FileHistoryDialogTest.java
index a3fe37d5b97e..1a0fee6afabb 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/FileHistoryDialogTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/FileHistoryDialogTest.java
@@ -28,18 +28,17 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.text.DateFormatUtil;
 
-import java.io.IOException;
 import java.util.Date;
 
 public class FileHistoryDialogTest extends LocalHistoryUITestCase {
-  public void testDialogWorks() throws IOException {
+  public void testDialogWorks() {
     VirtualFile file = createChildData(myRoot, "f.txt");
 
     FileHistoryDialog d = new FileHistoryDialog(myProject, myGateway, file);
     Disposer.dispose(d);
   }
 
-  public void testTitles() throws IOException {
+  public void testTitles() {
     long leftTime = new Date(2001 - 1900, 1, 3, 12, 0).getTime();
     long rightTime = new Date(2002 - 1900, 2, 4, 14, 0).getTime();
 
@@ -61,7 +60,7 @@ public class FileHistoryDialogTest extends LocalHistoryUITestCase {
                  m.getDifferenceModel().getRightTitle(new NullRevisionsProgress()));
   }
 
-  public void testContent() throws IOException {
+  public void testContent() {
     VirtualFile f = createChildData(myRoot, "f.txt");
     setBinaryContent(f, "old".getBytes());
     setBinaryContent(f, "new".getBytes());
@@ -72,7 +71,7 @@ public class FileHistoryDialogTest extends LocalHistoryUITestCase {
     assertDiffContents("old", "new", m);
   }
 
-  public void testContentWhenOnlyOneRevisionSelected() throws IOException {
+  public void testContentWhenOnlyOneRevisionSelected() {
     VirtualFile f = createChildData(myRoot, "f.txt");
     setBinaryContent(f, "old".getBytes());
     setBinaryContent(f, "new".getBytes());
@@ -82,7 +81,7 @@ public class FileHistoryDialogTest extends LocalHistoryUITestCase {
     assertDiffContents("old", "new", m);
   }
 
-  public void testContentForCurrentRevision() throws IOException {
+  public void testContentForCurrentRevision() {
     VirtualFile f = createChildData(myRoot, "f.txt");
     setBinaryContent(f, "old".getBytes());
     setBinaryContent(f, "current".getBytes());
@@ -107,7 +106,7 @@ public class FileHistoryDialogTest extends LocalHistoryUITestCase {
     assertEquals("newDir", dir.getName());
   }
 
-  private void assertDiffContents(String leftContent, String rightContent, FileHistoryDialogModel m) throws IOException {
+  private void assertDiffContents(String leftContent, String rightContent, FileHistoryDialogModel m) {
     DiffContent left = getLeftDiffContent(m);
     DiffContent right = getRightDiffContent(m);
 
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/HistoryDialogModelTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/HistoryDialogModelTest.java
index 8b97c3dffcb4..77dd5bcdbc01 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/HistoryDialogModelTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/HistoryDialogModelTest.java
@@ -24,7 +24,6 @@ import com.intellij.history.integration.ui.models.RevisionItem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.List;
 
 public class HistoryDialogModelTest extends IntegrationTestCase {
@@ -61,7 +60,7 @@ public class HistoryDialogModelTest extends IntegrationTestCase {
   }
 
   @Test
-  public void testDoesNotRecomputeRevisionsEveryTime() throws IOException {
+  public void testDoesNotRecomputeRevisionsEveryTime() {
     assertEquals(3, m.getRevisions().size());
 
     setContent(f, "xxx");
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java
index 22cb21884493..8d5edf49c025 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/LocalHistoryActionsTest.java
@@ -34,8 +34,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
-
 import static com.intellij.util.containers.UtilKt.stream;
 
 public class LocalHistoryActionsTest extends LocalHistoryUITestCase {
@@ -68,7 +66,7 @@ public class LocalHistoryActionsTest extends LocalHistoryUITestCase {
     return EditorFactory.getInstance();
   }
 
-  public void testShowHistoryAction() throws IOException {
+  public void testShowHistoryAction() {
     ShowHistoryAction a = new ShowHistoryAction();
     assertStatus(a, myRoot, true);
     assertStatus(a, f, true);
@@ -78,7 +76,7 @@ public class LocalHistoryActionsTest extends LocalHistoryUITestCase {
     assertStatus(a, createChildData(myRoot, "f.xxx"), false);
   }
 
-  public void testLocalHistoryActionDisabledWithoutProject() throws IOException {
+  public void testLocalHistoryActionDisabledWithoutProject() {
     LocalHistoryAction a = new LocalHistoryAction() {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
@@ -88,12 +86,12 @@ public class LocalHistoryActionsTest extends LocalHistoryUITestCase {
     assertStatus(a, myRoot, null, false);
   }
   
-  public void testShowHistoryActionIsDisabledForMultipleSelection() throws Exception {
+  public void testShowHistoryActionIsDisabledForMultipleSelection() {
     ShowHistoryAction a = new ShowHistoryAction();
     assertStatus(a, new VirtualFile[] {f, new TestVirtualFile("ff")}, myProject, false);
   }
 
-  public void testShowSelectionHistoryActionForSelection() throws Exception {
+  public void testShowSelectionHistoryActionForSelection() {
     editor.getSelectionModel().setSelection(0, 2);
 
     ShowSelectionHistoryAction a = new ShowSelectionHistoryAction();
@@ -105,13 +103,13 @@ public class LocalHistoryActionsTest extends LocalHistoryUITestCase {
     assertEquals("Show History for Selection", e.getPresentation().getText());
   }
 
-  public void testShowSelectionHistoryActionIsDisabledForNonFiles() throws IOException {
+  public void testShowSelectionHistoryActionIsDisabledForNonFiles() {
     ShowSelectionHistoryAction a = new ShowSelectionHistoryAction();
     assertStatus(a, myRoot, false);
     assertStatus(a, null, false);
   }
 
-  public void testShowSelectionHistoryActionIsDisabledForEmptySelection() throws Exception {
+  public void testShowSelectionHistoryActionIsDisabledForEmptySelection() {
     ShowSelectionHistoryAction a = new ShowSelectionHistoryAction();
     assertStatus(a, f, false);
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/RecentChangeDialogTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/RecentChangeDialogTest.java
index e1bee21de8db..9bea9f9e3a60 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/RecentChangeDialogTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/RecentChangeDialogTest.java
@@ -25,7 +25,7 @@ import com.intellij.openapi.util.Disposer;
 import java.io.IOException;
 
 public class RecentChangeDialogTest extends LocalHistoryUITestCase {
-  public void testDialogWork() throws IOException {
+  public void testDialogWork() {
     getVcs().beginChangeSet();
     createChildData(myRoot, "f.txt");
     getVcs().endChangeSet("change");
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/SelectionHistoryDialogTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/SelectionHistoryDialogTest.java
index d03e0d7accf0..ef265ca51caa 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/SelectionHistoryDialogTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/SelectionHistoryDialogTest.java
@@ -47,12 +47,12 @@ public class SelectionHistoryDialogTest extends LocalHistoryUITestCase {
     setBinaryContent(f,"a\nbcd\nc\ne\n".getBytes(), -1, 789,this);
   }
 
-  public void testDialogWorks() throws IOException {
+  public void testDialogWorks() {
     SelectionHistoryDialog d = new SelectionHistoryDialog(myProject, myGateway, f, 0, 0);
     Disposer.dispose(d);
   }
 
-  public void testTitles() throws IOException {
+  public void testTitles() {
     rename(f, "ff.txt");
     setBinaryContent(f,new byte[0]);
 
@@ -84,7 +84,7 @@ public class SelectionHistoryDialogTest extends LocalHistoryUITestCase {
     verify(p);
   }
 
-  public void testDiffContents() throws IOException {
+  public void testDiffContents() {
     initModelOnSecondLineAndSelectRevisions(0, 1);
 
     DiffContent left = dm.getLeftDiffContent(new NullRevisionsProgress());
@@ -94,7 +94,7 @@ public class SelectionHistoryDialogTest extends LocalHistoryUITestCase {
     assertContent("bc", right);
   }
 
-  public void testDiffContentsAndTitleForCurrentRevision() throws IOException {
+  public void testDiffContentsAndTitleForCurrentRevision() {
     initModelOnSecondLineAndSelectRevisions(0, 0);
 
     assertEquals("Current", dm.getRightTitle(new NullRevisionsProgress()));
diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/models/SelectionCalculatorTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/models/SelectionCalculatorTest.java
index 41817a90bac9..7aa4140ea049 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/models/SelectionCalculatorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/models/SelectionCalculatorTest.java
@@ -23,7 +23,6 @@ import com.intellij.history.core.LocalHistoryTestCase;
 import com.intellij.history.core.revisions.Revision;
 import com.intellij.history.core.tree.RootEntry;
 import com.intellij.history.integration.IdeaGateway;
-import com.intellij.util.diff.FilesTooBigForDiffException;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 
@@ -36,7 +35,7 @@ public class SelectionCalculatorTest extends LocalHistoryTestCase {
   LocalHistoryFacade vcs = new InMemoryLocalHistoryFacade();
 
   @Test
-  public void testSelectionWasNotChanged() throws FilesTooBigForDiffException {
+  public void testSelectionWasNotChanged() {
     List<Revision> rr = createRevisions("abc\ndef\nghi", "abc1\ndef1\nghi1");
     SelectionCalculator c = new SelectionCalculator(gw, rr, 0, 2);
 
@@ -48,7 +47,7 @@ public class SelectionCalculatorTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testSelectionWasMoved() throws FilesTooBigForDiffException {
+  public void testSelectionWasMoved() {
     List<Revision> rr = createRevisions("abc\ndef\nghi", "def\nghi");
     SelectionCalculator c = new SelectionCalculator(gw, rr, 0, 1);
 
@@ -60,7 +59,7 @@ public class SelectionCalculatorTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testSelectionForVeryOldRevisionTakenBackward() throws FilesTooBigForDiffException {
+  public void testSelectionForVeryOldRevisionTakenBackward() {
     List<Revision> rr = createRevisions("ghi\nabc\ndef", "abc\nghi\ndef", "abc\ndef\nghi");
     SelectionCalculator c = new SelectionCalculator(gw, rr, 0, 1);
 
@@ -74,7 +73,7 @@ public class SelectionCalculatorTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testNormalizingLineEnds() throws FilesTooBigForDiffException {
+  public void testNormalizingLineEnds() {
     List<Revision> rr = createRevisions("abc\ndef\nghi", "abc\r\ndef\r\nghi");
     SelectionCalculator c = new SelectionCalculator(gw, rr, 0, 1);
 
@@ -86,7 +85,7 @@ public class SelectionCalculatorTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testProgressOnGetSelection() throws FilesTooBigForDiffException {
+  public void testProgressOnGetSelection() {
     List<Revision> rr = createRevisions("one", "two", "three", "four");
     SelectionCalculator c = new SelectionCalculator(gw, rr, 0, 0);
 
@@ -103,7 +102,7 @@ public class SelectionCalculatorTest extends LocalHistoryTestCase {
   }
 
   @Test
-  public void testProgressOnCanCalculate() throws FilesTooBigForDiffException {
+  public void testProgressOnCanCalculate() {
     List<Revision> rr = createRevisions("one", "two");
     SelectionCalculator c = new SelectionCalculator(gw, rr, 0, 0);
 
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/ActivityMonitorTest.java b/platform/platform-tests/testSrc/com/intellij/ide/ActivityMonitorTest.java
index a0df57a6cc8c..3dd76c4b395d 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/ActivityMonitorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/ActivityMonitorTest.java
@@ -91,7 +91,7 @@ public class ActivityMonitorTest extends LightPlatformTestCase {
     assertReady(project2);
   }
 
-  public void testReadyWithWatchActivities() throws Exception {
+  public void testReadyWithWatchActivities() {
     final UiActivity root = new UiActivity("root");
 
     final UiActivity op1 = new UiActivity("root", "operation1");
@@ -161,7 +161,7 @@ public class ActivityMonitorTest extends LightPlatformTestCase {
     }
   }
 
-  public void testUiActivity() throws Exception {
+  public void testUiActivity() {
     assertTrue(new UiActivity("root", "folder1").isSameOrGeneralFor(new UiActivity("root", "folder1")));
     assertTrue(new UiActivity("root", "folder1").isSameOrGeneralFor(new UiActivity("root", "folder1", "folder2")));
     assertFalse(new UiActivity("root", "folder2").isSameOrGeneralFor(new UiActivity("root", "folder1", "folder2")));
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java b/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java
index fc61670666c3..0f8b1b37d921 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/bookmarks/BookmarkManagerTest.java
@@ -51,7 +51,7 @@ public class BookmarkManagerTest extends AbstractEditorTest {
     super.tearDown();
   }
 
-  public void testWholeTextReplace() throws IOException {
+  public void testWholeTextReplace() {
     @NonNls String text =
       "public class Test {\n" +
       "    public void test() {\n" +
@@ -66,7 +66,7 @@ public class BookmarkManagerTest extends AbstractEditorTest {
 
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         myEditor.getDocument().setText(text);
       }
     }.execute().throwException();
@@ -79,7 +79,7 @@ public class BookmarkManagerTest extends AbstractEditorTest {
     }
   }
   
-  public void testBookmarkLineRemove() throws IOException {
+  public void testBookmarkLineRemove() {
     List<ComponentAdapter> adapters = getProject().getPicoContainer().getComponentAdaptersOfType(ChangeListManagerImpl.class);
     LOG.debug(adapters.size() + " adapters:");
     for (ComponentAdapter adapter : adapters) {
@@ -101,7 +101,7 @@ public class BookmarkManagerTest extends AbstractEditorTest {
     assertTrue(getManager().getValidBookmarks().isEmpty());
   }
 
-  public void testTwoBookmarksOnSameLine1() throws  IOException {
+  public void testTwoBookmarksOnSameLine1() {
     @NonNls String text =
       "public class Test {\n" +
       "    public void test() {\n" +
@@ -126,7 +126,7 @@ public class BookmarkManagerTest extends AbstractEditorTest {
       checkBookmarkNavigation(bookmark);
     }
   }
-  public void testTwoBookmarksOnSameLine2() throws  IOException {
+  public void testTwoBookmarksOnSameLine2() {
     @NonNls String text =
       "public class Test {\n" +
       "    public void test() {\n" +
@@ -157,7 +157,7 @@ public class BookmarkManagerTest extends AbstractEditorTest {
     delete();
   }
   
-  public void testBookmarkIsSavedAfterRemoteChange() throws IOException {
+  public void testBookmarkIsSavedAfterRemoteChange() {
     @NonNls String text =
       "public class Test {\n" +
       "    public void test() {\n" +
@@ -169,7 +169,7 @@ public class BookmarkManagerTest extends AbstractEditorTest {
 
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         myEditor.getDocument().setText("111\n222" + text + "333");
       }
     }.execute().throwException();
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleConfigurationTest.java b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleConfigurationTest.java
index 153213d7d5a7..fce7cb984e29 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleConfigurationTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleConfigurationTest.java
@@ -32,7 +32,7 @@ public class CodeStyleConfigurationTest extends CodeStyleTestCase {
   /**
    * Check that indent options are correcly read if mixed with other language options
    */
-  public void testIndentOptionsRead() throws Exception {
+  public void testIndentOptionsRead() {
     org.jdom.Element rootElement = new Element("option");
 
     Element langCodeStyle = new Element("codeStyleSettings");
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleSchemesModelTest.java b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleSchemesModelTest.java
index 30a32da42618..81553ad820e7 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleSchemesModelTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/CodeStyleSchemesModelTest.java
@@ -56,7 +56,7 @@ public class CodeStyleSchemesModelTest extends CodeStyleTestCase {
     }
   }
 
-  public void testDefaults() throws Exception {
+  public void testDefaults() {
     CodeStyleScheme defaultScheme = myModel.getSelectedScheme();
     assertEquals(CodeStyleScheme.DEFAULT_SCHEME_NAME, defaultScheme.getName());
     assertEquals(new CodeStyleSettings(), defaultScheme.getCodeStyleSettings());
@@ -64,7 +64,7 @@ public class CodeStyleSchemesModelTest extends CodeStyleTestCase {
     assertFalse(myModel.isUsePerProjectSettings());
   }
 
-  public void testCopyToIde() throws Exception {
+  public void testCopyToIde() {
     CodeStyleScheme projectScheme = myModel.getProjectScheme();
     myModel.selectScheme(projectScheme, null);
     assertEquals(CodeStyleScheme.PROJECT_SCHEME_NAME, myModel.getSelectedScheme().getName());
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/NewProjectSettingsTest.java b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/NewProjectSettingsTest.java
index d2c20cb08749..4ba1d0b8ece2 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/NewProjectSettingsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/NewProjectSettingsTest.java
@@ -51,7 +51,7 @@ public class NewProjectSettingsTest extends CodeStyleTestCase {
   }
 
   @Override
-  protected void setupProject() throws Exception {
+  protected void setupProject() {
     Runnable setupRunnable = ourSetupMap.get(getTestName(true));
     if (setupRunnable != null) setupRunnable.run();
   }
@@ -66,7 +66,7 @@ public class NewProjectSettingsTest extends CodeStyleTestCase {
     manager.setMainProjectCodeStyle(null);
   }
 
-  public void testNonDefaultSettings() throws Exception {
+  public void testNonDefaultSettings() {
     CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     CodeStyleSettings appSettings = CodeStyleSettingsManager.getInstance().getMainProjectCodeStyle();
     assertNotNull(appSettings);
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/ProjectCodeStyleMigrationTest.java b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/ProjectCodeStyleMigrationTest.java
index cd773b1eabd5..4c0275c75c82 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/ProjectCodeStyleMigrationTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/ProjectCodeStyleMigrationTest.java
@@ -16,21 +16,16 @@
 package com.intellij.ide.codeStyleSettings;
 
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.LegacyCodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.ProjectCodeStyleSettingsManager;
-import com.intellij.testFramework.LightProjectDescriptor;
 import org.jdom.Document;
 import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.io.IOException;
 
 import static com.intellij.psi.codeStyle.CodeStyleScheme.CODE_STYLE_TAG_NAME;
 
@@ -53,7 +48,7 @@ public class ProjectCodeStyleMigrationTest extends CodeStyleTestCase {
   }
 
   @SuppressWarnings("deprecation")
-  public void testMigrateDefault() throws IOException {
+  public void testMigrateDefault() {
     CodeStyleSettingsManager settingsManager = CodeStyleSettingsManager.getInstance(getProject());
     assertInstanceOf(settingsManager, ProjectCodeStyleSettingsManager.class);
     CodeStyleSettings projectSettings = settingsManager.getCurrentSettings();
@@ -65,7 +60,7 @@ public class ProjectCodeStyleMigrationTest extends CodeStyleTestCase {
   }
 
   @SuppressWarnings("deprecation")
-  public void testMigrateChanged() throws IOException {
+  public void testMigrateChanged() {
     CodeStyleSettingsManager settingsManager = CodeStyleSettingsManager.getInstance(getProject());
     assertInstanceOf(settingsManager, ProjectCodeStyleSettingsManager.class);
     CodeStyleSettings projectSettings = settingsManager.getCurrentSettings();
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
index 9789fe0a779d..ab42b5623a0a 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java
@@ -43,7 +43,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
   private static final String TEST_TEMPLATE_TXT = "testTemplate.txt";
   private static final String HI_THERE = "hi there";
 
-  public void testSchemas() throws Exception {
+  public void testSchemas() {
     assertEquals(FileTemplatesScheme.DEFAULT, myTemplateManager.getCurrentScheme());
 
     FileTemplate template = myTemplateManager.getTemplate(TEST_TEMPLATE_TXT);
@@ -59,12 +59,12 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
     assertEquals(newText, myTemplateManager.getTemplate(TEST_TEMPLATE_TXT).getText());
   }
 
-  public void testDefaultProject() throws Exception {
+  public void testDefaultProject() {
     Project defaultProject = ProjectManager.getInstance().getDefaultProject();
     assertNull(FileTemplateManager.getInstance(defaultProject).getProjectScheme());
   }
 
-  public void testConfigurable() throws Exception {
+  public void testConfigurable() {
     AllFileTemplatesConfigurable configurable = new AllFileTemplatesConfigurable(getProject());
     try {
       configurable.createComponent();
@@ -75,7 +75,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
     }
   }
 
-  public void testSaveFileAsTemplate() throws Exception {
+  public void testSaveFileAsTemplate() {
     AllFileTemplatesConfigurable configurable = new AllFileTemplatesConfigurable(getProject());
     try {
       configurable.createComponent();
@@ -190,7 +190,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
     }
   }
 
-  public void testRemoveTemplate() throws Exception {
+  public void testRemoveTemplate() {
     FileTemplate[] before = myTemplateManager.getAllTemplates();
     try {
       FileTemplate template = myTemplateManager.getTemplate(TEST_TEMPLATE_TXT);
@@ -208,7 +208,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
     }
   }
 
-  public void testSaveReformatCode() throws Exception {
+  public void testSaveReformatCode() {
     FileTemplate template = myTemplateManager.getTemplate(TEST_TEMPLATE_TXT);
     assertTrue(template.isReformatCode());
     template.setReformatCode(false);
@@ -221,7 +221,7 @@ public class LightFileTemplatesTest extends LightPlatformTestCase {
       .writeElement(element));
   }
 
-  public void testDoNotSaveDefaults() throws Exception {
+  public void testDoNotSaveDefaults() {
     assertFalse(((FileTemplateBase)myTemplateManager.getTemplate(TEST_TEMPLATE_TXT)).isLiveTemplateEnabledByDefault());
     FileTemplateBase template = (FileTemplateBase)myTemplateManager.getTemplate("templateWithLiveTemplate.txt");
     assertTrue(template.isLiveTemplateEnabledByDefault());
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/packageSets/PatternRegexpConvertorTest.java b/platform/platform-tests/testSrc/com/intellij/ide/packageSets/PatternRegexpConvertorTest.java
index e29a1fe44bbc..a7dcba3cc8c9 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/packageSets/PatternRegexpConvertorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/packageSets/PatternRegexpConvertorTest.java
@@ -8,7 +8,7 @@ import com.intellij.psi.search.scope.packageSet.FilePatternPackageSet;
 import junit.framework.TestCase;
 
 public class PatternRegexpConvertorTest extends TestCase {
-   public void testConvertToRegexp() throws Exception {
+   public void testConvertToRegexp() {
      assertEquals("a\\.[^\\.]*", FilePatternPackageSet.convertToRegexp("a.*", '.'));
      assertEquals("a\\.(.*\\.)?[^\\.]*", FilePatternPackageSet.convertToRegexp("a..*", '.'));
      assertEquals("a\\/[^\\/]*", FilePatternPackageSet.convertToRegexp("a/*", '/'));
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java
index c48fae6e2261..baa4cdae6d56 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.java
@@ -20,7 +20,6 @@ import com.intellij.util.lang.UrlClassLoader;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -98,7 +97,7 @@ public class PluginDescriptorTest {
       }
 
       @Override
-      public Enumeration<URL> getResources(String name) throws IOException {
+      public Enumeration<URL> getResources(String name) {
         return new SingleUrlEnumeration(myUrl);
       }
     }
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/search/PorterStemmerTest.java b/platform/platform-tests/testSrc/com/intellij/ide/search/PorterStemmerTest.java
index 82d0c0b30986..ec799cd07252 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/search/PorterStemmerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/search/PorterStemmerTest.java
@@ -8,7 +8,7 @@ import com.intellij.ide.ui.search.PorterStemmerUtil;
 import junit.framework.TestCase;
 
 public class PorterStemmerTest extends TestCase {
-  public void test() throws Exception {
+  public void test() {
     assertEquals("name", PorterStemmerUtil.stem("names"));
     assertEquals("j2ee", PorterStemmerUtil.stem("j2ee"));
     assertEquals("keyword1", PorterStemmerUtil.stem("keyword1"));
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/severities/HighlightSeveritiesTest.java b/platform/platform-tests/testSrc/com/intellij/ide/severities/HighlightSeveritiesTest.java
index d73c017f72fc..9bae81b6c935 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/severities/HighlightSeveritiesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/severities/HighlightSeveritiesTest.java
@@ -21,7 +21,7 @@ import junit.framework.TestCase;
 import org.jdom.Element;
 
 public class HighlightSeveritiesTest extends TestCase {
-  public void testSeveritiesMigration() throws Exception{
+  public void testSeveritiesMigration() {
     final Element element = new Element("temp");
     new HighlightSeverity(HighlightSeverity.ERROR.myName, 500).writeExternal(element);
     HighlightSeverity newSeverity = new HighlightSeverity(element);
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/ui/TopHitProvidersTest.java b/platform/platform-tests/testSrc/com/intellij/ide/ui/TopHitProvidersTest.java
index c16e9f580319..9809807e8798 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/ui/TopHitProvidersTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/ui/TopHitProvidersTest.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
  * @author Konstantin Bulenkov
  */
 public class TopHitProvidersTest extends PlatformTestCase {
-  public void testUiSettings() throws Exception {
+  public void testUiSettings() {
     List<OptionsTopHitProvider> providers = getProvider(AppearanceOptionsTopHitProvider.ID);
     for (OptionsTopHitProvider provider: providers) {
       for (OptionDescription option : provider.getOptions(null)) {
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java
index 947fb566cb7e..1b98f6ce6ca2 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java
@@ -121,12 +121,12 @@ abstract class BaseTreeTestCase<StructureElement> extends FlyIdeaTestCase {
     Assert.assertTrue(success);
   }
 
-  void expand(final TreePath p) throws Exception {
+  void expand(final TreePath p) {
     invokeAndWaitIfNeeded(() -> myTree.expandPath(p));
     waitBuilderToCome();
   }
 
-  void collapsePath(final TreePath p) throws Exception {
+  void collapsePath(final TreePath p) {
     invokeAndWaitIfNeeded(() -> myTree.collapsePath(p));
     waitBuilderToCome();
   }
@@ -344,7 +344,7 @@ abstract class BaseTreeTestCase<StructureElement> extends FlyIdeaTestCase {
     super.tearDown();
   }
 
-  void assertTree(final String expected) throws Exception {
+  void assertTree(final String expected) {
     waitBuilderToCome();
     assertTreeNow(expected);
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java
index 28018f98d08b..4c9cfa2744a2 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java
@@ -166,11 +166,11 @@ public class FilteringTreeBuilderTest extends BaseTreeTestCase  {
     select(new Object[] {node}, false);
   }
 
-  private void updateFilter(final String text) throws Exception {
+  private void updateFilter(final String text) {
      update(text, null);
    }
 
-  private void update(final String text, @Nullable final Object selection) throws Exception {
+  private void update(final String text, @Nullable final Object selection) {
     myFilter.update(text, selection);
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
index e6f7cd40ca0c..6fa65d7f1bd5 100644
--- a/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
@@ -31,7 +31,6 @@ import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -1373,7 +1372,7 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
                              final int start,
                              final int end,
                              @Nullable final Runnable eachRunnable,
-                             @Nullable final Runnable endRunnable) throws InvocationTargetException, InterruptedException {
+                             @Nullable final Runnable endRunnable) {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       for (int i = start; i <= end; i++) {
         Node eachFile = node.addChild("File " + i);
@@ -1399,7 +1398,7 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
   private void runAndInterrupt(final Runnable action,
                                final String interruptAction,
                                final Object interruptElement,
-                               final Interruption interruption) throws Exception {
+                               final Interruption interruption) {
     myElementUpdate.clear();
 
     final boolean[] wasInterrupted = new boolean[]{false};
@@ -2390,47 +2389,47 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
     }
 
     @Override
-    public void testSelectionGoesToParentWhenOnlyChildMoved2() throws Exception {
+    public void testSelectionGoesToParentWhenOnlyChildMoved2() {
       //todo
     }
 
     @Override
-    public void testQueryStructureWhenExpand() throws Exception {
+    public void testQueryStructureWhenExpand() {
       //todo
     }
 
     @Override
-    public void testMoveElementToAdjacentEmptyParentWithSmartExpandAndSerialUpdateSubtrees() throws Exception {
+    public void testMoveElementToAdjacentEmptyParentWithSmartExpandAndSerialUpdateSubtrees() {
       // doesn't make sense since pass-through mode is always serial, it doesn't queue for updates
     }
 
     @Override
-    public void testElementMove1() throws Exception {
+    public void testElementMove1() {
       //todo
     }
 
     @Override
-    public void testClear() throws Exception {
+    public void testClear() {
       //todo
     }
 
     @Override
-    public void testDoubleCancelUpdate() throws Exception {
+    public void testDoubleCancelUpdate() {
       // doesn't make sense in pass-through mode
     }
 
     @Override
-    public void testNoExtraJTreeModelUpdate() throws Exception {
+    public void testNoExtraJTreeModelUpdate() {
       // doesn't make sense in pass-through mode
     }
 
     @Override
-    public void testSelectWhenUpdatesArePending() throws Exception {
+    public void testSelectWhenUpdatesArePending() {
       // doesn't make sense in pass-through mode
     }
 
     @Override
-    public void testBigTreeUpdate() throws Exception {
+    public void testBigTreeUpdate() {
       // doesn't make sense in pass-through mode
     }
   }
@@ -2459,12 +2458,12 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
     }
 
     @Override
-    public void testNoInfiniteSmartExpand() throws Exception {
+    public void testNoInfiniteSmartExpand() {
       //todo
     }
 
     @Override
-    public void testBigTreeUpdate() throws Exception {
+    public void testBigTreeUpdate() {
       //to slow, tested the same in VeryQuickBgLoadingTest
     }
   }
@@ -2480,12 +2479,12 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
     }
 
     @Override
-    public void testNoInfiniteSmartExpand() throws Exception {
+    public void testNoInfiniteSmartExpand() {
       //todo
     }
 
     @Override
-    public void testBigTreeUpdate() throws Exception {
+    public void testBigTreeUpdate() {
       //to slow, tested the same in VeryQuickBgLoadingTest
     }
   }
@@ -2497,17 +2496,17 @@ public class TreeUiTest extends AbstractTreeBuilderTest {
     }
 
     @Override
-    public void testNoInfiniteSmartExpand() throws Exception {
+    public void testNoInfiniteSmartExpand() {
       // todo;
     }
 
     @Override
-    public void testReleaseBuilderDuringUpdate() throws Exception {
+    public void testReleaseBuilderDuringUpdate() {
       // todo
     }
 
     @Override
-    public void testReleaseBuilderDuringGetChildren() throws Exception {
+    public void testReleaseBuilderDuringGetChildren() {
       // todo
     }
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/module/ModulePointerTest.java b/platform/platform-tests/testSrc/com/intellij/module/ModulePointerTest.java
index 4455819f8702..4fed5987b347 100644
--- a/platform/platform-tests/testSrc/com/intellij/module/ModulePointerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/module/ModulePointerTest.java
@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author nik
  */
 public class ModulePointerTest extends PlatformTestCase {
-  public void testCreateByName() throws Exception {
+  public void testCreateByName() {
     final ModulePointer pointer = getPointerManager().create("m");
     assertSame(pointer, getPointerManager().create("m"));
     assertNull(pointer.getModule());
@@ -41,7 +41,7 @@ public class ModulePointerTest extends PlatformTestCase {
     assertEquals("m", pointer.getModuleName());
   }
 
-  public void testCreateByModule() throws Exception {
+  public void testCreateByModule() {
     final Module module = addModule("x");
     final ModulePointer pointer = getPointerManager().create(module);
     assertSame(pointer, getPointerManager().create(module));
@@ -70,7 +70,7 @@ public class ModulePointerTest extends PlatformTestCase {
     assertEquals("xyz", pointer.getModuleName());
   }
 
-  public void testDisposePointerFromUncommittedModifiableModel() throws Exception {
+  public void testDisposePointerFromUncommittedModifiableModel() {
     ModulePointerManager pointerManager = getPointerManager();
     final ModulePointer pointer = pointerManager.create("xxx");
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java
index d07d2fc827da..202dbb26ae91 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java
@@ -117,14 +117,14 @@ public class ApplicationImplTest extends LightPlatformTestCase {
   }
 
 
-  public void testRead50Write50LockPerformance() throws InterruptedException {
+  public void testRead50Write50LockPerformance() {
     final int readIterations = 600000;
     final int writeIterations = 600000;
 
     runReadWrites(readIterations, writeIterations, 2000);
   }
 
-  public void testRead100Write0LockPerformance() throws InterruptedException {
+  public void testRead100Write0LockPerformance() {
     final int readIterations = 60000000;
     final int writeIterations = 0;
 
@@ -504,7 +504,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
     if (exception != null) throw exception;
   }
 
-  public void testRWLockPerformance() throws InterruptedException {
+  public void testRWLockPerformance() {
     long s = System.currentTimeMillis();
     while (System.currentTimeMillis() < s + 2000) {
       UIUtil.dispatchAllInvocationEvents();
@@ -556,7 +556,7 @@ public class ApplicationImplTest extends LightPlatformTestCase {
     UIUtil.dispatchAllInvocationEvents();
   }
 
-  public void testSuspendWriteActionDelaysForeignReadActions() throws Exception {
+  public void testSuspendWriteActionDelaysForeignReadActions() {
     Semaphore mayStartForeignRead = new Semaphore();
     mayStartForeignRead.down();
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java
index 43dcdf8e0e8f..8b6ef4a4a574 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java
@@ -31,7 +31,6 @@ import junit.framework.TestCase;
 
 import javax.swing.*;
 import java.awt.*;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -148,7 +147,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     if (exception[0] != null) throw exception[0];
   }
 
-  public void testReorder() throws InterruptedException, InvocationTargetException {
+  public void testReorder() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       LaterInvocator.enterModal(myWindow1);
       synchronized (this) {
@@ -164,7 +163,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     });
   }
 
-  public void testTrueReorder() throws InvocationTargetException, InterruptedException {
+  public void testTrueReorder() {
     SwingUtilities.invokeLater(() -> {
       LaterInvocator.enterModal(myWindow1);
       ApplicationManager.getApplication().invokeLater(new MyRunnable("1"), ModalityState.NON_MODAL);
@@ -178,7 +177,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     checkOrder(2);
   }
 
-  public void testEverInvoked() throws InvocationTargetException, InterruptedException {
+  public void testEverInvoked() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       LaterInvocator.enterModal(myWindow1);
       ApplicationManager.getApplication().invokeLater(ENTER_MODAL, ModalityState.NON_MODAL);
@@ -194,7 +193,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     });
   }
 
-  public void testDoesNotInvokeWhenModal() throws InvocationTargetException, InterruptedException {
+  public void testDoesNotInvokeWhenModal() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       LaterInvocator.enterModal(myWindow1);
 
@@ -209,7 +208,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     });
   }
 
-  public void testStress() throws Exception {
+  public void testStress() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       int N = 1000;
       //long start = System.currentTimeMillis();
@@ -274,7 +273,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
   }
 
 
-  public void testOrderWithSwingInvokeLater2() throws InterruptedException, InvocationTargetException {
+  public void testOrderWithSwingInvokeLater2() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       LaterInvocator.enterModal(myWindow1);
       synchronized (this) {
@@ -289,7 +288,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     });
   }
 
-  public void testOrderWithSwingInvokeLater3() throws InterruptedException, InvocationTargetException {
+  public void testOrderWithSwingInvokeLater3() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       LaterInvocator.enterModal(myWindow1);
       synchronized (this) {
@@ -304,7 +303,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     });
   }
 
-  public void testExpired() throws Exception {
+  public void testExpired() {
     UIUtil.invokeAndWaitIfNeeded(new Runnable() {
       @Override
       public void run() {
@@ -333,7 +332,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     });
   }
 
-  public void testOrderWithSwingInvokeLater4() throws InterruptedException, InvocationTargetException {
+  public void testOrderWithSwingInvokeLater4() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       SwingUtilities.invokeLater(ENTER_MODAL);
       flushSwingQueue();
@@ -356,7 +355,7 @@ public class LaterInvocatorTest extends PlatformTestCase {
     });
   }
 
-  public void testDeadLock() throws InvocationTargetException, InterruptedException {
+  public void testDeadLock() throws InterruptedException {
     final Object lock = new Object();
     final boolean[] started = { false };
     final Thread thread = new Thread("later invokator test") {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java
index dd55dcfec027..83ba980cbc04 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/PathMacroManagerTest.java
@@ -65,7 +65,7 @@ public class PathMacroManagerTest {
   private Disposable myRootDisposable = Disposer.newDisposable();
 
   @Before
-  public final void setupApplication() throws Exception {
+  public final void setupApplication() {
     context = new JUnit4Mockery();
     context.setImposteriser(ClassImposteriser.INSTANCE);
     myApplication = context.mock(ApplicationEx.class, "application");
@@ -87,7 +87,7 @@ public class PathMacroManagerTest {
 
           @Override
           @Nullable
-          public Object invoke(final Invocation invocation) throws Throwable {
+          public Object invoke(final Invocation invocation) {
             ((Runnable)invocation.getParameter(0)).run();
             return null;
           }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/diff/SimpleContentTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/diff/SimpleContentTest.java
index 2cc232d94534..f71abc44b524 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/diff/SimpleContentTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/diff/SimpleContentTest.java
@@ -18,11 +18,10 @@ package com.intellij.openapi.diff;
 import com.intellij.openapi.editor.Document;
 import com.intellij.testFramework.PlatformTestCase;
 
-import java.io.IOException;
 import java.util.Arrays;
 
 public class SimpleContentTest extends PlatformTestCase {
-  public void testEqualsAndDifferent() throws IOException {
+  public void testEqualsAndDifferent() {
     SimpleContent content1 = new SimpleContent("a\nb");
     SimpleContent content2 = new SimpleContent("a\nb");
     assertTrue(Arrays.equals(content1.getBytes(), content2.getBytes()));
@@ -45,7 +44,7 @@ public class SimpleContentTest extends PlatformTestCase {
     assertTrue(Arrays.equals("a\nb\r\nc".getBytes(), content.getBytes()));
   }
 
-  public void testModifyContent() throws IOException {
+  public void testModifyContent() {
     SimpleContent content = new SimpleContent("abc\r\ndef");
     content.setReadOnly(false);
     String originalText = content.getText();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeFuncTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeFuncTest.java
index 9393daeef1cc..014d7a7a0298 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeFuncTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeFuncTest.java
@@ -32,7 +32,6 @@ import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
 import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.util.Assertion;
-import com.intellij.util.diff.FilesTooBigForDiffException;
 import org.jetbrains.annotations.NotNull;
 
 public class MergeFuncTest extends PlatformTestCase {
@@ -47,7 +46,7 @@ public class MergeFuncTest extends PlatformTestCase {
   private final Assertion CHECK = new Assertion();
   private ChangeCounter myCounters;
 
-  public void testNoConflicts() throws FilesTooBigForDiffException {
+  public void testNoConflicts() {
     useDocuments("a\nIns1\nb\nccc",
                  "a\nb\nccc",
                  "a\nb\ndddd");
@@ -84,7 +83,7 @@ public class MergeFuncTest extends PlatformTestCase {
     assertEquals(conflicts, myCounters.getConflictCounter());
   }
 
-  public void testConflictingChange() throws FilesTooBigForDiffException {
+  public void testConflictingChange() {
     useDocuments("1\n2\n3\nX\na\nb\nc\nY\nVer1\nVer12\nZ",
                           "X\na\nb\nc\nY\n" +  "Ver12\nVer23\nZ",
                           "X\n"   +   "Y\n"     +     "Ver23\nVer3\nZ");
@@ -106,7 +105,7 @@ public class MergeFuncTest extends PlatformTestCase {
     checkCounters(0, 2);
   }
 
-  public void testApplyMergeThenUndo() throws FilesTooBigForDiffException {
+  public void testApplyMergeThenUndo() {
     String baseText = "X\n1\n2\n3\nY";
     useDocuments("X\nb\nY", baseText, "X\na\nY");
     initMerge();
@@ -137,7 +136,7 @@ public class MergeFuncTest extends PlatformTestCase {
     assertEquals(0, getBaseIntervals().length);
   }
 
-  public void testApplyModifiedDeletedConflict() throws FilesTooBigForDiffException {
+  public void testApplyModifiedDeletedConflict() {
     String baseText = "X\n1\n2\n3\nY";
     useDocuments("X\nY", baseText, "X\na\nY");
     initMerge();
@@ -164,7 +163,7 @@ public class MergeFuncTest extends PlatformTestCase {
     assertEquals(0, getBaseIntervals().length);
   }
 
-  public void testInvalidatingChange() throws FilesTooBigForDiffException {
+  public void testInvalidatingChange() {
     useDocuments("X\n1\n2\nY", "X\n1\nIns\n2\nY", "X\n1\n2\nY");
     initMerge();
     MergeTestUtils.Range[] sideConflict = {MergeTestUtils.del(4, 0)};
@@ -180,7 +179,7 @@ public class MergeFuncTest extends PlatformTestCase {
     assertEquals(0, getBaseIntervals().length);
   }
 
-  public void testApplySeveralActions() throws FilesTooBigForDiffException {
+  public void testApplySeveralActions() {
     useDocuments("X\n1\nY\n2\nZ\n3\n4\nU\nW\n",
                  "X\na\nY\nb\nZ\nc\nU\nd\nW\n",
                  "X\na\nY\nB\nZ\nC\nU\nD\nW\n");
@@ -198,7 +197,7 @@ public class MergeFuncTest extends PlatformTestCase {
     MergeTestUtils.checkMarkup(myERight, new MergeTestUtils.Range[0]);
   }
 
-  public void testIgnoreChangeAction() throws FilesTooBigForDiffException {
+  public void testIgnoreChangeAction() {
     useDocuments("X\n1\nY\n2\nZ", "X\na\nY\nb\nZ", "X\na\nY\nB\nZ");
     initMerge();
     pressIgnoreActionIcon(myELeft, 0);
@@ -213,7 +212,7 @@ public class MergeFuncTest extends PlatformTestCase {
     MergeTestUtils.checkMarkup(myERight, new MergeTestUtils.Range[0]);
   }
 
-  public void testLongBase() throws FilesTooBigForDiffException {
+  public void testLongBase() {
     useDocuments("X\n1\n2\n3\nZ", "X\n1\nb\n3\nd\ne\nf\nZ", "X\na\nb\nc\nZ");
     initMerge();
     MergeTestUtils.checkMarkup(myELeft, new MergeTestUtils.Range[]{MergeTestUtils.conf(2, 6)});
@@ -221,7 +220,7 @@ public class MergeFuncTest extends PlatformTestCase {
     MergeTestUtils.checkMarkup(myERight, new MergeTestUtils.Range[]{MergeTestUtils.conf(2, 6)});
   }
 
-  public void testReplaceBaseWithBranch() throws FilesTooBigForDiffException {
+  public void testReplaceBaseWithBranch() {
     String leftVersion = "a\nX\nb\nc";
     useDocuments(leftVersion, "A\nX\nB\nc", "1\nX\n1\nc");
     initMerge();
@@ -233,7 +232,7 @@ public class MergeFuncTest extends PlatformTestCase {
     MergeTestUtils.checkMarkup(myERight, new MergeTestUtils.Range[0]);
   }
 
-  public void testError1() throws FilesTooBigForDiffException {
+  public void testError1() {
     useDocuments("start\n" +
                  "change\n" +
                  " a\n" +
@@ -248,7 +247,7 @@ public class MergeFuncTest extends PlatformTestCase {
     initMerge();
   }
 
-  public void testError2() throws FilesTooBigForDiffException {
+  public void testError2() {
     useDocuments("C\nX", "C\n", "C\n");
     initMerge();
     MergeTestUtils.checkMarkup(myERight, new MergeTestUtils.Range[0]);
@@ -256,7 +255,7 @@ public class MergeFuncTest extends PlatformTestCase {
     MergeTestUtils.checkMarkup(myELeft, new MergeTestUtils.Range[]{MergeTestUtils.ins(2, 1)});
   }
 
-  public void testError3() throws FilesTooBigForDiffException {
+  public void testError3() {
     useDocuments("original\nlocal\nlocal\nlocal\noriginal\n",
                  "original\noriginal\noriginal\noriginal\noriginal\n",
                  "original\nremote\nremote\nremote\noriginal\n");
@@ -298,7 +297,7 @@ public class MergeFuncTest extends PlatformTestCase {
     myRight = MergeTestUtils.createRODocument(right);
   }
 
-  private void initMerge() throws FilesTooBigForDiffException {
+  private void initMerge() {
     myMergeList = MergeList.create(myProject, myLeft, myBase, myRight);
     Editor[] editors = myUtils.createEditors(new Document[]{myLeft, myBase, myRight});
     myELeft = editors[0];
@@ -362,7 +361,7 @@ public class MergeFuncTest extends PlatformTestCase {
   }
 
   @Override
-  protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
+  protected void invokeTestRunnable(@NotNull Runnable runnable) {
     runnable.run();
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeTestUtils.java b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeTestUtils.java
index da3159be76e2..3fc42348d5d1 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeTestUtils.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeTestUtils.java
@@ -139,7 +139,7 @@ public class MergeTestUtils {
     return new Range(DiffColors.DIFF_INSERTED.getExternalName(), createRange(start, length));
   }
 
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     EditorFactory editorFactory = EditorFactory.getInstance();
     for (Editor editor : myEditorsToDispose) {
       editorFactory.releaseEditor(editor);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/mergeTool/MergeDataTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/mergeTool/MergeDataTest.java
index 41389e0660c7..deeb119ae800 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/mergeTool/MergeDataTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/mergeTool/MergeDataTest.java
@@ -23,12 +23,10 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.TempFiles;
 
-import java.io.IOException;
-
 public class MergeDataTest extends BaseDiffTestCase {
   private TempFiles myTempFiles;
 
-  public void testWorkingDocument() throws IOException {
+  public void testWorkingDocument() {
     VirtualFile file = myTempFiles.createVFile("merge", ".txt");
     assertNotNull(file);
     assertEquals("txt", file.getExtension());
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/patch/GenericApplyPatchTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/patch/GenericApplyPatchTest.java
index cf5fba821d90..25a6f36d96e8 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/patch/GenericApplyPatchTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/patch/GenericApplyPatchTest.java
@@ -26,7 +26,7 @@ import org.junit.Assert;
 import java.util.*;
 
 public class GenericApplyPatchTest extends PlatformTestCase {
-  public void testSeveralSteps() throws Exception {
+  public void testSeveralSteps() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -49,7 +49,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\n2\n5\n6\n9\n10\n11\naaa", after);
   }
 
-  public void testExchangedParts() throws Exception {
+  public void testExchangedParts() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.REMOVE, "2"));
@@ -74,7 +74,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("5\n6a\n7a\n8\n1\n2a\n3a\n4\n9\nextra line", after);
   }
 
-  public void testDeleteAlmostOk() throws Exception {
+  public void testDeleteAlmostOk() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -96,7 +96,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\n9\n8\n11\naaa", after);
   }
 
-  public void testInsertAlmostOk() throws Exception {
+  public void testInsertAlmostOk() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -118,7 +118,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\n3\n4\n5\n9\n8\n11\naaa", after);
   }
 
-  public void testInsertAlmostOkAlreadyApplied() throws Exception {
+  public void testInsertAlmostOkAlreadyApplied() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -140,7 +140,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\n3\n4\n5\n9\n8\n11\naaa", after);
   }
 
-  public void testChangeAlmostOk() throws Exception {
+  public void testChangeAlmostOk() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -164,7 +164,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\na\nb\n9\n8\n11\naaa", after);
   }
 
-  public void testChangeAlmostOkAlreadyApplied() throws Exception {
+  public void testChangeAlmostOkAlreadyApplied() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -189,7 +189,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\na\nb\nc\n9\n8\n11\naaa", after);
   }
 
-  public void testChangeAlmostOkManySteps() throws Exception {
+  public void testChangeAlmostOkManySteps() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -224,7 +224,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\n-1\n4\n9\n8\n11\naaa\n2\n-1a\n-2a\n-3a\n-3b\n-4a\n-4b\n", after);
   }
 
-  public void testFirstNewLine() throws Exception {
+  public void testFirstNewLine() {
     final PatchHunk patchHunk = new PatchHunk(1, 2, 1, 3);
     patchHunk.addLine(new PatchLine(PatchLine.Type.ADD, ""));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
@@ -239,7 +239,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("\n1\n2\n", after);
   }
 
-    public void testNewEmptyLine() throws Exception {
+    public void testNewEmptyLine() {
     final PatchHunk patchHunk = new PatchHunk(1, 3, 1, 4);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "0"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.ADD, ""));
@@ -255,7 +255,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\n\n1\n2\n", after);
   }
 
-  public void testInsertionsIntoTransformationsCoinsidence() throws Exception {
+  public void testInsertionsIntoTransformationsCoinsidence() {
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 20; i++) {
       sb.append(String.valueOf(i + 1)).append('\n');
@@ -269,7 +269,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals(ApplyPatchStatus.ALREADY_APPLIED, gap.getStatus());
   }
 
-  public void testInsertionsIntoTransformationsInsert() throws Exception {
+  public void testInsertionsIntoTransformationsInsert() {
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 20; i++) {
       sb.append(String.valueOf(i + 1)).append('\n');
@@ -291,7 +291,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertTrue("ins".equals(list.get(1)));
   }
 
-  public void testInsertionsIntoTransformationsInsert0() throws Exception {
+  public void testInsertionsIntoTransformationsInsert0() {
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 20; i++) {
       sb.append(String.valueOf(i + 1)).append('\n');
@@ -313,7 +313,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertTrue("5".equals(list.get(1)));
   }
 
-  public void testInsertionsIntoTransformationsInsert1() throws Exception {
+  public void testInsertionsIntoTransformationsInsert1() {
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 20; i++) {
       sb.append(String.valueOf(i + 1)).append('\n');
@@ -335,7 +335,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertTrue("ins".equals(list.get(1)));
   }
 
-  public void testInsertionsIntoTransformationsDeletion() throws Exception {
+  public void testInsertionsIntoTransformationsDeletion() {
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 20; i++) {
       sb.append(String.valueOf(i + 1)).append('\n');
@@ -355,7 +355,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertTrue(list.size() == 0);
   }
 
-  public void testInsertionsIntoTransformationsDeletion1() throws Exception {
+  public void testInsertionsIntoTransformationsDeletion1() {
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 20; i++) {
       sb.append(String.valueOf(i + 1)).append('\n');
@@ -375,7 +375,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertTrue(list.size() == 0);
   }
 
-  public void testInsertionsIntoTransformationsDeletion0() throws Exception {
+  public void testInsertionsIntoTransformationsDeletion0() {
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 20; i++) {
       sb.append(String.valueOf(i + 1)).append('\n');
@@ -395,7 +395,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertTrue(list.size() == 0);
   }
 
-  public void testBetterContextMatch() throws Exception {
+  public void testBetterContextMatch() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -417,7 +417,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\n0\n0\n3\n4\n5\n\n\n5454\n5345\n2\na\nb\n543543", after);
   }
 
-  public void testBetterContextMatch1() throws Exception {
+  public void testBetterContextMatch1() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -439,7 +439,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\n0\n0\n3\n4\n5\n\n\n5454\n5345\na\nb\n11\n543543", after);
   }
 
-  public void testBetterContextMatch2() throws Exception {
+  public void testBetterContextMatch2() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -461,7 +461,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\n0\n0\n2\n3\n4\n5\n\n\n5454\n5345\n2\na\nb\n11\n543543", after);
   }
 
-  public void testFromSecondLineManySteps() throws Exception {
+  public void testFromSecondLineManySteps() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -496,7 +496,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\n-1\n4\n9\n8\n11\naaa\n2\n-1a\n-2a\n-3a\n-3b\n-4a\n-4b\n", after);
   }
 
-  public void testFromSecondLineManySteps0() throws Exception {
+  public void testFromSecondLineManySteps0() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -534,7 +534,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("0\nmmm\nfjsfsd\nqwhduhqwude\n\n2\n-1\n-1*\n4\n9\n8\n11\naaa\n2\n-1a\n-1a*\n-2a\n-3a\n-3b\n-4a\n-4b\n", after);
   }
 
-  public void testMoreInsertParts() throws Exception {
+  public void testMoreInsertParts() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1c"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2c"));
@@ -556,7 +556,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("sdsad\nsdsad\n1c\n2c\n3c\n2r\n3a\n3c\n2r\n8\n9\n10\n", after);
   }
 
-  public void testMoreDeletionParts() throws Exception {
+  public void testMoreDeletionParts() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1c"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2c"));
@@ -578,7 +578,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("sdsad\nsdsad\n1c\n2c\n3c\n2r\n8\n9\n10\n", after);
   }
 
-  public void testDoesNotMatchInTheEnd() throws Exception {
+  public void testDoesNotMatchInTheEnd() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -606,7 +606,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
 
   // actually didn't catch the previous version
   // nevertheless, should also pass
-  public void testDoesNotMatchAtStart() throws Exception {
+  public void testDoesNotMatchAtStart() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -632,7 +632,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("5\n6\n0\nmmm\n2\n4\n7\n8\n11\naaa", after);
   }
 
-  public void testOneLineInsertion() throws Exception {
+  public void testOneLineInsertion() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     final PatchLine line = new PatchLine(PatchLine.Type.ADD, "5");
     line.setSuppressNewLine(true);
@@ -648,7 +648,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("5\n", after);
   }
 
-  public void testOneLineBadInsertion() throws Exception {
+  public void testOneLineBadInsertion() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     final PatchLine line = new PatchLine(PatchLine.Type.ADD, "5");
     line.setSuppressNewLine(true);
@@ -665,7 +665,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("5\n7\n8\n5\n", after);
   }
 
-  public void testConflict1() throws Exception {
+  public void testConflict1() {
     final PatchHunk patchHunk = new PatchHunk(1, 8, 1, 8);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "2"));
@@ -686,7 +686,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     Assert.assertEquals("1\n2\n5\n3=*7\n11\n12", after);
   }
 
-  public void testAddAsFirst() throws Exception {
+  public void testAddAsFirst() {
     int[] beforeOfsetExpected = {1, 1};
     int[] afterOfsetExpected = {1, 2};
     final PatchHunk patchHunk = new PatchHunk(1, 4, 1, 5);
@@ -705,7 +705,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     }
   }
 
-  public void testOffsets() throws Exception {
+  public void testOffsets() {
     final PatchHunk patchHunk1 = new PatchHunk(1, 2, 1, 1);
     patchHunk1.addLine(new PatchLine(PatchLine.Type.CONTEXT, "1"));
     patchHunk1.addLine(new PatchLine(PatchLine.Type.REMOVE, "2"));
@@ -744,7 +744,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
   }
 
 
-  public void testAlreadyApplied() throws Exception {
+  public void testAlreadyApplied() {
     int[] beforeAppliedExpected = {2, 5, 6, 8};
     int[] endAppliedExpected = {4, 5, 7, 10};
 
@@ -781,7 +781,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     checkAppliedPositions(beforeAppliedExpected2, endAppliedExpected2, HunkStatus.ALREADY_APPLIED, appliedInfo);
   }
 
-  public void testExactlyApplied() throws Exception {
+  public void testExactlyApplied() {
     int[] beforeAppliedExpected = {5, 8, 10, 12};
     int[] afterAppliedExpected = {7, 9, 11, 12};
     final PatchHunk patchHunk = new PatchHunk(2, 12, 2, 12);
@@ -807,7 +807,7 @@ public class GenericApplyPatchTest extends PlatformTestCase {
     checkAppliedPositions(beforeAppliedExpected, afterAppliedExpected, HunkStatus.EXACTLY_APPLIED, gap.getAppliedInfo());
   }
 
-  public void testMatchBeforeStartOffset() throws Exception {
+  public void testMatchBeforeStartOffset() {
     final PatchHunk patchHunk = new PatchHunk(2, 9, 2, 12);
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "c2"));
     patchHunk.addLine(new PatchLine(PatchLine.Type.CONTEXT, "c2"));
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/DocumentTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/DocumentTest.java
index ce6b1bd496f0..4bdeb7ce74a4 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/DocumentTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/DocumentTest.java
@@ -25,10 +25,10 @@ import com.intellij.testFramework.LightPlatformTestCase;
 import com.intellij.util.IncorrectOperationException;
 
 public class DocumentTest extends LightPlatformTestCase {
-  public void testCorrectlyAddingAndRemovingListeners() throws Exception {
+  public void testCorrectlyAddingAndRemovingListeners() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final Document doc = new DocumentImpl("");
         final StringBuilder b = new StringBuilder();
         doc.addDocumentListener(new DocumentListener() {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java
index ab9fb6030137..1993d0b3f10b 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorCreationPerformanceTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.PlatformTestUtil;
 
 public class EditorCreationPerformanceTest extends AbstractEditorTest {
-  public void testOpeningEditorWithManyLines() throws Exception {
+  public void testOpeningEditorWithManyLines() {
     Document document = EditorFactory.getInstance().createDocument(StringUtil.repeat(LOREM_IPSUM + '\n', 15000));
 
     PlatformTestUtil.startPerformanceTest("Editor creation", 75, () -> {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorModificationUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorModificationUtilTest.java
index d4231f3f2564..e20433b58822 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorModificationUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorModificationUtilTest.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 
 public class EditorModificationUtilTest extends LightPlatformCodeInsightTestCase {
-  public void testInsertStringAtCaretNotMovingCaret() throws Exception {
+  public void testInsertStringAtCaretNotMovingCaret() {
     configureFromFileText(getTestName(false) + ".txt", "text <caret>");
     WriteCommandAction.runWriteCommandAction(getProject(), () -> {
       EditorModificationUtil.insertStringAtCaret(myEditor, " ", false, false);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretColumnModeTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretColumnModeTest.java
index 550676694bdf..1154f40efec0 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretColumnModeTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretColumnModeTest.java
@@ -19,10 +19,8 @@ import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.impl.AbstractEditorTest;
 
-import java.io.IOException;
-
 public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
-  public void testUpDown() throws Exception {
+  public void testUpDown() {
     init("line1\n" +
          "li<caret>ne2\n" +
          "line3");
@@ -58,7 +56,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "line3");
   }
 
-  public void testPageUpDown() throws Exception {
+  public void testPageUpDown() {
     init("line1\n" +
          "line2\n" +
          "line3\n" +
@@ -114,7 +112,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "line7");
   }
 
-  public void testSelectionWithKeyboard() throws Exception {
+  public void testSelectionWithKeyboard() {
     init("line1\n" +
          "li<caret>ne2\n" +
          "line3");
@@ -170,7 +168,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "line3");
   }
 
-  public void testSelectNextPrevWord() throws Exception {
+  public void testSelectNextPrevWord() {
     init("aaa aaa<caret>\n" +
          "bbbb bbbb");
     executeAction(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN_WITH_SELECTION);
@@ -182,7 +180,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "bbbb bb<selection>bb<caret></selection>");
   }
 
-  public void testMoveToSelectionStart() throws Exception {
+  public void testMoveToSelectionStart() {
     init("a");
     mouse().pressAt(0, 2).dragTo(0, 4).release();
     verifyCaretsAndSelections(0, 4, 2, 4);
@@ -191,7 +189,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
     verifyCaretsAndSelections(0, 2, 2, 2);
   }
 
-  public void testMoveToSelectionEnd() throws Exception {
+  public void testMoveToSelectionEnd() {
     init("a");
     mouse().pressAt(0, 4).dragTo(0, 2).release();
     verifyCaretsAndSelections(0, 2, 2, 4);
@@ -200,7 +198,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
     verifyCaretsAndSelections(0, 4, 4, 4);
   }
 
-  public void testReverseBlockSelection() throws Exception {
+  public void testReverseBlockSelection() {
     init("a");
     mouse().pressAt(0, 4).dragTo(0, 3).release();
     verifyCaretsAndSelections(0, 3, 3, 4);
@@ -209,7 +207,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
     verifyCaretsAndSelections(0, 4, 4, 4);
   }
 
-  public void testSelectionWithKeyboardInEmptySpace() throws Exception {
+  public void testSelectionWithKeyboardInEmptySpace() {
     init("\n\n");
     mouse().clickAt(1, 1);
     verifyCaretsAndSelections(1, 1, 1, 1);
@@ -251,7 +249,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
     verifyCaretsAndSelections(1, 1, 1, 1);
   }
 
-  public void testBlockSelection() throws Exception {
+  public void testBlockSelection() {
     init("a\n" +
          "bbb\n" +
          "ccccc");
@@ -261,7 +259,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                               2, 1, 1, 4);
   }
 
-  public void testTyping() throws Exception {
+  public void testTyping() {
     init("a\n" +
          "bbb\n" +
          "ccccc");
@@ -272,7 +270,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "ccS<caret>cc");
   }
 
-  public void testCopyPasteOfShortLines() throws Exception {
+  public void testCopyPasteOfShortLines() {
     init("a\n" +
          "bbb\n" +
          "ccccc");
@@ -285,7 +283,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "cc<caret>ccccc");
   }
 
-  public void testPasteOfBlockToASingleCaret() throws Exception {
+  public void testPasteOfBlockToASingleCaret() {
     init("a\n" +
          "bbb\n" +
          "ccccc");
@@ -298,7 +296,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "ccccc");
   }
 
-  public void testPasteOfSeveralLinesCopiedFromIdeaToASingleCaret() throws Exception {
+  public void testPasteOfSeveralLinesCopiedFromIdeaToASingleCaret() {
     init("a\n" +
          "bbb\n" +
          "ccccc");
@@ -313,7 +311,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "b<caret>ccccc");
   }
 
-  public void testSelectToDocumentStart() throws Exception {
+  public void testSelectToDocumentStart() {
     init("line1\n" +
          "line2\n" +
          "line3\n" +
@@ -326,7 +324,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "line4");
   }
 
-  public void testSelectToDocumentEnd() throws Exception {
+  public void testSelectToDocumentEnd() {
     init("line1\n" +
          "line2\n" +
          "line3\n" +
@@ -339,7 +337,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "l<selection>ine4<caret></selection>");
   }
 
-  public void testToggleCaseToLower() throws Exception {
+  public void testToggleCaseToLower() {
     init("a\n" +
          "BBB\n" +
          "ccccc");
@@ -352,7 +350,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                               2, 4, 2, 4);
   }
 
-  public void testToggleCaseToUpper() throws Exception {
+  public void testToggleCaseToUpper() {
     init("a\n" +
          "BBb\n" +
          "ccccc");
@@ -365,7 +363,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                               2, 4, 2, 4);
   }
   
-  public void testSeparatedCarets() throws Exception {
+  public void testSeparatedCarets() {
     init("\n" +
          "\n" +
          "<caret>\n" +
@@ -439,7 +437,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
                       "");
   }
 
-  public void testPageMovementsInteroperateWithLineMovements() throws Exception {
+  public void testPageMovementsInteroperateWithLineMovements() {
     init("abc\nabc\n<caret>abc\nabc\nabc");
     executeAction(IdeActions.ACTION_EDITOR_MOVE_CARET_PAGE_DOWN_WITH_SELECTION);
     checkResultByText("abc\nabc\n<caret>abc\n<caret>abc\n<caret>abc");
@@ -451,7 +449,7 @@ public class EditorMultiCaretColumnModeTest extends AbstractEditorTest {
     checkResultByText("abc\n<caret>abc\n<caret>abc\nabc\nabc");
   }
 
-  private void init(String text) throws IOException {
+  private void init(String text) {
     configureFromFileText(getTestName(false) + ".txt", text);
     setEditorVisibleSize(1000, 1000);
     ((EditorEx)myEditor).setColumnMode(true);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretPerformanceTest.java
index 72df52e41f11..92cfb5aa4f34 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretPerformanceTest.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.PlatformTestUtil;
 
 public class EditorMultiCaretPerformanceTest extends AbstractEditorTest {
-  public void testTyping() throws Exception {
+  public void testTyping() {
     int caretCount = 1000;
     int charactersToType = 100;
     String initialText = StringUtil.repeat("<caret>\n", caretCount);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretStateRestoreTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretStateRestoreTest.java
index 4f1771020885..3c1c436ac6df 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretStateRestoreTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretStateRestoreTest.java
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.testFramework.EditorTestUtil;
 
 public class EditorMultiCaretStateRestoreTest extends HeavyFileEditorManagerTestCase {
-  public void testRestoreState() throws Exception {
+  public void testRestoreState() {
     String text = "some<caret> text<caret>\n" +
                   "some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
                   "<selection>ano<caret>ther</selection> line";
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretTest.java
index 72a6e23ac91a..152114fa0ca0 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretTest.java
@@ -49,7 +49,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
     }
   }
 
-  public void testCaretAddingAndRemoval() throws Exception {
+  public void testCaretAddingAndRemoval() {
     initText("some <selection>t<caret>ext</selection>\n" +
              "another line");
 
@@ -95,7 +95,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
     });
   }
 
-  public void testAltDragStartingFromWithinLine() throws Exception {
+  public void testAltDragStartingFromWithinLine() {
     initText("<caret>line\n" +
              "long line\n" +
              "very long line\n" +
@@ -133,7 +133,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "line");
   }
 
-  public void testMiddleButtonDragStartingFromVirtualSpace() throws Exception {
+  public void testMiddleButtonDragStartingFromVirtualSpace() {
     initText("<caret>line\n" +
              "long line\n" +
              "very long line\n" +
@@ -171,7 +171,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "line");
   }
 
-  public void testAltOnOffWhileDragging() throws Exception {
+  public void testAltOnOffWhileDragging() {
     initText("line1\n" +
              "line2\n" +
              "line3");
@@ -192,7 +192,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "line<caret></selection>3");
   }
 
-  public void testTyping() throws Exception {
+  public void testTyping() {
     initText("some<caret> text<caret>\n" +
              "some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
              "<selection>ano<caret>ther</selection> line");
@@ -202,7 +202,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "A<caret> line");
   }
 
-  public void testCopyPaste() throws Exception {
+  public void testCopyPaste() {
     initText("<selection><caret>one</selection> two \n" +
              "<selection><caret>three</selection> four ");
     executeAction("EditorCopy");
@@ -212,7 +212,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "three fourthree<caret> ");
   }
 
-  public void testCutAndPaste() throws Exception {
+  public void testCutAndPaste() {
     initText("<selection>one<caret></selection> two \n" +
              "<selection>three<caret></selection> four ");
     executeAction("EditorCut");
@@ -222,7 +222,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       " fourthree<caret> ");
   }
 
-  public void testPasteSingleItem() throws Exception {
+  public void testPasteSingleItem() {
     initText("<selection>one<caret></selection> two \n" +
              "three four ");
     executeAction("EditorCopy");
@@ -233,7 +233,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "three fourone<caret> ");
   }
 
-  public void testCutAndPasteMultiline() throws Exception {
+  public void testCutAndPasteMultiline() {
     initText("one <selection>two \n" +
              "three<caret></selection> four \n" +
              "five <selection>six \n" +
@@ -247,7 +247,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "seven<caret>");
   }
 
-  public void testCopyMultilineFromOneCaretPasteIntoTwo() throws Exception {
+  public void testCopyMultilineFromOneCaretPasteIntoTwo() {
     initText("<selection>one\n" +
              "two<caret></selection>\n" +
              "three\n" +
@@ -264,7 +264,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "four");
   }
 
-  public void testCopyPasteDoesNothingWithUnevenSelection() throws Exception {
+  public void testCopyPasteDoesNothingWithUnevenSelection() {
     initText("<selection>one\n" +
              "two<caret></selection>\n" +
              "<selection>three<caret></selection>\n" +
@@ -277,7 +277,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "four");
   }
 
-  public void testPastingAtDifferentNumberOfCarets() throws Exception {
+  public void testPastingAtDifferentNumberOfCarets() {
     initText("<selection>one<caret></selection>\n" +
              "<selection>two<caret></selection>\n" +
              "<selection>three<caret></selection>\n" +
@@ -296,7 +296,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "four");
   }
 
-  public void testPastingLineWithBreakFromOutside() throws Exception {
+  public void testPastingLineWithBreakFromOutside() {
     initText("<caret>\n" +
              "<caret>");
     CopyPasteManager.getInstance().setContents(new StringSelection("abc\n"));
@@ -305,7 +305,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "abc<caret>");
   }
 
-  public void testEscapeAfterDragDown() throws Exception {
+  public void testEscapeAfterDragDown() {
     initText("line1\n" +
              "line2");
     setEditorVisibleSize(1000, 1000);
@@ -316,7 +316,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "line2");
   }
 
-  public void testEscapeAfterDragUp() throws Exception {
+  public void testEscapeAfterDragUp() {
     initText("line1\n" +
              "line2");
     setEditorVisibleSize(1000, 1000);
@@ -327,19 +327,19 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "li<caret>ne2");
   }
 
-  public void testAltShiftDoubleClick() throws Exception {
+  public void testAltShiftDoubleClick() {
     initText("q<caret>uick brown fox");
     mouse().alt().shift().doubleClickAt(0, 8);
     checkResultByText("q<caret>uick <selection>brown<caret></selection> fox");
   }
 
-  public void testAltShiftDoubleClickAtExistingCaret() throws Exception {
+  public void testAltShiftDoubleClickAtExistingCaret() {
     initText("q<caret>uick br<caret>own fox");
     mouse().alt().shift().doubleClickAt(0, 8);
     checkResultByText("q<caret>uick brown fox");
   }
 
-  public void testAltShiftTripleClick() throws Exception {
+  public void testAltShiftTripleClick() {
     initText("q<caret>uick\n" +
              "brown\n" +
              "fox");
@@ -349,7 +349,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "</selection>fox");
   }
 
-  public void testAltShiftTripleClickAtExistingCaret() throws Exception {
+  public void testAltShiftTripleClickAtExistingCaret() {
     initText("q<caret>uick\n" +
              "br<caret>own\n" +
              "fox");
@@ -359,7 +359,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "fox");
   }
 
-  public void testCaretPositionsRecalculationOnDocumentChange() throws Exception {
+  public void testCaretPositionsRecalculationOnDocumentChange() {
     initText("\n" +
              "<selection><caret>word</selection>\n" +
              "some long prefix <selection><caret>word</selection>-suffix");
@@ -373,7 +373,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
     verifySoftWrapPositions(19);
   }
 
-  public void testCreateRectangularSelectionWithMouseClicks() throws Exception {
+  public void testCreateRectangularSelectionWithMouseClicks() {
     initText("<caret>line\n" +
              "long line\n" +
              "very long line\n" +
@@ -387,7 +387,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "line");
   }
 
-  public void testCreateRectangularSelectionExtendsSelection() throws Exception {
+  public void testCreateRectangularSelectionExtendsSelection() {
     initText("<caret>line\n" +
              "long line\n" +
              "very long line\n" +
@@ -407,14 +407,14 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                       "line");
   }
 
-  public void testAddingMultipleSelectionsUsingMouse() throws Exception {
+  public void testAddingMultipleSelectionsUsingMouse() {
     initText("s<selection>om<caret></selection>e text\nother text");
     setEditorVisibleSize(1000, 1000);
     mouse().alt().shift().pressAt(0, 5).dragTo(1, 2).release();
     checkResultByText("s<selection>om<caret></selection>e <selection>text\not<caret></selection>her text");
   }
 
-  public void testAddingMultipleSelectionsUsingMouseInColumnSelectionMode() throws Exception {
+  public void testAddingMultipleSelectionsUsingMouseInColumnSelectionMode() {
     initText("s<selection>om<caret></selection>e text\nother text");
     setEditorVisibleSize(1000, 1000);
     ((EditorEx)myEditor).setColumnMode(true);
@@ -422,21 +422,21 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
     checkResultByText("s<selection>om<caret></selection>e <selection>text\not<caret></selection>her text");
   }
 
-  public void testAltShiftDragAfterRemovingCaret() throws Exception {
+  public void testAltShiftDragAfterRemovingCaret() {
     initText("<selection>a<caret></selection>b<caret>racadabra");
     setEditorVisibleSize(1000, 1000);
     mouse().alt().shift().pressAt(0, 2).dragTo(0, 3).release();
     checkResultByText("<selection>a<caret></selection>bracadabra");
   }
 
-  public void testAddingRectangualSelectionUsingMouse() throws Exception {
+  public void testAddingRectangualSelectionUsingMouse() {
     initText("s<selection>om<caret></selection>e text\nother text");
     setEditorVisibleSize(1000, 1000);
     mouse().ctrl().alt().shift().pressAt(0, 7).dragTo(1, 5).release();
     checkResultByText("s<selection>om<caret></selection>e <selection><caret>te</selection>xt\nother<selection><caret> t</selection>ext");
   }
   
-  public void testCaretPositionUpdateOnFolding() throws Exception {
+  public void testCaretPositionUpdateOnFolding() {
     initText("line1\n" +
              "line2\n" +
              "l<caret>ine3\n" +
@@ -446,7 +446,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
                               2, 4, 4, 4);
   }
 
-  public void testCaretStaysPrimaryOnMerging() throws Exception {
+  public void testCaretStaysPrimaryOnMerging() {
     initText("word\n" +
              "<caret>word word\n" +
              "");
@@ -473,7 +473,7 @@ public class EditorMultiCaretTest extends AbstractEditorTest {
     }
   }
 
-  public void testTypingAdjacentSpaces() throws Exception {
+  public void testTypingAdjacentSpaces() {
     initText("<caret>\t<caret>\t");
     rightWithSelection();
     type(' ');
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretUndoRedoTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretUndoRedoTest.java
index a96f00e7ef17..1937822809e2 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretUndoRedoTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretUndoRedoTest.java
@@ -29,8 +29,6 @@ import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
 import com.intellij.testFramework.TestFileType;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-
 public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
   private CurrentEditorProvider mySavedCurrentEditorProvider;
 
@@ -46,7 +44,7 @@ public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
 
   @Override
   // disabling execution of tests in command
-  protected void runTest() throws Throwable {
+  protected void runTest() {
     new WriteAction<Void>() {
       @Override
       protected void run(@NotNull Result<Void> result) throws Throwable {
@@ -55,7 +53,7 @@ public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
     }.execute();
   }
 
-  public void testUndoRedo() throws Exception {
+  public void testUndoRedo() {
     init("some<caret> text<caret>\n" +
          "some <selection><caret>other</selection> <selection>text<caret></selection>\n" +
          "<selection>ano<caret>ther</selection> line");
@@ -78,7 +76,7 @@ public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
                       "A<caret> line");
   }
 
-  public void testBlockSelectionStateAfterUndo() throws Exception {
+  public void testBlockSelectionStateAfterUndo() {
     init("a");
     ((EditorEx)myEditor).setColumnMode(true);
     mouse().clickAt(0, 2);
@@ -88,7 +86,7 @@ public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
     verifyCaretsAndSelections(0, 3, 2, 3);
   }
 
-  public void testBlockSelectionStateAfterUndo2() throws Exception {
+  public void testBlockSelectionStateAfterUndo2() {
     init("a");
     ((EditorEx)myEditor).setColumnMode(true);
     mouse().pressAt(0, 0).dragTo(0, 2).release();
@@ -97,7 +95,7 @@ public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
     verifyCaretsAndSelections(0, 2, 0, 2);
   }
 
-  public void testPrimaryCaretPositionAfterUndo() throws Exception {
+  public void testPrimaryCaretPositionAfterUndo() {
     init("line1\n" +
          "line2");
     mouse().alt().pressAt(1, 1).dragTo(0, 0).release();
@@ -126,7 +124,7 @@ public class EditorMultiCaretUndoRedoTest extends AbstractEditorTest {
     return TextEditorProvider.getInstance().getTextEditor(myEditor);
   }
 
-  private void init(String text) throws IOException {
+  private void init(String text) {
     init(text, TestFileType.TEXT);
     setEditorVisibleSize(1000, 1000);
     getUndoManager().setEditorProvider(new CurrentEditorProvider() {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java
index 47a2eff5107c..f68fb97c9527 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorPaintingPerformanceTest.java
@@ -26,13 +26,13 @@ import java.awt.*;
 public class EditorPaintingPerformanceTest extends AbstractEditorTest {
   private static final int EDITOR_WIDTH_PX = 1000;
 
-  public void testScrollingThroughLongTextFile() throws Exception {
+  public void testScrollingThroughLongTextFile() {
     initText(StringUtil.repeat(LOREM_IPSUM + '\n', 15000));
 
     doTestScrollingPerformance("scrolling through text file with many lines", 3600);
   }
 
-  public void testScrollingThroughLongSoftWrappedLine() throws Exception {
+  public void testScrollingThroughLongSoftWrappedLine() {
     initText(StringUtil.repeat(LOREM_IPSUM + ' ', 15000));
     EditorTestUtil.configureSoftWraps(myEditor, EDITOR_WIDTH_PX, TEST_CHAR_WIDTH);
     
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/FoldingStressTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/FoldingStressTest.java
index 2cd578519274..e7564b9a8675 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/FoldingStressTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/FoldingStressTest.java
@@ -23,13 +23,13 @@ import com.intellij.testFramework.PlatformTestUtil;
 
 public class FoldingStressTest extends LightPlatformTestCase {
 
-  public void testStressFoldingFromZeroOffset() throws Exception {
+  public void testStressFoldingFromZeroOffset() {
     for (int len = 2; len < 25; len++) {
       stress(len);
     }
   }
 
-  public void testStress8() throws Exception {
+  public void testStress8() {
     DocumentImpl doc = new DocumentImpl("0123456789\n123456789\n23456789");
     Editor editor = EditorFactory.getInstance().createEditor(doc);
     try {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/AbstractRegionToKillRingTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/AbstractRegionToKillRingTest.java
index c67816f1cb9e..ce021f6dc942 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/AbstractRegionToKillRingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/AbstractRegionToKillRingTest.java
@@ -26,22 +26,22 @@ import org.jetbrains.annotations.NotNull;
  */
 public abstract class AbstractRegionToKillRingTest extends LightPlatformCodeInsightTestCase {
 
-  public void testNoSelection() throws Exception {
+  public void testNoSelection() {
     doTest("this is a test string");
   }
 
-  public void testSingleLineSelection() throws Exception {
+  public void testSingleLineSelection() {
     doTest("this is a t<selection>est str</selection>ing");
   }
 
-  public void testMultiLineSelection() throws Exception {
+  public void testMultiLineSelection() {
     doTest(
       "this is the fir<selection>st string\n" +
       "this is the sec</selection>ond string"
     );
   }
   
-  protected abstract void doTest(@NotNull String text) throws Exception;
+  protected abstract void doTest(@NotNull String text);
 
   /**
    * Checks current editor and returns tuple of {@code (selected text; text over than selected)}.
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CopyActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CopyActionTest.java
index 254437d71254..bcc1b4960327 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CopyActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CopyActionTest.java
@@ -20,10 +20,9 @@ import com.intellij.testFramework.EditorTestUtil;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 
 import java.awt.datatransfer.DataFlavor;
-import java.io.IOException;
 
 public class CopyActionTest extends LightPlatformCodeInsightTestCase {
-  public void testCopyWithoutSelection() throws Exception {
+  public void testCopyWithoutSelection() {
     prepare("first line\n" +
             "second<caret> line\n" +
             "third line");
@@ -35,7 +34,7 @@ public class CopyActionTest extends LightPlatformCodeInsightTestCase {
     );
   }
 
-  public void testCopyWithoutSelectionWithSoftWraps() throws Exception {
+  public void testCopyWithoutSelectionWithSoftWraps() {
     prepare("first line\n" +
             "second line<caret>\n" + // this line will be wrapped and caret is positioned after the wrap
             "third line");
@@ -48,7 +47,7 @@ public class CopyActionTest extends LightPlatformCodeInsightTestCase {
     );
   }
 
-  private void prepare(String documentContents) throws IOException {
+  private void prepare(String documentContents) {
     configureFromFileText(getTestName(false) + ".txt", documentContents);
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineBackwardActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineBackwardActionTest.java
index d3afe5be6e5d..5bc8bb583951 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineBackwardActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineBackwardActionTest.java
@@ -18,22 +18,20 @@ package com.intellij.openapi.editor.actions;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-
 /**
  * @author Denis Zhdanov
  * @since 4/18/11 3:39 PM
  */
 public class CutLineBackwardActionTest extends LightPlatformCodeInsightTestCase {
 
-  public void testZeroPosition() throws IOException {
+  public void testZeroPosition() {
     String text = 
       "<caret>class Test {\n" +
       "}";
     doTest(text, text);
   }
   
-  public void testNonZeroPositionOfFirstLine() throws IOException {
+  public void testNonZeroPositionOfFirstLine() {
     doTest(
       "class <caret>Test {\n" +
       "}",
@@ -42,7 +40,7 @@ public class CutLineBackwardActionTest extends LightPlatformCodeInsightTestCase
     );
   }
   
-  public void testZeroPositionNonFirstLine() throws IOException {
+  public void testZeroPositionNonFirstLine() {
     doTest(
       "class Test {\n" +
       "<caret>    // This is comment string\n" +
@@ -52,7 +50,7 @@ public class CutLineBackwardActionTest extends LightPlatformCodeInsightTestCase
     );
   }
 
-  public void testNonZeroPositionNonFirstLine() throws IOException {
+  public void testNonZeroPositionNonFirstLine() {
     doTest(
       "class Test {\n" +
       "    // This is the comment string\n" +
@@ -64,7 +62,7 @@ public class CutLineBackwardActionTest extends LightPlatformCodeInsightTestCase
     );
   }
   
-  private void doTest(@NotNull String before, @NotNull String after) throws IOException {
+  private void doTest(@NotNull String before, @NotNull String after) {
     configureFromFileText(getTestName(false) + ".txt", before);
     cutLineBackward();
     checkResultByText(after);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineEndActionsTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineEndActionsTest.java
index e570e9d2445b..6d62732725db 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineEndActionsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/CutLineEndActionsTest.java
@@ -18,15 +18,13 @@ package com.intellij.openapi.editor.actions;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-
 /**
  * @author Denis Zhdanov
  * @since 4/18/11 2:47 PM
  */
 public class CutLineEndActionsTest extends LightPlatformCodeInsightTestCase {
   
-  public void testNonEmptyLineEnd() throws IOException {
+  public void testNonEmptyLineEnd() {
     doTest(
       "class Test {\n" +
       "    // This is a <caret>comment string\n" +
@@ -37,7 +35,7 @@ public class CutLineEndActionsTest extends LightPlatformCodeInsightTestCase {
     );
   }
 
-  public void testEmptyLineEnd() throws IOException {
+  public void testEmptyLineEnd() {
     doTest(
       "class Test {\n" +
       "    <caret>   \n" +
@@ -49,7 +47,7 @@ public class CutLineEndActionsTest extends LightPlatformCodeInsightTestCase {
     );
   }
   
-  public void testAtLineEnd() throws IOException {
+  public void testAtLineEnd() {
     doTest(
       "class Test {\n" +
       "    // This is a comment string1<caret>\n" +
@@ -61,14 +59,14 @@ public class CutLineEndActionsTest extends LightPlatformCodeInsightTestCase {
     );
   }
   
-  public void testAtDocumentEnd() throws IOException {
+  public void testAtDocumentEnd() {
     String text = 
       "class Test{\n" +
       "}<caret>";
     doTest(text, text);
   }
   
-  public void testEmptyLastLineEnd() throws IOException {
+  public void testEmptyLastLineEnd() {
     doTest(
       "class Test {\n" +
       "}<caret>         ",
@@ -77,7 +75,7 @@ public class CutLineEndActionsTest extends LightPlatformCodeInsightTestCase {
     );
   }
   
-  private void doTest(@NotNull String before, @NotNull String after) throws IOException {
+  private void doTest(@NotNull String before, @NotNull String after) {
     configureFromFileText(getTestName(false) + ".txt", before);
     cutToLineEnd();
     checkResultByText(after);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/DeleteToLineStartAndEndActionsTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/DeleteToLineStartAndEndActionsTest.java
index 441c9b1080f1..44f2a3438d9a 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/DeleteToLineStartAndEndActionsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/DeleteToLineStartAndEndActionsTest.java
@@ -21,19 +21,17 @@ import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
-
 public class DeleteToLineStartAndEndActionsTest extends AbstractEditorTest {
-  public void testEmpty() throws IOException {
+  public void testEmpty() {
     doTestDeleteToStart("<caret>", "<caret>");
     doTestDeleteToEnd("<caret>", "<caret>");
   }
-  public void testEmptyLine() throws IOException {
+  public void testEmptyLine() {
     doTestDeleteToStart("\n<caret>\n\n", "\n<caret>\n\n");
     doTestDeleteToEnd("\n<caret>\n\n", "\n<caret>\n");
   }
 
-  public void testEndOfNonEmptyLine() throws IOException {
+  public void testEndOfNonEmptyLine() {
     doTestDeleteToStart("\n a a a <caret>\n\n", "\n<caret>\n\n");
     doTestDeleteToEnd("\n a a a <caret>\n\n", "\n a a a <caret>\n");
 
@@ -41,7 +39,7 @@ public class DeleteToLineStartAndEndActionsTest extends AbstractEditorTest {
     doTestDeleteToEnd(" a a a <caret>", " a a a <caret>");
   }
 
-  public void testBeginningOfNonEmptyLine() throws IOException {
+  public void testBeginningOfNonEmptyLine() {
     doTestDeleteToStart("\n<caret> a a a \n\n", "\n<caret> a a a \n\n");
     doTestDeleteToEnd("\n<caret> a a a \n\n", "\n<caret>\n\n");
 
@@ -49,7 +47,7 @@ public class DeleteToLineStartAndEndActionsTest extends AbstractEditorTest {
     doTestDeleteToEnd("<caret> a a a ", "<caret>");
   }
 
-  public void testMiddleOfNonEmptyLine() throws IOException {
+  public void testMiddleOfNonEmptyLine() {
     doTestDeleteToStart("\n a a <caret> b b \n\n", "\n<caret> b b \n\n");
     doTestDeleteToEnd("\n a a <caret> b b \n\n", "\n a a <caret>\n\n");
 
@@ -57,7 +55,7 @@ public class DeleteToLineStartAndEndActionsTest extends AbstractEditorTest {
     doTestDeleteToEnd(" a a <caret> b b ", " a a <caret>");
   }
 
-  public void testMoveCaretFromVirtualSpaceToRealOffset() throws IOException {
+  public void testMoveCaretFromVirtualSpaceToRealOffset() {
     boolean virtualSpacesBefore = EditorSettingsExternalizable.getInstance().isVirtualSpace();
     EditorSettingsExternalizable.getInstance().setVirtualSpace(true);
 
@@ -78,32 +76,32 @@ public class DeleteToLineStartAndEndActionsTest extends AbstractEditorTest {
     }
   }
 
-  public void testDeleteSelectionFirst() throws IOException {
+  public void testDeleteSelectionFirst() {
     doTestDeleteToStart("aaa <selection>bbb \n ccc</selection><caret> ddd", "aaa <caret> ddd");
     doTestDeleteToEnd("aaa <selection>bbb \n ccc</selection><caret> ddd", "aaa <caret> ddd");
   }
 
-  private void doTestDeleteToStart(@NotNull String before, @NotNull String after) throws IOException {
+  private void doTestDeleteToStart(@NotNull String before, @NotNull String after) {
     doTestDelete(true, before, null, after, null);
   }
 
   private void doTestDeleteToStart(@NotNull String before, @Nullable VisualPosition positionBefore,
-                                   @NotNull String after, @Nullable VisualPosition positionAfter) throws IOException {
+                                   @NotNull String after, @Nullable VisualPosition positionAfter) {
     doTestDelete(true, before, positionBefore, after, positionAfter);
   }
 
-  private void doTestDeleteToEnd(@NotNull String before, @NotNull String after) throws IOException {
+  private void doTestDeleteToEnd(@NotNull String before, @NotNull String after) {
     doTestDelete(false, before, null, after, null);
   }
 
   private void doTestDeleteToEnd(@NotNull String before, @Nullable VisualPosition positionBefore,
-                                 @NotNull String after, @Nullable VisualPosition positionAfter) throws IOException {
+                                 @NotNull String after, @Nullable VisualPosition positionAfter) {
     doTestDelete(false, before, positionBefore, after, positionAfter);
   }
 
   private void doTestDelete(boolean toStart,
                             @NotNull String before, @Nullable VisualPosition positionBefore,
-                            @NotNull String after, @Nullable VisualPosition positionAfter) throws IOException {
+                            @NotNull String after, @Nullable VisualPosition positionAfter) {
     configureFromFileText(getTestName(false) + ".txt", before);
     if (positionBefore != null) mouse().clickAt(positionBefore.line, positionBefore.column);
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorActionTest.java
index 51e8e6b11601..9c8262892c31 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorActionTest.java
@@ -25,10 +25,9 @@ import com.intellij.testFramework.EditorTestUtil;
 import com.intellij.testFramework.TestFileType;
 
 import java.awt.datatransfer.StringSelection;
-import java.io.IOException;
 
 public class EditorActionTest extends AbstractEditorTest {
-  public void testDownWithSelectionWhenCaretsAreAllowedInsideTabs() throws Exception {
+  public void testDownWithSelectionWhenCaretsAreAllowedInsideTabs() {
     init("<caret>text",
          TestFileType.TEXT);
 
@@ -43,7 +42,7 @@ public class EditorActionTest extends AbstractEditorTest {
       editorSettings.setCaretInsideTabs(old);
     }
   }
-  public void testPageDownWithSelectionWhenCaretsAreAllowedInsideTabs() throws Exception {
+  public void testPageDownWithSelectionWhenCaretsAreAllowedInsideTabs() {
     init("<caret>line 1\n" +
          "line 2",
          TestFileType.TEXT);
@@ -62,7 +61,7 @@ public class EditorActionTest extends AbstractEditorTest {
     }
   }
 
-  public void testDuplicateFirstLineWhenSoftWrapsAreOn() throws Exception {
+  public void testDuplicateFirstLineWhenSoftWrapsAreOn() {
     init("long long t<caret>ext", TestFileType.TEXT);
     EditorTestUtil.configureSoftWraps(myEditor, 10);
 
@@ -71,13 +70,13 @@ public class EditorActionTest extends AbstractEditorTest {
                       "long long t<caret>ext");
   }
 
-  public void testTabWithSelection() throws Exception {
+  public void testTabWithSelection() {
     init("some<selection> <caret></selection>text", TestFileType.TEXT);
     executeAction("EditorTab");
     checkResultByText("some    <caret>text");
   }
 
-  public void testLineDeleteWithSelectionEndAtLineStart() throws IOException {
+  public void testLineDeleteWithSelectionEndAtLineStart() {
     String text =
       "line 1\n" +
       "<selection>line 2\n" +
@@ -90,7 +89,7 @@ public class EditorActionTest extends AbstractEditorTest {
     );
   }
 
-  public void testDeleteLastLine() throws IOException {
+  public void testDeleteLastLine() {
     String text =
       "1\n" +
       "2<caret>\n" +
@@ -102,13 +101,13 @@ public class EditorActionTest extends AbstractEditorTest {
     checkResultByText("1");
   }
 
-  public void testDeleteLastNonEmptyLine() throws IOException {
+  public void testDeleteLastNonEmptyLine() {
     init("<caret>1\n", TestFileType.TEXT);
     deleteLine();
     checkResultByText("");
   }
 
-  public void testDeleteLineHonorSelection() throws Exception {
+  public void testDeleteLineHonorSelection() {
     init("xxxx\n" +
          "bla <selection><caret>bla\n" +
          "bla</selection> bla\n" +
@@ -119,13 +118,13 @@ public class EditorActionTest extends AbstractEditorTest {
                       "yyy<caret>");
   }
 
-  public void testIndentWhitespaceLineWithCaretAtLineStart() throws Exception {
+  public void testIndentWhitespaceLineWithCaretAtLineStart() {
     init("<caret> ", TestFileType.TEXT);
     executeAction("EditorIndentLineOrSelection");
     checkResultByText("    <caret> ");
   }
 
-  public void testBackspaceWithStickySelection() throws Exception {
+  public void testBackspaceWithStickySelection() {
     init("te<caret>xt", TestFileType.TEXT);
     executeAction(IdeActions.ACTION_EDITOR_TOGGLE_STICKY_SELECTION);
     executeAction(IdeActions.ACTION_EDITOR_MOVE_CARET_RIGHT);
@@ -134,21 +133,21 @@ public class EditorActionTest extends AbstractEditorTest {
     assertFalse(((EditorEx)myEditor).isStickySelection());
   }
 
-  public void testMoveRightAtFoldedLineEnd() throws Exception {
+  public void testMoveRightAtFoldedLineEnd() {
     init("line1<caret>\nline2\nline3", TestFileType.TEXT);
     addCollapsedFoldRegion(5, 7, "...");
     executeAction(IdeActions.ACTION_EDITOR_MOVE_CARET_RIGHT);
     assertEquals(new VisualPosition(0, 6), myEditor.getCaretModel().getVisualPosition());
   }
 
-  public void testEnterOnLastLineInOverwriteMode() throws Exception {
+  public void testEnterOnLastLineInOverwriteMode() {
     init("text<caret>", TestFileType.TEXT);
     executeAction(IdeActions.ACTION_EDITOR_TOGGLE_OVERWRITE_MODE);
     executeAction(IdeActions.ACTION_EDITOR_ENTER);
     checkResultByText("text\n<caret>");
   }
 
-  public void testPasteInOneLineMode() throws Exception {
+  public void testPasteInOneLineMode() {
     init("", TestFileType.TEXT);
     ((EditorEx)myEditor).setOneLineMode(true);
     CopyPasteManager.getInstance().setContents(new StringSelection("a\rb"));
@@ -156,19 +155,19 @@ public class EditorActionTest extends AbstractEditorTest {
     checkResultByText("a b<caret>");
   }
 
-  public void testDeleteToWordStartWithEscapeChars() throws Exception {
+  public void testDeleteToWordStartWithEscapeChars() {
     init("class Foo { String s = \"a\\nb<caret>\"; }", TestFileType.JAVA);
     executeAction(IdeActions.ACTION_EDITOR_DELETE_TO_WORD_START);
     checkResultByText("class Foo { String s = \"a\\n<caret>\"; }");
   }
 
-  public void testDeleteToWordEndWithEscapeChars() throws Exception {
+  public void testDeleteToWordEndWithEscapeChars() {
     init("class Foo { String s = \"a\\<caret>nb\"; }", TestFileType.JAVA);
     executeAction(IdeActions.ACTION_EDITOR_DELETE_TO_WORD_END);
     checkResultByText("class Foo { String s = \"a\\<caret>b\"; }");
   }
   
-  public void testUpWithSelectionOnCaretInsideSelection() throws Exception {
+  public void testUpWithSelectionOnCaretInsideSelection() {
     initText("blah blah\n" +
              "blah <selection>bl<caret>ah</selection>\n" +
              "blah blah");
@@ -178,7 +177,7 @@ public class EditorActionTest extends AbstractEditorTest {
                       "blah blah");
   }
   
-  public void testDownWithSelectionOnCaretInsideSelection() throws Exception {
+  public void testDownWithSelectionOnCaretInsideSelection() {
     initText("blah blah\n" +
              "blah <selection>bl<caret>ah</selection>\n" +
              "blah blah");
@@ -188,20 +187,20 @@ public class EditorActionTest extends AbstractEditorTest {
                       "blah bl<caret></selection>ah");
   }
   
-  public void testCaretComesBeforeTextOnUnindent() throws IOException {
+  public void testCaretComesBeforeTextOnUnindent() {
     initText("      <caret>  text");
     unindent();
     checkResultByText("    <caret>text");
   }
   
-  public void testSwapSelectionBoundaries() throws IOException {
+  public void testSwapSelectionBoundaries() {
     initText("a<selection>b<caret></selection>c");
     executeAction(IdeActions.ACTION_EDITOR_SWAP_SELECTION_BOUNDARIES);
     left();
     checkResultByText("a<caret>bc");
   }
   
-  public void testSwapSelectionBoundariesWithStickySelection() throws IOException {
+  public void testSwapSelectionBoundariesWithStickySelection() {
     initText("a<selection>b<caret></selection>c");
     ((EditorEx)myEditor).setStickySelection(true);
     executeAction(IdeActions.ACTION_EDITOR_SWAP_SELECTION_BOUNDARIES);
@@ -209,13 +208,13 @@ public class EditorActionTest extends AbstractEditorTest {
     checkResultByText("<selection><caret>ab</selection>c");
   }
   
-  public void testDuplicateLinesWhenSelectionEndsAtLineStart() throws IOException {
+  public void testDuplicateLinesWhenSelectionEndsAtLineStart() {
     initText("a\n<selection>b\n</selection>c");
     executeAction(IdeActions.ACTION_EDITOR_DUPLICATE_LINES);
     checkResultByText("a\nb\n<selection>b\n</selection>c");
   }
   
-  public void testSmartHomeAfterFoldedRegion() throws IOException {
+  public void testSmartHomeAfterFoldedRegion() {
     initText(" text with [multiline\nfold region]<caret>");
     foldOccurrences("(?s)\\[.*\\]", "...");
     myEditor.getSettings().setSmartHome(true);
@@ -223,38 +222,38 @@ public class EditorActionTest extends AbstractEditorTest {
     checkResultByText(" <caret>text with [multiline\nfold region]");
   }
 
-  public void testToggleCaseForTextAfterEscapedSlash() throws IOException {
+  public void testToggleCaseForTextAfterEscapedSlash() {
     init("class C { String s = \"<selection>ab\\\\cd<caret></selection>\"; }", TestFileType.JAVA);
     executeAction(IdeActions.ACTION_EDITOR_TOGGLE_CASE);
     checkResultByText("class C { String s = \"<selection>AB\\\\CD<caret></selection>\"; }");
   }
 
-  public void testToggleCaseForEscapedChar() throws IOException {
+  public void testToggleCaseForEscapedChar() {
     init("class C { String s = \"<selection>ab\\ncd<caret></selection>\"; }", TestFileType.JAVA);
     executeAction(IdeActions.ACTION_EDITOR_TOGGLE_CASE);
     checkResultByText("class C { String s = \"<selection>AB\\nCD<caret></selection>\"; }");
   }
 
-  public void testJoinSeveralLinesAtDocumentEnd() throws Exception {
+  public void testJoinSeveralLinesAtDocumentEnd() {
     initText("a\nb\nc");
     executeAction(IdeActions.ACTION_SELECT_ALL);
     executeAction(IdeActions.ACTION_EDITOR_JOIN_LINES);
     checkResultByText("a b c");
   }
 
-  public void testDeleteAtSurrogatePair() throws Exception {
+  public void testDeleteAtSurrogatePair() {
     initText("a<caret>" + SURROGATE_PAIR + "b");
     delete();
     checkResultByText("a<caret>b");
   }
 
-  public void testBackspaceAtSurrogatePair() throws Exception {
+  public void testBackspaceAtSurrogatePair() {
     initText("a" + SURROGATE_PAIR + "<caret>b");
     backspace();
     checkResultByText("a<caret>b");
   }
 
-  public void testCaretMovementNearSurrogatePair() throws Exception {
+  public void testCaretMovementNearSurrogatePair() {
     initText("a<caret>" + SURROGATE_PAIR + "b");
     right();
     checkResultByText("a" + SURROGATE_PAIR + "<caret>b");
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ForwardBackwardParagraphActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ForwardBackwardParagraphActionTest.java
index 748c3dfdddb0..0a06bc83db74 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ForwardBackwardParagraphActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ForwardBackwardParagraphActionTest.java
@@ -108,13 +108,13 @@ public class ForwardBackwardParagraphActionTest extends AbstractEditorTest {
                    "abc");
   }
 
-  private void doTestForward(String initialText, String resultText) throws Exception {
+  private void doTestForward(String initialText, String resultText) {
     initText(initialText);
     executeAction(IdeActions.ACTION_EDITOR_FORWARD_PARAGRAPH);
     checkResultByText(resultText);
   }
 
-  private void doTestBackward(String initialText, String resultText) throws Exception {
+  private void doTestBackward(String initialText, String resultText) {
     initText(initialText);
     executeAction(IdeActions.ACTION_EDITOR_BACKWARD_PARAGRAPH);
     checkResultByText(resultText);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java
index e86f0538e96f..7d9eb7f902f6 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java
@@ -19,27 +19,27 @@ import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCa
 
 public class IndentSelectionActionTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testWithoutSelection() throws Exception {
+  public void testWithoutSelection() {
     verifyAction("some text",
                  null);
   }
 
-  public void testWithInlineSelection() throws Exception {
+  public void testWithInlineSelection() {
     verifyAction("some <selection>text</selection>",
                  "    some <selection>text</selection>");
   }
 
-  public void testWithInlineWhitespaceOnlySelection() throws Exception {
+  public void testWithInlineWhitespaceOnlySelection() {
     verifyAction("some<selection> </selection>text",
                  null);
   }
 
-  public void testWithLineSelection() throws Exception {
+  public void testWithLineSelection() {
     verifyAction("<selection>some text</selection>",
                  "    <selection>some text</selection>");
   }
 
-  public void testWithLineSelectionExcludingSpaces() throws Exception {
+  public void testWithLineSelectionExcludingSpaces() {
     verifyAction(" <selection>some text</selection>",
                  "     <selection>some text</selection>");
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRegionActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRegionActionTest.java
index 2c05207653e1..9ccce1c969a8 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRegionActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRegionActionTest.java
@@ -27,7 +27,7 @@ import java.awt.datatransfer.DataFlavor;
  */
 public class KillRegionActionTest extends AbstractRegionToKillRingTest {
 
-  protected void doTest(@NotNull String text) throws Exception {
+  protected void doTest(@NotNull String text) {
     configureFromFileText(getTestName(false) + ".txt", text);
     Pair<String,String> parseResult = parse();
     killRegion();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRingSaveActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRingSaveActionTest.java
index f436175166df..e48897d96a23 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRingSaveActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillRingSaveActionTest.java
@@ -27,7 +27,7 @@ import java.awt.datatransfer.DataFlavor;
  */
 public class KillRingSaveActionTest extends AbstractRegionToKillRingTest {
 
-  protected void doTest(@NotNull String text) throws Exception {
+  protected void doTest(@NotNull String text) {
     configureFromFileText(getTestName(false) + ".txt", text);
     Pair<String,String> parseResult = parse();
     String textBefore = myEditor.getDocument().getText();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java
index 1e6ef592ceed..b8e959e5bc34 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java
@@ -33,35 +33,35 @@ import java.io.IOException;
  */
 public class KillToWordEndActionTest extends LightPlatformCodeInsightTestCase {
 
-  public void testAtWordStart() throws IOException {
+  public void testAtWordStart() {
     doTest(
       "this is a <caret>string",
       "this is a <caret>"
     );
   }
 
-  public void testInTheMiddle() throws IOException {
+  public void testInTheMiddle() {
     doTest(
       "th<caret>is is a string",
       "th<caret> is a string"
     );
   }
 
-  public void testAtWordEnd() throws IOException {
+  public void testAtWordEnd() {
     doTest(
       "this is<caret> a string",
       "this is<caret> string"
     );
   }
 
-  public void testAtWhiteSpaceBetweenWords() throws IOException {
+  public void testAtWhiteSpaceBetweenWords() {
     doTest(
       "this  <caret>     is  a string",
       "this  <caret>  a string"
     );
   }
 
-  public void testAfterLastWordOnTheLineEnd() throws IOException {
+  public void testAfterLastWordOnTheLineEnd() {
     doTest(
       "this is the first string<caret>     \n" +
       "this is the second string",
@@ -69,21 +69,21 @@ public class KillToWordEndActionTest extends LightPlatformCodeInsightTestCase {
     );
   }
 
-  public void testAfterLastWord() throws IOException {
+  public void testAfterLastWord() {
     doTest(
       "this is a string<caret>",
       "this is a string<caret>"
     );
   }
 
-  public void testAfterLastWordBeforeWhiteSpace() throws IOException {
+  public void testAfterLastWordBeforeWhiteSpace() {
     doTest(
       "this is a string<caret>  ",
       "this is a string<caret>"
     );
   }
 
-  public void testAtWhiteSpaceAtLineEnd() throws IOException {
+  public void testAtWhiteSpaceAtLineEnd() {
     doTest(
       "this is the first string  <caret>     \n" +
       "this is the second string",
@@ -91,13 +91,13 @@ public class KillToWordEndActionTest extends LightPlatformCodeInsightTestCase {
     );
   }
 
-  public void testEscapeChars() throws Exception {
+  public void testEscapeChars() {
     configureFromFileText(getTestName(false) + ".java", "class Foo { String s = \"a\\<caret>nb\"; }");
     killToWordEnd();
     checkResultByText("class Foo { String s = \"a\\<caret>b\"; }");
   }
 
-  private void doTest(@NotNull String before, @NotNull String after) throws IOException {
+  private void doTest(@NotNull String before, @NotNull String after) {
     configureFromFileText(getTestName(false) + ".txt", before);
     killToWordEnd();
     checkResultByText(after);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordStartActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordStartActionTest.java
index 9daf7c5df508..24034a7f32a7 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordStartActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordStartActionTest.java
@@ -19,43 +19,41 @@ import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-
 /**
  * @author Denis Zhdanov
  * @since 4/19/11 4:21 PM
  */
 public class KillToWordStartActionTest extends LightPlatformCodeInsightTestCase {
 
-  public void testAfterWordEnd() throws IOException {
+  public void testAfterWordEnd() {
     doTest(
       "this is a test string    <caret>",
       "this is a test <caret>"
     );
   }
 
-  public void testAtWordEnd() throws IOException {
+  public void testAtWordEnd() {
     doTest(
       "this is a test string<caret>",
       "this is a test <caret>"
     );
   }
 
-  public void testInTheMiddleOfTheWord() throws IOException {
+  public void testInTheMiddleOfTheWord() {
     doTest(
       "this is a test str<caret>ing",
       "this is a test <caret>ing"
     );
   }
 
-  public void testInTheWordStart() throws IOException {
+  public void testInTheWordStart() {
     doTest(
       "this is a test <caret>string",
       "this is a <caret>string"
     );
   }
   
-  public void testInWhiteSpaceAtLineStart() throws IOException {
+  public void testInWhiteSpaceAtLineStart() {
     doTest(
       "this is the first string  \n" +
       " <caret>  this is the second string",
@@ -63,7 +61,7 @@ public class KillToWordStartActionTest extends LightPlatformCodeInsightTestCase
     );
   }
 
-  public void testAtLineStart() throws IOException {
+  public void testAtLineStart() {
     doTest(
       "this is the first string  \n" +
       "<caret>  this is the second string",
@@ -71,27 +69,27 @@ public class KillToWordStartActionTest extends LightPlatformCodeInsightTestCase
     );
   }
 
-  public void testInWhiteSpaceAtDocumentStart() throws IOException {
+  public void testInWhiteSpaceAtDocumentStart() {
     doTest(
       "    <caret>  this is the first string",
       "<caret>  this is the first string"
     );
   }
 
-  public void testAtDocumentStart() throws IOException {
+  public void testAtDocumentStart() {
     doTest(
       "<caret>  this is the first string",
       "<caret>  this is the first string"
     );
   }
 
-  public void testEscapeChars() throws Exception {
+  public void testEscapeChars() {
     configureFromFileText(getTestName(false) + ".java", "class Foo { String s = \"a\\nb<caret>\"; }");
     killToWordStart();
     checkResultByText("class Foo { String s = \"a\\n<caret>\"; }");
   }
   
-  public void testNearDocumentStartInCamelHumpsMode() throws IOException {
+  public void testNearDocumentStartInCamelHumpsMode() {
     EditorSettingsExternalizable editorSettings = EditorSettingsExternalizable.getInstance();
     boolean savedValue = editorSettings.isCamelWords();
     editorSettings.setCamelWords(true);
@@ -103,7 +101,7 @@ public class KillToWordStartActionTest extends LightPlatformCodeInsightTestCase
     }
   }
 
-  private void doTest(@NotNull String before, @NotNull String after) throws IOException {
+  private void doTest(@NotNull String before, @NotNull String after) {
     configureFromFileText(getTestName(false) + ".txt", before);
     killToWordStart();
     checkResultByText(after);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveLineTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveLineTest.java
index 83136242bc28..db36ecd3f396 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveLineTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/MoveLineTest.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import static org.junit.Assert.assertArrayEquals;
 
 public class MoveLineTest extends AbstractEditorTest {
-  public void testInlaysAreMovedWithText() throws Exception {
+  public void testInlaysAreMovedWithText() {
     initText("<caret>ab\ncd\n");
     addInlay(1);
     executeAction(IdeActions.ACTION_MOVE_LINE_DOWN_ACTION);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java
index 89ffe687d2d2..08c3ff838104 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/NextPrevWordTest.java
@@ -39,19 +39,19 @@ public class NextPrevWordTest extends LightPlatformCodeInsightFixtureTestCase {
     myFixture.checkResult("<caret><foo>");
   }
 
-  public void testNextWordWithEscapeChars() throws Exception {
+  public void testNextWordWithEscapeChars() {
     myFixture.configureByText("Foo.java", "class Foo { String s = \"a\\<caret>nb\"; }");
     myFixture.performEditorAction(IdeActions.ACTION_EDITOR_NEXT_WORD);
     myFixture.checkResult("class Foo { String s = \"a\\n<caret>b\"; }");
   }
 
-  public void testPrevWordWithEscapeChars() throws Exception {
+  public void testPrevWordWithEscapeChars() {
     myFixture.configureByText("Foo.java", "class Foo { String s = \"a\\nb<caret>\"; }");
     myFixture.performEditorAction(IdeActions.ACTION_EDITOR_PREVIOUS_WORD);
     myFixture.checkResult("class Foo { String s = \"a\\n<caret>b\"; }");
   }
 
-  public void testPrevWordWithIllegalEscapeChar() throws Exception {
+  public void testPrevWordWithIllegalEscapeChar() {
     myFixture.configureByText("Foo.java", "class Foo { String s = \"a\\xb<caret>\"; }");
     myFixture.performEditorAction(IdeActions.ACTION_EDITOR_PREVIOUS_WORD);
     myFixture.checkResult("class Foo { String s = \"a\\x<caret>b\"; }");
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectLineActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectLineActionTest.java
index 6ee9d7c837ac..c31ddd13929a 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectLineActionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectLineActionTest.java
@@ -18,10 +18,8 @@ package com.intellij.openapi.editor.actions;
 import com.intellij.testFramework.EditorTestUtil;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 
-import java.io.IOException;
-
 public class SelectLineActionTest extends LightPlatformCodeInsightTestCase {
-  public void test() throws Exception {
+  public void test() {
     prepare("first line\n" +
             "second<caret> line\n" +
             "third line");
@@ -32,7 +30,7 @@ public class SelectLineActionTest extends LightPlatformCodeInsightTestCase {
     );
   }
 
-  public void testWithSoftWraps() throws Exception {
+  public void testWithSoftWraps() {
     prepare("first line\n" +
             "second line<caret>\n" + // this line will be wrapped and caret is positioned after the wrap
             "third line");
@@ -44,7 +42,7 @@ public class SelectLineActionTest extends LightPlatformCodeInsightTestCase {
     );
   }
 
-  private void prepare(String documentContents) throws IOException {
+  private void prepare(String documentContents) {
     configureFromFileText(getTestName(false) + ".txt", documentContents);
   }
 }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java
index 38c4fcacb07b..afccf1e51d82 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java
@@ -43,7 +43,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     ApplicationManager.getApplication().getMessageBus().connect(myFixture.getTestRootDisposable()).subscribe(EditorHintListener.TOPIC, listener);
   }
 
-  public void testAllWithoutInitialSelection() throws Exception {
+  public void testAllWithoutInitialSelection() {
     init("some t<caret>ext\n" +
          "some texts\n" +
          "another text here"
@@ -54,7 +54,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
                 "another <selection>t<caret>ext</selection> here");
   }
 
-  public void testAllWithInitialWholeWordSelection() throws Exception {
+  public void testAllWithInitialWholeWordSelection() {
     init("some <selection>t<caret>ext</selection>\n" +
          "some texts\n" +
          "some texts\n" +
@@ -67,7 +67,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertEquals(0, hintCount);
   }
 
-  public void testNoInitialSelection() throws Exception {
+  public void testNoInitialSelection() {
     init("some t<caret>ext\n" +
          "some texts\n" +
          "another text here"
@@ -83,7 +83,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertEquals(0, hintCount);
   }
 
-  public void testInitialWholeWordSelection() throws Exception {
+  public void testInitialWholeWordSelection() {
     init("some <selection>t<caret>ext</selection>\n" +
          "some texts\n" +
          "another text here");
@@ -94,7 +94,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertEquals(0, hintCount);
   }
 
-  public void testShowingHint() throws Exception {
+  public void testShowingHint() {
     init("some <selection>t<caret>ext</selection>\n" +
          "another <selection>t<caret>ext</selection> here");
     executeAction();
@@ -107,7 +107,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
                 "another <selection>t<caret>ext</selection> here");
   }
 
-  public void testRevert() throws Exception {
+  public void testRevert() {
     init("some <selection>t<caret>ext</selection>\n" +
          "another <selection>t<caret>ext</selection> here");
     executeReverseAction();
@@ -116,7 +116,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertEquals(0, hintCount);
   }
 
-  public void testRevertSingleSelection() throws Exception {
+  public void testRevertSingleSelection() {
     init("some <selection>t<caret>ext</selection>\n" +
          "some texts\n" +
          "another text here");
@@ -127,7 +127,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertEquals(0, hintCount);
   }
 
-  public void testSelectAfterHint() throws Exception {
+  public void testSelectAfterHint() {
     init("some text\n" +
          "some texts\n" +
          "another <selection>t<caret>ext</selection> here");
@@ -143,7 +143,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertEquals(1, hintCount);
   }
 
-  public void testInitialNonWholeWordSelection() throws Exception {
+  public void testInitialNonWholeWordSelection() {
     init("some <selection>t<caret>ex</selection>t\n" +
          "some texts\n" +
          "another text here");
@@ -158,7 +158,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertEquals(0, hintCount);
   }
 
-  public void testOccurrenceInCollapsedRegion() throws Exception {
+  public void testOccurrenceInCollapsedRegion() {
     init("normal <selection><caret>line</selection>\n" +
          "collapsed line");
     final FoldingModel foldingModel = myFixture.getEditor().getFoldingModel();
@@ -176,7 +176,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     assertTrue(foldRegions[0].isExpanded());
   }
 
-  public void testSelectAfterNotFoundAndUnselect() throws Exception {
+  public void testSelectAfterNotFoundAndUnselect() {
     init("text <selection><caret>text</selection> <selection><caret>text</selection>");
     executeAction();
     executeReverseAction();
@@ -184,7 +184,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
     checkResult("text <selection><caret>text</selection> <selection><caret>text</selection>");
   }
 
-  public void testEscapeReturnsToInitialPosition() throws Exception {
+  public void testEscapeReturnsToInitialPosition() {
     init("l<caret>ine\n" +
          "another line");
     executeAction();
@@ -193,14 +193,14 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
                 "another line");
   }
 
-  public void testSelectingAdjacentFragments() throws Exception {
+  public void testSelectingAdjacentFragments() {
     init("fragment<selection>fragment<caret></selection>");
     executeAction();
     executeAction();
     checkResult("<selection>fragment<caret></selection><selection>fragment<caret></selection>");
   }
 
-  public void testSkippingOccurrence() throws Exception {
+  public void testSkippingOccurrence() {
     init("fr<caret>uit\n" +
          "fruits\n" +
          "fruit\n" +
@@ -216,7 +216,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
                 "<selection>fr<caret>uit</selection>");
   }
 
-  public void testMovingSelectionBackAndForth() throws Exception {
+  public void testMovingSelectionBackAndForth() {
     init("fr<caret>uit\n" +
          "fruits\n" +
          "fruit\n" +
@@ -234,7 +234,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
                 "<selection>fr<caret>uit</selection>");
   }
 
-  public void testSkipDoesNotRemovePreviousSelections() throws Exception {
+  public void testSkipDoesNotRemovePreviousSelections() {
     init("<caret>fruit\n" +
          "fruit\n" +
          "fruit");
@@ -250,7 +250,7 @@ public class SelectUnselectOccurrenceActionsTest extends LightPlatformCodeInsigh
                 "<selection><caret>fruit</selection>");
   }
 
-  public void testNearInlays() throws Exception {
+  public void testNearInlays() {
     init("cat cat");
     EditorTestUtil.addInlay(myFixture.getEditor(), 0);
     EditorTestUtil.addInlay(myFixture.getEditor(), 4);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java
index c35017bb74e5..e8c2a26ed1d3 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
 
 public class ToggleColumnModeActionMultiCaretTest extends LightPlatformCodeInsightFixtureTestCase {
-  public void testSingleCaretWithoutSelection() throws Exception {
+  public void testSingleCaretWithoutSelection() {
     doTestToggleOnOff("line1\n" +
                       "line<caret>2",
 
@@ -31,7 +31,7 @@ public class ToggleColumnModeActionMultiCaretTest extends LightPlatformCodeInsig
     );
   }
 
-  public void testSingleCaretWithForwardSelection() throws Exception {
+  public void testSingleCaretWithForwardSelection() {
     doTestToggleOnOff("l<selection>ine1\n" +
                       "line<caret></selection>2",
 
@@ -43,7 +43,7 @@ public class ToggleColumnModeActionMultiCaretTest extends LightPlatformCodeInsig
     );
   }
 
-  public void testSingleCaretWithBackwardSelection() throws Exception {
+  public void testSingleCaretWithBackwardSelection() {
     doTestToggleOnOff("l<selection><caret>ine1\n" +
                       "line</selection>2",
 
@@ -55,7 +55,7 @@ public class ToggleColumnModeActionMultiCaretTest extends LightPlatformCodeInsig
     );
   }
 
-  public void testSingleCaretWithCrossSelection() throws Exception {
+  public void testSingleCaretWithCrossSelection() {
     doTestToggleOnOff("line<selection><caret>1\n" +
                       "l</selection>ine2",
 
@@ -67,7 +67,7 @@ public class ToggleColumnModeActionMultiCaretTest extends LightPlatformCodeInsig
     );
   }
 
-  public void testSingleCaretWithCrossSelection2() throws Exception {
+  public void testSingleCaretWithCrossSelection2() {
     doTestToggleOnOff("line<selection>1\n" +
                       "l<caret></selection>ine2",
 
@@ -79,7 +79,7 @@ public class ToggleColumnModeActionMultiCaretTest extends LightPlatformCodeInsig
     );
   }
 
-  public void testMultipleCarets() throws Exception {
+  public void testMultipleCarets() {
     doTestToggleOnOff("<caret>l<selection>ine1\n" +
                       "line<caret></selection>2",
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java
index 21b1d14331eb..f8f182ed3e29 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java
@@ -101,7 +101,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
     assertEquals(FontPreferences.DEFAULT_FONT_SIZE, myScheme.getConsoleFontSize());
   }
 
-  public void testSetFontPreferences() throws Exception {
+  public void testSetFontPreferences() {
     String fontName1 = getExistingNonDefaultFontName();
     String fontName2 = getAnotherExistingNonDefaultFontName();
     myScheme.setEditorFontName(fontName1);
@@ -144,7 +144,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
 
   }
 
-  public void testSetName() throws Exception {
+  public void testSetName() {
     String fontName1 = getExistingNonDefaultFontName();
     String fontName2 = getAnotherExistingNonDefaultFontName();
     myScheme.setEditorFontName(fontName1);
@@ -167,7 +167,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
     assertEquals(scaledSize, myScheme.getConsoleFontSize());
   }
 
-  public void testSetSize() throws Exception {
+  public void testSetSize() {
     myScheme.setEditorFontSize(25);
     myScheme.setConsoleFontSize(21);
 
@@ -187,7 +187,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
     assertEquals(21, myScheme.getConsoleFontSize());
   }
 
-  public void testSetNameAndSize() throws Exception {
+  public void testSetNameAndSize() {
     String fontName1 = getExistingNonDefaultFontName();
     String fontName2 = getAnotherExistingNonDefaultFontName();
     myScheme.setEditorFontName(fontName1);
@@ -211,7 +211,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
     assertEquals(21, myScheme.getConsoleFontSize());
   }
 
-  public void testSetSizeAndName() throws Exception {
+  public void testSetSizeAndName() {
     String fontName1 = getExistingNonDefaultFontName();
     String fontName2 = getAnotherExistingNonDefaultFontName();
     myScheme.setEditorFontSize(25);
@@ -265,7 +265,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
   }
 
 
-  public void testSaveInheritance() throws Exception {
+  public void testSaveInheritance() {
     Pair<EditorColorsScheme, TextAttributes> result = doTestWriteRead(DefaultLanguageHighlighterColors.STATIC_METHOD, USE_INHERITED_MARKER);
     TextAttributes fallbackAttrs = result.first.getAttributes(DefaultLanguageHighlighterColors.STATIC_METHOD.getFallbackAttributeKey());
     assertSame(result.second, fallbackAttrs);
@@ -279,7 +279,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
     assertThat(result.second).isEqualTo(fallbackAttrs);
   }
 
-  public void testSaveInheritanceForEmptyAttrs() throws Exception {
+  public void testSaveInheritanceForEmptyAttrs() {
     Pair<EditorColorsScheme, TextAttributes> result = doTestWriteRead(DefaultLanguageHighlighterColors.INSTANCE_FIELD, USE_INHERITED_MARKER);
     TextAttributes fallbackAttrs = result.first.getAttributes(DefaultLanguageHighlighterColors.INSTANCE_FIELD.getFallbackAttributeKey());
     TextAttributes directlyDefined =
@@ -343,7 +343,7 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
     }
   }
 
-  public void testIdea152156() throws Exception {
+  public void testIdea152156() {
     EditorColorsScheme defaultScheme = EditorColorsManager.getInstance().getScheme(EditorColorsScheme.DEFAULT_SCHEME_NAME);
     EditorColorsScheme parentScheme = (EditorColorsScheme)defaultScheme.clone();
     parentScheme.setName("DefaultTest");
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/TextAttributesReaderTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/TextAttributesReaderTest.java
index a5866deabb4a..51f960a41c23 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/TextAttributesReaderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/TextAttributesReaderTest.java
@@ -21,8 +21,7 @@ import com.intellij.testFramework.LightPlatformTestCase;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 
-import java.awt.Color;
-import java.awt.Font;
+import java.awt.*;
 
 /**
  * @author Sergey.Malenkov
@@ -161,7 +160,7 @@ public final class TextAttributesReaderTest extends LightPlatformTestCase {
     return read(Option.element(value));
   }
 
-  private TextAttributes read(Element element) throws Exception {
+  private TextAttributes read(Element element) {
     return myReader.read(TextAttributes.class, element);
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/ex/util/EditorUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/ex/util/EditorUtilTest.java
index 0b2392452f92..910772fa5768 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/ex/util/EditorUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/ex/util/EditorUtilTest.java
@@ -19,7 +19,7 @@ import com.intellij.testFramework.EditorTestUtil;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 
 public class EditorUtilTest extends LightPlatformCodeInsightTestCase {
-  public void testGetNotFoldedLineStartEndOffsets() throws Exception {
+  public void testGetNotFoldedLineStartEndOffsets() {
     configureFromFileText(getTestName(false) + ".txt",
                           "aaa\nbbb\nccc\nddd");
     EditorTestUtil.addFoldRegion(myEditor, 4, 8, "...", true);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractEditorTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractEditorTest.java
index 14a6141aa529..550fac75e5f2 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractEditorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractEditorTest.java
@@ -27,7 +27,6 @@ import com.intellij.util.ThrowableRunnable;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -72,11 +71,11 @@ public abstract class AbstractEditorTest extends LightPlatformCodeInsightTestCas
     }
   }
 
-  protected void initText(@NotNull @NonNls String fileText) throws IOException {
+  protected void initText(@NotNull @NonNls String fileText) {
     init(fileText, TestFileType.TEXT);
   }
   
-  protected void init(@NotNull @NonNls String fileText, @NotNull TestFileType type) throws IOException {
+  protected void init(@NotNull @NonNls String fileText, @NotNull TestFileType type) {
     configureFromFileText(getFileName(type), fileText);
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractRtlTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractRtlTest.java
index 54df8119f3f7..dd8b72e840a3 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractRtlTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractRtlTest.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.editor.VisualPosition;
 import com.intellij.testFramework.TestFileType;
 
 import java.awt.*;
-import java.io.IOException;
 import java.util.ArrayList;
 
 /**
@@ -32,11 +31,11 @@ public abstract class AbstractRtlTest extends AbstractEditorTest {
   private static final char RTL_CHAR = '\u05d0'; // Hebrew 'aleph' letter
   private static final char BIDI_BOUNDARY_MARKER = '|';
 
-  protected void prepareText(String text) throws IOException {
+  protected void prepareText(String text) {
     prepare(text, TestFileType.TEXT);
   }
   
-  protected void prepare(String text, TestFileType fileType) throws IOException {
+  protected void prepare(String text, TestFileType fileType) {
     init(text.replace(RTL_CHAR_REPRESENTATION, RTL_CHAR), fileType);
   }
   
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java
index 95f1a5e1b0c2..8817e0141c38 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/DocumentMarkupModelTest.java
@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Dmitry Avdeev
  */
 public class DocumentMarkupModelTest extends LightPlatformCodeInsightFixtureTestCase {
-  public void testInfoTestAttributes() throws Exception {
+  public void testInfoTestAttributes() {
     LanguageExtensionPoint<Annotator> extension = new LanguageExtensionPoint<>();
     extension.language="TEXT";
     extension.implementationClass = TestAnnotator.class.getName();
@@ -72,7 +72,7 @@ public class DocumentMarkupModelTest extends LightPlatformCodeInsightFixtureTest
     RangeHighlighterEx highlighter = model.addPersistentLineHighlighter(2, 0, null);
     new WriteCommandAction<Void>(getProject()){
       @Override
-      protected void run(@NotNull Result<Void> result) throws Throwable {
+      protected void run(@NotNull Result<Void> result) {
         document.deleteString(document.getLineStartOffset(1), document.getTextLength());
       }
     }.execute();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorColorsSchemeDelegateTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorColorsSchemeDelegateTest.java
index e5e968445141..a8209cdfb390 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorColorsSchemeDelegateTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorColorsSchemeDelegateTest.java
@@ -15,7 +15,10 @@
  */
 package com.intellij.openapi.editor.impl;
 
-import com.intellij.openapi.editor.colors.*;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
+import com.intellij.openapi.editor.colors.EditorColorsScheme;
+import com.intellij.openapi.editor.colors.FontPreferences;
+import com.intellij.openapi.editor.colors.ModifiableFontPreferences;
 import com.intellij.openapi.editor.colors.impl.AppEditorFontOptions;
 import com.intellij.openapi.editor.colors.impl.DelegateColorScheme;
 import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl;
@@ -54,7 +57,7 @@ public class EditorColorsSchemeDelegateTest extends AbstractEditorTest {
     }
   }
   
-  public void testSecondaryFontIsAvailable() throws Exception {
+  public void testSecondaryFontIsAvailable() {
     String secondaryFont = getExistingNonDefaultFontName();
     FontPreferences globalPrefs = AppEditorFontOptions.getInstance().getFontPreferences();
     FontPreferences tempCopy = new FontPreferencesImpl();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java
index f30aa775908b..c3a90464bfb1 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java
@@ -38,14 +38,14 @@ import java.awt.*;
 import java.awt.datatransfer.StringSelection;
 
 public class EditorImplTest extends AbstractEditorTest {
-  public void testPositionCalculationForZeroWidthChars() throws Exception {
+  public void testPositionCalculationForZeroWidthChars() {
     initText("some\u2044text");
     VisualPosition pos = new VisualPosition(0, 6);
     VisualPosition recalculatedPos = myEditor.xyToVisualPosition(myEditor.visualPositionToXY(pos));
     assertEquals(pos, recalculatedPos);
   }
 
-  public void testPositionCalculationOnEmptyLine() throws Exception {
+  public void testPositionCalculationOnEmptyLine() {
     initText("text with\n" +
          "\n" +
          "empty line");
@@ -54,7 +54,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(pos, recalculatedPos);
   }
 
-  public void testShiftDragAddsToSelection() throws Exception {
+  public void testShiftDragAddsToSelection() {
     initText("A quick brown fox");
     EditorTestUtil.setEditorVisibleSize(myEditor, 1000, 1000); // enable drag testing
     mouse().clickAt(0, 1);
@@ -62,7 +62,7 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("A<selection> q<caret></selection>uick brown fox");
   }
 
-  public void testSoftWrapsRecalculationInASpecificCase() throws Exception {
+  public void testSoftWrapsRecalculationInASpecificCase() {
     configureFromFileText(getTestName(false) + ".java",
                           "<selection>class Foo {\n" +
                           "\t@Override\n" +
@@ -89,7 +89,7 @@ public class EditorImplTest extends AbstractEditorTest {
     verifySoftWrapPositions(58, 93);
   }
 
-  public void testCorrectVisibleLineCountCalculation() throws Exception {
+  public void testCorrectVisibleLineCountCalculation() {
     initText("line containing FOLDED_REGION\n" +
          "next <caret>line\n" +
          "last line");
@@ -103,7 +103,7 @@ public class EditorImplTest extends AbstractEditorTest {
                       "last <caret>line");
   }
 
-  public void testInsertingFirstTab() throws Exception {
+  public void testInsertingFirstTab() {
     initText(" <caret>space-indented line");
     configureSoftWraps(100);
     myEditor.getSettings().setUseTabCharacter(true);
@@ -112,7 +112,7 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText(" \t<caret>space-indented line");
   }
 
-  public void testNoExceptionDuringBulkModeDocumentUpdate() throws Exception {
+  public void testNoExceptionDuringBulkModeDocumentUpdate() {
     initText("something");
     DocumentEx document = (DocumentEx)myEditor.getDocument();
     runWriteCommand(() -> {
@@ -124,7 +124,7 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("something\telse");
   }
 
-  public void testCaretMergeDuringBulkModeDocumentUpdate() throws Exception {
+  public void testCaretMergeDuringBulkModeDocumentUpdate() {
     initText("a<selection>bcdef<caret></selection>g\n" +
              "a<selection>bcdef<caret></selection>g");
     runWriteCommand(() -> {
@@ -140,7 +140,7 @@ public class EditorImplTest extends AbstractEditorTest {
                       "a<caret>g");
   }
 
-  public void testPositionCalculationForOneCharacterFolds() throws Exception {
+  public void testPositionCalculationForOneCharacterFolds() {
     initText("something");
     addCollapsedFoldRegion(1, 2, "...");
     addCollapsedFoldRegion(3, 4, "...");
@@ -148,7 +148,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new VisualPosition(0, 5), myEditor.logicalToVisualPosition(new LogicalPosition(0, 3)));
   }
   
-  public void testNavigationIntoFoldedRegionWithSoftWrapsEnabled() throws Exception {
+  public void testNavigationIntoFoldedRegionWithSoftWrapsEnabled() {
     initText("something");
     addCollapsedFoldRegion(4, 8, "...");
     configureSoftWraps(1000);
@@ -158,7 +158,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new VisualPosition(0, 5), myEditor.getCaretModel().getVisualPosition());
   }
   
-  public void testPositionCalculationForMultilineFoldingWithEmptyPlaceholder() throws Exception {
+  public void testPositionCalculationForMultilineFoldingWithEmptyPlaceholder() {
     initText("line1\n" +
              "line2\n" +
              "line3\n" +
@@ -169,7 +169,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new LogicalPosition(3, 0), myEditor.visualToLogicalPosition(new VisualPosition(2, 0)));
   }
   
-  public void testNavigationInsideNonNormalizedLineTerminator() throws Exception {
+  public void testNavigationInsideNonNormalizedLineTerminator() {
     initText("");
     ((DocumentImpl)myEditor.getDocument()).setAcceptSlashR(true);
     runWriteCommand(() -> myEditor.getDocument().insertString(0, "abc\r\ndef"));
@@ -180,7 +180,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new VisualPosition(0, 3), myEditor.getCaretModel().getVisualPosition());
   }
   
-  public void testSoftWrapModeUpdateDuringBulkModeChange() throws Exception {
+  public void testSoftWrapModeUpdateDuringBulkModeChange() {
     initText("long long line<caret>");
     configureSoftWraps(12);
     DocumentEx document = (DocumentEx)myEditor.getDocument();
@@ -193,7 +193,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new VisualPosition(1, 5), myEditor.getCaretModel().getVisualPosition());
   }
   
-  public void testSuccessiveBulkModeOperations() throws Exception {
+  public void testSuccessiveBulkModeOperations() {
     initText("some text");
     DocumentEx document = (DocumentEx)myEditor.getDocument();
 
@@ -213,7 +213,7 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("some+text<caret>");
   }
   
-  public void testCorrectCaretPositionRestorationAfterMultipleFoldRegionsChange() throws Exception {
+  public void testCorrectCaretPositionRestorationAfterMultipleFoldRegionsChange() {
     initText("so<caret>me long text");
     final FoldRegion innerRegion = addCollapsedFoldRegion(0, 4, "...");
     final FoldRegion outerRegion = addCollapsedFoldRegion(0, 9, "...");
@@ -226,21 +226,21 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("so<caret>me long text");
   }
   
-  public void testEditorSizeCalculationOnOpening() throws Exception {
+  public void testEditorSizeCalculationOnOpening() {
     initText("a\nbbb\nccccc");
     myEditor.getSettings().setAdditionalColumnsCount(0);
     myEditor.getSettings().setAdditionalLinesCount(0);
     assertEquals(new Dimension(50, 30), myEditor.getContentComponent().getPreferredSize());
   }
   
-  public void testCollapsingRegionContainingSoftWrap() throws Exception {
+  public void testCollapsingRegionContainingSoftWrap() {
     initText("abcdef abcdef");
     configureSoftWraps(10);
     addCollapsedFoldRegion(0, 13, "...");
     assertEquals(new VisualPosition(0, 3), myEditor.offsetToVisualPosition(13));
   }
   
-  public void testSizeRecalculationOnTurningSoftWrapsOff() throws Exception {
+  public void testSizeRecalculationOnTurningSoftWrapsOff() {
     initText("abc def");
     myEditor.getSettings().setAdditionalColumnsCount(0);
     myEditor.getSettings().setAdditionalLinesCount(0);
@@ -249,7 +249,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new Dimension(70, 10), myEditor.getContentComponent().getPreferredSize());
   }
   
-  public void testUpdatingCaretPositionAfterBulkMode() throws Exception {
+  public void testUpdatingCaretPositionAfterBulkMode() {
     initText("a<caret>bc");
     runWriteCommand(() -> {
       DocumentEx document = (DocumentEx)myEditor.getDocument();
@@ -261,27 +261,27 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("\n a<caret>bc");
   }
   
-  public void testAllowCaretPositioningInsideSoftWrapOnlyIfVirtualSpaceIsEnabled() throws Exception {
+  public void testAllowCaretPositioningInsideSoftWrapOnlyIfVirtualSpaceIsEnabled() {
     initText("abcdef abcdef");
     configureSoftWraps(10);
     mouse().clickAt(0, 10);
     assertEquals(new VisualPosition(0, 7), myEditor.getCaretModel().getVisualPosition());
   }
   
-  public void testXYToVisualPositionWhenPrefixIsSet() throws Exception {
+  public void testXYToVisualPositionWhenPrefixIsSet() {
     initText("abc");
     configureSoftWraps(1000); // to make sure soft wrap character width is properly mocked
     ((EditorEx)myEditor).setPrefixTextAndAttributes(">", new TextAttributes());
     assertEquals(new VisualPosition(0, 0), myEditor.xyToVisualPosition(new Point(1, 0)));
   }
   
-  public void testLogicalPositionCacheInvalidationAfterLineDeletion() throws Exception {
+  public void testLogicalPositionCacheInvalidationAfterLineDeletion() {
     initText("<caret>\n\t");
     delete();
     assertEquals(new LogicalPosition(0, 4), myEditor.offsetToLogicalPosition(1));
   }
   
-  public void testSoftWrapsUpdateAfterEditorWasHidden() throws Exception {
+  public void testSoftWrapsUpdateAfterEditorWasHidden() {
     initText("long long line");
     configureSoftWraps(6);
     verifySoftWrapPositions(5, 10);
@@ -296,7 +296,7 @@ public class EditorImplTest extends AbstractEditorTest {
     verifySoftWrapPositions();
   }
   
-  public void testUpDownNearDocumentTopAndBottom() throws Exception {
+  public void testUpDownNearDocumentTopAndBottom() {
     initText("abc\nd<caret>ef\nghi");
     up();
     checkResultByText("a<caret>bc\ndef\nghi");
@@ -312,7 +312,7 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("abc\nd<caret>ef\nghi");
   }
   
-  public void testScrollingToCaretAtSoftWrap() throws Exception {
+  public void testScrollingToCaretAtSoftWrap() {
     initText("looooooooooooooooong wooooooooooooooooords");
     configureSoftWraps(10);
     end();
@@ -322,7 +322,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertTrue(visibleArea.contains(caretPoint));
   }
 
-  public void testChangingHighlightersInBulkModeListener() throws Exception {
+  public void testChangingHighlightersInBulkModeListener() {
     DocumentBulkUpdateListener.Adapter listener = new DocumentBulkUpdateListener.Adapter() {
       @Override
       public void updateFinished(@NotNull Document doc) {
@@ -345,7 +345,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(8, highlighters[0].getEndOffset());
   }
 
-  public void testChangingHighlightersAfterClearingFoldingsDuringFoldingBatchUpdate() throws Exception {
+  public void testChangingHighlightersAfterClearingFoldingsDuringFoldingBatchUpdate() {
     initText("abc\n\ndef");
     addCollapsedFoldRegion(2, 6, "...");
     runFoldingOperation(() -> {
@@ -359,14 +359,14 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(8, highlighters[0].getEndOffset());
   }
 
-  public void testShiftPressedBeforeDragOverLineNumbersIsFinished() throws Exception {
+  public void testShiftPressedBeforeDragOverLineNumbersIsFinished() {
     initText("abc\ndef\nghi");
     EditorTestUtil.setEditorVisibleSize(myEditor, 1000, 1000); // enable drag testing
     mouse().pressAtLineNumbers(0).dragToLineNumbers(2).shift().release();
     checkResultByText("<selection>abc\ndef\nghi</selection>");
   }
 
-  public void testScrollingInEditorOfSmallHeight() throws Exception {
+  public void testScrollingInEditorOfSmallHeight() {
     initText("abc\n<caret>");
     int heightInPixels = (int)(myEditor.getLineHeight() * 1.5);
     EditorTestUtil.setEditorVisibleSizeInPixels(myEditor,
@@ -379,7 +379,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(heightInPixels - myEditor.getLineHeight(), myEditor.getScrollingModel().getVerticalScrollOffset());
   }
 
-  public void testEditorWithSoftWrapsBecomesVisibleAfterDocumentTextRemoval() throws Exception {
+  public void testEditorWithSoftWrapsBecomesVisibleAfterDocumentTextRemoval() {
     initText("abc def ghi");
     configureSoftWraps(3);
     JViewport viewport = ((EditorEx)myEditor).getScrollPane().getViewport();
@@ -392,7 +392,7 @@ public class EditorImplTest extends AbstractEditorTest {
     verifySoftWrapPositions();
   }
 
-  public void testDocumentChangeAfterEditorDisposal() throws Exception {
+  public void testDocumentChangeAfterEditorDisposal() {
     EditorFactory editorFactory = EditorFactory.getInstance();
 
     Document document = editorFactory.createDocument("ab");
@@ -407,12 +407,12 @@ public class EditorImplTest extends AbstractEditorTest {
     runWriteCommand(() -> document.setText("cd")); // should run without throwing an exception
   }
 
-  public void testLineLengthMatchingLogicalPositionCacheFrequency() throws Exception {
+  public void testLineLengthMatchingLogicalPositionCacheFrequency() {
     initText("\t" + StringUtil.repeat(" ", 1023));
     assertEquals(new LogicalPosition(0, 1027), myEditor.offsetToLogicalPosition(1024));
   }
 
-  public void testSpecialCaseOfCaretPositionUpdateOnFolding() throws Exception {
+  public void testSpecialCaseOfCaretPositionUpdateOnFolding() {
     initText("abc\ndef\ngh<caret>i");
     FoldRegion region = addCollapsedFoldRegion(1, 11, "...");
     runWriteCommand(()-> myEditor.getDocument().deleteString(7, 8));
@@ -421,7 +421,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertFalse(region.isExpanded());
   }
 
-  public void testEditingNearInlayInBulkMode() throws Exception {
+  public void testEditingNearInlayInBulkMode() {
     initText("a<caret>bc");
     addInlay(1);
     runWriteCommand(()-> DocumentUtil.executeInBulk(myEditor.getDocument(), true,
@@ -430,7 +430,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertTrue(myEditor.getInlayModel().hasInlineElementAt(1));
   }
 
-  public void testCoordinateConversionsAroundSurrogatePair() throws Exception {
+  public void testCoordinateConversionsAroundSurrogatePair() {
     initText("a" + SURROGATE_PAIR + "b");
     assertEquals(new LogicalPosition(0, 2), myEditor.offsetToLogicalPosition(3));
     assertEquals(3, myEditor.logicalPositionToOffset(new LogicalPosition(0, 2)));
@@ -438,7 +438,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new LogicalPosition(0, 2), myEditor.visualToLogicalPosition(new VisualPosition(0, 2)));
   }
 
-  public void testCreationOfSurrogatePairByMergingDividedParts() throws Exception {
+  public void testCreationOfSurrogatePairByMergingDividedParts() {
     initText(""); // Cannot set up text with singular surrogate characters directly
     runWriteCommand(() -> {
       myEditor.getDocument().setText(HIGH_SURROGATE + " " + LOW_SURROGATE);
@@ -448,7 +448,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new LogicalPosition(0, 1), myEditor.offsetToLogicalPosition(2));
   }
 
-  public void testCaretDoesntGetInsideSurrogatePair() throws Exception {
+  public void testCaretDoesntGetInsideSurrogatePair() {
     initText(""); // Cannot set up text with singular surrogate characters directly
     runWriteCommand(() -> myEditor.getDocument().setText(HIGH_SURROGATE + LOW_SURROGATE + LOW_SURROGATE));
     myEditor.getCaretModel().moveToOffset(2);
@@ -456,7 +456,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertFalse(DocumentUtil.isInsideSurrogatePair(myEditor.getDocument(), myEditor.getCaretModel().getOffset()));
   }
 
-  public void testFoldingBoundaryDoesntGetInsideSurrogatePair() throws Exception {
+  public void testFoldingBoundaryDoesntGetInsideSurrogatePair() {
     initText(""); // Cannot set up text with singular surrogate characters directly
     runWriteCommand(() -> myEditor.getDocument().setText(HIGH_SURROGATE + LOW_SURROGATE + LOW_SURROGATE));
     addFoldRegion(2, 3, "...");
@@ -465,7 +465,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertFalse(foldRegions.length > 0 && DocumentUtil.isInsideSurrogatePair(myEditor.getDocument(), foldRegions[0].getStartOffset()));
   }
 
-  public void testRemovalOfNonExpandingFoldingRegion() throws Exception {
+  public void testRemovalOfNonExpandingFoldingRegion() {
     initText("a\nb");
     FoldingModelEx model = (FoldingModelEx)myEditor.getFoldingModel();
     Ref<FoldRegion> regionRef = new Ref<>();
@@ -480,7 +480,7 @@ public class EditorImplTest extends AbstractEditorTest {
     assertEquals(new VisualPosition(1, 1), myEditor.offsetToVisualPosition(3));
   }
   
-  public void testPasteWithStickySelection() throws Exception {
+  public void testPasteWithStickySelection() {
     initText("<selection>abc<caret></selection>\ndef");
     copy();
     down();
@@ -493,7 +493,7 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("abc\nabc<caret>");
   }
   
-  public void testPasteInVirtualSpaceWhenSelectionExists() throws Exception {
+  public void testPasteInVirtualSpaceWhenSelectionExists() {
     initText("foo");
     myEditor.getSettings().setVirtualSpace(true);
     mouse().clickAt(0, 10);
@@ -503,7 +503,7 @@ public class EditorImplTest extends AbstractEditorTest {
     checkResultByText("bar<caret>");
   }
 
-  public void testMoveTextNearInlayAtBrokenSurrogates() throws Exception {
+  public void testMoveTextNearInlayAtBrokenSurrogates() {
     initText(""); // Cannot set up text with singular surrogate characters directly
     runWriteCommand(() -> myEditor.getDocument().setText(LOW_SURROGATE + HIGH_SURROGATE));
     Inlay inlay = addInlay(2);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorInlayTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorInlayTest.java
index 60a0dfe2f447..446123746972 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorInlayTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorInlayTest.java
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import static org.junit.Assert.assertArrayEquals;
 
 public class EditorInlayTest extends AbstractEditorTest {
-  public void testCaretMovement() throws Exception {
+  public void testCaretMovement() {
     initText("ab");
     addInlay(1);
     right();
@@ -47,7 +47,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(0, 0, 0);
   }
 
-  public void testFoldedInlay() throws Exception {
+  public void testFoldedInlay() {
     initText("abc");
     addInlay(1);
     addCollapsedFoldRegion(1, 2, ".");
@@ -57,7 +57,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(2, 2, 2);
   }
 
-  public void testCaretMovementWithSelection() throws Exception {
+  public void testCaretMovementWithSelection() {
     initText("ab");
     addInlay(1);
     rightWithSelection();
@@ -80,7 +80,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPositionAndSelection(2, 2, 3, 2, 2);
   }
 
-  public void testBackspace() throws Exception {
+  public void testBackspace() {
     initText("ab<caret>c");
     addInlay(1);
     backspace();
@@ -94,7 +94,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(0, 0, 0);
   }
 
-  public void testDelete() throws Exception {
+  public void testDelete() {
     initText("a<caret>bc");
     addInlay(2);
     delete();
@@ -108,7 +108,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(1, 1, 2);
   }
 
-  public void testMulticaretDelete() throws Exception {
+  public void testMulticaretDelete() {
     initText("<caret>ab <caret>ab");
     addInlay(1);
     addInlay(4);
@@ -119,7 +119,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkResultByText("a<caret> a<caret>");
   }
 
-  public void testMulticaretTyping() throws Exception {
+  public void testMulticaretTyping() {
     initText("<caret>ab <caret>ab");
     addInlay(1);
     addInlay(4);
@@ -135,21 +135,21 @@ public class EditorInlayTest extends AbstractEditorTest {
                  ContainerUtil.map(myEditor.getCaretModel().getAllCarets(), Caret::getVisualPosition));
   }
 
-  public void testDocumentEditingWithSoftWraps() throws Exception {
+  public void testDocumentEditingWithSoftWraps() {
     initText("long line");
     configureSoftWraps(7);
     Inlay inlay = addInlay(1);
     assertNotNull(myEditor.getSoftWrapModel().getSoftWrap(5));
     new WriteCommandAction.Simple<Void>(ourProject) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         myEditor.getDocument().setText(" ");
       }
     }.execute();
     assertFalse(inlay.isValid());
   }
 
-  public void testInlayDoesntGetInsideSurrogatePair() throws Exception {
+  public void testInlayDoesntGetInsideSurrogatePair() {
     initText(""); // Cannot set up text with singular surrogate characters directly
     runWriteCommand(() -> myEditor.getDocument().setText(HIGH_SURROGATE + LOW_SURROGATE + LOW_SURROGATE));
     Inlay inlay = addInlay(2);
@@ -159,7 +159,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     assertFalse(inlay.isValid() && DocumentUtil.isInsideSurrogatePair(myEditor.getDocument(), inlay.getOffset()));
   }
 
-  public void testTwoInlaysAtSameOffset() throws Exception {
+  public void testTwoInlaysAtSameOffset() {
     initText("ab");
     addInlay(1);
     addInlay(1);
@@ -181,7 +181,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(0, 0, 0);
   }
 
-  public void testTypingBetweenInlaysAtSameOffset() throws Exception {
+  public void testTypingBetweenInlaysAtSameOffset() {
     initText("ab");
     Inlay inlay1 = addInlay(1);
     Inlay inlay2 = addInlay(1);
@@ -196,14 +196,14 @@ public class EditorInlayTest extends AbstractEditorTest {
     assertEquals(2, inlay2.getOffset());
   }
 
-  public void testHasInlayAtVisualPosition() throws Exception {
+  public void testHasInlayAtVisualPosition() {
     initText("ab");
     addInlay(1);
     addInlay(1);
     assertTrue(myEditor.getInlayModel().hasInlineElementAt(new VisualPosition(0, 2)));
   }
 
-  public void testBackspaceWithTwoInlaysAtSameOffset() throws Exception {
+  public void testBackspaceWithTwoInlaysAtSameOffset() {
     initText("ab<caret>c");
     addInlay(1);
     addInlay(1);
@@ -221,7 +221,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(0, 0, 0);
   }
 
-  public void testDeleteWithTwoInlaysAtSameOffset() throws Exception {
+  public void testDeleteWithTwoInlaysAtSameOffset() {
     initText("a<caret>bc");
     addInlay(2);
     addInlay(2);
@@ -239,7 +239,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(1, 1, 3);
   }
 
-  public void testSelectionWithTwoInlaysAtSameOffset() throws Exception {
+  public void testSelectionWithTwoInlaysAtSameOffset() {
     initText("ab");
     addInlay(1);
     addInlay(1);
@@ -263,7 +263,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPositionAndSelection(2, 2, 4, 2, 2);
   }
 
-  public void testDeleteBetweenInlays() throws Exception {
+  public void testDeleteBetweenInlays() {
     initText("abc");
     addInlay(1);
     addInlay(2);
@@ -275,7 +275,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     assertInlaysPositions(1, 1);
   }
 
-  public void testCaretPositionAfterInlayDisposalToTheLeft() throws Exception {
+  public void testCaretPositionAfterInlayDisposalToTheLeft() {
     initText("ab");
     Inlay inlay = addInlay(1);
     addInlay(1);
@@ -285,7 +285,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(1, 1, 1);
   }
 
-  public void testCaretPositionAfterInlayDisposalToTheRight() throws Exception {
+  public void testCaretPositionAfterInlayDisposalToTheRight() {
     initText("ab");
     addInlay(1);
     Inlay inlay = addInlay(1);
@@ -295,7 +295,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(1, 1, 2);
   }
 
-  public void testPositionConversionForAdjacentInlays() throws Exception {
+  public void testPositionConversionForAdjacentInlays() {
     initText("ab");
     addInlay(1);
     addInlay(1);
@@ -304,7 +304,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     assertFalse(lp.leansForward);
   }
 
-  public void testFoldingOperationDoesntMoveCaretFromBetweenInlays() throws Exception {
+  public void testFoldingOperationDoesntMoveCaretFromBetweenInlays() {
     initText("abc");
     addInlay(2);
     addInlay(2);
@@ -315,7 +315,7 @@ public class EditorInlayTest extends AbstractEditorTest {
     checkCaretPosition(2, 2, 5);
   }
 
-  public void testBehaviourOnTextInsertion() throws Exception {
+  public void testBehaviourOnTextInsertion() {
     initText("abc");
     Inlay i1 = addInlay(1, false);
     Inlay i2 = addInlay(2, true);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java
index f5b5b3be9e5c..3506dec34ad1 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java
@@ -52,21 +52,21 @@ public class EditorLastActionTrackerTest extends LightPlatformCodeInsightFixture
     super.tearDown();
   }
 
-  public void testLastActionIsAvailable() throws Exception {
+  public void testLastActionIsAvailable() {
     assertEquals(SAMPLE_ACTION, myTracker.getLastActionId());
   }
 
-  public void testMouseClickClearsLastAction() throws Exception {
+  public void testMouseClickClearsLastAction() {
     new EditorMouseFixture((EditorImpl)myFixture.getEditor()).clickAt(0, 1);
     assertNull(myTracker.getLastActionId());
   }
 
-  public void testTypingClearsLastAction() throws Exception {
+  public void testTypingClearsLastAction() {
     myFixture.type('A');
     assertNull(myTracker.getLastActionId());
   }
 
-  public void testTwoEditors() throws Exception {
+  public void testTwoEditors() {
     myFixture.configureByText(getTestName(true) + "-other.txt", "doesn't matter as well");
     myFixture.performEditorAction(SAMPLE_ACTION);
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorRtlTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorRtlTest.java
index f5808f60b9aa..d0afdf20256c 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorRtlTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorRtlTest.java
@@ -469,7 +469,7 @@ public class EditorRtlTest extends AbstractRtlTest {
     checkResult("R<selection>R</selection>");
   }
 
-  public void testUsingLexerForBidiLayout() throws Exception {
+  public void testUsingLexerForBidiLayout() {
     prepare("class Foo {\n  int<caret> R = 1;\n}", TestFileType.JAVA);
     right();
     right();
@@ -477,7 +477,7 @@ public class EditorRtlTest extends AbstractRtlTest {
     checkResult("class Foo {\n  int R<caret> = 1;\n}");
   }
   
-  public void testJavadocTokensAreMergedForBidiLayoutPurposes() throws Exception {
+  public void testJavadocTokensAreMergedForBidiLayoutPurposes() {
     prepare("<caret>/**R R*/ class Foo {}", TestFileType.JAVA);
     for (int i = 0; i < 4; i++) {
       right();
@@ -486,7 +486,7 @@ public class EditorRtlTest extends AbstractRtlTest {
     checkResult("/**R R<caret>*/ class Foo {}");
   }
   
-  public void testXmlTextIsLaidOutCorrectly() throws Exception {
+  public void testXmlTextIsLaidOutCorrectly() {
     prepare("<caret><L>R R</L>", TestFileType.XML);
     for (int i = 0; i < 4; i++) {
       right();
@@ -558,21 +558,21 @@ public class EditorRtlTest extends AbstractRtlTest {
     checkResult("R\tRR<caret>");
   }
   
-  public void testEscapedBackslashInStringLiteral() throws Exception {
+  public void testEscapedBackslashInStringLiteral() {
     prepare("class C {\n  String s = \"R\\<caret>\\R\";\n}", TestFileType.JAVA);
     right();
     right();
     checkResult("class C {\n  String s = \"<caret>R\\\\R\";\n}");
   }
 
-  public void testRtlLayoutPersistsAfterEditing() throws Exception {
+  public void testRtlLayoutPersistsAfterEditing() {
     prepare("<caret>\nRR", TestFileType.TEXT);
     delete();
     checkResult("<caret>RR");
     assertTrue(myEditor.getCaretModel().getPrimaryCaret().isAtBidiRunBoundary());
   }
 
-  public void testTokenOrderIsAlwaysLtr() throws Exception {
+  public void testTokenOrderIsAlwaysLtr() {
     BidiTextDirection savedValue = EditorSettingsExternalizable.getInstance().getBidiTextDirection();
     try {
       EditorSettingsExternalizable.getInstance().setBidiTextDirection(BidiTextDirection.RTL);
@@ -585,13 +585,13 @@ public class EditorRtlTest extends AbstractRtlTest {
     }
   }
 
-  public void testLineCommentLayout() throws Exception {
+  public void testLineCommentLayout() {
     prepare("<caret>// R", TestFileType.JAVA);
     right();
     checkResult("/<caret>/ R");
   }
 
-  public void testIndentIsTreatedSeparately() throws Exception {
+  public void testIndentIsTreatedSeparately() {
     checkBidiRunBoundaries(" |R", "txt");
   }
 }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java
index a94518748726..dc90507e1259 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java
@@ -99,7 +99,7 @@ public class EditorStressTest extends AbstractEditorTest {
       int offset = random.nextInt(document.getTextLength() + 1);
       new WriteCommandAction.Simple(getProject()) {
         @Override
-        protected void run() throws Throwable {
+        protected void run() {
           document.insertString(offset, myText);
         }
       }.execute().throwException();
@@ -115,7 +115,7 @@ public class EditorStressTest extends AbstractEditorTest {
       int offset = random.nextInt(textLength);
       new WriteCommandAction.Simple(getProject()) {
         @Override
-        protected void run() throws Throwable {
+        protected void run() {
           document.deleteString(offset, offset + 1);
         }
       }.execute().throwException();
@@ -133,7 +133,7 @@ public class EditorStressTest extends AbstractEditorTest {
       if (targetOffset < offset || targetOffset > offset + 1) {
         new WriteCommandAction.Simple(getProject()) {
           @Override
-          protected void run() throws Throwable {
+          protected void run() {
             ((DocumentEx)document).moveText(offset, offset + 1, targetOffset);
           }
         }.execute().throwException();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingTest.java
index 2e5d03a46a1c..443633ae6f9b 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/FoldingTest.java
@@ -65,7 +65,7 @@ public class FoldingTest extends AbstractEditorTest {
     assertSize(1, myModel.getAllFoldRegions());
   }
 
-  public void testIntersects () throws Exception {
+  public void testIntersects () {
     myModel.runBatchFoldingOperation(() -> {
       FoldRegion region = myModel.addFoldRegion(5, 10, ".");
       assertNotNull(region);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java
index d441c61209ce..17d09e1b5898 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/GuardBlockTest.java
@@ -15,7 +15,7 @@ public class GuardBlockTest extends LightPlatformCodeInsightFixtureTestCase {
     return document.createGuardedBlock(start, end);
   }
 
-  public void testZero() throws Exception {
+  public void testZero() {
     myFixture.configureByText("x.txt", "xxxx");
     RangeMarker guard = createGuard(0, 0);
     guard.setGreedyToLeft(true);
@@ -24,14 +24,14 @@ public class GuardBlockTest extends LightPlatformCodeInsightFixtureTestCase {
     checkCanTypeIn(1);
   }
 
-  public void testInTheMiddle() throws Exception {
+  public void testInTheMiddle() {
     myFixture.configureByText("x.txt", "xxxxxxxx");
     createGuard(1, 4);
     checkUnableToTypeIn(2);
     checkCanTypeIn(0);
   }
 
-  public void testGreedy() throws Exception {
+  public void testGreedy() {
     myFixture.configureByText("x.txt", "012345678");
     {
       RangeMarker guard = createGuard(0, 5);
@@ -46,7 +46,7 @@ public class GuardBlockTest extends LightPlatformCodeInsightFixtureTestCase {
     checkCanTypeIn(5);
     checkUnableToTypeIn(0);
   }
-  public void testGreedyEnd() throws Exception {
+  public void testGreedyEnd() {
     myFixture.configureByText("x.txt", "012345678");
     {
       RangeMarker guard = createGuard(0, 5);
@@ -75,7 +75,7 @@ public class GuardBlockTest extends LightPlatformCodeInsightFixtureTestCase {
     myFixture.type("yy");
   }
 
-  public void testNoCompletion() throws Exception {
+  public void testNoCompletion() {
     String text = "abc abd a<caret> abx";
     myFixture.configureByText("x.txt", text);
     int offset = myFixture.getEditor().getCaretModel().getOffset();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/ImmediatePainterTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/ImmediatePainterTest.java
index 75fb3e03344d..5bc17644b148 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/ImmediatePainterTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/ImmediatePainterTest.java
@@ -208,7 +208,7 @@ public class ImmediatePainterTest extends AbstractEditorTest {
   //  assertTypedCorrectly(1, '+');
   //}
 
-  protected void init(String text) throws IOException {
+  protected void init(String text) {
     init(text, TestFileType.TEXT);
 
     myEditor.getSettings().setAdditionalLinesCount(0);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/RangeMarkerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/RangeMarkerTest.java
index 5f909a63ce97..bd43522b26f6 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/RangeMarkerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/RangeMarkerTest.java
@@ -95,7 +95,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     super.tearDown();
   }
 
-  public void testCreation() throws Exception {
+  public void testCreation() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     assertEquals(2, marker.getStartOffset());
@@ -103,7 +103,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testDeleteBeforeStart() throws Exception {
+  public void testDeleteBeforeStart() {
     RangeMarker marker = createMarker("01[234]56789");
 
     marker.getDocument().deleteString(0, 1);
@@ -113,7 +113,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testInsertIntoRange() throws Exception {
+  public void testInsertIntoRange() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().insertString(4, "xxx");
@@ -123,7 +123,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testInsertIntoPoint() throws Exception {
+  public void testInsertIntoPoint() {
     RangeMarker marker = createMarker("0123456789", 2, 2);
 
     marker.getDocument().insertString(2, "xxx");
@@ -133,7 +133,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testDeletePoint() throws Exception {
+  public void testDeletePoint() {
     RangeMarker marker = createMarker("0123456789", 2, 2);
 
     marker.getDocument().deleteString(1, 3);
@@ -141,7 +141,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertFalse(marker.isValid());
   }
 
-  public void testDeleteRangeInside() throws Exception {
+  public void testDeleteRangeInside() {
     RangeMarker marker = createMarker("0123456789", 1, 7);
 
     marker.getDocument().deleteString(2, 5);
@@ -149,7 +149,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testReplaceRangeToSingleChar() throws Exception {
+  public void testReplaceRangeToSingleChar() {
     RangeMarker marker = createMarker("0123456789", 1, 7);
 
     marker.getDocument().replaceString(2, 5, " ");
@@ -157,13 +157,13 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testReplaceWholeRange() throws Exception {
+  public void testReplaceWholeRange() {
     RangeMarker marker = createMarker("0123456789", 1, 7);
     marker.getDocument().replaceString(1, 7, "abc");
     assertValidMarker(marker, 1, 4);
   }
 
-  public void testUpdateInvalid() throws Exception {
+  public void testUpdateInvalid() {
     RangeMarker marker = createMarker("01[]23456789");
 
     marker.getDocument().deleteString(1, 3);
@@ -176,7 +176,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertFalse(marker.isValid());
   }
 
-  public void testInsertAfterEnd() throws Exception {
+  public void testInsertAfterEnd() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().insertString(6, "xxx");
@@ -187,7 +187,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
   }
 
 
-  public void testDeleteEndPart() throws Exception {
+  public void testDeleteEndPart() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().deleteString(4, 6);
@@ -195,7 +195,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 4);
   }
 
-  public void testDeleteStartPart() throws Exception {
+  public void testDeleteStartPart() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().deleteString(0, 4);
@@ -203,7 +203,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 0, 1);
   }
 
-  public void testReplaceStartPartInvalid() throws Exception {
+  public void testReplaceStartPartInvalid() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().replaceString(0, 4, "xxxx");
@@ -211,7 +211,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 4, 5);
   }
 
-  public void testDeleteFirstChar() throws Exception {
+  public void testDeleteFirstChar() {
     RangeMarker marker = createMarker("0123456789", 0, 5);
 
     marker.getDocument().deleteString(0, 1);
@@ -219,7 +219,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 0, 4);
   }
 
-  public void testInsertBeforeStart() throws Exception {
+  public void testInsertBeforeStart() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().insertString(0, "xxx");
@@ -229,7 +229,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testInsertIntoStart() throws Exception {
+  public void testInsertIntoStart() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().insertString(2, "xxx");
@@ -237,7 +237,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 5, 8);
   }
 
-  public void testInsertIntoStartExpandToLeft() throws Exception {
+  public void testInsertIntoStartExpandToLeft() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.setGreedyToLeft(true);
@@ -249,7 +249,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testInsertIntoEnd() throws Exception {
+  public void testInsertIntoEnd() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().insertString(5, "xxx");
@@ -259,7 +259,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testInsertIntoEndExpandRight() throws Exception {
+  public void testInsertIntoEndExpandRight() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.setGreedyToRight(true);
@@ -271,7 +271,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertTrue(marker.isValid());
   }
 
-  public void testNoNegative() throws Exception {
+  public void testNoNegative() {
     RangeMarker marker = createMarker("package safd;\n\n[import javax.swing.JPanel;]\nimport java.util.ArrayList;\n\nclass T{}");
 
     marker.getDocument()
@@ -280,7 +280,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertEquals(15, marker.getStartOffset());
   }
 
-  public void testReplaceRightIncludingFirstChar() throws Exception {
+  public void testReplaceRightIncludingFirstChar() {
     String s = "12345\n \n12345";
     RangeMarker marker = createMarker(s, 6, 8);
 
@@ -289,7 +289,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 6, 7);
   }
 
-  public void testDeleteRightPart() throws Exception {
+  public void testDeleteRightPart() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().deleteString(4, 6);
@@ -297,7 +297,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 4);
   }
 
-  public void testDeleteRightPart2() throws Exception {
+  public void testDeleteRightPart2() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().deleteString(4, 5);
@@ -305,7 +305,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 4);
   }
 
-  public void testReplaceRightPartInvalid() throws Exception {
+  public void testReplaceRightPartInvalid() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().replaceString(4, 6, "xxx");
@@ -313,34 +313,34 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 4);
   }
 
-  public void testDeleteWholeRange() throws Exception {
+  public void testDeleteWholeRange() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
     marker.getDocument().deleteString(1, 6);
     assertFalse(marker.isValid());
   }
 
-  public void testDeleteExactRange() throws Exception {
+  public void testDeleteExactRange() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().deleteString(2, 5);
     assertValidMarker(marker, 2, 2);
   }
 
-  public void testDeleteJustBeforeStart() throws Exception {
+  public void testDeleteJustBeforeStart() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().deleteString(0, 2);
     assertValidMarker(marker, 0, 3);
   }
 
-  public void testDeleteRightAfterEnd() throws Exception {
+  public void testDeleteRightAfterEnd() {
     RangeMarker marker = createMarker("0123456789", 2, 2);
 
     marker.getDocument().deleteString(2, 5);
     assertValidMarker(marker, 2, 2);
   }
 
-  public void testReplacementWithOldTextOverlap() throws Exception {
+  public void testReplacementWithOldTextOverlap() {
     RangeMarker marker = createMarker("0123456789", 2, 5);
 
     marker.getDocument().replaceString(0, 10, "0123456789");
@@ -349,7 +349,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
 
   // Psi -> Document synchronization
 
-  public void testPsi2Doc1() throws Exception {
+  public void testPsi2Doc1() {
     StringBuilder buffer = new StringBuilder("0123456789");
     RangeMarker marker = createMarker(buffer.toString(), 2, 5);
     synchronizer.startTransaction(getProject(), document, psiFile);
@@ -364,7 +364,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 6);
   }
 
-  public void testDocSynchronizerPrefersLineBoundaryChanges() throws Exception {
+  public void testDocSynchronizerPrefersLineBoundaryChanges() {
     String text = "import java.awt.List;\n" +
                     "[import java.util.ArrayList;\n]" +
                     "import java.util.HashMap;\n" +
@@ -389,7 +389,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertEquals("DocumentEventImpl[myOffset=22, myOldLength=28, myNewLength=0, myOldString='import java.util.ArrayList;\n', myNewString=''].", event.toString());
   }
 
-  public void testPsi2DocReplaceAfterAdd() throws Exception {
+  public void testPsi2DocReplaceAfterAdd() {
     StringBuilder buffer = new StringBuilder("0123456789");
     RangeMarker marker = createMarker(buffer.toString(), 2, 5);
     synchronizer.startTransaction(getProject(), document, psiFile);
@@ -426,7 +426,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertEquals("xxx", document.getText());
   }
 
-  public void testPsi2DocMergeReplaceAfterAdd() throws Exception {
+  public void testPsi2DocMergeReplaceAfterAdd() {
     StringBuilder buffer = new StringBuilder("0123456789");
     RangeMarker marker = createMarker(buffer.toString(), 2, 5);
     synchronizer.startTransaction(getProject(), document, psiFile);
@@ -449,7 +449,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 3, 6);
   }
 
-  public void testPsi2DocMergeReplaceWithMultipleAdditions() throws Exception {
+  public void testPsi2DocMergeReplaceWithMultipleAdditions() {
     StringBuilder buffer = new StringBuilder("0123456789");
     RangeMarker marker = createMarker(buffer.toString(), 2, 5);
     synchronizer.startTransaction(getProject(), document, psiFile);
@@ -472,7 +472,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 5);
   }
 
-  public void testPsi2DocMergeMultipleAdditionsWithReplace() throws Exception {
+  public void testPsi2DocMergeMultipleAdditionsWithReplace() {
     StringBuilder buffer = new StringBuilder("0123456789");
     RangeMarker marker = createMarker(buffer.toString(), 2, 5);
     synchronizer.startTransaction(getProject(), document, psiFile);
@@ -497,7 +497,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 5);
   }
 
-  public void testPsi2DocSurround() throws Exception {
+  public void testPsi2DocSurround() {
     StringBuilder buffer = new StringBuilder("0123456789");
     RangeMarker marker = createMarker(buffer.toString(), 2, 5);
     synchronizer.startTransaction(getProject(), document, psiFile);
@@ -521,7 +521,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker, 2, 7);
   }
 
-  public void testPsi2DocForwardRangesChanges() throws Exception {
+  public void testPsi2DocForwardRangesChanges() {
     StringBuilder buffer = new StringBuilder("0123456789");
     RangeMarker marker = createMarker(buffer.toString(), 2, 5);
     synchronizer.startTransaction(getProject(), document, psiFile);
@@ -893,7 +893,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
       final DocumentEx finalDocument = document;
       new WriteCommandAction(getProject()) {
         @Override
-        protected void run(@NotNull Result result) throws Exception {
+        protected void run(@NotNull Result result) {
           List<Pair<RangeMarker, TextRange>> adds = new ArrayList<>();
           List<Pair<RangeMarker, TextRange>> dels = new ArrayList<>();
           List<Trinity<Integer, Integer, Integer>> edits = new ArrayList<>();
@@ -977,7 +977,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     return createMarker(string, start, end);
   }
 
-  public void testRangeMarkersAreWeakReferenced_NoCommand() throws Exception {
+  public void testRangeMarkersAreWeakReferenced_NoCommand() {
     final Document document = EditorFactory.getInstance().createDocument("[xxxxxxxxxxxxxx]");
     Set<RangeMarker> markers = ContainerUtil.newHashSet();
     for (int i = 0; i < 10; i++) {
@@ -987,7 +987,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     LeakHunter.checkLeak(document, RangeMarker.class, markers::contains);
   }
 
-  public void testRangeMarkersAreLazyCreated() throws Exception {
+  public void testRangeMarkersAreLazyCreated() {
     final Document document = EditorFactory.getInstance().createDocument("[xxxxxxxxxxxxxx]");
     RangeMarker m1 = document.createRangeMarker(2, 4);
     RangeMarker m2 = document.createRangeMarker(2, 4);
@@ -1015,7 +1015,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertEquals(2, ((DocumentImpl)document).getRangeMarkersSize());
     assertEquals(2, ((DocumentImpl)document).getRangeMarkersNodeSize());
   }
-  public void testRangeHighlightersRecreateBug() throws Exception {
+  public void testRangeHighlightersRecreateBug() {
     Document document = EditorFactory.getInstance().createDocument("[xxxxxxxxxxxxxx]");
 
     MarkupModel markupModel = DocumentMarkupModel.forDocument(document, ourProject, true);
@@ -1029,7 +1029,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
       assertFalse(m3.isValid());
     }
   }
-  public void testValidationBug() throws Exception {
+  public void testValidationBug() {
     Document document = EditorFactory.getInstance().createDocument("[xxxxxxxxxxxxxx]");
     final Editor editor = EditorFactory.getInstance().createEditor(document);
 
@@ -1046,7 +1046,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
       EditorFactory.getInstance().releaseEditor(editor);
     }
   }
-  public void testPersistent() throws Exception {
+  public void testPersistent() {
     String text = "xxx\nzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz";
     Document document = EditorFactory.getInstance().createDocument(text);
     int startOffset = text.indexOf('z');
@@ -1069,7 +1069,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertFalse(normal.isValid());
   }
 
-  public void testMoveTextRetargetsMarkers() throws Exception {
+  public void testMoveTextRetargetsMarkers() {
     RangeMarkerEx marker1 = createMarker("01234567890", 1, 3);
     DocumentEx document = (DocumentEx)marker1.getDocument();
     RangeMarker marker2 = document.createRangeMarker(2, 4);
@@ -1081,7 +1081,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker2, 5, 7);
   }
 
-  public void testMoveText2() throws Exception {
+  public void testMoveText2() {
     RangeMarkerEx marker1 = createMarker(StringUtil.repeat(" ",100), 0, 0);
     DocumentEx document = (DocumentEx)marker1.getDocument();
     RangeMarker marker2 = document.createRangeMarker(49, 49);
@@ -1091,7 +1091,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     marker2.dispose();
   }
 
-  public void testMoveTextToTheBeginningRetargetsMarkers() throws Exception {
+  public void testMoveTextToTheBeginningRetargetsMarkers() {
     RangeMarkerEx marker1 = createMarker("01234567890", 5, 5);
     DocumentEx document = (DocumentEx)marker1.getDocument();
     RangeMarker marker2 = document.createRangeMarker(5, 7);
@@ -1103,7 +1103,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertValidMarker(marker2, 2, 4);
   }
 
-  public void testRangeHighlighterDisposeVsRemoveAllConflict() throws Exception {
+  public void testRangeHighlighterDisposeVsRemoveAllConflict() {
     Document document = EditorFactory.getInstance().createDocument("[xxxxxxxxxxxxxx]");
 
     MarkupModel markupModel = DocumentMarkupModel.forDocument(document, ourProject, true);
@@ -1116,7 +1116,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     assertFalse(m.isValid());
   }
 
-  public void testRangeHighlighterLinesInRangeForLongLinePerformance() throws Exception {
+  public void testRangeHighlighterLinesInRangeForLongLinePerformance() {
     final int N = 50000;
     Document document = EditorFactory.getInstance().createDocument(StringUtil.repeatSymbol('x', 2 * N));
 
@@ -1137,7 +1137,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
     }).assertTiming();
   }
 
-  public void testRangeHighlighterIteratorOrder() throws Exception {
+  public void testRangeHighlighterIteratorOrder() {
     Document document = EditorFactory.getInstance().createDocument("1234567890");
 
     final MarkupModelEx markupModel = (MarkupModelEx)DocumentMarkupModel.forDocument(document, ourProject, true);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/TrailingSpacesStripperTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/TrailingSpacesStripperTest.java
index fe203bc351fd..eb8f97f3e471 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/TrailingSpacesStripperTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/TrailingSpacesStripperTest.java
@@ -68,21 +68,21 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     });
   }
 
-  public void testDoNotStripModifiedOnCurrentLine() throws IOException {
+  public void testDoNotStripModifiedOnCurrentLine() {
     doTest("xxx\n   <caret>\nyyy",
            "xxx\n   <caret>\nyyy");
   }
-  public void testDoStripModifiedOnCurrentLineIfCaretWouldNotJump() throws IOException {
+  public void testDoStripModifiedOnCurrentLineIfCaretWouldNotJump() {
     doTest("xxx\n   222<caret>    \nyyy",
            "xxx\n   222<caret>\nyyy");
   }
 
-  public void testStrippingWithMultipleCarets() throws Exception {
+  public void testStrippingWithMultipleCarets() {
     doTest("xxx\n   <caret>\nyyy<caret>  ",
            "xxx\n   <caret>\nyyy<caret>");
   }
 
-  public void testModifyAndAltTabAway() throws IOException {
+  public void testModifyAndAltTabAway() {
     configureFromFileText("x.txt", "xxx<caret>\nyyy");
     type(' ');
 
@@ -96,7 +96,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText("xxx <caret>\nyyy");
   }
 
-  public void testOnlyModifiedLinesGetStripped() throws IOException {
+  public void testOnlyModifiedLinesGetStripped() {
     @NonNls String text = "xxx<caret>   \nyyy   ";
     configureFromFileText("x.txt", text);
     ((DocumentEx)myEditor.getDocument()).clearLineModificationFlags();
@@ -108,7 +108,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText("xxxz<caret>\nyyy   ");
   }
 
-  public void testOnlyModifiedLinesWhenDoesNotAllowCaretAfterEndOfLine() throws IOException {
+  public void testOnlyModifiedLinesWhenDoesNotAllowCaretAfterEndOfLine() {
     configureFromFileText("x.txt", "xxx<caret>   \nZ   ");
     type(' ');
     myEditor.getCaretModel().moveToOffset(myEditor.getDocument().getText().indexOf('Z') + 1);
@@ -118,7 +118,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText("xxx\nZZ<caret>");
   }
 
-  public void testModifyLineAndExitApplication_ShouldStripEvenWhenCaretIsAtTheChangedLine() throws IOException {
+  public void testModifyLineAndExitApplication_ShouldStripEvenWhenCaretIsAtTheChangedLine() {
     configureFromFileText("x.txt", "xxx        <caret>\n");
     type(' ');
 
@@ -134,7 +134,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     }
   }
 
-  public void testModifyLine_Save_MoveCaret_SaveAgain_ShouldStrip() throws IOException {
+  public void testModifyLine_Save_MoveCaret_SaveAgain_ShouldStrip() {
     configureFromFileText("x.txt", "xxx <caret>\nyyy\n");
     type(' ');
     FileDocumentManager.getInstance().saveAllDocuments();
@@ -145,7 +145,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText("xxx\n<caret>yyy\n"); // now we can strip
   }
 
-  public void testDisableStrip_Modify_Save_EnableOnModifiedLines_Modify_Save_ShouldStripModifiedOnly() throws IOException {
+  public void testDisableStrip_Modify_Save_EnableOnModifiedLines_Modify_Save_ShouldStripModifiedOnly() {
     EditorSettingsExternalizable settings = EditorSettingsExternalizable.getInstance();
     settings.setStripTrailingSpaces(EditorSettingsExternalizable.STRIP_TRAILING_SPACES_NONE);
 
@@ -163,7 +163,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText("xxx\nyyy   \nzzz   \n<caret>");
   }
 
-  public void testDoNotStripModifiedLines_And_EnsureBlankLineAtTheEnd_LeavesWhitespacesAtTheEndOfFileAlone() throws IOException {
+  public void testDoNotStripModifiedLines_And_EnsureBlankLineAtTheEnd_LeavesWhitespacesAtTheEndOfFileAlone() {
     EditorSettingsExternalizable settings = EditorSettingsExternalizable.getInstance();
     settings.setStripTrailingSpaces(EditorSettingsExternalizable.STRIP_TRAILING_SPACES_NONE);
     settings.setEnsureNewLineAtEOF(true);
@@ -178,7 +178,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText(" xxx <caret>\nyyy\n\t\t\t\n");
   }
 
-  public void testOverrideStripTrailingSpaces() throws IOException {
+  public void testOverrideStripTrailingSpaces() {
     EditorSettingsExternalizable settings = EditorSettingsExternalizable.getInstance();
     settings.setStripTrailingSpaces(EditorSettingsExternalizable.STRIP_TRAILING_SPACES_NONE);
     configureFromFileText("x.txt", "xxx<caret>\n   222    \nyyy");
@@ -189,7 +189,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText("xxx <caret>\n   222\nyyy");
   }
 
-  public void testOverrideEnsureNewline() throws  IOException {
+  public void testOverrideEnsureNewline() {
     EditorSettingsExternalizable settings = EditorSettingsExternalizable.getInstance();
     settings.setEnsureNewLineAtEOF(false);
     configureFromFileText("x.txt", "XXX<caret>\nYYY");
@@ -199,7 +199,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
     checkResultByText("XXX <caret>\nYYY\n");
   }
 
-  public void testModifySameLineInTwoFilesAndSaveAllShouldStripAtLeastOneFile() throws IOException {
+  public void testModifySameLineInTwoFilesAndSaveAllShouldStripAtLeastOneFile() {
     EditorSettingsExternalizable settings = EditorSettingsExternalizable.getInstance();
     settings.setStripTrailingSpaces(EditorSettingsExternalizable.STRIP_TRAILING_SPACES_CHANGED);
 
@@ -233,7 +233,7 @@ public class TrailingSpacesStripperTest extends LightPlatformCodeInsightTestCase
   }
 
   @NotNull
-  private static Editor createHeavyEditor(@NotNull String name, @NotNull String text) throws IOException {
+  private static Editor createHeavyEditor(@NotNull String name, @NotNull String text) {
     VirtualFile myVFile = WriteAction.compute(() -> {
       try {
         VirtualFile file = getSourceRoot().createChildData(null, name);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java
index 932b6827cf58..9d6c2e953b76 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/SoftWrapTest.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import com.intellij.testFramework.EditorTestUtil;
 import com.intellij.testFramework.TestFileType;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -29,21 +28,21 @@ import java.util.regex.Pattern;
 
 public class SoftWrapTest extends AbstractEditorTest {
 
-  public void testCollapsedRegionWithLongPlaceholderAtLineStart1() throws IOException {
+  public void testCollapsedRegionWithLongPlaceholderAtLineStart1() {
     doTestSoftWraps(10, "<fold text='veryVeryVeryLongPlaceholder'>foo</fold>");
   }
 
-  public void testCollapsedRegionWithLongPlaceholderAtLineStart2() throws IOException {
+  public void testCollapsedRegionWithLongPlaceholderAtLineStart2() {
     doTestSoftWraps(10, "<fold text='veryVeryVeryLongPlaceholder'>foo</fold><wrap>bar");
   }
 
-  public void testCollapsedRegionWithLongPlaceholderAtLineStart3() throws IOException {
+  public void testCollapsedRegionWithLongPlaceholderAtLineStart3() {
     doTestSoftWraps(10, "<fold text='veryVeryVeryLongPlaceholder'>foo</fold>\nvery long <wrap>text");
   }
 
   private static final String TAGS_PATTERN = "(<fold(\\stext=\'([^\']*)\')?>)|(</fold>)|<wrap>";
 
-  private void doTestSoftWraps(int wrapWidth, String text) throws IOException {
+  private void doTestSoftWraps(int wrapWidth, String text) {
     List<MyFoldRegion> foldRegions = new ArrayList<>();
     List<Integer> wrapPositions = new ArrayList<>();
     int foldInsertPosition = 0;
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceOnDocumentModificationTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceOnDocumentModificationTest.java
index e9d0b5a34c1b..3011b318c030 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceOnDocumentModificationTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceOnDocumentModificationTest.java
@@ -894,7 +894,7 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     assertEmpty(getSoftWrapModel().getRegisteredSoftWraps());
   }
 
-  public void testMultiLineFoldRegionBeforeWrapPosition() throws IOException {
+  public void testMultiLineFoldRegionBeforeWrapPosition() {
     final String text = 
       "package org.denis;\n" +
       "\n" +
@@ -1043,7 +1043,7 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     assertEquals(new LogicalPosition(0, 0), myEditor.visualToLogicalPosition(new VisualPosition(0, 0)));
   }
   
-  public void testOnlyMinimalRangeIsRecalculatedOnDocumentChange() throws IOException {
+  public void testOnlyMinimalRangeIsRecalculatedOnDocumentChange() {
     init("aa bb cc dd ee<caret> ff gg hh ii jj", TestFileType.TEXT);
     EditorTestUtil.configureSoftWraps(myEditor, 8);
     verifySoftWrapPositions(6, 12, 18, 24);
@@ -1065,7 +1065,7 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     assertEquals(19, event[0].getActualEndOffset());
   }
   
-  public void testPositionsAreCorrectAfterIncrementalRecalculation() throws IOException {
+  public void testPositionsAreCorrectAfterIncrementalRecalculation() {
     initText("abra<caret> cadabra");
     configureSoftWraps(10);
     type(' ');
@@ -1074,7 +1074,7 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     assertEquals(new VisualPosition(1, 1), myEditor.offsetToVisualPosition(6));
   }
 
-  public void testSoftWrappingWithFoldRegionAndTabs() throws IOException {
+  public void testSoftWrappingWithFoldRegionAndTabs() {
     initText("foldA\t\t\t\t");
     addCollapsedFoldRegion(0, 4, ".");
     configureSoftWraps(10);
@@ -1082,7 +1082,7 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     assertNull(myEditor.getSoftWrapModel().getSoftWrap(4));
   }
   
-  public void testSoftWrapsAreNotCreatedInsideFoldRegions() throws Exception {
+  public void testSoftWrapsAreNotCreatedInsideFoldRegions() {
     initText("\t\t\taaaaa\t");
     addCollapsedFoldRegion(7, 9, ".");
     configureSoftWraps(10);
@@ -1090,14 +1090,14 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     assertNull(myEditor.getSoftWrapModel().getSoftWrap(8));
   }
   
-  public void testUnbreakableLinesDontAffectFollowingLines() throws Exception {
+  public void testUnbreakableLinesDontAffectFollowingLines() {
     initText("unbreakableLine\nshort line");
     configureSoftWraps(10);
     
     verifySoftWrapPositions();
   }
   
-  public void testFoldRegionPreventsLaterWrapping() throws Exception {
+  public void testFoldRegionPreventsLaterWrapping() {
     initText("unbreakableText.txt");
     configureSoftWraps(10);
     verifySoftWrapPositions(15);
@@ -1108,7 +1108,7 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     assertEquals(1, myEditor.offsetToVisualPosition(19).line);
   }
   
-  public void testMoveWithFoldRegionInside() throws Exception {
+  public void testMoveWithFoldRegionInside() {
     initText("abc\ndef\nghi\n");
     configureSoftWraps(100);
     addCollapsedFoldRegion(0, 4, "...");
@@ -1127,11 +1127,11 @@ public class SoftWrapApplianceOnDocumentModificationTest extends AbstractEditorT
     init(visibleWidthInColumns * symbolWidthInPixels, fileText, symbolWidthInPixels);
   }
   
-  private void init(final int visibleWidth, @NotNull String fileText, int symbolWidth) throws IOException {
+  private void init(final int visibleWidth, @NotNull String fileText, int symbolWidth) {
     init(visibleWidth, fileText, TestFileType.TEXT, symbolWidth);
   }
   
-  private void init(final int visibleWidth, @NotNull String fileText, @NotNull TestFileType fileType, final int symbolWidth) throws IOException {
+  private void init(final int visibleWidth, @NotNull String fileText, @NotNull TestFileType fileType, final int symbolWidth) {
     init(fileText, fileType);
     EditorTestUtil.configureSoftWraps(myEditor, visibleWidth, symbolWidth);
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/view/VisualLinesIteratorTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/view/VisualLinesIteratorTest.java
index e5de612e9c42..8b786900610f 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/view/VisualLinesIteratorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/view/VisualLinesIteratorTest.java
@@ -18,10 +18,8 @@ package com.intellij.openapi.editor.impl.view;
 import com.intellij.openapi.editor.impl.AbstractEditorTest;
 import com.intellij.openapi.editor.impl.EditorImpl;
 
-import java.io.IOException;
-
 public class VisualLinesIteratorTest extends AbstractEditorTest {
-  public void testWrapAfterFolding() throws IOException {
+  public void testWrapAfterFolding() {
     initText("abcdefghij");
     addCollapsedFoldRegion(1, 8, "...");
     configureSoftWraps(4);
@@ -38,7 +36,7 @@ public class VisualLinesIteratorTest extends AbstractEditorTest {
     assertEquals(1, it.getStartFoldingIndex());
   }
   
-  public void testWrapAtFoldedLineBreak() throws IOException {
+  public void testWrapAtFoldedLineBreak() {
     initText("abc\ndef");
     addCollapsedFoldRegion(3, 4, "...");
     configureSoftWraps(6);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java
index 8e664e73d044..194c150b3caf 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/richcopy/SyntaxInfoConstructionTest.java
@@ -219,7 +219,7 @@ public class SyntaxInfoConstructionTest extends LightPlatformCodeInsightFixtureT
                      "text= \n");
   }
 
-  public void testIndentStrippingWhenFirstLineIsMostIndented() throws Exception {
+  public void testIndentStrippingWhenFirstLineIsMostIndented() {
     init("public class Test {\n" +
          "<selection>  int field;\n" +
          "}</selection>");
@@ -231,7 +231,7 @@ public class SyntaxInfoConstructionTest extends LightPlatformCodeInsightFixtureT
                      "text=}\n");
   }
 
-  public void testIndentStrippingWhenSelectionEndIsBeforeNonWsCharactersOnTheLine() throws Exception {
+  public void testIndentStrippingWhenSelectionEndIsBeforeNonWsCharactersOnTheLine() {
     init("public class Test {\n" +
          "<selection>  int field;\n" +
          "</selection>}");
@@ -241,7 +241,7 @@ public class SyntaxInfoConstructionTest extends LightPlatformCodeInsightFixtureT
                      "\n");
   }
 
-  public void testSlashRSeparator() throws Exception {
+  public void testSlashRSeparator() {
     String text = "package org;\r" +
                   "\r" +
                   "public class TestClass {\r" +
@@ -268,7 +268,7 @@ public class SyntaxInfoConstructionTest extends LightPlatformCodeInsightFixtureT
                      "text=}\n");
   }
 
-  public void testSlashRSlashNSeparator() throws Exception {
+  public void testSlashRSlashNSeparator() {
     String text = "package org;\r\n" +
                   "\r\n" +
                   "public class TestClass {\r\n" +
@@ -295,7 +295,7 @@ public class SyntaxInfoConstructionTest extends LightPlatformCodeInsightFixtureT
                      "text=}\n");
   }
   
-  public void testNonPhysicalFile() throws Exception {
+  public void testNonPhysicalFile() {
     String fileName = "Test.java";
     FileType fileType = FileTypeRegistry.getInstance().getFileTypeByFileName(fileName);
     PsiFile psiFile = PsiFileFactory.getInstance(getProject()).createFileFromText(fileName, fileType, "class Test {}", 0, false);
@@ -335,27 +335,27 @@ public class SyntaxInfoConstructionTest extends LightPlatformCodeInsightFixtureT
         assertEquals((float)editor.getColorsScheme().getEditorFontSize(), syntaxInfo.getFontSize(), 0.01f);
         syntaxInfo.processOutputInfo(new MarkupHandler() {
           @Override
-          public void handleText(int startOffset, int endOffset) throws Exception {
+          public void handleText(int startOffset, int endOffset) {
             builder.append("text=").append(text.substring(startOffset, endOffset)).append('\n');
           }
 
           @Override
-          public void handleForeground(int foregroundId) throws Exception {
+          public void handleForeground(int foregroundId) {
             builder.append("foreground=").append(colorRegistry.dataById(foregroundId)).append(',');
           }
 
           @Override
-          public void handleBackground(int backgroundId) throws Exception {
+          public void handleBackground(int backgroundId) {
             builder.append("background=").append(colorRegistry.dataById(backgroundId)).append(',');
           }
 
           @Override
-          public void handleFont(int fontNameId) throws Exception {
+          public void handleFont(int fontNameId) {
             assertEquals(1, fontNameId);
           }
 
           @Override
-          public void handleStyle(int style) throws Exception {
+          public void handleStyle(int style) {
             builder.append("fontStyle=").append(style).append(',');
           }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/execution/ParametersListTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/execution/ParametersListTest.java
index 5d658ba27a5f..c270bb7000b3 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/execution/ParametersListTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/execution/ParametersListTest.java
@@ -209,7 +209,7 @@ public class ParametersListTest {
   }
 
   @Test
-  public void testParameterListUtil() throws Exception {
+  public void testParameterListUtil() {
     final List<String> expected = Arrays.asList(
       "cmd",
       "-a",
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java
index f95278edf6ae..2eac5846c775 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java
@@ -144,7 +144,7 @@ public class FileEditorManagerTest extends FileEditorManagerTestCase {
     assertEquals("mockEditor", selectedEditors[0].getName());
   }
 
-  public void testTrackSelectedEditor() throws Exception {
+  public void testTrackSelectedEditor() {
     PlatformTestUtil
       .registerExtension(FileEditorProvider.EP_FILE_EDITOR_PROVIDER, new MyFileEditorProvider(), myFixture.getTestRootDisposable());
     VirtualFile file = getFile("/src/1.txt");
@@ -160,7 +160,7 @@ public class FileEditorManagerTest extends FileEditorManagerTestCase {
     assertEquals("mockEditor", myManager.getSelectedEditor(file).getName());
   }
 
-  public void testWindowClosingRetainsOtherWindows() throws Exception {
+  public void testWindowClosingRetainsOtherWindows() {
     VirtualFile file = getFile("/src/1.txt");
     assertNotNull(file);
     myManager.openFile(file, false);
@@ -174,7 +174,7 @@ public class FileEditorManagerTest extends FileEditorManagerTestCase {
     assertEquals(2, myManager.getWindows().length);
   }
 
-  public void testStoringCaretStateForFileWithFoldingsWithNoTabs() throws Exception {
+  public void testStoringCaretStateForFileWithFoldingsWithNoTabs() {
     UISettings.getInstance().setEditorTabPlacement(UISettings.TABS_NONE);
     VirtualFile file = getFile("/src/Test.java");
     assertNotNull(file);
@@ -207,7 +207,7 @@ public class FileEditorManagerTest extends FileEditorManagerTestCase {
     assertEquals(textLength, editor.getSelectionModel().getSelectionEnd());
   }
 
-  public void testOpenInDumbMode() throws Exception {
+  public void testOpenInDumbMode() {
     PlatformTestUtil
       .registerExtension(FileEditorProvider.EP_FILE_EDITOR_PROVIDER, new MyFileEditorProvider(), myFixture.getTestRootDisposable());
     PlatformTestUtil
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java
index 2ffe21e32f0c..ae693884e1d3 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java
@@ -53,7 +53,7 @@ public class NewDocumentHistoryTest extends HeavyFileEditorManagerTestCase {
     }
   }
 
-  public void testBackNavigationBetweenEditors() throws Exception {
+  public void testBackNavigationBetweenEditors() {
     PlatformTestUtil.registerExtension(FileEditorProvider.EP_FILE_EDITOR_PROVIDER, new FileEditorManagerTest.MyFileEditorProvider(), myFixture.getTestRootDisposable());
     VirtualFile file = getFile("/src/1.txt");
     assertNotNull(file);
@@ -68,7 +68,7 @@ public class NewDocumentHistoryTest extends HeavyFileEditorManagerTestCase {
     assertEquals("mockEditor", myManager.getSelectedEditor(file).getName());
   }
 
-  public void testSelectFileOnNavigation() throws Exception {
+  public void testSelectFileOnNavigation() {
     VirtualFile file1 = getFile("/src/1.txt");
     myManager.openFile(file1, true);
     VirtualFile file2 = getFile("/src/2.txt");
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java
index c0fbb4b3edcc..77f464c87004 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java
@@ -122,7 +122,7 @@ public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase {
     typeAndCheck(nonProjectFile, false); // original is still locked 
   }
 
-  public void testAccessToProjectSystemFiles() throws Exception {
+  public void testAccessToProjectSystemFiles() {
     PlatformTestUtil.saveProject(getProject());
     VirtualFile fileUnderProjectDir = createFileExternally(new File(getProject().getBaseDir().getPath()));
     
@@ -133,7 +133,7 @@ public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase {
     typeAndCheck(fileUnderProjectDir, false);
   }
 
-  public void testAccessToModuleSystemFiles() throws Exception {
+  public void testAccessToModuleSystemFiles() {
     final Module moduleWithoutContentRoot = new WriteCommandAction<Module>(getProject()) {
       @Override
       protected void run(@NotNull Result<Module> result) throws Throwable {
@@ -276,7 +276,7 @@ public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase {
     typeAndCheck(nonProjectFile2, false);
   }
   
-  public void testCheckingExtensionsForNonWritableFiles() throws Exception {
+  public void testCheckingExtensionsForNonWritableFiles() {
     VirtualFile nonProjectFile1 = createProjectFile();
     VirtualFile nonProjectFile2 = createProjectFile();
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java
index 6454ea8f2e58..41238d243504 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java
@@ -85,7 +85,7 @@ public class FileDocumentManagerImplTest extends PlatformTestCase {
     super.tearDown();
   }
 
-  public void testGetCachedDocument_Cached() throws Exception {
+  public void testGetCachedDocument_Cached() {
     final Document cachedDocument = myDocumentManager.getCachedDocument(new MockVirtualFile("test.txt"));
     assertNull(cachedDocument);
   }
@@ -146,7 +146,7 @@ public class FileDocumentManagerImplTest extends PlatformTestCase {
     assertTrue(idCode != System.identityHashCode(document));
   }
 
-  public void testGetUnsavedDocuments_NoDocuments() throws Exception {
+  public void testGetUnsavedDocuments_NoDocuments() {
     final Document[] unsavedDocuments = myDocumentManager.getUnsavedDocuments();
     assertEquals(0, unsavedDocuments.length);
   }
@@ -307,7 +307,7 @@ public class FileDocumentManagerImplTest extends PlatformTestCase {
     assertSame(file, myDocumentManager.getFile(document));
   }
 
-  public void testConvertSeparators() throws Exception {
+  public void testConvertSeparators() {
     final VirtualFile file = new MockVirtualFile("test.txt", "test\rtest");
     Document document = myDocumentManager.getDocument(file);
     assertNotNull(file.toString(), document);
@@ -358,11 +358,11 @@ public class FileDocumentManagerImplTest extends PlatformTestCase {
     assertEquals("test\ntest", document.getText());
   }
 
-  public void testContentChanged_ignoreEventsFromSelfOnSave() throws Exception {
+  public void testContentChanged_ignoreEventsFromSelfOnSave() {
     final VirtualFile file = new MockVirtualFile("test.txt", "test\rtest") {
       @NotNull
       @Override
-      public OutputStream getOutputStream(final Object requestor, final long newModificationStamp, long newTimeStamp) throws IOException {
+      public OutputStream getOutputStream(final Object requestor, final long newModificationStamp, long newTimeStamp) {
         final VirtualFile self = this;
         return new ByteArrayOutputStream() {
           @Override
@@ -440,7 +440,7 @@ public class FileDocumentManagerImplTest extends PlatformTestCase {
   // this test requires changes in idea code to support MockFile as local file system file (FileDocumentManager.needsRefresh).
   // TODO: think how to test this functionality without hacking production code
   @SuppressWarnings("UnusedDeclaration")
-  public void _testContentChanged_reloadChangedDocumentOnSave() throws Exception {
+  public void _testContentChanged_reloadChangedDocumentOnSave() {
     final MockVirtualFile file = new MockVirtualFile("test.txt", "test\rtest") {
       @Override
       public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) {
@@ -572,7 +572,7 @@ public class FileDocumentManagerImplTest extends PlatformTestCase {
     });
   }
 
-  public void testNoPSIModificationsDuringSave() throws IOException {
+  public void testNoPSIModificationsDuringSave() {
     File ioFile = IoTestUtil.createTestFile("test.txt", "<html>some text</html>");
     VirtualFile virtualFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(ioFile);
     assertNotNull(ioFile.getPath(), virtualFile);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryTest.java
index d460eb98a5bc..dee9456303e1 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryTest.java
@@ -94,7 +94,7 @@ public class IdeDocumentHistoryTest extends PlatformTestCase {
     super.tearDown();
   }
 
-  public void testNoHistoryRecording() throws Throwable {
+  public void testNoHistoryRecording() {
     myHistory.onCommandStarted();
     myHistory.onCommandFinished(null);
 
@@ -102,7 +102,7 @@ public class IdeDocumentHistoryTest extends PlatformTestCase {
     assertFalse(myHistory.isForwardAvailable());
   }
 
-  public void testNavigationRecording() throws Throwable {
+  public void testNavigationRecording() {
     makeNavigationChange(myState2);
 
     assertTrue(myHistory.isBackAvailable());
@@ -111,7 +111,7 @@ public class IdeDocumentHistoryTest extends PlatformTestCase {
     assertEquals(1, myHistory.getBackPlaces().size());
   }
 
-  public void testMergingForwardPlaces() throws Throwable {
+  public void testMergingForwardPlaces() {
     myEditorState = new MyState(true, "state1");
     makeNavigationChange(new MyState(true, "state2"));
 
@@ -121,7 +121,7 @@ public class IdeDocumentHistoryTest extends PlatformTestCase {
     assertEquals(1, myHistory.getBackPlaces().size());
   }
 
-  public void testSimpleNavigation() throws Throwable {
+  public void testSimpleNavigation() {
     pushTwoStates();
 
     assertFalse(myHistory.isForwardAvailable());
@@ -148,7 +148,7 @@ public class IdeDocumentHistoryTest extends PlatformTestCase {
     assertSame(myState3, myEditorState);
   }
 
-  public void testQueueCutOff() throws Throwable {
+  public void testQueueCutOff() {
     pushTwoStates();
     myHistory.back();
 
@@ -168,7 +168,7 @@ public class IdeDocumentHistoryTest extends PlatformTestCase {
     assertFalse(myHistory.isBackAvailable());
   }
 
-  public void testRemoveInvalid() throws Throwable {
+  public void testRemoveInvalid() {
     pushTwoStates();
     assertTrue(myHistory.isBackAvailable());
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
index 7e537f026287..49c4f63fade5 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
@@ -131,7 +131,7 @@ public class FileTypesTest extends PlatformTestCase {
     assertFalse(pattern.matcher("x/a\\b").matches());
   }
 
-  public void testAddNewExtension() throws Exception {
+  public void testAddNewExtension() {
     FileTypeAssocTable<FileType> associations = new FileTypeAssocTable<>();
     associations.addAssociation(FileTypeManager.parseFromString("*.java"), FileTypes.ARCHIVE);
     associations.addAssociation(FileTypeManager.parseFromString("*.xyz"), StdFileTypes.XML);
@@ -349,7 +349,7 @@ public class FileTypesTest extends PlatformTestCase {
     log("T: ensureRedetected: clear");
   }
 
-  public void testReassignedPredefinedFileType() throws Exception {
+  public void testReassignedPredefinedFileType() {
     final FileType perlFileType = myFileTypeManager.getFileTypeByFileName("foo.pl");
     assertEquals("Perl", perlFileType.getName());
     assertEquals(PlainTextFileType.INSTANCE, myFileTypeManager.getFileTypeByFileName("foo.cgi"));
@@ -414,7 +414,7 @@ public class FileTypesTest extends PlatformTestCase {
     assertEquals(typeFromPlugin, mappings.values().iterator().next().first);
   }
 
-  public void testPreserveUninstalledPluginAssociations() throws Exception {
+  public void testPreserveUninstalledPluginAssociations() {
     final FileType typeFromPlugin = new FileType() {
       @NotNull
       @Override
@@ -528,7 +528,7 @@ public class FileTypesTest extends PlatformTestCase {
     }
   }
 
-  public void testDefaultFileType() throws Exception {
+  public void testDefaultFileType() {
     final String extension = "veryRareExtension";
     final FileType idl = myFileTypeManager.findFileTypeByName("IDL");
     ApplicationManager.getApplication().runWriteAction(() -> myFileTypeManager.associatePattern(idl, "*." + extension));
@@ -602,7 +602,7 @@ public class FileTypesTest extends PlatformTestCase {
     }
   }
 
-  public void _testStressPlainTextFileWithEverIncreasingLength() throws IOException, InterruptedException {
+  public void _testStressPlainTextFileWithEverIncreasingLength() throws IOException {
     FrequentEventDetector.disableUntil(getTestRootDisposable());
 
     File f = createTempFile("xx.lkjlkjlkjlj", "a");
@@ -664,7 +664,7 @@ public class FileTypesTest extends PlatformTestCase {
     if (exception.get() != null) throw new RuntimeException(exception.get());
   }
 
-  public void _testStressPlainTextFileWithEverIncreasingLength2() throws IOException, InterruptedException {
+  public void _testStressPlainTextFileWithEverIncreasingLength2() throws IOException {
     FrequentEventDetector.disableUntil(getTestRootDisposable());
 
     File f = createTempFile("xx.asdkjfhlkasjdhf", StringUtil.repeatSymbol(' ', (int)PersistentFSConstants.FILE_LENGTH_TO_CACHE_THRESHOLD - 100));
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcherTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcherTest.java
index 4ead4c32d797..dce289347e9d 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcherTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcherTest.java
@@ -78,7 +78,7 @@ public class IdeMouseEventDispatcherTest extends LightPlatformTestCase {
     }
   }
 
-  public void testActionTriggering() throws Exception {
+  public void testActionTriggering() {
     assertFalse(myDispatcher.dispatchMouseEvent(new MouseEvent(myEventSource, MouseEvent.MOUSE_PRESSED, 0, 0, 0, 0, 1, false, MouseEvent.BUTTON2)));
     MouseEvent mouseEvent = new MouseEvent(myEventSource, MouseEvent.MOUSE_RELEASED, 0, 0, 0, 0, 1, false, MouseEvent.BUTTON2);
     assertTrue(!myDispatcher.dispatchMouseEvent(mouseEvent) && mouseEvent.isConsumed());
@@ -86,7 +86,7 @@ public class IdeMouseEventDispatcherTest extends LightPlatformTestCase {
     assertEquals(1, myActionExecutionCount);
   }
 
-  public void testActionBlocking() throws Exception {
+  public void testActionBlocking() {
     assertFalse(myDispatcher.dispatchMouseEvent(new MouseEvent(myEventSource, MouseEvent.MOUSE_PRESSED, 0, 0, 0, 0, 1, false, MouseEvent.BUTTON2)));
     MouseEvent dragEvent = new MouseEvent(myEventSource, MouseEvent.MOUSE_DRAGGED, 0, 0, 0, 0, 0, false, MouseEvent.BUTTON2);
     assertFalse(myDispatcher.dispatchMouseEvent(dragEvent));
@@ -95,7 +95,7 @@ public class IdeMouseEventDispatcherTest extends LightPlatformTestCase {
     assertEquals(0, myActionExecutionCount);
   }
 
-  public void testModifiersArePickedAtMousePressed() throws Exception {
+  public void testModifiersArePickedAtMousePressed() {
     assertFalse(myDispatcher.dispatchMouseEvent(new MouseEvent(myEventSource, MouseEvent.MOUSE_PRESSED, 0, 0, 0, 0, 1, false, MouseEvent.BUTTON1)));
     assertFalse(myDispatcher.dispatchMouseEvent(new MouseEvent(myEventSource, MouseEvent.MOUSE_RELEASED, 0, InputEvent.CTRL_MASK, 0, 0, 1, false, MouseEvent.BUTTON1)));
     assertEquals(0, myActionExecutionCount);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java
index fc42b267731f..adbbce998b3b 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java
@@ -58,7 +58,7 @@ public class KeymapTest extends PlatformTestCase {
     myChild.addShortcut(ACTION_1, shortcutA);
   }
 
-  public void testParentAndChildShortcuts() throws Exception {
+  public void testParentAndChildShortcuts() {
     assertTrue(myParent.hasOwnActionId(ACTION_1));
     assertTrue(myParent.hasOwnActionId(ACTION_2));
     assertFalse(myParent.hasOwnActionId(ACTION_NON_EXISTENT));
@@ -86,7 +86,7 @@ public class KeymapTest extends PlatformTestCase {
     assertSameElements(myChild.getActionIds(shortcutB));
   }
 
-  public void testRemovingShortcutsFromParentAndChild() throws Exception {
+  public void testRemovingShortcutsFromParentAndChild() {
     myParent.removeShortcut(ACTION_1, shortcut1);
 
     assertFalse(myParent.hasOwnActionId(ACTION_1));
@@ -119,7 +119,7 @@ public class KeymapTest extends PlatformTestCase {
     assertTrue(myChild.hasOwnActionId(ACTION_2)); // since different from parent list
   }
 
-  public void testRemovingShortcutFromChildWhenInheritedDontChangeTheListIfShortcutIsAbsent() throws Exception {
+  public void testRemovingShortcutFromChildWhenInheritedDontChangeTheListIfShortcutIsAbsent() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -144,7 +144,7 @@ public class KeymapTest extends PlatformTestCase {
     assertThat(myChild.getShortcuts(ACTION_2)).containsExactly(shortcut2, shortcutB);
   }
 
-  public void testRemovingShortcutFirst() throws Exception {
+  public void testRemovingShortcutFirst() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -156,7 +156,7 @@ public class KeymapTest extends PlatformTestCase {
     assertThat(myChild.getShortcuts(ACTION_2)).containsExactly(shortcutA, shortcutB);
   }
 
-  public void testRemoveMouseShortcut() throws Exception {
+  public void testRemoveMouseShortcut() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -192,7 +192,7 @@ public class KeymapTest extends PlatformTestCase {
   //  }
   //}
 
-  public void testChangingMouseShortcutInGrandChild() throws Exception {
+  public void testChangingMouseShortcutInGrandChild() {
     MouseShortcut mouseShortcut = new MouseShortcut(MouseEvent.BUTTON1, 0, 1);
     myParent.addShortcut(ACTION_2, mouseShortcut);
     Keymap grandChild = myChild.deriveKeymap("GrandChild");
@@ -201,7 +201,7 @@ public class KeymapTest extends PlatformTestCase {
     assertThat(grandChild.getActionIds(mouseShortcut)).containsExactly(ACTION_1);
   }
 
-  public void testRemovingShortcutLast() throws Exception {
+  public void testRemovingShortcutLast() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -213,7 +213,7 @@ public class KeymapTest extends PlatformTestCase {
     assertThat(myChild.getShortcuts(ACTION_2)).containsExactly(shortcut2, shortcutA);
   }
 
-  public void testRemovingShortcutFromChildWhenInherited() throws Exception {
+  public void testRemovingShortcutFromChildWhenInherited() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -233,7 +233,7 @@ public class KeymapTest extends PlatformTestCase {
     assertSameElements(myChild.getShortcuts(ACTION_1), shortcut2);
   }
 
-  public void testRemovingShortcutFromChildWhenInheritedAndBound() throws Exception {
+  public void testRemovingShortcutFromChildWhenInheritedAndBound() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -281,7 +281,7 @@ public class KeymapTest extends PlatformTestCase {
     }
   }
 
-  public void testRemovingShortcutNotInheritedBoundAndNotBound() throws Exception {
+  public void testRemovingShortcutNotInheritedBoundAndNotBound() {
     KeymapImpl standalone = new KeymapImpl();
     standalone.setName("standalone");
 
@@ -323,7 +323,7 @@ public class KeymapTest extends PlatformTestCase {
     }
   }
 
-  public void testResettingMappingInChild() throws Exception {
+  public void testResettingMappingInChild() {
     assertSameElements(myChild.getShortcuts(ACTION_1), shortcut1, shortcutA);
     assertSameElements(myChild.getActionIds(shortcut1), ACTION_1);
     assertSameElements(myChild.getActionIds(shortcutA), ACTION_1);
@@ -346,7 +346,7 @@ public class KeymapTest extends PlatformTestCase {
     assertFalse(myChild.hasOwnActionId(ACTION_2));
   }
 
-  public void testChangingAndResettingBoundShortcutsInParentKeymap() throws Exception {
+  public void testChangingAndResettingBoundShortcutsInParentKeymap() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -471,7 +471,7 @@ public class KeymapTest extends PlatformTestCase {
     }
   }
 
-  public void testChangingAndResettingBoundShortcutsInChildKeymap() throws Exception {
+  public void testChangingAndResettingBoundShortcutsInChildKeymap() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -607,7 +607,7 @@ public class KeymapTest extends PlatformTestCase {
     }
   }
 
-  public void testRemovingChildMappingIsTheSameAsResetting() throws Exception {
+  public void testRemovingChildMappingIsTheSameAsResetting() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
 
@@ -686,7 +686,7 @@ public class KeymapTest extends PlatformTestCase {
     }
   }
 
-  public void testLookingForShortcutsInParentFirstAndOnlyThenConsiderBoundActions() throws Exception {
+  public void testLookingForShortcutsInParentFirstAndOnlyThenConsiderBoundActions() {
     myParent.clearOwnActionsIds();
     myChild.clearOwnActionsIds();
     KeymapImpl myGrandChild = myChild.deriveKeymap("GrandChild");
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/RecentProjectsTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/RecentProjectsTest.java
index a1f03b5e4f19..9977c3560dfa 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/RecentProjectsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/project/impl/RecentProjectsTest.java
@@ -129,7 +129,7 @@ public class RecentProjectsTest extends PlatformTestCase {
     Assert.assertEquals(Arrays.toString(groups), Arrays.toString(recentGroups.toArray()));
   }
 
-  private static String createAndOpenProject(String name) throws IOException, JDOMException, InterruptedException {
+  private static String createAndOpenProject(String name) throws IOException, JDOMException {
     Project project = null;
     try {
       File path = PlatformTestCase.createTempDir(name);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/roots/ProjectRootUtilSymlinkedFilesTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/roots/ProjectRootUtilSymlinkedFilesTest.java
index be8d8418f828..7fe15023b0bb 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/roots/ProjectRootUtilSymlinkedFilesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/roots/ProjectRootUtilSymlinkedFilesTest.java
@@ -27,7 +27,6 @@ import com.intellij.testFramework.PsiTestUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.io.IOException;
 
 public class ProjectRootUtilSymlinkedFilesTest extends PlatformTestCase {
   private File myNonContentDir;
@@ -65,19 +64,19 @@ public class ProjectRootUtilSymlinkedFilesTest extends PlatformTestCase {
     PsiTestUtil.addLibrary(getModule(), myLibraryVDir.getPath());
   }
 
-  public void testNoFilesInContent() throws Exception {
+  public void testNoFilesInContent() {
     assertEquals(myNonContentVFile, ProjectRootUtil.findSymlinkedFileInContent(getProject(), myNonContentVFile));
   }
 
-  public void testLinkedDirInContent() throws Exception {
+  public void testLinkedDirInContent() {
     doTestLinkedDirInProjectRoots(true);
   }
 
-  public void testLinkedDirInLibrary() throws Exception {
+  public void testLinkedDirInLibrary() {
     doTestLinkedDirInProjectRoots(false);
   }
 
-  public void doTestLinkedDirInProjectRoots(boolean content) throws Exception {
+  public void doTestLinkedDirInProjectRoots(boolean content) {
     String linkedPath = (content ? myContentDir : myLibraryDir).getPath() + "/linked";
     IoTestUtil.createSymLink(myNonContentDir.getPath(), linkedPath, true);
     
@@ -87,7 +86,7 @@ public class ProjectRootUtilSymlinkedFilesTest extends PlatformTestCase {
   }
 
   // not supported
-  public void _testLinkedFileInSources() throws Exception {
+  public void _testLinkedFileInSources() {
     String linkedPath = myContentDir.getPath() + "/linked.txt";
     IoTestUtil.createSymLink(myNonContentVFile.getPath(), linkedPath, true);
     
@@ -95,7 +94,7 @@ public class ProjectRootUtilSymlinkedFilesTest extends PlatformTestCase {
     assertEquals(linkedVFile, ProjectRootUtil.findSymlinkedFileInContent(getProject(), myNonContentVFile));
   }
   
-  public void testFileWithTheSameNotButNotLinked() throws Exception {
+  public void testFileWithTheSameNotButNotLinked() {
     new WriteAction<Object>() {
       @Override
       protected void run(@NotNull Result<Object> result) throws Throwable {
@@ -106,7 +105,7 @@ public class ProjectRootUtilSymlinkedFilesTest extends PlatformTestCase {
     assertEquals(myNonContentVFile, ProjectRootUtil.findSymlinkedFileInContent(getProject(), myNonContentVFile));
   }
 
-  public void testWhenSeveralLinkedAlwaysReturnTheSameFile() throws Exception {
+  public void testWhenSeveralLinkedAlwaysReturnTheSameFile() {
     String linkedPath1 = myContentDir.getPath() + "/linked1";
     IoTestUtil.createSymLink(myNonContentDir.getPath(), linkedPath1, true);
     VirtualFile linkedVFile1 = VfsUtil.findFileByIoFile(new File(linkedPath1, myNonContentFile.getName()), true);
@@ -124,15 +123,15 @@ public class ProjectRootUtilSymlinkedFilesTest extends PlatformTestCase {
     }
   }
 
-  public void testLinkedAndCanonicalUnderContent() throws Exception {
+  public void testLinkedAndCanonicalUnderContent() {
     doTestLinkedAndCanonicalUnderRoot(true);
   }
   
-  public void testLinkedAndCanonicalUnderLibraryRoot() throws Exception {
+  public void testLinkedAndCanonicalUnderLibraryRoot() {
     doTestLinkedAndCanonicalUnderRoot(false);
   }
 
-  private void doTestLinkedAndCanonicalUnderRoot(boolean content) throws InterruptedException, IOException {
+  private void doTestLinkedAndCanonicalUnderRoot(boolean content) {
     String linkedPath = myContentDir.getPath() + "/linked";
     IoTestUtil.createSymLink(myNonContentDir.getPath(), linkedPath, true);
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/util/io/FileUtilPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/util/io/FileUtilPerformanceTest.java
index 475cc1155a4c..a2a8f93e054a 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/util/io/FileUtilPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/util/io/FileUtilPerformanceTest.java
@@ -27,7 +27,7 @@ public class FileUtilPerformanceTest {
   private String mySimpleTestPath = "file.txt";
 
   @Test
-  public void toCanonicalPath() throws Exception {
+  public void toCanonicalPath() {
     assertEquals(myCanonicalPath, FileUtil.toCanonicalPath(myTestPath));
 
     PlatformTestUtil.startPerformanceTest("toCanonicalPath", 650, () -> {
@@ -39,7 +39,7 @@ public class FileUtilPerformanceTest {
   }
 
   @Test
-  public void toCanonicalPathSimple() throws Exception {
+  public void toCanonicalPathSimple() {
     assertEquals(mySimpleTestPath, FileUtil.toCanonicalPath(mySimpleTestPath));
 
     PlatformTestUtil.startPerformanceTest("toCanonicalPathSimple", 210, () -> {
@@ -51,7 +51,7 @@ public class FileUtilPerformanceTest {
   }
 
   @Test
-  public void isAncestor() throws Exception {
+  public void isAncestor() {
     assertTrue(FileUtil.isAncestor(myTestPath, myCanonicalPath, false));
 
     PlatformTestUtil.startPerformanceTest("isAncestor", 3000, () -> {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/util/text/StringUtilPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/util/text/StringUtilPerformanceTest.java
index 15f0611ccf9d..0626fa02ac44 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/util/text/StringUtilPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/util/text/StringUtilPerformanceTest.java
@@ -26,7 +26,7 @@ public class StringUtilPerformanceTest {
   private static final String TEST_STRING = "0123456789abcdefghijklmnopqrstuvwxyz";
 
   @Test
-  public void containsAnyChar() throws Exception {
+  public void containsAnyChar() {
     assertTrue(StringUtil.containsAnyChar(TEST_STRING, Integer.toString(new Random().nextInt())));
 
     PlatformTestUtil.startPerformanceTest("StringUtil.containsAnyChar()", 300, () -> {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/DummyFileSystemTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/DummyFileSystemTest.java
index c6379fb8ac28..1c95697f9744 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/DummyFileSystemTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/DummyFileSystemTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotNull;
 
 public class DummyFileSystemTest extends BareTestFixtureTestCase {
   @Test
-  public void testDeletionEvents() throws Exception {
+  public void testDeletionEvents() {
     DummyFileSystem fs = new DummyFileSystem();
 
     Pair<VirtualFile, VirtualFile> pair = new WriteAction<Pair<VirtualFile, VirtualFile>>() {
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java
index 16ae12206f44..cd3b5a4536d9 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilPerformanceTest.java
@@ -152,7 +152,7 @@ public class VfsUtilPerformanceTest extends BareTestFixtureTestCase {
           }
 
           @Override
-          public void run() throws Throwable {
+          public void run() {
             for (int i = 0; i < 5_000_000; i++) {
               checkRootsEqual();
             }
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
index 9ebcb117aac8..05a1cc656c29 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
@@ -163,7 +163,7 @@ public class VirtualFilePointerTest extends PlatformTestCase {
     }
   }
 
-  public void testUrlsHavingOnlyStartingSlashInCommon() throws Exception {
+  public void testUrlsHavingOnlyStartingSlashInCommon() {
     VirtualFilePointer p1 = myVirtualFilePointerManager.create("file:///a/p1", disposable, null);
     VirtualFilePointer p2 = myVirtualFilePointerManager.create("file:///b/p2", disposable, null);
     final LightVirtualFile root = new LightVirtualFile("/");
@@ -173,7 +173,7 @@ public class VirtualFilePointerTest extends PlatformTestCase {
     assertSameElements(myVirtualFilePointerManager.getPointersUnder(b, "p2"), p2);
   }
 
-  public void testUrlsHavingOnlyStartingSlashInCommonAndInvalidUrlBetweenThem() throws Exception {
+  public void testUrlsHavingOnlyStartingSlashInCommonAndInvalidUrlBetweenThem() {
     VirtualFilePointer p1 = myVirtualFilePointerManager.create("file:///a/p1", disposable, null);
     myVirtualFilePointerManager.create("file://invalid/path", disposable, null);
     VirtualFilePointer p2 = myVirtualFilePointerManager.create("file:///b/p2", disposable, null);
@@ -608,7 +608,7 @@ public class VirtualFilePointerTest extends PlatformTestCase {
     assertFalse(pointer.isValid());
   }
 
-  public void testContainerCreateDeletePerformance() throws Exception {
+  public void testContainerCreateDeletePerformance() {
     PlatformTestUtil.startPerformanceTest("VF container create/delete", 100, () -> {
       Disposable parent = Disposer.newDisposable();
       for (int i = 0; i < 10_000; i++) {
@@ -759,7 +759,7 @@ public class VirtualFilePointerTest extends PlatformTestCase {
     }).assertTiming();
   }
 
-  public void testMultipleCreationOfTheSamePointerPerformance() throws IOException {
+  public void testMultipleCreationOfTheSamePointerPerformance() {
     final LoggingListener listener = new LoggingListener();
     final String url = VfsUtilCore.pathToUrl("/a/b/c/d/e");
     final VirtualFilePointer thePointer = myVirtualFilePointerManager.create(url, disposable, listener);
@@ -902,7 +902,7 @@ public class VirtualFilePointerTest extends PlatformTestCase {
     assertEquals(file, pointer.getFile());
   }
 
-  public void testAlienVirtualFileSystemPointerRemovedFromUrlToIdentityCacheOnDispose() throws IOException {
+  public void testAlienVirtualFileSystemPointerRemovedFromUrlToIdentityCacheOnDispose() {
     VirtualFile mockVirtualFile = new MockVirtualFile("test_name", "test_text");
     Disposable disposable1 = Disposer.newDisposable();
     final VirtualFilePointer pointer = VirtualFilePointerManager.getInstance().create(mockVirtualFile, disposable1, null);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.java
index fcee8b1ac143..91aa353de56a 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/local/CanonicalPathMapTest.java
@@ -139,7 +139,7 @@ public class CanonicalPathMapTest {
   }
 
   @Test
-  public void remappedSymLinkReportsOriginalWatchedPath() throws IOException, InterruptedException {
+  public void remappedSymLinkReportsOriginalWatchedPath() throws IOException {
     // Tests the situation where the watch root is a symlink AND REMAPPED by the native file watcher.
     File realDir = myTempDir.newFolder("real");
     File symLink = IoTestUtil.createSymLink(realDir.getPath(), myTempDir.getRoot() + "/link");
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java
index 53bf6e5c3ccb..85d575ddc79f 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/JarRootsRefreshTest.java
@@ -36,16 +36,15 @@ import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.PsiTestUtil;
 
 import java.io.File;
-import java.io.IOException;
 
 public class JarRootsRefreshTest extends PlatformTestCase {
-  public void testJarRefreshOnRenameOrMove() throws IOException {
+  public void testJarRefreshOnRenameOrMove() {
     File jar = IoTestUtil.createTestJar();
     VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(jar);
     assertNotNull(vFile);
     new WriteCommandAction.Simple(myProject) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         PsiTestUtil.addContentRoot(myModule, vFile.getParent());
       }
     }.execute();
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
index 51b77dec3a2a..22b5dd16f93a 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/LocalFileSystemTest.java
@@ -265,7 +265,7 @@ public class LocalFileSystemTest extends PlatformTestCase {
     assertTrue(childFile.delete());
   }
 
-  public void testFindRoot() throws IOException {
+  public void testFindRoot() {
     VirtualFile root = myFS.findFileByPath("wrong_path");
     assertNull(root);
 
@@ -371,7 +371,7 @@ public class LocalFileSystemTest extends PlatformTestCase {
     }
   }
 
-  public void testWindowsHiddenDirectory() throws Exception {
+  public void testWindowsHiddenDirectory() {
     if (!SystemInfo.isWindows) {
       System.err.println(getName() + " skipped: " + SystemInfo.OS_NAME);
       return;
@@ -460,7 +460,7 @@ public class LocalFileSystemTest extends PlatformTestCase {
     assertNull(vFile);
   }
 
-  public void testNoMoreFakeRoots() throws Exception {
+  public void testNoMoreFakeRoots() {
     try {
       PersistentFS.getInstance().findRoot("", myFS);
       fail("should fail by assertion in PersistentFsImpl.findRoot()");
@@ -714,7 +714,7 @@ public class LocalFileSystemTest extends PlatformTestCase {
     });
   }
 
-  public void testBrokenSymlinkMove() throws IOException, InterruptedException {
+  public void testBrokenSymlinkMove() throws IOException {
     if (!SystemInfo.areSymLinksSupported) {
       System.err.println(getName() + " skipped: " + SystemInfo.OS_NAME);
       return;
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/PersistentFsTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/PersistentFsTest.java
index b2ed234fd8b5..393bbcf11798 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/PersistentFsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/PersistentFsTest.java
@@ -160,13 +160,13 @@ public class PersistentFsTest extends PlatformTestCase {
     }
   }
 
-  public void testInvalidJarRootsIgnored() throws Exception {
+  public void testInvalidJarRootsIgnored() {
     File file = IoTestUtil.createTestFile("file.txt");
     String url = "jar://" + FileUtil.toSystemIndependentName(file.getPath()) + "!/";
     assertNull(VirtualFileManager.getInstance().findFileByUrl(url));
   }
 
-  public void testBrokenJarRoots() throws Exception {
+  public void testBrokenJarRoots() {
     final File jarFile = IoTestUtil.createTestFile("empty.jar");
 
     final int[] logCount = {0};
@@ -287,7 +287,7 @@ public class PersistentFsTest extends PlatformTestCase {
     assertFalse(FSRecords.isDirty());
   }
 
-  public void testProcessEventsMustIgnoreDeleteDuplicates() throws IOException {
+  public void testProcessEventsMustIgnoreDeleteDuplicates() {
     VirtualFile vFile = setupFile();
     checkEvents("Before:[VFileDeleteEvent->file.txt]\nAfter:[VFileDeleteEvent->file.txt]\n",
                 new VFileDeleteEvent(this, vFile, false),
@@ -318,7 +318,7 @@ public class PersistentFsTest extends PlatformTestCase {
     assertEquals(expectedEvents, log.toString());
   }
 
-  public void testProcessEventsMustGroupDependentEventsCorrectly() throws IOException {
+  public void testProcessEventsMustGroupDependentEventsCorrectly() {
     VirtualFile vFile = setupFile();
     checkEvents("Before:[VFileCreateEvent->xx.created, VFileDeleteEvent->file.txt]\n" +
                 "After:[VFileCreateEvent->xx.created, VFileDeleteEvent->file.txt]\n",
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java
index ac96f0a3c43e..bef7402325ff 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/SymlinkHandlingTest.java
@@ -49,7 +49,7 @@ public class SymlinkHandlingTest extends BareTestFixtureTestCase {
   }
 
   @Test
-  public void testMissingLink() throws Exception {
+  public void testMissingLink() {
     File missingFile = new File(myTempDir.getRoot(), "missing_file");
     assertTrue(missingFile.getPath(), !missingFile.exists() || missingFile.delete());
     File missingLinkFile = createSymLink(missingFile.getPath(), myTempDir.getRoot() + "/missing_link", false);
@@ -60,7 +60,7 @@ public class SymlinkHandlingTest extends BareTestFixtureTestCase {
   }
 
   @Test
-  public void testSelfLink() throws Exception {
+  public void testSelfLink() {
     String target = new File(myTempDir.getRoot(), "self_link").getPath();
     File selfLinkFile = createSymLink(target, target, false);
     VirtualFile selfLinkVFile = refreshAndFind(selfLinkFile);
@@ -70,7 +70,7 @@ public class SymlinkHandlingTest extends BareTestFixtureTestCase {
   }
 
   @Test
-  public void testDotLink() throws Exception {
+  public void testDotLink() {
     File dotLinkFile = createSymLink(".", myTempDir.getRoot() + "/dot_link");
     VirtualFile dotLinkVFile = refreshAndFind(dotLinkFile);
     assertNotNull(dotLinkVFile);
@@ -317,7 +317,7 @@ public class SymlinkHandlingTest extends BareTestFixtureTestCase {
     doTestLinkSwitch("text 1", "text 2");
   }
 
-  private void doTestLinkSwitch(String text1, String text2) throws IOException, InterruptedException {
+  private void doTestLinkSwitch(String text1, String text2) throws IOException {
     File target1 = myTempDir.newFile("target1.txt");
     FileUtil.writeToFile(target1, text1);
     File target2 = myTempDir.newFile("target2.txt");
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/NameUtilTest.java b/platform/platform-tests/testSrc/com/intellij/psi/NameUtilTest.java
index d5a7e2d49519..92fdf1ad188c 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/NameUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/NameUtilTest.java
@@ -27,32 +27,32 @@ import static org.junit.Assert.assertEquals;
  */
 public class NameUtilTest {
   @Test
-  public void testSplitIntoWords1() throws Exception {
+  public void testSplitIntoWords1() {
     assertSplitEquals(new String[]{"I", "Base"}, "IBase");
   }
 
   @Test
-  public void testSplitIntoWords2() throws Exception {
+  public void testSplitIntoWords2() {
     assertSplitEquals(new String[]{"Order", "Index"}, "OrderIndex");
   }
 
   @Test
-  public void testSplitIntoWords3() throws Exception {
+  public void testSplitIntoWords3() {
     assertSplitEquals(new String[]{"order", "Index"}, "orderIndex");
   }
 
   @Test
-  public void testSplitIntoWords4() throws Exception {
+  public void testSplitIntoWords4() {
     assertSplitEquals(new String[]{"Order", "Index"}, "Order_Index");
   }
 
   @Test
-  public void testSplitIntoWords5() throws Exception {
+  public void testSplitIntoWords5() {
     assertSplitEquals(new String[]{"ORDER", "INDEX"}, "ORDER_INDEX");
   }
 
   @Test
-  public void testSplitIntoWords6() throws Exception {
+  public void testSplitIntoWords6() {
     assertSplitEquals(new String[]{"gg", "J"}, "ggJ");
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/PsiModificationTrackerTreeChangesUpdatesTest.java b/platform/platform-tests/testSrc/com/intellij/psi/PsiModificationTrackerTreeChangesUpdatesTest.java
index b26bb9a239eb..f0260559d6a8 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/PsiModificationTrackerTreeChangesUpdatesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/PsiModificationTrackerTreeChangesUpdatesTest.java
@@ -42,7 +42,7 @@ public class PsiModificationTrackerTreeChangesUpdatesTest extends PlatformTestCa
     super.tearDown();
   }
 
-  public void testMoveFile() throws Exception {
+  public void testMoveFile() {
     new WriteAction<Object>() {
       @Override
       protected void run(@NotNull Result<Object> result) throws Throwable {
@@ -61,7 +61,7 @@ public class PsiModificationTrackerTreeChangesUpdatesTest extends PlatformTestCa
     }.execute();
   }
 
-  public void testMoveDir() throws Exception {
+  public void testMoveDir() {
     new WriteAction<Object>() {
       @Override
       protected void run(@NotNull Result<Object> result) throws Throwable {
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
index a13399b18772..643a3894665d 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiDocumentManagerImplTest.java
@@ -98,17 +98,17 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     }
   }
 
-  public void testGetCachedPsiFile_NoFile() throws Exception {
+  public void testGetCachedPsiFile_NoFile() {
     final PsiFile file = getPsiDocumentManager().getCachedPsiFile(new MockDocument());
     assertNull(file);
   }
 
-  public void testGetPsiFile_NotRegisteredDocument() throws Exception {
+  public void testGetPsiFile_NotRegisteredDocument() {
     final PsiFile file = getPsiDocumentManager().getPsiFile(new MockDocument());
     assertNull(file);
   }
 
-  public void testGetDocument_FirstGet() throws Exception {
+  public void testGetDocument_FirstGet() {
     VirtualFile vFile = createFile();
     final PsiFile file = new MockPsiFile(vFile, getPsiManager());
 
@@ -144,11 +144,11 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     return getPsiManager().findFile(vFile);
   }
 
-  public void testGetUncommittedDocuments_noDocuments() throws Exception {
+  public void testGetUncommittedDocuments_noDocuments() {
     assertEquals(0, getPsiDocumentManager().getUncommittedDocuments().length);
   }
 
-  public void testGetUncommittedDocuments_documentChanged_DontProcessEvents() throws Exception {
+  public void testGetUncommittedDocuments_documentChanged_DontProcessEvents() {
     final PsiFile file = findFile(createFile());
 
     final Document document = getDocument(file);
@@ -160,7 +160,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     assertEquals(0, getPsiDocumentManager().getUncommittedDocuments().length);
   }
 
-  public void testGetUncommittedDocuments_documentNotRegistered() throws Exception {
+  public void testGetUncommittedDocuments_documentNotRegistered() {
     final Document document = new MockDocument();
 
     WriteCommandAction.runWriteCommandAction(null, () -> changeDocument(document, getPsiDocumentManager()));
@@ -169,7 +169,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     assertEquals(0, getPsiDocumentManager().getUncommittedDocuments().length);
   }
 
-  public void testCommitDocument_RemovesFromUncommittedList() throws Exception {
+  public void testCommitDocument_RemovesFromUncommittedList() {
     PsiFile file = findFile(createFile());
 
     final Document document = getDocument(file);
@@ -190,7 +190,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     manager.documentChanged(event);
   }
 
-  public void testCommitAllDocument_RemovesFromUncommittedList() throws Exception {
+  public void testCommitAllDocument_RemovesFromUncommittedList() {
     PsiFile file = findFile(createFile());
 
     final Document document = getDocument(file);
@@ -307,7 +307,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     assertEquals(2, count.get());
   }
 
-  public void testDocumentCommittedInBackgroundEventuallyEvenDespiteTyping() throws InterruptedException, IOException {
+  public void testDocumentCommittedInBackgroundEventuallyEvenDespiteTyping() throws IOException {
     VirtualFile virtualFile = getVirtualFile(createTempFile("X.java", ""));
     PsiFile file = findFile(virtualFile);
     assertNotNull(file);
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java b/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java
index 6cade77fde03..74735be7837f 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
 * @author peter
 */
 public class MetaRegistryTest extends LightPlatformTestCase {
-  public void testChangingMetaData() throws Throwable {
+  public void testChangingMetaData() {
     final boolean[] flag = {false};
     MetaRegistry.addMetadataBinding(new ElementFilter() {
       @Override
@@ -62,7 +62,7 @@ public class MetaRegistryTest extends LightPlatformTestCase {
     flag[0] = true;
     new WriteCommandAction(LightPlatformTestCase.getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         tag.setName("b");
       }
     }.execute();
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/search/GlobalSearchScopeTest.java b/platform/platform-tests/testSrc/com/intellij/psi/search/GlobalSearchScopeTest.java
index ae001e7dbd94..89d9e9bf9bbe 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/search/GlobalSearchScopeTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/search/GlobalSearchScopeTest.java
@@ -60,7 +60,7 @@ public class GlobalSearchScopeTest extends PlatformTestCase {
     assertSame(s.uniteWith(s), s);
   }
 
-  public void testNotScope() throws Exception {
+  public void testNotScope() {
     VirtualFile moduleRoot = new TempFiles(myFilesToDelete).createTempVDir();
     ModuleRootModificationUtil.addContentRoot(getModule(), moduleRoot.getPath());
 
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java b/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java
index 82995b944880..c2e9131b8e05 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/tree/IElementTypeTest.java
@@ -42,7 +42,7 @@ public class IElementTypeTest extends LightPlatformCodeInsightFixtureTestCase {
 
   // load all parser definitions, instantiate all lexers & parsers to initialize all IElementType constants
   @SuppressWarnings("UnusedDeclaration")
-  public void testCount() throws Exception {
+  public void testCount() {
     int count = IElementType.getAllocatedTypesCount();
     LOG.debug("Preloaded: " + count +" element types");
     LanguageExtensionPoint[] extensions = Extensions.getExtensions(new ExtensionPointName<LanguageExtensionPoint>("com.intellij.lang.parserDefinition"));
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/tree/TokenSetTest.java b/platform/platform-tests/testSrc/com/intellij/psi/tree/TokenSetTest.java
index 19aa2cfb28e2..ed3d402bb54a 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/tree/TokenSetTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/tree/TokenSetTest.java
@@ -70,7 +70,7 @@ public class TokenSetTest {
   }
 
   @Test
-  public void getTypes() throws Exception {
+  public void getTypes() {
     assertArrayEquals(IElementType.EMPTY_ARRAY, TokenSet.EMPTY.getTypes());
     assertArrayEquals(new IElementType[]{T1, T2}, S12.getTypes());
     assertArrayEquals(new IElementType[]{T3, T4}, S34.getTypes());
@@ -92,7 +92,7 @@ public class TokenSetTest {
   }
 
   @Test
-  public void andNot() throws Exception {
+  public void andNot() {
     final TokenSet S123 = TokenSet.orSet(S12, S3);
     check(TokenSet.andNot(S123, S12), T3);
     check(TokenSet.andNot(S123, S5), T1, T2, T3);
@@ -118,7 +118,7 @@ public class TokenSetTest {
 
 
   @Test
-  public void performance() throws Exception {
+  public void performance() {
     final IElementType[] elementTypes = IElementType.enumerate(IElementType.TRUE);
     final TokenSet set = TokenSet.create();
     final int shift = new Random().nextInt(500000);
diff --git a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilMatchingTest.java b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilMatchingTest.java
index eb35a7648466..0bae7f066b2c 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilMatchingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilMatchingTest.java
@@ -40,7 +40,7 @@ import java.util.List;
  */
 public class NameUtilMatchingTest extends UsefulTestCase {
 
-  public void testSimpleCases() throws Exception {
+  public void testSimpleCases() {
     assertMatches("N", "NameUtilTest");
     assertMatches("NU", "NameUtilTest");
     assertMatches("NUT", "NameUtilTest");
@@ -66,7 +66,7 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     assertDoesntMatch("ABCD", "AbstractButton.DISABLED_ICON_CHANGED_PROPERTY");
   }
   
-  public void testSimpleCasesWithFirstLowercased() throws Exception {
+  public void testSimpleCasesWithFirstLowercased() {
     assertMatches("N", "nameUtilTest");
     assertDoesntMatch("N", "anameUtilTest");
     assertMatches("NU", "nameUtilTest");
@@ -80,7 +80,7 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     assertMatches("NaUtTe", "nameUtilTest");
   }
   
-  public void testSpaceDelimiters() throws Exception {
+  public void testSpaceDelimiters() {
     assertMatches("Na Ut Te", "name util test");
     assertMatches("Na Ut Te", "name Util Test");
     assertDoesntMatch("Na Ut Ta", "name Util Test");
@@ -91,18 +91,18 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     assertDoesntMatch("na ti", "name_util_test");
   }
   
-  public void testXMLCompletion() throws Exception {
+  public void testXMLCompletion() {
     assertDoesntMatch("N_T", "NameUtilTest");
     assertMatches("ORGS_ACC", "ORGS_POSITION_ACCOUNTABILITY");
     assertMatches("ORGS-ACC", "ORGS-POSITION_ACCOUNTABILITY");
     assertMatches("ORGS.ACC", "ORGS.POSITION_ACCOUNTABILITY");
   }
 
-  public void testStarFalsePositive() throws Exception {
+  public void testStarFalsePositive() {
     assertDoesntMatch("ar*l*p", "AbstractResponseHandler");
   }
 
-  public void testUnderscoreStyle() throws Exception {
+  public void testUnderscoreStyle() {
     assertMatches("N_U_T", "NAME_UTIL_TEST");
     assertMatches("NUT", "NAME_UTIL_TEST");
     assertDoesntMatch("NUT", "NameutilTest");
@@ -112,7 +112,7 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     assertMatches("NOS", "NetOutputStream");
   }
 
-  public void testCommonFileNameConventions() throws Exception {
+  public void testCommonFileNameConventions() {
     // See IDEADEV-12310
 
     assertMatches("BLWN", "base_layout_without_navigation.xhtml");
@@ -159,7 +159,7 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     assertDoesntMatch("A*.html", "10_after.html");
   }
 
-  public void testIDEADEV15503() throws Exception {
+  public void testIDEADEV15503() {
     assertMatches("AR.jsp", "add_relationship.jsp");
     assertMatches("AR.jsp", "advanced_rule.jsp");
     assertMatches("AR.jsp", "alarm_reduction.jsp");
@@ -208,23 +208,23 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     assertMatches("combobox", "comboBox");
   }
   
-  public void testStartsWithDot() throws Exception {
+  public void testStartsWithDot() {
     assertMatches(".foo", ".foo");
   }
 
-  public void testProperDotEscaping() throws Exception {
+  public void testProperDotEscaping() {
     assertMatches("*inspection*.pro", "InspectionsBundle.properties");
     assertDoesntMatch("*inspection*.pro", "InspectionsInProgress.png");
   }
 
-  public void testLeadingUnderscore() throws Exception {
+  public void testLeadingUnderscore() {
     assertDoesntMatch("form", "_form.html.erb");
     assertMatches("_form", "_form.html.erb");
     assertMatches("_form", "__form");
     assertTrue(firstLetterMatcher("_form").matches("__form"));
   }
 
-  public void testLowerCaseWords() throws Exception {
+  public void testLowerCaseWords() {
     assertMatches("uct", "unit_controller_test");
     assertMatches("unictest", "unit_controller_test");
     assertMatches("uc", "unit_controller_test");
@@ -232,7 +232,7 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     assertDoesntMatch("utc", "unit_controller_test");
   }
 
-  public void testObjectiveCCases() throws Exception {
+  public void testObjectiveCCases() {
     assertMatches("h*:", "h:aaa");
     assertMatches("h:", "h:aaa");
     assertMatches("text:sh", "textField:shouldChangeCharactersInRange:replacementString:");
@@ -358,11 +358,11 @@ public class NameUtilMatchingTest extends UsefulTestCase {
     return NameUtil.buildMatcher(pattern, NameUtil.MatchingCaseSensitivity.FIRST_LETTER);
   }
 
-  public void testSpaceInCompletionPrefix() throws Exception {
+  public void testSpaceInCompletionPrefix() {
     assertTrue(caseInsensitiveMatcher("create ").matches("create module"));
   }
 
-  public void testLong() throws Exception {
+  public void testLong() {
     assertMatches("Product.findByDateAndNameGreaterThanEqualsAndQualityGreaterThanEqual",
                   "Product.findByDateAndNameGreaterThanEqualsAndQualityGreaterThanEqualsIntellijIdeaRulezzz");
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/refactoring/rename/naming/NameSuggesterTest.java b/platform/platform-tests/testSrc/com/intellij/refactoring/rename/naming/NameSuggesterTest.java
index 39d005fa11c4..131354a217ab 100644
--- a/platform/platform-tests/testSrc/com/intellij/refactoring/rename/naming/NameSuggesterTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/refactoring/rename/naming/NameSuggesterTest.java
@@ -22,113 +22,113 @@ import junit.framework.TestCase;
  * @author dsl
  */
 public class NameSuggesterTest extends TestCase {
-  public void testChanges1() throws Exception {
+  public void testChanges1() {
     doChangesTest("NameSuggesterTest", "NameUnifierTest", "[<Suggester,Unifier>]");
   }
 
-  public void testChanges2() throws Exception {
+  public void testChanges2() {
     doChangesTest("CompletionContext", "CompletionResult", "[<Context,Result>]");
   }
 
-  public void testChanges3() throws Exception {
+  public void testChanges3() {
     doChangesTest("CodeCompletionContext", "CompletionResult", "[<Code,>, <Context,Result>]");
   }
 
-  public void testChanges4() throws Exception {
+  public void testChanges4() {
     doChangesTest("A", "B", "[<A,B>]");
   }
 
-  public void testChanges5() throws Exception {
+  public void testChanges5() {
     doChangesTest("PsiManager", "PsiManagerImpl", "[<,Impl>]");
   }
 
-  public void testChanges6() throws Exception {
+  public void testChanges6() {
     doChangesTest("IBase", "IMain", "[<Base,Main>]");
   }
 
-  public void testSuggestions1() throws Exception {
+  public void testSuggestions1() {
     doSuggestionTest("NameSuggesterTest", "NameUnifierTest", "suggester", "unifier");
   }
 
-  public void testSuggestions2() throws Exception {
+  public void testSuggestions2() {
     doSuggestionTest("CompletionContext", "CompletionResult", "completionContext", "completionResult");
   }
 
-  public void testSuggestions3() throws Exception {
+  public void testSuggestions3() {
     doSuggestionTest("CompletionContext", "CompletionResult", "context", "result");
   }
 
 
-  public void testSuggestions4() throws Exception {
+  public void testSuggestions4() {
     doSuggestionTest("CompletionContext", "CompletionResult", "codeCompletionContext", "codeCompletionResult");
   }
 
-  public void testSuggestions5() throws Exception {
+  public void testSuggestions5() {
     doSuggestionTest("CodeCompletionContext", "CompletionResult", "codeCompletionContext", "completionResult");
   }
 
-  public void testSuggestions6() throws Exception {
+  public void testSuggestions6() {
     doSuggestionTest("CodeCompletionContext", "CompletionResult", "context", "result");
   }
 
-  public void testSuggestions7() throws Exception {
+  public void testSuggestions7() {
     doSuggestionTest("CodeCompletionContext", "CompletionResult", "contextWithAdvances", "resultWithAdvances");
   }
 
-  public void testSuggestions8() throws Exception {
+  public void testSuggestions8() {
     doSuggestionTest("CodeCompletionContext", "CompletionResult", "_context", "_result");
   }
 
-  public void testSuggestions9() throws Exception {
+  public void testSuggestions9() {
     doSuggestionTest("CodeCompletionContext", "CompletionResult", "p_context", "p_result");
   }
 
-  public void testSuggestions10() throws Exception {
+  public void testSuggestions10() {
     doSuggestionTest("IBase", "IMain", "base", "main");
   }
 
-  public void testSuggestions11() throws Exception {
+  public void testSuggestions11() {
     doSuggestionTest("Descriptor", "BasicDescriptor", "descriptor", "basicDescriptor");
   }
 
-  public void testSuggestions12() throws Exception {
+  public void testSuggestions12() {
     doSuggestionTest("Provider", "ObjectProvider", "provider", "objectProvider");
   }
 
-  public void testSuggestions13() throws Exception {
+  public void testSuggestions13() {
     doSuggestionTest("SimpleModel", "Model", "simpleModel", "model");
   }
 
 
-  public void testSuggestions14() throws Exception {
+  public void testSuggestions14() {
     doSuggestionTest("ConfigItem", "Config", "item", "item");
   }
 
-  public void testSuggestions15() throws Exception {
+  public void testSuggestions15() {
     doSuggestionTest("Transaction", "TransactionPolicy", "transaction", "transactionPolicy");
   }
 
-  public void testSuggestions16() throws Exception {
+  public void testSuggestions16() {
     doSuggestionTest("Transaction", "TransactionPolicyHandler", "transaction", "transactionPolicyHandler");
   }
 
-  public void testSuggestions17() throws Exception {
+  public void testSuggestions17() {
     doSuggestionTest("Transaction", "StrictTransactionPolicyHandler", "transaction", "strictTransactionPolicyHandler");
   }
 
-  public void testSuggestions18() throws Exception {
+  public void testSuggestions18() {
     doSuggestionTest("Foo", "FooTask", "fooImpl", "fooTaskImpl");
   }
 
-  public void testSuggestions19() throws Exception {
+  public void testSuggestions19() {
     doSuggestionTest("Foo", "FooTask", "implFoo", "implFooTask");
   }
 
-  public void testSuggestions20() throws Exception {
+  public void testSuggestions20() {
     doSuggestionTest("Foo", "TaskFoo", "fooImpl", "taskFooImpl");
   }
 
-   public void testSuggestions21() throws Exception {
+   public void testSuggestions21() {
     doSuggestionTest("Foo", "TaskFoo", "implFoo", "implTaskFoo");
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/run/PathMacrosCollectorTest.java b/platform/platform-tests/testSrc/com/intellij/run/PathMacrosCollectorTest.java
index 5f961b791975..92a689e7a731 100644
--- a/platform/platform-tests/testSrc/com/intellij/run/PathMacrosCollectorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/run/PathMacrosCollectorTest.java
@@ -48,7 +48,7 @@ public class PathMacrosCollectorTest extends TestCase {
     UsefulTestCase.assertSameElements(macros, "MACro1", "macro4", "mac_ro6", "macr.o7", "mac-ro8", "root");
   }
 
-  public void testWithRecursiveFilter() throws Exception {
+  public void testWithRecursiveFilter() {
     Element root = new Element("root");
     final Element configuration = new Element("configuration");
     configuration.setAttribute("value", "some text$macro5$fdsjfhdskjfsd$MACRO$");
@@ -64,7 +64,7 @@ public class PathMacrosCollectorTest extends TestCase {
     UsefulTestCase.assertSameElements(macros, "macro5", "MACRO", "root");
   }
 
-  public void testWithFilter() throws Exception {
+  public void testWithFilter() {
     Element root = new Element("root");
     final Element testTag = new Element("test");
     testTag.setAttribute("path", "$MACRO$");
diff --git a/platform/platform-tests/testSrc/com/intellij/statistics/StatisticsManagerTest.java b/platform/platform-tests/testSrc/com/intellij/statistics/StatisticsManagerTest.java
index 6f03aeabc323..e3d7cefdbd57 100644
--- a/platform/platform-tests/testSrc/com/intellij/statistics/StatisticsManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/statistics/StatisticsManagerTest.java
@@ -32,7 +32,7 @@ public class StatisticsManagerTest extends LightPlatformTestCase {
     return StatisticsManager.getInstance().getUseCount(new StatisticsInfo(TEST_CONTEXT, value));
   }
 
-  public void testIncUseCount() throws Throwable {
+  public void testIncUseCount() {
     incUseCount("b", 1);
     assertEquals(1, getUseCount("b"));
     assertEquals(0, getUseCount("c"));
@@ -42,13 +42,13 @@ public class StatisticsManagerTest extends LightPlatformTestCase {
     assertEquals(1, getUseCount("c"));
   }
 
-  public void testFlexibility() throws Throwable {
+  public void testFlexibility() {
     incUseCount("b", 100);
     incUseCount("c", 4);
     assertTrue(getUseCount("c") > getUseCount("b"));
   }
 
-  public void testReturn() throws Throwable {
+  public void testReturn() {
     incUseCount("b", 100);
     incUseCount("c", 4);
     incUseCount("b", 1);
diff --git a/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java b/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java
index 8d7d85dd0615..a0759ec64f78 100644
--- a/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java
@@ -43,7 +43,7 @@ public class SmartTreeStructureTest extends LightPlatformCodeInsightFixtureTestC
     root.addChild("xxx").addChild("aaa").addChild("bbb");
   }
 
-  public void testGrouping() throws Exception {
+  public void testGrouping() {
     assertStructureEqual("root\n" +
                          ".Group:a\n" +
                          "..Group:d\n" +
@@ -74,7 +74,7 @@ public class SmartTreeStructureTest extends LightPlatformCodeInsightFixtureTestC
                          ".....bbb\n", PlatformTestUtil.createComparator(myPrintInfo));
   }
 
-  public void testFiltering() throws Exception {
+  public void testFiltering() {
     myModel.addFlter(new Filter() {
       @Override
       @NotNull
@@ -115,7 +115,7 @@ public class SmartTreeStructureTest extends LightPlatformCodeInsightFixtureTestC
                          ".xxx\n", PlatformTestUtil.createComparator(myPrintInfo));
   }
 
-  public void testSorting() throws Exception {
+  public void testSorting() {
     myModel.addSorter(new Sorter() {
       @NotNull
       @Override
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/CustomProtocolHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/ui/CustomProtocolHandlerTest.java
index 2df1d0a48f2b..367893ff2bde 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/CustomProtocolHandlerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/CustomProtocolHandlerTest.java
@@ -2,7 +2,6 @@ package com.intellij.ui;
 
 import junit.framework.TestCase;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
@@ -11,7 +10,7 @@ import java.util.List;
  * @author Dennis.Ushakov
  */
 public class CustomProtocolHandlerTest extends TestCase {
-  public void testOpenOurLink() throws URISyntaxException, MalformedURLException {
+  public void testOpenOurLink() throws URISyntaxException {
     final URI uri = new URI("x-mine://open?file=/Users/denofevil/RubymineProjects/JRubyRails/app/assets/javascripts/application.js.coffee&line=2");
     final List<String> args = new CustomProtocolHandler().getOpenArgs(uri);
     assertTrue(args.contains("--line"));
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelSelectionUpdateTest.java b/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelSelectionUpdateTest.java
index 954521bc1f36..b46c93a4803d 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelSelectionUpdateTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelSelectionUpdateTest.java
@@ -29,7 +29,7 @@ import java.util.List;
 @SkipInHeadlessEnvironment
 public class FinderRecursivePanelSelectionUpdateTest extends LightPlatformTestCase {
 
-  public void testUpdate() throws InterruptedException {
+  public void testUpdate() {
     StringFinderRecursivePanel panel_0 = new StringFinderRecursivePanel(getProject());
     disposeOnTearDown(panel_0);
 
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/TextTruncationTest.java b/platform/platform-tests/testSrc/com/intellij/ui/TextTruncationTest.java
index 955ee1b52244..256374d87ed6 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/TextTruncationTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/ui/TextTruncationTest.java
@@ -27,7 +27,7 @@ import java.util.Map;
  */
 public class TextTruncationTest {
   @Test
-  public void testVariants() throws Exception {
+  public void testVariants() {
     final MyWidthCalculator calculator = new MyWidthCalculator();
     testString("this is just a test", "this is just a test", calculator);
     testString("this is just a test", "this is just a ", calculator);
diff --git a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
index c2f4655d6d83..5db5276992d5 100644
--- a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
@@ -50,7 +50,7 @@ import java.io.IOException;
  * @author max
  */
 public class UsageNodeTreeBuilderTest extends LightPlatformTestCase {
-  public void testNoGroupingRules() throws Exception {
+  public void testNoGroupingRules() {
     GroupNode groupNode = buildUsageTree(new int[]{2, 3, 0}, UsageGroupingRule.EMPTY_ARRAY);
 
     assertNotNull(groupNode);
@@ -60,17 +60,17 @@ public class UsageNodeTreeBuilderTest extends LightPlatformTestCase {
     assertEquals("Root [0, 2, 3]", groupNode.toString());
   }
 
-  public void testOneGroupingRuleOnly() throws Exception {
+  public void testOneGroupingRuleOnly() {
     GroupNode groupNode = buildUsageTree(new int[]{0, 1, 0, 1 , 1}, new UsageGroupingRule[] {new OddEvenGroupingRule()});
     assertEquals("Root [Even[0, 0], Odd[1, 1, 1]]", groupNode.toString());
   }
 
-  public void testNotGroupedItemsComeToEnd() throws Exception {
+  public void testNotGroupedItemsComeToEnd() {
     GroupNode groupNode = buildUsageTree(new int[]{0, 1, 0, 1 , 1, 1003, 1002, 1001}, new UsageGroupingRule[] {new OddEvenGroupingRule()});
     assertEquals("Root [Even[0, 0], Odd[1, 1, 1], 1001, 1002, 1003]", groupNode.toString());
   }
 
-  public void test2Groupings() throws Exception {
+  public void test2Groupings() {
     GroupNode groupNode = buildUsageTree(new int[]{0, 1, 2, 3, 12, 13, 14, 15, 101, 103, 102, 105, 10001, 10002, 10003}, new UsageGroupingRule[] {
       new OddEvenGroupingRule(),
       new LogGroupingRule()});
@@ -78,7 +78,7 @@ public class UsageNodeTreeBuilderTest extends LightPlatformTestCase {
     assertEquals("Root [Even[1[0, 2], 2[12, 14], 3[102]], Odd[1[1, 3], 2[13, 15], 3[101, 103, 105]], 5[10001, 10002, 10003]]", groupNode.toString());
   }
 
-  public void testDifferentRulesDontDependOnOrder() throws Exception {
+  public void testDifferentRulesDontDependOnOrder() {
     GroupNode groupNode = buildUsageTree(new int[]{10003, 0}, new UsageGroupingRule[] {
       new OddEvenGroupingRule(),
       new LogGroupingRule()});
@@ -86,7 +86,7 @@ public class UsageNodeTreeBuilderTest extends LightPlatformTestCase {
     assertEquals("Root [Even[1[0]], 5[10003]]", groupNode.toString());
   }
 
-  public void testGroupsFromDifferentRulesAreCorrectlySorted() throws Exception {
+  public void testGroupsFromDifferentRulesAreCorrectlySorted() {
     GroupNode groupNode = buildUsageTree(new int[]{10003, 0, 1, 2, 3, 12, 13, 14, 15, 101, 103, 102, 105, 10001, 10002}, new UsageGroupingRule[] {
       new OddEvenGroupingRule(),
       new LogGroupingRule()});
diff --git a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java
index f1c6ba91e19d..14cb9f85209e 100644
--- a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewTest.java
@@ -50,7 +50,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class UsageViewTest extends LightPlatformCodeInsightFixtureTestCase {
-  public void testUsageViewDoesNotHoldPsiFilesOrDocuments() throws Exception {
+  public void testUsageViewDoesNotHoldPsiFilesOrDocuments() {
     boolean[] foundLeaksBeforeTest = new boolean[1];
     LeakHunter.checkLeak(ApplicationManager.getApplication(), PsiFileImpl.class, file -> {
       if (!file.isPhysical()) return false;
@@ -81,7 +81,7 @@ public class UsageViewTest extends LightPlatformCodeInsightFixtureTestCase {
     LeakHunter.checkLeak(usageView, Document.class);
   }
 
-  public void testUsageViewHandlesDocumentChange() throws Exception {
+  public void testUsageViewHandlesDocumentChange() {
     PsiFile psiFile = myFixture.addFileToProject("X.java", "public class X{ int xxx; } //comment");
     Usage usage = createUsage(psiFile, psiFile.getText().indexOf("xxx"));
 
@@ -95,7 +95,7 @@ public class UsageViewTest extends LightPlatformCodeInsightFixtureTestCase {
     int navigationOffset = ((UsageInfo2UsageAdapter)usage).getUsageInfo().getNavigationOffset();
     assertEquals(psiFile.getText().indexOf("xxx"), navigationOffset);
   }
-  public void testTextUsageInfoHandlesDocumentChange() throws Exception {
+  public void testTextUsageInfoHandlesDocumentChange() {
     PsiFile psiFile = myFixture.addFileToProject("X.java", "public class X{ int xxx; } //comment");
     Usage usage = new UsageInfo2UsageAdapter(new UsageInfo(psiFile, psiFile.getText().indexOf("xxx"), StringUtil.indexOfSubstringEnd(psiFile.getText(),"xxx")));
 
@@ -116,7 +116,7 @@ public class UsageViewTest extends LightPlatformCodeInsightFixtureTestCase {
     return new UsageInfo2UsageAdapter(new UsageInfo(element));
   }
 
-  public void testUsageViewCanRerunAfterTargetWasInvalidatedAndRestored() throws Exception {
+  public void testUsageViewCanRerunAfterTargetWasInvalidatedAndRestored() {
     PsiFile psiFile = myFixture.addFileToProject("X.java", "public class X{" +
                                                            "    void foo() {\n" +
                                                            "        bar();\n" +
@@ -164,7 +164,7 @@ public class UsageViewTest extends LightPlatformCodeInsightFixtureTestCase {
     assertEquals(2, usages.size());
   }
 
-  public void testExcludeUsageMustExcludeChildrenAndParents() throws Exception {
+  public void testExcludeUsageMustExcludeChildrenAndParents() {
     PsiFile psiFile = myFixture.addFileToProject("X.java", "public class X{ int xxx; } //comment");
     Usage usage = new UsageInfo2UsageAdapter(new UsageInfo(psiFile, psiFile.getText().indexOf("xxx"), StringUtil.indexOfSubstringEnd(psiFile.getText(),"xxx")));
 
@@ -216,7 +216,7 @@ public class UsageViewTest extends LightPlatformCodeInsightFixtureTestCase {
                  "                    1 public class X{ int xxx; } //comment\n", StringUtil.convertLineSeparators(text));
   }
 
-  public void testExcludeNodeMustExcludeChildrenAndParents() throws Exception {
+  public void testExcludeNodeMustExcludeChildrenAndParents() {
     PsiFile psiFile = myFixture.addFileToProject("X.java", "public class X{ int xxx; } //comment");
     Usage usage = new UsageInfo2UsageAdapter(new UsageInfo(psiFile, psiFile.getText().indexOf("xxx"), StringUtil.indexOfSubstringEnd(psiFile.getText(),"xxx")));
 
diff --git a/platform/platform-tests/testSrc/com/intellij/util/AlarmTest.java b/platform/platform-tests/testSrc/com/intellij/util/AlarmTest.java
index 4c3c8f2cfec4..83f423317f7c 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/AlarmTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/AlarmTest.java
@@ -53,7 +53,7 @@ public class AlarmTest extends PlatformTestCase {
     assertRequestsExecuteSequentially(alarm);
   }
 
-  private static void assertRequestsExecuteSequentially(@NotNull Alarm alarm) throws InterruptedException, ExecutionException, TimeoutException {
+  private static void assertRequestsExecuteSequentially(@NotNull Alarm alarm) throws InterruptedException, ExecutionException {
     int N = 10000;
     StringBuffer log = new StringBuffer(N*4);
     StringBuilder expected = new StringBuilder(N * 4);
@@ -81,7 +81,7 @@ public class AlarmTest extends PlatformTestCase {
     assertEquals(expected.toString(), log.toString());
   }
 
-  public void testOneAlarmDoesNotStartTooManyThreads() throws InterruptedException, ExecutionException, TimeoutException {
+  public void testOneAlarmDoesNotStartTooManyThreads() {
     Alarm alarm = new Alarm(getTestRootDisposable());
     Map<Thread, StackTraceElement[]> before = Thread.getAllStackTraces();
     AtomicInteger executed = new AtomicInteger();
@@ -96,7 +96,7 @@ public class AlarmTest extends PlatformTestCase {
     assertTrue("before: "+before.size()+"; after: "+after.size(), after.size() - before.size() < 10);
   }
 
-  public void testManyAlarmsDoNotStartTooManyThreads() throws InterruptedException, ExecutionException, TimeoutException {
+  public void testManyAlarmsDoNotStartTooManyThreads() {
     Map<Thread, StackTraceElement[]> before = Thread.getAllStackTraces();
     AtomicInteger executed = new AtomicInteger();
     int N = 100000;
diff --git a/platform/platform-tests/testSrc/com/intellij/util/JdkBundleListTest.java b/platform/platform-tests/testSrc/com/intellij/util/JdkBundleListTest.java
index acfecabae9c2..336792f7fd91 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/JdkBundleListTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/JdkBundleListTest.java
@@ -26,7 +26,7 @@ import static com.intellij.testFramework.UsefulTestCase.assertSameElements;
 
 public class JdkBundleListTest {
   @Test
-  public void testAddBundle() throws Exception {
+  public void testAddBundle() {
     JdkBundle jb0 = new JdkBundle(new File("/jb0"), "java", Pair.create(new Version(1, 8, 0), new Integer(0)), true, false);
     JdkBundle jb1 = new JdkBundle(new File("/jb1"), "java", Pair.create(new Version(1, 8, 0), new Integer(1)), false, false);
     JdkBundle jb2 = new JdkBundle(new File("/jb2"), "java", Pair.create(new Version(1, 8, 0), new Integer(2)), false, false);
diff --git a/platform/platform-tests/testSrc/com/intellij/util/JdkBundleTest.java b/platform/platform-tests/testSrc/com/intellij/util/JdkBundleTest.java
index f86bafaeaeee..cb95c3773180 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/JdkBundleTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/JdkBundleTest.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.*;
+import static junit.framework.TestCase.assertFalse;
 
 public class JdkBundleTest {
 
@@ -41,7 +41,7 @@ public class JdkBundleTest {
   }
 
   @Test
-  public void testJdk6OnMac() throws Exception {
+  public void testJdk6OnMac() {
     if (!SystemInfo.isMac) return;
 
     boolean testPassed;
@@ -84,7 +84,7 @@ public class JdkBundleTest {
   }
 
   @Test
-  public void testJre7OnMac() throws Exception {
+  public void testJre7OnMac() {
     if (!SystemInfo.isMac || !"true".equals(System.getProperty("idea.jre.check"))) return;
 
     File standardJdkLocationDirectory = new File(STANDARD_JDK_LOCATION_ON_MAC_OS_X);
@@ -113,7 +113,7 @@ public class JdkBundleTest {
     }
   }
 
-  public void doTestCreateBundle(File homeJDK) throws Exception {
+  public void doTestCreateBundle(File homeJDK) {
     if (!new File(homeJDK, "lib/tools.jar").exists()) return; // Skip pure jre
 
     File bootJDK = SystemInfo.isMac ? homeJDK.getParentFile().getParentFile() : homeJDK;
@@ -139,7 +139,7 @@ public class JdkBundleTest {
   }
 
   @Test
-  public void testCreateBundle() throws Exception {
+  public void testCreateBundle() {
     File home = new File(System.getProperty("java.home"));
 
     doTestCreateBundle(home);
@@ -148,7 +148,7 @@ public class JdkBundleTest {
   }
 
   @Test
-  public void testCreateBoot() throws Exception {
+  public void testCreateBoot() {
     File homeJDK = new File(System.getProperty("java.home")).getParentFile();
 
     if (!new File(homeJDK, "lib/tools.jar").exists()) return; // Skip pure jre
diff --git a/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java b/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java
index 0c8abb2e1bed..b73bb987b907 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/PsiErrorElementUtilTest.java
@@ -30,12 +30,12 @@ public class PsiErrorElementUtilTest extends LightPlatformCodeInsightFixtureTest
     return PlatformTestUtil.getPlatformTestDataPath();
   }
 
-  public void testNoErrors() throws Exception {
+  public void testNoErrors() {
     PsiFile file = myFixture.configureByText(StdFileTypes.XML, "<hello></hello>");
     Assert.assertFalse(PsiErrorElementUtil.hasErrors(getProject(), file.getVirtualFile()));
   }
 
-  public void testErrors() throws Exception {
+  public void testErrors() {
     PsiFile file = myFixture.configureByText(StdFileTypes.XML, "<hello></hello");
     Assert.assertTrue(PsiErrorElementUtil.hasErrors(getProject(), file.getVirtualFile()));
   }
diff --git a/platform/platform-tests/testSrc/com/intellij/util/concurrency/AppScheduledExecutorServiceTest.java b/platform/platform-tests/testSrc/com/intellij/util/concurrency/AppScheduledExecutorServiceTest.java
index 659add19a133..8f8dbf141112 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/concurrency/AppScheduledExecutorServiceTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/concurrency/AppScheduledExecutorServiceTest.java
@@ -67,7 +67,7 @@ public class AppScheduledExecutorServiceTest extends TestCase {
     super.tearDown();
   }
 
-  public void testDelayedWorks() throws InterruptedException, TimeoutException {
+  public void testDelayedWorks() throws InterruptedException {
     assertFalse(service.isShutdown());
     assertFalse(service.isTerminated());
 
@@ -236,7 +236,7 @@ public class AppScheduledExecutorServiceTest extends TestCase {
     assertEquals(N, usedThreads.size());
   }
 
-  public void testAwaitTerminationMakesSureTasksTransferredToBackendExecutorAreFinished() throws InterruptedException, ExecutionException {
+  public void testAwaitTerminationMakesSureTasksTransferredToBackendExecutorAreFinished() throws InterruptedException {
     final AppScheduledExecutorService service = new AppScheduledExecutorService(getName());
     final List<LogInfo> log = Collections.synchronizedList(new ArrayList<>());
 
diff --git a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BackgroundTaskQueueTest.java b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BackgroundTaskQueueTest.java
index b66b50240a11..3c23dab69d11 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BackgroundTaskQueueTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BackgroundTaskQueueTest.java
@@ -52,7 +52,7 @@ public class BackgroundTaskQueueTest extends PlatformTestCase {
   private Random myRandom;
 
   @Override
-  protected void setUp() throws Exception {
+  protected void setUp() {
     EdtTestUtil.runInEdtAndWait(() -> {
       try {
         super.setUp();
@@ -69,7 +69,7 @@ public class BackgroundTaskQueueTest extends PlatformTestCase {
   }
 
   @Override
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     myThreadRunner.finish();
 
     EdtTestUtil.runInEdtAndWait((() -> {
diff --git a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java
index d89d2ec813d5..27a54938ba65 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedScheduledExecutorTest.java
@@ -111,7 +111,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
     assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
   }
 
-  public void testEarlyCancelPreventsRunning() throws ExecutionException, InterruptedException {
+  public void testEarlyCancelPreventsRunning() throws InterruptedException {
     AtomicBoolean run = new AtomicBoolean();
     BoundedScheduledExecutorService executor = createBoundedScheduledExecutor(AppExecutorUtil.getAppExecutorService(), 1);
 
@@ -208,7 +208,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
   }
 
 
-  public void testShutdownNowMustCancel() throws ExecutionException, InterruptedException {
+  public void testShutdownNowMustCancel() throws InterruptedException {
     BoundedScheduledExecutorService executor = createBoundedScheduledExecutor(AppExecutorUtil.getAppExecutorService(), 1);
     int N = 100000;
     StringBuffer log = new StringBuffer(N*4);
@@ -243,7 +243,7 @@ public class BoundedScheduledExecutorTest extends TestCase {
     assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
   }
 
-  public void testShutdownMustDisableSubmit() throws ExecutionException, InterruptedException {
+  public void testShutdownMustDisableSubmit() throws InterruptedException {
     BoundedScheduledExecutorService executor = createBoundedScheduledExecutor(AppExecutorUtil.getAppExecutorService(), 1);
     int N = 100000;
     StringBuffer log = new StringBuffer(N*4);
diff --git a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java
index 71b69477a0d4..c473f369ce7d 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/concurrency/BoundedTaskExecutorTest.java
@@ -78,7 +78,7 @@ public class BoundedTaskExecutorTest extends TestCase {
     }
   }
 
-  public void testReallyBound() throws InterruptedException, ExecutionException {
+  public void testReallyBound() throws InterruptedException {
     for (int maxTasks=1; maxTasks<5;maxTasks++) {
       LOG.debug("maxTasks = " + maxTasks);
       ExecutorService backendExecutor = Executors.newCachedThreadPool(ConcurrencyUtil.newNamedThreadFactory("maxTasks = " + maxTasks));
@@ -146,7 +146,7 @@ public class BoundedTaskExecutorTest extends TestCase {
     assertTrue(backendExecutor.awaitTermination(100, TimeUnit.SECONDS));
   }
 
-  public void testStressWhenSomeTasksCallOtherTasksGet() throws ExecutionException, InterruptedException {
+  public void testStressWhenSomeTasksCallOtherTasksGet() throws InterruptedException {
     ExecutorService backendExecutor = Executors.newCachedThreadPool(ConcurrencyUtil.newNamedThreadFactory(getName()));
     for (int maxSimultaneousTasks = 1; maxSimultaneousTasks<20; maxSimultaneousTasks++) {
       BoundedTaskExecutor executor = new BoundedTaskExecutor(getName(),backendExecutor, maxSimultaneousTasks);
@@ -322,7 +322,7 @@ public class BoundedTaskExecutorTest extends TestCase {
     assertTrue(backendExecutor.awaitTermination(1, TimeUnit.MINUTES));
   }
 
-  public void testShutdownNowMustCancel() throws ExecutionException, InterruptedException {
+  public void testShutdownNowMustCancel() throws InterruptedException {
     ExecutorService executor = new BoundedTaskExecutor(getName(),PooledThreadExecutor.INSTANCE, 1);
     int N = 100000;
     StringBuffer log = new StringBuffer(N*4);
@@ -397,7 +397,7 @@ public class BoundedTaskExecutorTest extends TestCase {
     assertTrue(executor.awaitTermination(100, TimeUnit.SECONDS));
   }
 
-  public void testNoExtraThreadsAreEverCreated() throws ExecutionException, InterruptedException {
+  public void testNoExtraThreadsAreEverCreated() throws InterruptedException {
     for (int nMaxThreads=1; nMaxThreads<10; nMaxThreads++) {
       LOG.debug("nMaxThreads = " + nMaxThreads);
       ExecutorService executor = AppExecutorUtil.createBoundedApplicationPoolExecutor(getName(),nMaxThreads);
@@ -501,7 +501,7 @@ public class BoundedTaskExecutorTest extends TestCase {
     assertFalse(future.isCancelled());
   }
 
-  public void testErrorsThrownInFiredAndForgottenTaskMustBeLogged() throws ExecutionException, InterruptedException {
+  public void testErrorsThrownInFiredAndForgottenTaskMustBeLogged() {
     ExecutorService executor = new BoundedTaskExecutor(getName(),PooledThreadExecutor.INSTANCE, 1);
     LoggedErrorProcessor oldInstance = LoggedErrorProcessor.getInstance();
     try {
diff --git a/platform/platform-tests/testSrc/com/intellij/util/containers/ContainerUtilTest.java b/platform/platform-tests/testSrc/com/intellij/util/containers/ContainerUtilTest.java
index b97b34a9aba0..ce3ad3b05a8b 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/containers/ContainerUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/containers/ContainerUtilTest.java
@@ -75,7 +75,7 @@ public class ContainerUtilTest {
   }
 
   @Test
-  public void testIterateWithCondition() throws Exception {
+  public void testIterateWithCondition() {
     Condition<Integer> cond = integer -> integer > 2;
 
     assertIterating(Arrays.asList(1, 4, 2, 5), cond, 4, 5);
@@ -90,7 +90,7 @@ public class ContainerUtilTest {
   }
 
   @Test
-  public void testIteratingBackward() throws Exception {
+  public void testIteratingBackward() {
     List<String> ss = new ArrayList<>();
     ss.add("a");
     ss.add("b");
diff --git a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java
index ce5e2c87407b..d533be814b74 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class FileTypeIndexTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testAddFileType() throws Exception {
+  public void testAddFileType() {
     addAndRemoveFileType();
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PersistenceStressTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/PersistenceStressTest.java
index a2c961f5ba75..a832a1b441b7 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/PersistenceStressTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/PersistenceStressTest.java
@@ -132,18 +132,10 @@ public class PersistenceStressTest extends LightPlatformCodeInsightFixtureTestCa
 
   @NotNull
   private Future<Boolean> submit(final PersistentHashMap<String, Record> map) {
-    return myThreadPool.submit(() -> {
-      try {
-        return doTask(map);
-      }
-      catch (IOException e) {
-        e.printStackTrace();
-        return false;
-      }
-    });
+    return myThreadPool.submit(() -> doTask(map));
   }
 
-  private boolean doTask(PersistentHashMap<String, Record> map) throws IOException {
+  private boolean doTask(PersistentHashMap<String, Record> map) {
     Random random = new Random();
     try {
       for (int i = 0; i < 100000; i++) {
diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
index 84e9d4027e46..876faaeb292f 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentMapTest.java
@@ -436,7 +436,7 @@ public class PersistentMapTest extends PersistentMapTestBase {
     }
   }
 
-  private void closeMapSilently() throws IOException {
+  private void closeMapSilently() {
     try {
       myMap.close();
     } catch (IOException ignore) {}
diff --git a/platform/platform-tests/testSrc/com/intellij/util/net/ssl/CertificateTest.java b/platform/platform-tests/testSrc/com/intellij/util/net/ssl/CertificateTest.java
index 1db4155a971d..370033f742fc 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/net/ssl/CertificateTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/net/ssl/CertificateTest.java
@@ -60,7 +60,7 @@ public class CertificateTest extends LightPlatformTestCase {
   private X509Certificate myAuthorityCertificate;
 
 
-  public void testSetUp() throws Exception {
+  public void testSetUp() {
     assertTrue(myTrustManager.containsCertificate(AUTHORITY_CN));
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/util/ui/update/MergingUpdateQueueTest.java b/platform/platform-tests/testSrc/com/intellij/util/ui/update/MergingUpdateQueueTest.java
index 0f90b664d370..e2f4fa7ac2b6 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/ui/update/MergingUpdateQueueTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/ui/update/MergingUpdateQueueTest.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class MergingUpdateQueueTest extends UsefulTestCase {
-  public void testOnShowNotify() throws Exception {
+  public void testOnShowNotify() {
     final MyUpdate first = new MyUpdate("first");
     final MyUpdate second = new MyUpdate("second");
 
@@ -52,7 +52,7 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
     assertAfterProcessing(second, true, true);
   }
 
-  public void testPriority() throws Exception {
+  public void testPriority() {
     final boolean[] attemps = new boolean[3];
 
     final MyQueue queue = new MyQueue();
@@ -98,7 +98,7 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
     assertAfterProcessing(third, true, true);
   }
 
-  public void testDoNoExecuteExpired() throws Throwable {
+  public void testDoNoExecuteExpired() {
 
     final boolean[] expired = new boolean[1];
 
@@ -128,7 +128,7 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
   }
 
 
-  public void testOnShowNotifyMerging() throws Exception {
+  public void testOnShowNotifyMerging() {
     final MyUpdate twin1 = new MyUpdate("twin");
     final MyUpdate twin2 = new MyUpdate("twin");
 
@@ -147,7 +147,7 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
     assertAfterProcessing(twin2, true, true);
   }
 
-  public void testExecuteWhenActive() throws Exception {
+  public void testExecuteWhenActive() {
     final MyQueue queue = new MyQueue();
 
     queue.showNotify();
@@ -164,7 +164,7 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
     assertAfterProcessing(second, true, true);
   }
 
-  public void testMergeWhenActive() throws Exception {
+  public void testMergeWhenActive() {
     final MyQueue queue = new MyQueue();
 
     queue.showNotify();
@@ -181,15 +181,15 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
     assertAfterProcessing(twin2, true, true);
   }
 
-  public void testEatByQueue() throws Exception {
+  public void testEatByQueue() {
     executeEatingTest(false);
   }
 
-  public void testEatUpdatesInQueue() throws Exception {
+  public void testEatUpdatesInQueue() {
     executeEatingTest(true);
   }
 
-  private static void executeEatingTest(boolean foodFirst) throws Exception{
+  private static void executeEatingTest(boolean foodFirst) {
     final MyQueue queue = new MyQueue();
     queue.showNotify();
 
@@ -215,7 +215,7 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
     assertAfterProcessing(food, false, false);
   }
 
-  public void testConcurrentFlushing() throws Exception {
+  public void testConcurrentFlushing() {
     final MyQueue queue = new MyQueue();
     queue.showNotify();
 
@@ -255,7 +255,7 @@ public class MergingUpdateQueueTest extends UsefulTestCase {
     assertTrue(Boolean.TRUE.equals(executed.get()));
   }
 
-  public void testConcurrentQueueing() throws Exception {
+  public void testConcurrentQueueing() {
     final MyQueue queue = new MyQueue();
     queue.showNotify();
 
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/OutputLineSplitterTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/OutputLineSplitterTest.java
index 38c47787773f..d3ecba5ce45e 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/OutputLineSplitterTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/OutputLineSplitterTest.java
@@ -66,7 +66,7 @@ public class OutputLineSplitterTest extends PlatformTestCase {
   /**
    * When tc message is in the middle of line it should reported as separate line like if it has \n before it
    */
-  public void testMessageInTheMiddleOfLine() throws Exception {
+  public void testMessageInTheMiddleOfLine() {
     for(String prefix: new String[]{"...", "", "... ", "##", " ##", "##team##teamcity["}) {
       final String testStarted = ServiceMessageBuilder.testStarted("myTest").toString() + "\n";
       final String testEnded = ServiceMessageBuilder.testFinished("myTest").toString() + "\n";
@@ -204,7 +204,7 @@ public class OutputLineSplitterTest extends PlatformTestCase {
     }
   }
 
-  public void testPerformanceWithLotsOfFragments() throws Exception {
+  public void testPerformanceWithLotsOfFragments() {
     PlatformTestUtil.startPerformanceTest("Flushing lot's of fragments", 5, mySplitter::flush)
       .setup(() -> {
         for (int i = 0; i < 10_000; i++) {
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertorTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertorTest.java
index 0769de64c9ea..eaca233b754b 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertorTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertorTest.java
@@ -51,14 +51,14 @@ public class GeneralIdBasedToSMTRunnerEventsConvertorTest extends BaseSMTRunnerT
     assertTrue(myRootProxy.isLeaf());
   }
 
-  public void testOnTestStarted() throws InterruptedException {
+  public void testOnTestStarted() {
     onTestStarted("my test", null, "1", TreeNodeEvent.ROOT_NODE_ID, true);
     SMTestProxy proxy = validateTest("1", "my test", null, true, myRootProxy);
     onTestFailed("1", "", 1);
     validateTestFailure("1", proxy, 1);
   }
 
-  public void testRunningSuite() throws Exception {
+  public void testRunningSuite() {
     onSuiteStarted("Code", null, "1", TreeNodeEvent.ROOT_NODE_ID);
     SMTestProxy suiteProxy = validateSuite("1", "Code", null, myRootProxy);
     onTestStarted("should work", null, "2", "1", true);
@@ -74,7 +74,7 @@ public class GeneralIdBasedToSMTRunnerEventsConvertorTest extends BaseSMTRunnerT
     assertFalse(bugsSuiteProxy.isInProgress());
   }
 
-  public void testRunningSuiteWithMetainfo() throws Exception {
+  public void testRunningSuiteWithMetainfo() {
     onSuiteStarted("Code", "any:info:string:that:can:help?navigation", "1", TreeNodeEvent.ROOT_NODE_ID);
     SMTestProxy suiteProxy = validateSuite("1", "Code", "any:info:string:that:can:help?navigation", myRootProxy);
     onTestStarted("should work", "but is not a part of primary key", "2", "1", true);
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
index 9d6adc8df1de..148fe19e2d52 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
@@ -133,7 +133,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
     assertEquals("[root]", rootTreeNode.toString());
   }
 
-  public void testOnTestStarted() throws InterruptedException {
+  public void testOnTestStarted() {
     onTestStarted("some_test");
     final String fullName = myEventsProcessor.getFullTestName("some_test");
     final SMTestProxy proxy = myEventsProcessor.getProxyByFullTestName(fullName);
@@ -161,7 +161,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
     assertEquals(1, myEventsProcessor.getRunningTestsQuantity());
   }
 
-  public void testOnTestStarted_WithLocation() throws InterruptedException {
+  public void testOnTestStarted_WithLocation() {
     onTestStarted("some_test", "file://some/file.rb:1");
     final String fullName = myEventsProcessor.getFullTestName("some_test");
     final SMTestProxy proxy = myEventsProcessor.getProxyByFullTestName(fullName);
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java
index 94fa7a434d94..3581f3298b73 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.execution.testframework.sm.runner;
 
-import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.runners.ExecutionEnvironment;
@@ -53,7 +52,7 @@ public class MockRuntimeConfiguration extends LocatableConfigurationBase impleme
   }
 
   @Override
-  public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment env) throws ExecutionException {
+  public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment env) {
     return null;
   }
 
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java
index 39f324d601f4..cb50be4a37ce 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java
@@ -28,7 +28,6 @@ import com.intellij.execution.testframework.sm.runner.ui.SMTestRunnerResultsForm
 import com.intellij.execution.testframework.ui.TestsOutputConsolePrinter;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.psi.impl.DebugUtil;
 import com.intellij.util.concurrency.Semaphore;
 import org.jetbrains.annotations.NotNull;
 
@@ -539,7 +538,7 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
     assertAllOutputs(myMockResettablePrinter, "preved", "","Empty test suite.\n");
   }
 
-  public void testEnsureOrderedClearFlush() throws Exception {
+  public void testEnsureOrderedClearFlush() {
     StringBuffer buf = new StringBuffer();
     String expected = "";
     for(int i = 0; i < 100; i++) {
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java
index 05b5458db4b1..5f3a3e38f0d0 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTestProxyTest.java
@@ -19,14 +19,10 @@ import com.intellij.execution.filters.HyperlinkInfo;
 import com.intellij.execution.testframework.Filter;
 import com.intellij.execution.testframework.TestConsoleProperties;
 import com.intellij.execution.testframework.sm.runner.ui.MockPrinter;
-import com.intellij.execution.testframework.stacktrace.DiffHyperlink;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.easymock.EasyMock;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static com.intellij.execution.testframework.sm.runner.states.TestStateInfo.Magnitude;
 
 /**
@@ -86,7 +82,7 @@ public class SMTestProxyTest extends BaseSMTRunnerTestCase {
     assertFalse(mySuite.isLeaf());
   }
 
-  public void testAppendedChildToTestShouldMakeItSuite() throws Exception {
+  public void testAppendedChildToTestShouldMakeItSuite() {
     mySuite = createTestProxy("unroll spock test");
     assertFalse(mySuite.isSuite());
     assertFalse(mySuite.isDefect());
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/TestSuiteStackTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/TestSuiteStackTest.java
index 303f83c44b28..d9c579e8133a 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/TestSuiteStackTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/TestSuiteStackTest.java
@@ -81,7 +81,7 @@ public class TestSuiteStackTest extends BaseSMTRunnerTestCase {
     });
   }
 
-  public void testPopEmptySuite_NormalMode() throws Throwable {
+  public void testPopEmptySuite_NormalMode() {
     assertNull(myTestSuiteStack.popSuite("some suite"));
   }
 
@@ -107,7 +107,7 @@ public class TestSuiteStackTest extends BaseSMTRunnerTestCase {
     assertEquals(4, myTestSuiteStack.getStackSize());
   }
 
-  public void testPopInconsistentSuite_NormalMode() throws Throwable {
+  public void testPopInconsistentSuite_NormalMode() {
     final String suiteName = mySuite.getName();
 
     myTestSuiteStack.pushSuite(createSuiteProxy("0"));
@@ -123,7 +123,7 @@ public class TestSuiteStackTest extends BaseSMTRunnerTestCase {
     assertEquals(1, myTestSuiteStack.getStackSize());
   }
 
-  public void testPopSuite() throws Throwable {
+  public void testPopSuite() {
     final String suiteName = mySuite.getName();
 
     myTestSuiteStack.pushSuite(mySuite);
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java
index 4587ac036d77..77e5c8d96515 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java
@@ -224,7 +224,7 @@ public class SMTestRunnerResultsFormTest extends BaseSMTRunnerTestCase {
     assertTrue(focusRequestedRef.get());
   }
 
-  public void testRuby_1767() throws InterruptedException {
+  public void testRuby_1767() {
     TestConsoleProperties.HIDE_PASSED_TESTS.set(myConsoleProperties, true);
 
     myEventsProcessor.onStartTesting();
@@ -251,7 +251,7 @@ public class SMTestRunnerResultsFormTest extends BaseSMTRunnerTestCase {
     assertEquals(1, myTreeModel.getChildCount(myTreeModel.getChild(myTreeModel.getRoot(), 0)));
   }
 
-  public void testExpandIfOnlyOneRootChild() throws InterruptedException {
+  public void testExpandIfOnlyOneRootChild() {
     myEventsProcessor.onStartTesting();
     myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite1", null));
     myResultsViewer.performUpdate();
@@ -288,7 +288,7 @@ public class SMTestRunnerResultsFormTest extends BaseSMTRunnerTestCase {
   }
 
   //with test tree build before start actual tests
-  public void testPrependTreeAndSameTestsStartFinish() throws Exception {
+  public void testPrependTreeAndSameTestsStartFinish() {
     //send tree
     myEventsProcessor.onSuiteTreeStarted("suite1", null, "suite1", "0");
     myEventsProcessor.onSuiteTreeNodeAdded("test1", null, "test1", "suite1");
diff --git a/platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java b/platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java
index 5590012d4081..1447f31807f7 100644
--- a/platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java
+++ b/platform/smRunner/testSrc/com/intellij/internal/statistic/beans/ConvertUsagesUtilTest.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 public class ConvertUsagesUtilTest extends TestCase {
 
-  public void testEscapeDescriptorName() throws Exception {
+  public void testEscapeDescriptorName() {
     ConvertUsagesUtil.assertDescriptorName(ConvertUsagesUtil.escapeDescriptorName("'Copy'_on_Steroids"));
     ConvertUsagesUtil.assertDescriptorName(ConvertUsagesUtil.escapeDescriptorName("Some config name"));
     ConvertUsagesUtil.assertDescriptorName(ConvertUsagesUtil.escapeDescriptorName("\"config\""));
diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java
index a07415d7f8ef..374569e41d9c 100644
--- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java
+++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/OptimizedSearchScanTest.java
@@ -22,7 +22,7 @@ import com.intellij.structuralsearch.impl.matcher.compiler.PatternCompiler;
  */
 public class OptimizedSearchScanTest extends StructuralSearchTestCase {
 
-  public void testClassByQName() throws Exception {
+  public void testClassByQName() {
     final String plan = findWordsToBeUsedWhenSearchingFor("A.f");
     assertEquals("[in code:f][in code:A]", plan);
   }
diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java
index 60cdb9217925..8510a448e947 100644
--- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java
+++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSBasedInspectionTest.java
@@ -35,11 +35,11 @@ public class SSBasedInspectionTest extends InspectionTestCase {
     myWrapper = new LocalInspectionToolWrapper(inspection);
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doTest();
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     doTest("ssBased/" + getTestName(true), myWrapper,"java 1.5");
   }
 
diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
index 510a1d3c6c11..f7b52856d74e 100644
--- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
@@ -1527,7 +1527,7 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
                  findMatchesCount(s9, "java.lang.String.'_method ( '_params* )"));
   }
 
-  public void testAnnotations() throws Exception {
+  public void testAnnotations() {
     String s1 = "@MyBean(\"\")\n" +
                 "@MyBean2(\"\")\n" +
                 "public class TestBean {}\n" +
@@ -2040,7 +2040,7 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
     assertEquals(7,findMatchesCount(s3, s4));
   }
 
-  public void testMultiStatementPatternWithTypedVariable() throws Exception {
+  public void testMultiStatementPatternWithTypedVariable() {
     String s = "class X {{ Integer i; i.valueOf(); }}";
     assertEquals(1, findMatchesCount(s, "Integer '_i;\n'_i.valueOf();"));
 
@@ -2052,21 +2052,21 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
     assertEquals(1, findMatchesCount(s, pattern));
   }
 
-  public void testFindAnnotationDeclarations() throws Exception {
+  public void testFindAnnotationDeclarations() {
     String s = "interface Foo {} interface Bar {} @interface X {}";
     String s2 = "@interface 'x {}";
 
     assertEquals(1, findMatchesCount(s,s2));
   }
 
-  public void testFindEnums() throws Exception {
+  public void testFindEnums() {
     String s = "class Foo {} class Bar {} enum X {}";
     String s2 = "enum 'x {}";
 
     assertEquals(1, findMatchesCount(s,s2));
   }
 
-  public void testFindDeclaration() throws Exception {
+  public void testFindDeclaration() {
     String s = "public class F {\n" +
                "  static Category cat = Category.getInstance(F.class.getName());\n" +
                "  Category cat2 = Category.getInstance(F.class.getName());\n" +
diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java
index 24a0422f5eb1..3e4f32ba61c2 100644
--- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java
+++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/impl/matcher/compiler/StringToConstraintsTransformerTest.java
@@ -23,9 +23,7 @@ import com.intellij.structuralsearch.plugin.ui.Configuration;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * @author Bas Leijdekkers
@@ -35,7 +33,7 @@ public class StringToConstraintsTransformerTest {
   private MatchOptions myOptions;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     myOptions = new MatchOptions();
   }
 
diff --git a/platform/util/testSrc/com/intellij/execution/configurations/CommandLineTokenizerTest.java b/platform/util/testSrc/com/intellij/execution/configurations/CommandLineTokenizerTest.java
index 98d56bb87dd6..cef1986a44e6 100644
--- a/platform/util/testSrc/com/intellij/execution/configurations/CommandLineTokenizerTest.java
+++ b/platform/util/testSrc/com/intellij/execution/configurations/CommandLineTokenizerTest.java
@@ -18,7 +18,7 @@ package com.intellij.execution.configurations;
 import junit.framework.TestCase;
 
 public class CommandLineTokenizerTest extends TestCase {
-  public void testBasic() throws Exception {
+  public void testBasic() {
     assertTokens("a b", "a", "b");
     assertTokens("\"a b\"", "a b");
     assertTokens("a\" b\"", "a b");
@@ -30,7 +30,7 @@ public class CommandLineTokenizerTest extends TestCase {
     assertTokens("\"-Dquote=\\\\\"", "-Dquote=\\\\");
   }
 
-  public void testEscape() throws Exception {
+  public void testEscape() {
     assertTokens("a\\ b", true, "a b");
     assertTokens("a\\ b", false, "a\\", "b");
 
diff --git a/platform/util/testSrc/com/intellij/openapi/util/BuildNumberTest.java b/platform/util/testSrc/com/intellij/openapi/util/BuildNumberTest.java
index cb91d33654c4..fcc44703d581 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/BuildNumberTest.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/BuildNumberTest.java
@@ -33,7 +33,7 @@ public class BuildNumberTest {
   }
 
   @Test
-  public void branchBasedBuild() throws Exception {
+  public void branchBasedBuild() {
     assertParsed(BuildNumber.fromString("145"), 145, 0, "145.0");
     assertParsed(BuildNumber.fromString("145.1"), 145, 1, "145.1");
     assertParsed(BuildNumber.fromString("145.1.2"), 145, 1, "145.1.2");
@@ -54,7 +54,7 @@ public class BuildNumberTest {
   }
 
   @Test
-  public void comparingVersion() throws Exception {
+  public void comparingVersion() {
     assertTrue(BuildNumber.fromString("145.1").compareTo(BuildNumber.fromString("145.*")) < 0);
     assertTrue(BuildNumber.fromString("145.1.1").compareTo(BuildNumber.fromString("145.*")) < 0);
     assertTrue(BuildNumber.fromString("145.1.1.1.1").compareTo(BuildNumber.fromString("145.*")) < 0);
@@ -80,7 +80,7 @@ public class BuildNumberTest {
   }
 
   @Test
-  public void devSnapshotVersion() throws Exception {
+  public void devSnapshotVersion() {
     BuildNumber b = BuildNumber.fromString("__BUILD_NUMBER__");
     assertTrue(b.asString(), b.getBaselineVersion() >= 145 && b.getBaselineVersion() <= 3000);
     assertTrue(b.isSnapshot());
@@ -129,7 +129,7 @@ public class BuildNumberTest {
   }
 
   @Test
-  public void currentVersion() throws Exception {
+  public void currentVersion() {
     BuildNumber current = BuildNumber.currentVersion();
     assertTrue(current.isSnapshot());
 
diff --git a/platform/util/testSrc/com/intellij/openapi/util/ReflectionUtilTest.java b/platform/util/testSrc/com/intellij/openapi/util/ReflectionUtilTest.java
index d1a86208d7fd..becdad6a17d9 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/ReflectionUtilTest.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/ReflectionUtilTest.java
@@ -38,7 +38,7 @@ public class ReflectionUtilTest extends TestCase {
     fail();
   }
 
-  public void testResetField() throws Exception {
+  public void testResetField() {
     final Reset reset = new Reset();
 
     ReflectionUtil.resetField(reset, String.class, "STRING");
diff --git a/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java b/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
index 7f2bda12d6d1..3f8d08024d8c 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
@@ -83,7 +83,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     if (myTempDirectory != null) {
       FileUtil.delete(myTempDirectory);
     }
@@ -154,7 +154,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void root() throws Exception {
+  public void root() {
     final File file = new File(SystemInfo.isWindows ? "C:\\" : "/");
 
     final FileAttributes attributes = getAttributes(file);
@@ -183,7 +183,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void special() throws Exception {
+  public void special() {
     assumeTrue(SystemInfo.isUnix);
     final File file = new File("/dev/null");
 
@@ -325,7 +325,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void hiddenDir() throws Exception {
+  public void hiddenDir() {
     assumeTrue(SystemInfo.isWindows);
     File dir = IoTestUtil.createTestDir(myTempDirectory, "dir");
     FileAttributes attributes = getAttributes(dir);
@@ -336,7 +336,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void hiddenFile() throws Exception {
+  public void hiddenFile() {
     assumeTrue(SystemInfo.isWindows);
     File file = IoTestUtil.createTestFile(myTempDirectory, "file");
     FileAttributes attributes = getAttributes(file);
@@ -347,7 +347,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void notSoHiddenRoot() throws Exception {
+  public void notSoHiddenRoot() {
     if (SystemInfo.isWindows) {
       File absRoot = new File("C:\\");
       FileAttributes absAttributes = getAttributes(absRoot);
@@ -365,7 +365,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void wellHiddenFile() throws Exception {
+  public void wellHiddenFile() {
     assumeTrue(SystemInfo.isWindows);
     final File file = new File("C:\\Documents and Settings\\desktop.ini");
     assumeTrue(file.exists());
@@ -507,7 +507,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void notOwned() throws Exception {
+  public void notOwned() {
     assumeTrue(SystemInfo.isUnix);
     File userHome = new File(SystemProperties.getUserHome());
 
@@ -521,7 +521,7 @@ public abstract class FileAttributesReadingTest {
   }
 
   @Test
-  public void permissionsCloning() throws Exception {
+  public void permissionsCloning() {
     assumeTrue(SystemInfo.isUnix);
 
     File donor = IoTestUtil.createTestFile(myTempDirectory, "donor");
diff --git a/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilHeavyTest.java b/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilHeavyTest.java
index 49f1f9df6a86..d4b851ff5ca8 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilHeavyTest.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/io/FileUtilHeavyTest.java
@@ -194,7 +194,7 @@ public class FileUtilHeavyTest {
       private int count = 0;
 
       @Override
-      public Boolean execute(boolean lastAttempt) throws IOException {
+      public Boolean execute(boolean lastAttempt) {
         count++;
         return stop(lastAttempt) ? true : null;
       }
diff --git a/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java b/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java
index ad769c48a9b4..33ae219980ad 100644
--- a/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java
+++ b/platform/util/testSrc/com/intellij/openapi/util/objectTree/DisposerTest.java
@@ -70,7 +70,7 @@ public class DisposerTest extends TestCase {
     }
   }
 
-  public void testDisposalAndAbsenceOfReferences() throws Exception {
+  public void testDisposalAndAbsenceOfReferences() {
     Disposer.register(myRoot, myFolder1);
     Disposer.register(myRoot, myFolder2);
     Disposer.register(myFolder1, myLeaf1);
@@ -88,7 +88,7 @@ public class DisposerTest extends TestCase {
     Disposer.dispose(myLeaf1);
   }
 
-  public void testDisposalOrder() throws Exception {
+  public void testDisposalOrder() {
     Disposer.register(myRoot, myFolder1);
     Disposer.register(myFolder1, myLeaf1);
     Disposer.register(myRoot, myFolder2);
@@ -104,7 +104,7 @@ public class DisposerTest extends TestCase {
     assertEquals(expected, myDisposedObjects);
   }
 
-  public void testDirectCallOfDisposable() throws Exception {
+  public void testDirectCallOfDisposable() {
     SelDisposable selfDisposable = new SelDisposable("root");
     Disposer.register(myRoot, selfDisposable);
     Disposer.register(selfDisposable, myFolder1);
@@ -120,13 +120,13 @@ public class DisposerTest extends TestCase {
     assertEquals(0, Disposer.getTree().getNodesInExecution().size());
   }
 
-  public void testDirectCallOfUnregisteredSelfDisposable() throws Exception {
+  public void testDirectCallOfUnregisteredSelfDisposable() {
     SelDisposable selfDisposable = new SelDisposable("root");
     //noinspection SSBasedInspection
     selfDisposable.dispose();
   }
 
-  public void testDisposeAndReplace() throws Exception {
+  public void testDisposeAndReplace() {
     Disposer.register(myRoot, myFolder1);
 
     Disposer.disposeChildAndReplace(myFolder1, myFolder2);
@@ -137,7 +137,7 @@ public class DisposerTest extends TestCase {
     assertDisposed(myFolder2);
   }
 
-  public void testPostponedParentRegistration() throws Exception {
+  public void testPostponedParentRegistration() {
     Disposer.register(myFolder1, myLeaf1);
     Disposer.register(myLeaf1, myLeaf2);
     Disposer.register(myRoot, myFolder1);
@@ -151,7 +151,7 @@ public class DisposerTest extends TestCase {
     assertDisposed(myLeaf2);
   }
 
-  public void testDisposalOfParentless() throws Throwable {
+  public void testDisposalOfParentless() {
     Disposer.register(myFolder1, myLeaf1);
     Disposer.register(myFolder1, myFolder2);
     Disposer.register(myFolder2, myLeaf2);
@@ -164,7 +164,7 @@ public class DisposerTest extends TestCase {
     assertDisposed(myLeaf2);
   }
 
-  public void testDisposalOfParentess2() throws Throwable {
+  public void testDisposalOfParentess2() {
     Disposer.register(myFolder1, myLeaf1);
     Disposer.register(myFolder2, myLeaf2);
     Disposer.register(myFolder1, myFolder2);
@@ -177,7 +177,7 @@ public class DisposerTest extends TestCase {
     assertDisposed(myLeaf2);
   }
 
-  public void testOverrideParentDisposable() throws Exception {
+  public void testOverrideParentDisposable() {
     Disposer.register(myFolder1, myLeaf1);
     Disposer.register(myFolder2, myFolder1);
     Disposer.register(myRoot, myFolder1);
@@ -193,7 +193,7 @@ public class DisposerTest extends TestCase {
     assertDisposed(myLeaf1);
   }
 
-  public void testDisposableParentNotify() throws Exception {
+  public void testDisposableParentNotify() {
     MyParentDisposable root = new MyParentDisposable("root");
     Disposer.register(root, myFolder1);
 
diff --git a/platform/util/testSrc/com/intellij/util/ArrayUtilTest.java b/platform/util/testSrc/com/intellij/util/ArrayUtilTest.java
index fb2312e1bf5f..2763a8471f5b 100644
--- a/platform/util/testSrc/com/intellij/util/ArrayUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/ArrayUtilTest.java
@@ -76,7 +76,7 @@ public class ArrayUtilTest extends TestCase {
     assertTrue(Arrays.equals(expected, actual));
   }
 
-  public void testReverse() throws Exception {
+  public void testReverse() {
     checkArrayReverse(new int[]{}, new int[]{});
     checkArrayReverse(new int[]{1}, new int[]{1});
     checkArrayReverse(new int[]{1, 2, 3, 4}, new int[]{4, 3, 2, 1});
diff --git a/platform/util/testSrc/com/intellij/util/FoundationTest.java b/platform/util/testSrc/com/intellij/util/FoundationTest.java
index bea77a006e35..4ea11e590f36 100644
--- a/platform/util/testSrc/com/intellij/util/FoundationTest.java
+++ b/platform/util/testSrc/com/intellij/util/FoundationTest.java
@@ -32,12 +32,12 @@ public class FoundationTest {
   }
 
   @Test
-  public void testStrings() throws Exception {
+  public void testStrings() {
     assertThat(Foundation.toStringViaUTF8(Foundation.nsString("Test")), equalTo("Test"));
   }
 
   @Test
-  public void testEncodings() throws Exception {
+  public void testEncodings() {
     assertThat(Foundation.getEncodingName(4), equalTo("utf-8"));
     assertThat(Foundation.getEncodingName(0), nullValue());
     assertThat(Foundation.getEncodingName(-1), nullValue());
@@ -60,7 +60,7 @@ public class FoundationTest {
   }
 
   @Test
-  public void testFindingAppBundle() throws Exception {
+  public void testFindingAppBundle() {
     String path;
     
     path = NSWorkspace.absolutePathForAppBundleWithIdentifier("com.apple.Finder");
diff --git a/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java b/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java
index c604fedaa3e2..0b2af228c8ee 100644
--- a/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java
+++ b/platform/util/testSrc/com/intellij/util/PathMappingSettingsTest.java
@@ -16,7 +16,7 @@ public class PathMappingSettingsTest {
   private PathMappingSettings myMappingSettings;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     myMappingSettings = new PathMappingSettings();
   }
 
diff --git a/platform/util/testSrc/com/intellij/util/SystemInfoTest.java b/platform/util/testSrc/com/intellij/util/SystemInfoTest.java
index 140b54446ab7..1ff59dd0eaa5 100644
--- a/platform/util/testSrc/com/intellij/util/SystemInfoTest.java
+++ b/platform/util/testSrc/com/intellij/util/SystemInfoTest.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.util.SystemInfo;
 import junit.framework.TestCase;
 
 public class SystemInfoTest extends TestCase {
-  public void testMacOsVersions() throws Exception {
+  public void testMacOsVersions() {
     // see http://developer.apple.com/library/mac/#documentation/Carbon/Reference/Gestalt_Manager/Reference/reference.html#//apple_ref/doc/uid/TP30000036-CH1g-F01632
     // System Version Selectors
 
@@ -31,7 +31,7 @@ public class SystemInfoTest extends TestCase {
     assertEquals("1.2", SystemInfo.getMacOSMajorVersion("1.2.3.4"));
   }
 
-  public void testMacOsVersionCode() throws Exception {
+  public void testMacOsVersionCode() {
     // see http://developer.apple.com/library/mac/#documentation/Carbon/Reference/Gestalt_Manager/Reference/reference.html#//apple_ref/doc/uid/TP30000036-CH1g-F01632
     // System Version Selectors
 
diff --git a/platform/util/testSrc/com/intellij/util/VersionUtilTest.java b/platform/util/testSrc/com/intellij/util/VersionUtilTest.java
index 73be8fc2b0d9..9726998eb077 100644
--- a/platform/util/testSrc/com/intellij/util/VersionUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/VersionUtilTest.java
@@ -55,13 +55,13 @@ public class VersionUtilTest extends TestCase {
     {"java version \"9-ea\"",                                                           new Version(9, 0, 0), 0},
   };
 
-  public void testParseVersion() throws Exception {
+  public void testParseVersion() {
     for (Object[] aTestData : testDataVersion) {
       String versionString = (String)aTestData[0];
       assertEquals("For \"" + versionString + "\"", aTestData[1], VersionUtil.parseVersion(versionString, VERSION_PATTERNS));
     }
   }
-  public void testParseVersionAndUpdate() throws Exception {
+  public void testParseVersionAndUpdate() {
     for (Object[] aTestData : testDataVersionUpdate) {
       String versionString = (String)aTestData[0];
       Pair<Version, Integer> versionAndUpdate = VersionUtil.parseNewVersionAndUpdate(versionString, LINE_TO_VERSION_PATTERNS);
diff --git a/platform/util/testSrc/com/intellij/util/concurrency/BlockingSetTest.java b/platform/util/testSrc/com/intellij/util/concurrency/BlockingSetTest.java
index a8c658cc3ce8..a8a28b792cd4 100644
--- a/platform/util/testSrc/com/intellij/util/concurrency/BlockingSetTest.java
+++ b/platform/util/testSrc/com/intellij/util/concurrency/BlockingSetTest.java
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class BlockingSetTest {
   @Test
-  public void testSingleThreadLock() throws Exception {
+  public void testSingleThreadLock() {
     BlockingSet<String> lock = new BlockingSet<>();
     lock.put("eins");
     lock.put("zwei");
@@ -24,7 +24,7 @@ public class BlockingSetTest {
   }
 
   @Test(expected = IllegalStateException.class)
-  public void testReleaseNotAcquired() throws Exception {
+  public void testReleaseNotAcquired() {
     BlockingSet<String> lock = new BlockingSet<>();
     lock.put("eins");
     lock.put("zwei");
diff --git a/platform/util/testSrc/com/intellij/util/containers/ByteArrayQueueTest.java b/platform/util/testSrc/com/intellij/util/containers/ByteArrayQueueTest.java
index 6d0a4d0d7d9a..4debfa178ef9 100644
--- a/platform/util/testSrc/com/intellij/util/containers/ByteArrayQueueTest.java
+++ b/platform/util/testSrc/com/intellij/util/containers/ByteArrayQueueTest.java
@@ -8,7 +8,7 @@ import junit.framework.Assert;
 public class ByteArrayQueueTest {
 
   @org.junit.Test
-  public void testSingleAdd() throws Exception {
+  public void testSingleAdd() {
     ByteArrayQueue queue = new ByteArrayQueue(0);
     byte value = 1;
     queue.add(value);
@@ -18,7 +18,7 @@ public class ByteArrayQueueTest {
   }
 
   @org.junit.Test
-  public void testResize1() throws Exception {
+  public void testResize1() {
     ByteArrayQueue queue = new ByteArrayQueue(4);
     byte[] buf = new byte[] {1, 2, 3, 4, 5};
     queue.addAll(buf);
@@ -30,7 +30,7 @@ public class ByteArrayQueueTest {
   }
 
   @org.junit.Test
-  public void testResize2() throws Exception {
+  public void testResize2() {
     ByteArrayQueue queue = new ByteArrayQueue(4);
     byte[] buf = new byte[] {1, 2, 3, 4, 5, 6, 7, 8};
     queue.addAll(buf);
diff --git a/platform/util/testSrc/com/intellij/util/containers/CircularCharBufferTest.java b/platform/util/testSrc/com/intellij/util/containers/CircularCharBufferTest.java
index 9cc31b6a4966..be39e69ea59f 100644
--- a/platform/util/testSrc/com/intellij/util/containers/CircularCharBufferTest.java
+++ b/platform/util/testSrc/com/intellij/util/containers/CircularCharBufferTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 public class CircularCharBufferTest {
   @Test
-  public void testSingleAdd() throws Exception {
+  public void testSingleAdd() {
     CircularCharBuffer queue = new CircularCharBuffer(0);
     char value = '1';
     queue.add(value);
@@ -30,7 +30,7 @@ public class CircularCharBufferTest {
   }
 
   @Test
-  public void testResize1() throws Exception {
+  public void testResize1() {
     CircularCharBuffer queue = new CircularCharBuffer(4);
     char[] buf = {'1', '2', '3', '4', '5'};
     queue.add(buf);
@@ -42,7 +42,7 @@ public class CircularCharBufferTest {
   }
 
   @Test
-  public void testResize2() throws Exception {
+  public void testResize2() {
     CircularCharBuffer queue = new CircularCharBuffer(4, 16);
     char[] buf = {'1', '2', '3', '4', '5', '6', '7', '8'};
     queue.add(buf);
@@ -67,7 +67,7 @@ public class CircularCharBufferTest {
   }
 
   @Test
-  public void testAddString() throws Exception {
+  public void testAddString() {
     CircularCharBuffer queue = new CircularCharBuffer(2, 16);
     queue.add("");
     Assert.assertEquals(0, queue.size());
@@ -79,7 +79,7 @@ public class CircularCharBufferTest {
   }
 
   @Test
-  public void testOverflow() throws Exception {
+  public void testOverflow() {
     CircularCharBuffer queue = new CircularCharBuffer(1, 4);
     queue.add("1");
     Assert.assertEquals("1", queue.getText());
@@ -102,7 +102,7 @@ public class CircularCharBufferTest {
   }
 
   @Test
-  public void testOverflowComplex() throws Exception {
+  public void testOverflowComplex() {
     CircularCharBuffer queue = new CircularCharBuffer(1, 10);
     String alphabet = "abcdefghijklmnopqrstuvwxyz";
     queue.add(alphabet);
diff --git a/platform/util/testSrc/com/intellij/util/containers/ConcurrentBitSetTest.java b/platform/util/testSrc/com/intellij/util/containers/ConcurrentBitSetTest.java
index df595298c22b..d2fb9979e5be 100644
--- a/platform/util/testSrc/com/intellij/util/containers/ConcurrentBitSetTest.java
+++ b/platform/util/testSrc/com/intellij/util/containers/ConcurrentBitSetTest.java
@@ -70,7 +70,7 @@ public class ConcurrentBitSetTest extends TestCase {
     assertEquals(bitSet, emptySet);
   }
 
-  public void testStress() throws InterruptedException {
+  public void testStress() {
     final ConcurrentBitSet bitSet = new ConcurrentBitSet();
     int N = 100;
     final int L = 100;
@@ -91,7 +91,7 @@ public class ConcurrentBitSetTest extends TestCase {
 
     assertEquals(-1, bitSet.nextSetBit(0));
   }
-  public void testStress2_Performance() throws InterruptedException {
+  public void testStress2_Performance() {
     final ConcurrentBitSet bitSet = new ConcurrentBitSet();
     int N = 10;
     final int L = 1000000;
diff --git a/platform/util/testSrc/com/intellij/util/containers/MostlySingularMultiMapTest.java b/platform/util/testSrc/com/intellij/util/containers/MostlySingularMultiMapTest.java
index e9178c275765..93d6e357b417 100644
--- a/platform/util/testSrc/com/intellij/util/containers/MostlySingularMultiMapTest.java
+++ b/platform/util/testSrc/com/intellij/util/containers/MostlySingularMultiMapTest.java
@@ -175,7 +175,7 @@ public class MostlySingularMultiMapTest extends TestCase {
                  map1.get("k3d"));
   }
 
-  public void testAddAllDoesntOwnOriginalValues() throws Exception {
+  public void testAddAllDoesntOwnOriginalValues() {
     MostlySingularMultiMap<String, String> mapEmpty = new MostlySingularMultiMap<>();
     MostlySingularMultiMap<String, String> mapWithOne = new MostlySingularMultiMap<>();
     MostlySingularMultiMap<String, String> mapWithMultiple = new MostlySingularMultiMap<>();
diff --git a/platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java b/platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java
index 49494ede6ad7..1c5d547bdb6c 100644
--- a/platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java
+++ b/platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java
@@ -17,7 +17,6 @@ package com.intellij.util.containers;
 
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.util.Processor;
 import gnu.trove.THashSet;
 import junit.framework.TestCase;
 
@@ -67,7 +66,7 @@ public class PathInternerTest extends TestCase {
   }
 
   @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
-  public static void main(String[] args) throws InterruptedException, IOException {
+  public static void main(String[] args) throws IOException {
     final HashSet<String> hs = new HashSet<>();
     FileUtil.processFilesRecursively(new File(PathManager.getHomePath()), file -> {
       hs.add(file.getPath());
diff --git a/platform/util/testSrc/com/intellij/util/containers/SequenceIteratorTest.java b/platform/util/testSrc/com/intellij/util/containers/SequenceIteratorTest.java
index 7f9b4c15265e..fea99312312c 100644
--- a/platform/util/testSrc/com/intellij/util/containers/SequenceIteratorTest.java
+++ b/platform/util/testSrc/com/intellij/util/containers/SequenceIteratorTest.java
@@ -63,7 +63,7 @@ public class SequenceIteratorTest extends TestCase {
   }
 
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     final Iterator<Integer> iterator = compose(Arrays.asList(iter(arr1), iter(arr2), iter(arr3)));
     int cnt = 0;
     while (iterator.hasNext()) {
@@ -77,7 +77,7 @@ public class SequenceIteratorTest extends TestCase {
     return ContainerUtil.concatIterators(iterators);
   }
 
-  public void testOne() throws Exception {
+  public void testOne() {
     final Iterator<Integer> iterator = compose(Arrays.asList(iter(arr1)));
     int cnt = 0;
     while (iterator.hasNext()) {
@@ -87,7 +87,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertEquals(arr1.length, cnt);
   }
 
-  public void testOneOne() throws Exception {
+  public void testOneOne() {
     final Iterator<Integer> iterator = compose(Arrays.asList(iter(new Integer[]{1})));
     int cnt = 0;
     while (iterator.hasNext()) {
@@ -97,7 +97,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertEquals(1, cnt);
   }
 
-  public void testEmpty() throws Exception {
+  public void testEmpty() {
     final Iterator<Integer> iterator = compose(Arrays.asList(iter(new Integer[]{})));
     int cnt = 0;
     while (iterator.hasNext()) {
@@ -107,7 +107,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertEquals(0, cnt);
   }
 
-  public void testManyEmpty() throws Exception {
+  public void testManyEmpty() {
     final Iterator<Integer> iterator =
       compose(Arrays.asList(iter(new Integer[]{}), iter(new Integer[]{}), iter(new Integer[]{})));
     int cnt = 0;
@@ -118,7 +118,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertEquals(0, cnt);
   }
 
-  public void testRemoveSimple() throws Exception {
+  public void testRemoveSimple() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(arr1));
     final ArrayList<Integer> list2 = new ArrayList<>(Arrays.asList(arr2));
     final ArrayList<Integer> list3 = new ArrayList<>(Arrays.asList(arr3));
@@ -138,7 +138,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertTrue(! list3.contains(103));
   }
 
-  public void testRemoveAfterLast() throws Exception {
+  public void testRemoveAfterLast() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(arr1));
     final Iterator<Integer> it1 = list1.iterator();
     while (it1.hasNext()) {
@@ -160,7 +160,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertTrue(! list3.contains(105));
   }
 
-  public void testRemoveOnlyOne() throws Exception {
+  public void testRemoveOnlyOne() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(new Integer[]{1}));
     final Iterator<Integer> iterator = compose(Arrays.asList(list1.iterator()));
     iterator.next();
@@ -168,7 +168,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertTrue(list1.isEmpty());
   }
 
-  public void testIterateWithEmptyInside() throws Exception {
+  public void testIterateWithEmptyInside() {
     final Iterator<Integer> iterator = compose(Arrays.asList(iter(arr1), iter(new Integer[]{}), iter(arr3)));
     int cnt = 0;
     int sum = 0;
@@ -181,7 +181,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertEquals(530, sum);
   }
 
-  public void testRemoveIfNextNotCalled() throws Exception {
+  public void testRemoveIfNextNotCalled() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(new Integer[]{1}));
     final Iterator<Integer> iterator = compose(Arrays.asList(list1.iterator()));
     try {
@@ -192,7 +192,7 @@ public class SequenceIteratorTest extends TestCase {
     }
   }
 
-  public void testRemoveTwice() throws Exception {
+  public void testRemoveTwice() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(new Integer[]{1, 2, 3, 4, 5}));
     final Iterator<Integer> iterator = compose(Arrays.asList(list1.iterator()));
     try {
@@ -205,7 +205,7 @@ public class SequenceIteratorTest extends TestCase {
     }
   }
 
-  public void testRemoveAll() throws Exception {
+  public void testRemoveAll() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(1, 2));
     final ArrayList<Integer> list2 = new ArrayList<>(Arrays.asList(3, 4));
     final ArrayList<Integer> list3 = new ArrayList<>(Arrays.asList(5, 6));
@@ -221,7 +221,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertTrue(list3.isEmpty());
   }
 
-  public void testRemoveAllWithEmptyInside() throws Exception {
+  public void testRemoveAllWithEmptyInside() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(1, 2));
     final ArrayList<Integer> list2 = new ArrayList<>();
     final ArrayList<Integer> list3 = new ArrayList<>(Arrays.asList(5, 6));
@@ -237,7 +237,7 @@ public class SequenceIteratorTest extends TestCase {
     Assert.assertTrue(list3.isEmpty());
   }
 
-  public void testRemoveLastAndFirstINNext() throws Exception {
+  public void testRemoveLastAndFirstINNext() {
     final ArrayList<Integer> list1 = new ArrayList<>(Arrays.asList(1, 2));
     final ArrayList<Integer> list2 = new ArrayList<>(Arrays.asList(3, 4));
     final ArrayList<Integer> list3 = new ArrayList<>(Arrays.asList(5, 6));
diff --git a/platform/util/testSrc/com/intellij/util/diff/DiffTreeTest.java b/platform/util/testSrc/com/intellij/util/diff/DiffTreeTest.java
index 9f18bce13ed5..992e14646360 100644
--- a/platform/util/testSrc/com/intellij/util/diff/DiffTreeTest.java
+++ b/platform/util/testSrc/com/intellij/util/diff/DiffTreeTest.java
@@ -154,7 +154,7 @@ public class DiffTreeTest extends TestCase {
     }
   }
 
-  public void testEmptyEqualRoots() throws Exception {
+  public void testEmptyEqualRoots() {
     Node r1 = new Node(0,0);
     Node r2 = new Node(0,0);
     final String expected = "";
@@ -162,7 +162,7 @@ public class DiffTreeTest extends TestCase {
     performTest(r1, r2, expected);
   }
 
-  public void testSingleChildEqualRoots() throws Exception {
+  public void testSingleChildEqualRoots() {
     Node r1 = new Node(0,0, new Node(1,0));
     Node r2 = new Node(0,0, new Node(1,0));
     final String expected = "";
@@ -170,7 +170,7 @@ public class DiffTreeTest extends TestCase {
     performTest(r1, r2, expected);
   }
 
-  public void testTheOnlyChildRemoved() throws Exception {
+  public void testTheOnlyChildRemoved() {
     Node r1 = new Node(0,0, new Node(1,0));
     Node r2 = new Node(0,0);
     String expected = "DELETED from 0: 1";
@@ -178,7 +178,7 @@ public class DiffTreeTest extends TestCase {
     performTest(r1, r2, expected);
   }
 
-  public void testTheOnlyChildAdded() throws Exception {
+  public void testTheOnlyChildAdded() {
     Node r1 = new Node(0,0);
     Node r2 = new Node(0,0, new Node(1,0));
     String expected = "INSERTED to 0: 1 at 0";
@@ -187,7 +187,7 @@ public class DiffTreeTest extends TestCase {
 
   }
 
-  public void testTheOnlyChildReplaced() throws Exception {
+  public void testTheOnlyChildReplaced() {
     Node r1 = new Node(0,0, new Node(1,0));
     Node r2 = new Node(0,0, new Node(2,0));
     String expected = "REPLACED: 1 to 2";
@@ -195,7 +195,7 @@ public class DiffTreeTest extends TestCase {
     performTest(r1, r2, expected);
   }
 
-  public void testInsertedIntoTheMiddle() throws Exception {
+  public void testInsertedIntoTheMiddle() {
     Node r1 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1)));
     Node r2 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(4,1), new Node(3,2)));
     String expected = "INSERTED to 1: 4 at 1";
@@ -203,7 +203,7 @@ public class DiffTreeTest extends TestCase {
     performTest(r1, r2, expected);
   }
 
-  public void testInsertedFirst() throws Exception {
+  public void testInsertedFirst() {
     Node r1 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(4,1)));
     Node r2 = new Node(0,0, new Node(1,0, new Node(3,0), new Node(2,1), new Node(4,2)));
     String expected = "INSERTED to 1: 3 at 0";
@@ -211,7 +211,7 @@ public class DiffTreeTest extends TestCase {
     performTest(r1, r2, expected);
   }
 
-  public void testInsertedLast() throws Exception {
+  public void testInsertedLast() {
     Node r1 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1)));
     Node r2 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1), new Node(4,2)));
     String expected = "INSERTED to 1: 4 at 2";
@@ -219,21 +219,21 @@ public class DiffTreeTest extends TestCase {
     performTest(r1, r2, expected);
   }
 
-  public void testInsertedTwoLast() throws Exception {
+  public void testInsertedTwoLast() {
     Node r1 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1)));
     Node r2 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1), new Node(4,2), new Node(5,3)));
 
     performTest(r1, r2, "INSERTED to 1: 4 at 2", "INSERTED to 1: 5 at 3");
   }
 
-  public void testSubtreeAppears() throws Exception {
+  public void testSubtreeAppears() {
     Node r1 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1), new Node(4,2)));
     Node r2 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1, new Node(6,1)), new Node(4,2)));
 
     performTest(r1, r2, "INSERTED to 3: 6 at 0");
   }
 
-  public void testSubtreeChanges() throws Exception {
+  public void testSubtreeChanges() {
     Node r1 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(3,1, new Node(6,1)), new Node(4,2)));
     Node r2 = new Node(0,0, new Node(1,0, new Node(2,0), new Node(5,1, new Node(6,1)), new Node(4,2)));
 
diff --git a/platform/util/testSrc/com/intellij/util/diff/IntLCSNewTest.java b/platform/util/testSrc/com/intellij/util/diff/IntLCSNewTest.java
index 647243c5602e..0aa48409953d 100644
--- a/platform/util/testSrc/com/intellij/util/diff/IntLCSNewTest.java
+++ b/platform/util/testSrc/com/intellij/util/diff/IntLCSNewTest.java
@@ -20,37 +20,37 @@ import junit.framework.TestCase;
 import java.util.BitSet;
 
 public class IntLCSNewTest extends TestCase {
-  public void testEqual() throws FilesTooBigForDiffException {
+  public void testEqual() {
     BitSet[] change = buildChange(new int[]{1, 2, 3}, new int[]{1, 2, 3});
     checkChange(change, new int[]{0, 0, 0}, new int[]{0, 0, 0});
   }
 
-  public void testOneAtBegging() throws FilesTooBigForDiffException {
+  public void testOneAtBegging() {
     BitSet[] change = buildChange(new int[]{1, 2}, new int[]{1, 3});
     checkChange(change, new int[]{0, 1}, new int[]{0, 1});
   }
 
-  public void testOneAntEnd() throws FilesTooBigForDiffException {
+  public void testOneAntEnd() {
     BitSet[] change = buildChange(new int[]{1, 3}, new int[]{2, 3});
     checkChange(change, new int[]{1, 0}, new int[]{1, 0});
   }
 
-  public void testOneOverAtEnd() throws FilesTooBigForDiffException {
+  public void testOneOverAtEnd() {
     BitSet[] change = buildChange(new int[]{1, 2}, new int[]{1, 2, 3});
     checkChange(change, new int[]{0, 0}, new int[]{0, 0, 1});
   }
 
-  public void testOneOverAtBegging() throws FilesTooBigForDiffException {
+  public void testOneOverAtBegging() {
     BitSet[] change = buildChange(new int[]{1, 2, 3}, new int[]{2, 3});
     checkChange(change, new int[]{1, 0, 0}, new int[]{0, 0});
   }
 
-  public void testSingleMiddle() throws FilesTooBigForDiffException {
+  public void testSingleMiddle() {
     BitSet[] change = buildChange(new int[]{1, 2, 3}, new int[]{4, 2, 5});
     checkChange(change, new int[]{1, 0, 1}, new int[]{1, 0, 1});
   }
 
-  public void testAbsolutelyDifferent() throws FilesTooBigForDiffException {
+  public void testAbsolutelyDifferent() {
     BitSet[] change1 = buildChange(new int[]{1, 2}, new int[]{3, 4});
     checkChange(change1, new int[]{1, 1}, new int[]{1, 1});
 
@@ -58,19 +58,19 @@ public class IntLCSNewTest extends TestCase {
     checkChange(change2, new int[]{1, 1, 1}, new int[]{1, 1, 1});
   }
 
-  public void testSingleUniqueMoved() throws FilesTooBigForDiffException {
+  public void testSingleUniqueMoved() {
     BitSet[] change = buildChange(new int[]{1, 1, 2, 2, 10}, new int[]{10, 1, 1, 2, 2});
     checkChange(change, new int[]{0, 0, 0, 0, 1}, new int[]{1, 0, 0, 0, 0});
   }
 
-  public void testSingleFunctionMoved() throws FilesTooBigForDiffException {
+  public void testSingleFunctionMoved() {
     BitSet[] change = buildChange(new int[]{1, 2, 3, 4, 5, 6, 7, 8, 7, 9, 10, 2, 11, 12, 5, 13, 7, 8, 7},
                                   new int[]{10, 2, 11, 12, 5, 13, 7, 8, 7, 9, 1, 2, 3, 4, 5, 6, 7, 8, 7});
     checkChange(change, new int[]{1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1},
                 new int[]{1, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1});
   }
 
-  private static BitSet[] buildChange(int[] first, int[] second) throws FilesTooBigForDiffException {
+  private static BitSet[] buildChange(int[] first, int[] second) {
     MyersLCS myersLCS = new MyersLCS(first, second);
     myersLCS.execute();
     return myersLCS.getChanges();
diff --git a/platform/util/testSrc/com/intellij/util/diff/IntLCSTest.java b/platform/util/testSrc/com/intellij/util/diff/IntLCSTest.java
index aa8ee8d2058e..1fb4841616b9 100644
--- a/platform/util/testSrc/com/intellij/util/diff/IntLCSTest.java
+++ b/platform/util/testSrc/com/intellij/util/diff/IntLCSTest.java
@@ -24,47 +24,47 @@ import java.util.BitSet;
  * @author dyoma
  */
 public class IntLCSTest extends TestCase {
-  public void testDiag() throws FilesTooBigForDiffException {
+  public void testDiag() {
     Diff.Change change = buildChange(new int[]{1, 2, 3}, new int[]{1, 2, 3}, 0);
     assertNull(change);
   }
 
-  public void testOneAtBegging() throws FilesTooBigForDiffException {
+  public void testOneAtBegging() {
     Diff.Change change = buildChange(new int[]{1, 2}, new int[]{1, 3}, 2);
     checkLastChange(change, 1, 1, 1, 1);
   }
 
-  public void testOneAntEnd() throws FilesTooBigForDiffException {
+  public void testOneAntEnd() {
     Diff.Change change = buildChange(new int[]{1, 3}, new int[]{2, 3}, 2);
     checkLastChange(change, 0, 0, 1, 1);
   }
 
-  public void testOneOverAtEnd() throws FilesTooBigForDiffException {
+  public void testOneOverAtEnd() {
     Diff.Change change = buildChange(new int[]{1, 2}, new int[]{1, 2, 3}, 1);
     checkLastChange(change, 2, 2, 1, 0);
   }
 
-  public void testOneOverAtBegging() throws FilesTooBigForDiffException {
+  public void testOneOverAtBegging() {
     Diff.Change change = buildChange(new int[]{1, 2, 3}, new int[]{2, 3}, 1);
     checkLastChange(change, 0, 0, 0, 1);
   }
 
-  public void testOneTail() throws FilesTooBigForDiffException {
+  public void testOneTail() {
     assertEquals(1, countChanges(new int[]{1, 2}, new int[]{1, 2, 3}));
   }
 
-  public void testSingleMiddle() throws FilesTooBigForDiffException {
+  public void testSingleMiddle() {
     Diff.Change change = buildChange(new int[]{1, 2, 3}, new int[]{4, 2, 5}, 4);
     checkChange(change, 0, 0, 1, 1);
     checkLastChange(change.link, 2, 2, 1, 1);
   }
 
-  public void testAbsolutelyDifferent() throws FilesTooBigForDiffException {
+  public void testAbsolutelyDifferent() {
     assertEquals(4, countChanges(new int[]{1, 2}, new int[]{3, 4}));
     assertEquals(6, countChanges(new int[]{1, 2, 3}, new int[]{4, 5, 6}));
   }
 
-  private static Diff.Change buildChange(int[] first, int[] second, int expectedNonDiags) throws FilesTooBigForDiffException {
+  private static Diff.Change buildChange(int[] first, int[] second, int expectedNonDiags) {
     assertEquals(expectedNonDiags, countChanges(first, second));
     MyersLCS intLCS = new MyersLCS(first, second);
     intLCS.execute();
@@ -89,7 +89,7 @@ public class IntLCSTest extends TestCase {
     assertNull("Expected last change", change.link);
   }
 
-  private static int countChanges(int[] first, int[] second) throws FilesTooBigForDiffException {
+  private static int countChanges(int[] first, int[] second) {
     MyersLCS lcs = new MyersLCS(first, second);
     lcs.execute();
     BitSet[] changes = lcs.getChanges();
diff --git a/platform/util/testSrc/com/intellij/util/diff/PatienceIntLCSTest.java b/platform/util/testSrc/com/intellij/util/diff/PatienceIntLCSTest.java
index 4932a3361ddb..80c926356088 100644
--- a/platform/util/testSrc/com/intellij/util/diff/PatienceIntLCSTest.java
+++ b/platform/util/testSrc/com/intellij/util/diff/PatienceIntLCSTest.java
@@ -98,35 +98,35 @@ public class PatienceIntLCSTest extends TestCase {
     checkChange(change, new int[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, new int[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1});
   }
 
-  public void testNotAbortedEqual() throws FilesTooBigForDiffException {
+  public void testNotAbortedEqual() {
     checkAborted(false, new int[]{1, 2, 3}, new int[]{1, 2, 3});
   }
 
-  public void testNotAbortedSimple() throws FilesTooBigForDiffException {
+  public void testNotAbortedSimple() {
     checkAborted(false, new int[]{100, 1, 2, 3, 4, 5, 100}, new int[]{1, 2, 3, 4});
   }
 
-  public void testAbortedNoMatches() throws FilesTooBigForDiffException {
+  public void testAbortedNoMatches() {
     checkAborted(true, new int[]{4, 1, 2, 3}, new int[]{500, 100, 600,});
   }
 
-  public void testAbortedSimple() throws FilesTooBigForDiffException {
+  public void testAbortedSimple() {
     checkAborted(true, new int[]{4, 1, 2, 3, 100}, new int[]{5, 1, 6, 8, 9, 10});
   }
 
-  public void testNotAbortedSecondStep() throws FilesTooBigForDiffException {
+  public void testNotAbortedSecondStep() {
     checkAborted(false,
                  new int[]{100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 100},
                  new int[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0});
   }
 
-  public void testNotAbortedThirdStep() throws FilesTooBigForDiffException {
+  public void testNotAbortedThirdStep() {
     checkAborted(false,
                  new int[]{100, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, 1, 0, 100},
                  new int[]{2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2});
   }
 
-  public void testAbortedForthStep() throws FilesTooBigForDiffException {
+  public void testAbortedForthStep() {
     checkAborted(true,
                  new int[]{100, 3, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, 1, 0, 100},
                  new int[]{2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 2});
diff --git a/platform/util/testSrc/com/intellij/util/diff/ReindexerNewTest.java b/platform/util/testSrc/com/intellij/util/diff/ReindexerNewTest.java
index 764515e43c38..bca310fd451a 100644
--- a/platform/util/testSrc/com/intellij/util/diff/ReindexerNewTest.java
+++ b/platform/util/testSrc/com/intellij/util/diff/ReindexerNewTest.java
@@ -21,37 +21,37 @@ import java.util.BitSet;
 import java.util.Random;
 
 public class ReindexerNewTest extends TestCase {
-  public void testAllUnique() throws FilesTooBigForDiffException {
+  public void testAllUnique() {
     checkCase(new int[]{1, 2, 3}, new int[]{4, 5});
     checkCase(new int[]{}, new int[]{4, 5});
     checkCase(new int[]{1, 2, 3}, new int[]{});
   }
 
-  public void testUniqueBeginning() throws FilesTooBigForDiffException {
+  public void testUniqueBeginning() {
     checkCase(new int[]{13, 15, 1, 2, 3}, new int[]{17, 1, 3});
   }
 
-  public void testUniqueEnd() throws FilesTooBigForDiffException {
+  public void testUniqueEnd() {
     checkCase(new int[]{1, 2, 3, 13, 15}, new int[]{1, 3, 17});
   }
 
-  public void testSingleUniqueMoved() throws FilesTooBigForDiffException {
+  public void testSingleUniqueMoved() {
     checkCase(new int[]{1, 1, 2, 2, 10}, new int[]{10, 1, 1, 2, 2});
   }
 
-  public void testSingleFunctionMoved() throws FilesTooBigForDiffException {
+  public void testSingleFunctionMoved() {
     checkCase(new int[]{1, 2, 3, 4, 5, 6, 7, 8, 7, 9, 10, 2, 11, 12, 5, 13, 7, 8, 7},
               new int[]{10, 2, 11, 12, 5, 13, 7, 8, 7, 9, 1, 2, 3, 4, 5, 6, 7, 8, 7});
   }
 
-  public void testInnerChunks() throws FilesTooBigForDiffException {
+  public void testInnerChunks() {
     checkCase(new int[]{0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0}, new int[]{1, 2, 1, 3, 1, 4, 1, 5, 1, 6, 1, 7, 1});
     checkCase(new int[]{0, 2, 3, 0, 4, 5, 0}, new int[]{1, 2, 1, 3, 4, 5, 1});
     checkCase(new int[]{15, 1, 2, 3, 1, 4, 5, 1, 15}, new int[]{13, 1, 2, 1, 3, 4, 5, 1, 13});
     checkCase(new int[]{15, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 15}, new int[]{13, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 13});
   }
 
-  public void testRandomExample() throws FilesTooBigForDiffException {
+  public void testRandomExample() {
     int[] ints1 = new int[100];
     int[] ints2 = new int[100];
     Random rng = new Random();
@@ -76,11 +76,11 @@ public class ReindexerNewTest extends TestCase {
     }
   }
 
-  public static void checkCase(int[] ints1, int[] ints2) throws FilesTooBigForDiffException {
+  public static void checkCase(int[] ints1, int[] ints2) {
     checkCase(ints1, ints2, "");
   }
 
-  public static void checkCase(int[] ints1, int[] ints2, String message) throws FilesTooBigForDiffException {
+  public static void checkCase(int[] ints1, int[] ints2, String message) {
     final BitSet[] reindexChanges = new BitSet[]{new BitSet(), new BitSet()};
     LCSBuilder builder = new LCSBuilder() {
       private int myIndex1 = 0;
diff --git a/platform/util/testSrc/com/intellij/util/diff/UniqueLCSTest.java b/platform/util/testSrc/com/intellij/util/diff/UniqueLCSTest.java
index 231d961c620c..d9a154f4942c 100644
--- a/platform/util/testSrc/com/intellij/util/diff/UniqueLCSTest.java
+++ b/platform/util/testSrc/com/intellij/util/diff/UniqueLCSTest.java
@@ -18,7 +18,7 @@ package com.intellij.util.diff;
 import junit.framework.TestCase;
 
 public class UniqueLCSTest extends TestCase {
-  public void testNoUnique() throws FilesTooBigForDiffException {
+  public void testNoUnique() {
     int[][] change = buildChange(new int[]{1, 2, 3}, new int[]{4, 5, 6});
     assertNull(change);
 
@@ -47,7 +47,7 @@ public class UniqueLCSTest extends TestCase {
     assertNull(change);
   }
 
-  public void testSingleUnique() throws FilesTooBigForDiffException {
+  public void testSingleUnique() {
     int[][] change = buildChange(new int[]{1}, new int[]{1});
     checkChange(change, new int[]{0}, new int[]{0});
 
@@ -67,28 +67,28 @@ public class UniqueLCSTest extends TestCase {
     checkChange(change, new int[]{1}, new int[]{1});
   }
 
-  public void testSingleSequence() throws FilesTooBigForDiffException {
+  public void testSingleSequence() {
     int[][] change = buildChange(new int[]{2, 4, 6, 1, 8, 3, 8, 2, 6, 5, 2, 4, 7, 11, 13}, new int[]{1, 10, 2, 3, 5, 7, 11, 13, 12});
     checkChange(change, new int[]{3, 5, 9, 12, 13, 14}, new int[]{0, 3, 4, 5, 6, 7});
   }
 
-  public void testLargestLCS1() throws FilesTooBigForDiffException {
+  public void testLargestLCS1() {
     checkMaxSequence(new int[]{1, 2, 3}, new int[]{1, 2, 3});
   }
 
-  public void testLargestLCS2() throws FilesTooBigForDiffException {
+  public void testLargestLCS2() {
     checkMaxSequence(new int[]{5, 6, 1, 2, 3}, new int[]{1, 2, 3});
   }
 
-  public void testLargestLCS3() throws FilesTooBigForDiffException {
+  public void testLargestLCS3() {
     checkMaxSequence(new int[]{0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 7, 15}, new int[]{0, 2, 6, 9, 13, 15});
   }
 
-  public void testLargestLCS4() throws FilesTooBigForDiffException {
+  public void testLargestLCS4() {
     checkMaxSequence(new int[]{1, 9, 3, 8, 11, 4, 5, 6, 19, 7}, new int[]{1, 3, 4, 5, 6, 7});
   }
 
-  private static int[][] buildChange(int[] first, int[] second) throws FilesTooBigForDiffException {
+  private static int[][] buildChange(int[] first, int[] second) {
     UniqueLCS uniqueLCS = new UniqueLCS(first, second);
     return uniqueLCS.execute();
   }
@@ -102,7 +102,7 @@ public class UniqueLCSTest extends TestCase {
     }
   }
 
-  private static void checkMaxSequence(int[] sequence, int[] expected) throws FilesTooBigForDiffException {
+  private static void checkMaxSequence(int[] sequence, int[] expected) {
     int max = 0;
     for (int i = 0; i < sequence.length; i++) {
       max = Math.max(sequence[i] + 1, max);
diff --git a/platform/util/testSrc/com/intellij/util/io/UrlUtilTest.java b/platform/util/testSrc/com/intellij/util/io/UrlUtilTest.java
index 8c4c1773ff34..a94660900967 100644
--- a/platform/util/testSrc/com/intellij/util/io/UrlUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/io/UrlUtilTest.java
@@ -138,7 +138,7 @@ public class UrlUtilTest {
   }
 
   @Test
-  public void testUrlParsing() throws Exception {
+  public void testUrlParsing() {
     doUrlTest("not detecting jetbrains.com", null);
     doUrlTest("mailto:admin@jetbrains.com;", "mailto:admin@jetbrains.com");
     doUrlTest("news://jetbrains.com is good", "news://jetbrains.com");
@@ -167,7 +167,7 @@ public class UrlUtilTest {
   }
 
   @Test
-  public void testEncodeURIComponent() throws Exception {
+  public void testEncodeURIComponent() {
     assertEquals("Test", URLUtil.encodeURIComponent("Test"));
     assertEquals("%20Test%20%20(~%2Fpath!)", URLUtil.encodeURIComponent(" Test  (~/path!)"));
     StringBuilder str = new StringBuilder("");
diff --git a/platform/util/testSrc/com/intellij/util/pico/IdeaPicoContainerTest.java b/platform/util/testSrc/com/intellij/util/pico/IdeaPicoContainerTest.java
index 4f3c00ec50cc..a04f87fdb52e 100644
--- a/platform/util/testSrc/com/intellij/util/pico/IdeaPicoContainerTest.java
+++ b/platform/util/testSrc/com/intellij/util/pico/IdeaPicoContainerTest.java
@@ -24,12 +24,12 @@ public class IdeaPicoContainerTest {
   private MutablePicoContainer myContainer;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     myContainer = new DefaultPicoContainer();
   }
 
   @Test
-  public void testUnregister() throws Exception {
+  public void testUnregister() {
     String key = "myObject";
     MyComponentClass instance = new MyComponentClass();
     myContainer.registerComponentInstance(key, instance);
diff --git a/platform/util/testSrc/com/intellij/util/text/MarkdownUtilTest.java b/platform/util/testSrc/com/intellij/util/text/MarkdownUtilTest.java
index 28757d890b09..9fde738f6ac2 100644
--- a/platform/util/testSrc/com/intellij/util/text/MarkdownUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/MarkdownUtilTest.java
@@ -28,14 +28,14 @@ import java.util.List;
 public class MarkdownUtilTest {
 
   @Test
-  public void testReplaceHeaders() throws Exception {
+  public void testReplaceHeaders() {
     List<String> markdown = ContainerUtil.newArrayList("# Hello1", "## Hello2##", "### Hello3#");
     MarkdownUtil.replaceHeaders(markdown);
     Assert.assertEquals(ContainerUtil.newArrayList("<h1>Hello1</h1>", "<h2>Hello2</h2>", "<h3>Hello3</h3>"), markdown);
   }
 
   @Test
-  public void testRemoveImage() throws Exception {
+  public void testRemoveImage() {
     List<String> markdown = Arrays.asList(
       "![logo](http://localhost/logo.png)",
       "Hello, [node](http://nodejs.org). [![Build Status](https://secure.travis-ci.org/visionmedia/express.png)](http://travis-ci.org/visionmedia/express) [![Dependency Status](https://gemnasium.com/visionmedia/express.png)](https://gemnasium.com/visionmedia/express)"
@@ -48,14 +48,14 @@ public class MarkdownUtilTest {
   }
 
   @Test
-  public void testRemoveImageEdgeCase() throws Exception {
+  public void testRemoveImageEdgeCase() {
     List<String> markdown = Arrays.asList("[![logo](http://localhost/logo.png)]");
     MarkdownUtil.removeImages(markdown);
     Assert.assertEquals(Arrays.asList("[]"),markdown);
   }
 
   @Test
-  public void testReplaceCodeBlocks() throws Exception {
+  public void testReplaceCodeBlocks() {
     List<String> markdown = Arrays.asList(" Create the app:",
                                           "",
                                           "    $ npm install -g express",
@@ -68,7 +68,7 @@ public class MarkdownUtilTest {
   }
 
   @Test
-  public void testReplaceCodeBlocks2() throws Exception {
+  public void testReplaceCodeBlocks2() {
     List<String> markdown = Arrays.asList(
       "   text",
       "    code block",
@@ -98,7 +98,7 @@ public class MarkdownUtilTest {
   }
 
   @Test
-  public void testReplaceLists1() throws Exception {
+  public void testReplaceLists1() {
     List<String> markdown = Arrays.asList(
       "*   Red",
       "*   Green",
@@ -116,7 +116,7 @@ public class MarkdownUtilTest {
   }
 
   @Test
-  public void testReplaceLists2() throws Exception {
+  public void testReplaceLists2() {
     List<String> markdown = Arrays.asList(
       "1.   Red",
       "",
@@ -134,7 +134,7 @@ public class MarkdownUtilTest {
   }
 
   @Test
-  public void testReplaceLists3() throws Exception {
+  public void testReplaceLists3() {
     List<String> markdown = Arrays.asList(
       "1986\\. What a great season."
     );
@@ -148,7 +148,7 @@ public class MarkdownUtilTest {
   }
 
   @Test
-  public void testReplaceLists4() throws Exception {
+  public void testReplaceLists4() {
     List<String> markdown = Arrays.asList(
       "+ one two",
       "three",
diff --git a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
index cc3acb45e840..c49c78bf17a0 100644
--- a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
@@ -21,11 +21,11 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.LineSeparator;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.util.XmlStringUtil;
+import jetCheck.Generator;
+import jetCheck.PropertyChecker;
 import org.jdom.Verifier;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
-import jetCheck.Generator;
-import jetCheck.PropertyChecker;
 
 import java.nio.CharBuffer;
 import java.util.Arrays;
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
  */
 public class StringUtilTest {
   @Test
-  public void testTrimLeadingChar() throws Exception {
+  public void testTrimLeadingChar() {
     doTestTrimLeading("", "");
     doTestTrimLeading("", " ");
     doTestTrimLeading("", "    ");
@@ -49,7 +49,7 @@ public class StringUtilTest {
   }
 
   @Test
-  public void testTrimTrailingChar() throws Exception {
+  public void testTrimTrailingChar() {
     doTestTrimTrailing("", "");
     doTestTrimTrailing("", " ");
     doTestTrimTrailing("", "    ");
@@ -94,7 +94,7 @@ public class StringUtilTest {
   }
 
   @Test
-  public void testIsEmptyOrSpaces() throws Exception {
+  public void testIsEmptyOrSpaces() {
     assertTrue(StringUtil.isEmptyOrSpaces(null));
     assertTrue(StringUtil.isEmptyOrSpaces(""));
     assertTrue(StringUtil.isEmptyOrSpaces("                   "));
diff --git a/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerUtilTest.java b/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerUtilTest.java
index 5214b66928c9..0eeceae97371 100644
--- a/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerUtilTest.java
@@ -29,14 +29,14 @@ public class XmlSerializerUtilTest extends TestCase {
     assertEquals("x", copy.s);
   }
 
-  public void testCopyBeanOfSameClass() throws Exception {
+  public void testCopyBeanOfSameClass() {
     BaseBean to = new BaseBean();
     XmlSerializerUtil.copyBean(new BaseBean("a", 1), to);
     assertEquals(1, to.i);
     assertEquals("a", to.s);
   }
 
-  public void testCopyBeanToInheritor() throws Exception {
+  public void testCopyBeanToInheritor() {
     InheritedBean to = new InheritedBean();
     to.b = true;
     XmlSerializerUtil.copyBean(new BaseBean("a", 1), to);
diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ConvertExcludedToIgnoredTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ConvertExcludedToIgnoredTest.java
index 3957d425553d..f7959dc9f12d 100644
--- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ConvertExcludedToIgnoredTest.java
+++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ConvertExcludedToIgnoredTest.java
@@ -41,7 +41,7 @@ public class ConvertExcludedToIgnoredTest extends PlatformTestCase {
     PsiTestUtil.addContentRoot(myModule, myContentRoot);
   }
 
-  public void testExcludedFolder() throws IOException {
+  public void testExcludedFolder() {
     VirtualFile excluded = createChildDirectory(myContentRoot, "exc");
     PsiTestUtil.addExcludedRoot(myModule, excluded);
     getChangeListManager().convertExcludedToIgnored();
@@ -50,7 +50,7 @@ public class ConvertExcludedToIgnoredTest extends PlatformTestCase {
     assertIgnored(excluded);
   }
 
-  public void testModuleOutput() throws IOException {
+  public void testModuleOutput() {
     VirtualFile output = createChildDirectory(myContentRoot, "out");
     PsiTestUtil.setCompilerOutputPath(myModule, output.getUrl(), false);
     getChangeListManager().convertExcludedToIgnored();
@@ -78,7 +78,7 @@ public class ConvertExcludedToIgnoredTest extends PlatformTestCase {
     assertIgnored(output);
   }
 
-  public void testModuleOutputUnderExcluded() throws IOException {
+  public void testModuleOutputUnderExcluded() {
     VirtualFile excluded = createChildDirectory(myContentRoot, "target");
     PsiTestUtil.addExcludedRoot(myModule, excluded);
     VirtualFile moduleOutput = createChildDirectory(excluded, "classes");
@@ -89,7 +89,7 @@ public class ConvertExcludedToIgnoredTest extends PlatformTestCase {
     assertIgnored(excluded);
   }
 
-  public void testDoNotIgnoreInnerModuleExplicitlyMarkedAsExcludedFromOuterModule() throws IOException {
+  public void testDoNotIgnoreInnerModuleExplicitlyMarkedAsExcludedFromOuterModule() {
     VirtualFile inner = createChildDirectory(myContentRoot, "inner");
     PsiTestUtil.addModule(myProject, ModuleType.EMPTY, "inner", inner);
     PsiTestUtil.addExcludedRoot(myModule, inner);
diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ui/HierarchicalFilePathComparatorTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ui/HierarchicalFilePathComparatorTest.java
index f20adac22f07..d6df64073f76 100644
--- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ui/HierarchicalFilePathComparatorTest.java
+++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/changes/ui/HierarchicalFilePathComparatorTest.java
@@ -29,65 +29,65 @@ import java.util.Collection;
 import java.util.List;
 
 public class HierarchicalFilePathComparatorTest extends TestCase {
-  public void testInOneDirectory() throws Exception {
+  public void testInOneDirectory() {
     assertEquals(-1, compare("~/project/A.java", "~/project/B.java"));
     assertEquals(1, compare("~/project/Z.java", "~/project/B.java"));
   }
 
-  public void testInDifferentDirs() throws Exception {
+  public void testInDifferentDirs() {
     assertEquals(-1, compare("~/project/aaa/A.java", "~/project/bbb/B.java"));
     assertEquals(-1, compare("~/project/aaa/B.java", "~/project/zzz/A.java"));
     assertEquals(1, compare("~/project/zzz/A.java", "~/project/aaa/B.java"));
   }
 
-  public void testInSubDir() throws Exception {
+  public void testInSubDir() {
     // all folders precede plain files
     assertEquals("Folders should precede plain files", -1, compare("~/project/dir/subdir/A.java", "~/project/dir/B.java"));
     assertEquals("Folders should precede plain files", -1, compare("~/project/dir/A.java", "~/project/B.java"));
     assertEquals("Folders should precede plain files", 1, compare("~/project/B.java", "~/project/dir/subdir/A.java"));
   }
 
-  public void testEqualPaths() throws Exception {
+  public void testEqualPaths() {
     assertEquals("Equal paths should compare to 0", 0, compare("~/project/A.java", "~/project/A.java"));
     assertEquals("Equal paths should compare to 0", 0, compare("~/project/aaa/A.java", "~/project/aaa/A.java"));
   }
 
-  public void testEmptyPaths() throws Exception {
+  public void testEmptyPaths() {
     assertEquals(0, compare("", ""));
   }
 
-  public void testSamePrefixFolder() throws Exception {
+  public void testSamePrefixFolder() {
     assertEquals(-1, compare("~/project/aaa/", "~/project/aaa-qwe/"));
     assertEquals(-1, compare("~/project/aaa/A.java", "~/project/aaa-qwe/A.java"));
     assertEquals(1, compare("~/project/zzz-qwe.java", "~/project/zzz/"));
   }
 
-  public void testRootDirectory() throws Exception {
+  public void testRootDirectory() {
     assertEquals(0, compare("A.java", "A.java"));
     assertEquals(0, compare("/aaa/", "/aaa/"));
     assertEquals(-1, compare("/aaa/", "/aaa-qwe/"));
     assertEquals(-1, compare("/aaa/", "/ZZ.java"));
   }
 
-  public void testCaseIgnored() throws Exception {
+  public void testCaseIgnored() {
     assertEquals(-1, compare("a.java", "B.java"));
     assertEquals(-1, compare("A.java", "b.java"));
   }
 
-  public void testAssociativeBug() throws Exception {
+  public void testAssociativeBug() {
     assertEquals(1, compare("/folder/aaa-qwerty/", "/folder/aaa/"));
     assertEquals(1, compare("/folder/aaa/.gitignore", "/folder/aaa/"));
     assertEquals(-1, compare("/folder/aaa/.gitignore", "/folder/aaa-qwerty/"));
     assertEquals(1, compare("/folder/aaa-qwerty/qwerty", "/folder/aaa/qwerty/"));
   }
 
-  public void testTransitiveBug() throws Exception {
+  public void testTransitiveBug() {
     assertEquals(1, compare("/folder/abd", "/folder/abd/"));
     assertEquals(1, compare("/folder/abx/", "/folder/abd/"));
     assertEquals(-1, compare("/folder/abx/", "/folder/abd"));
   }
 
-  public void testTransitive() throws Exception {
+  public void testTransitive() {
     Collection<String> paths = ContainerUtil.list(
       "",
       "/",
diff --git a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockContentRevision.java b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockContentRevision.java
index 7ae5366baaf6..5a9a132f6dc6 100644
--- a/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockContentRevision.java
+++ b/platform/vcs-impl/testSrc/com/intellij/testFramework/vcs/MockContentRevision.java
@@ -17,7 +17,6 @@
 package com.intellij.testFramework.vcs;
 
 import com.intellij.openapi.vcs.FilePath;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.ContentRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import org.jetbrains.annotations.NotNull;
@@ -37,7 +36,7 @@ public class MockContentRevision implements ContentRevision {
 
   @Override
   @Nullable
-  public String getContent() throws VcsException {
+  public String getContent() {
     return null;
   }
 
diff --git a/platform/vcs-log/impl/test/com/intellij/vcs/log/data/VcsLogRefresherTest.java b/platform/vcs-log/impl/test/com/intellij/vcs/log/data/VcsLogRefresherTest.java
index f13e73ecb1e8..a1c2f9961ecc 100644
--- a/platform/vcs-log/impl/test/com/intellij/vcs/log/data/VcsLogRefresherTest.java
+++ b/platform/vcs-log/impl/test/com/intellij/vcs/log/data/VcsLogRefresherTest.java
@@ -106,14 +106,14 @@ public class VcsLogRefresherTest extends VcsPlatformTest {
     myDataWaiter.get();
   }
 
-  public void test_first_refresh_reports_full_history() throws InterruptedException, ExecutionException, TimeoutException {
+  public void test_first_refresh_reports_full_history() throws InterruptedException {
     myLoader.readFirstBlock();
 
     DataPack result = myDataWaiter.get();
     assertDataPack(log(myCommits), result.getPermanentGraph().getAllCommits());
   }
 
-  public void test_first_refresh_waits_for_full_log() throws InterruptedException, ExecutionException, TimeoutException {
+  public void test_first_refresh_waits_for_full_log() throws InterruptedException {
     myLogProvider.blockFullLog();
     myLoader.readFirstBlock();
     assertTimeout("Refresh waiter should have failed on the timeout");
@@ -194,7 +194,7 @@ public class VcsLogRefresherTest extends VcsPlatformTest {
     assertNoMoreResultsArrive();
   }
 
-  private void assertTimeout(@NotNull String message) throws InterruptedException, ExecutionException {
+  private void assertTimeout(@NotNull String message) throws InterruptedException {
     assertNull(message, myDataWaiter.myQueue.poll(500, TimeUnit.MILLISECONDS));
   }
 
diff --git a/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/TestVcsLogProvider.java b/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/TestVcsLogProvider.java
index 2db06ffb152d..4b45a6cced30 100644
--- a/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/TestVcsLogProvider.java
+++ b/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/TestVcsLogProvider.java
@@ -17,7 +17,6 @@ package com.intellij.vcs.log.impl;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsKey;
 import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -32,7 +31,6 @@ import org.jetbrains.annotations.Nullable;
 import java.awt.*;
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.IOException;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.Semaphore;
@@ -88,7 +86,7 @@ public class TestVcsLogProvider implements VcsLogProvider {
 
   @NotNull
   @Override
-  public DetailedLogData readFirstBlock(@NotNull final VirtualFile root, @NotNull Requirements requirements) throws VcsException {
+  public DetailedLogData readFirstBlock(@NotNull final VirtualFile root, @NotNull Requirements requirements) {
     LOG.debug("readFirstBlock began");
     if (requirements instanceof VcsLogProviderRequirementsEx && ((VcsLogProviderRequirementsEx)requirements).isRefresh()) {
       try {
@@ -108,7 +106,7 @@ public class TestVcsLogProvider implements VcsLogProvider {
 
   @NotNull
   @Override
-  public LogData readAllHashes(@NotNull VirtualFile root, @NotNull Consumer<TimedVcsCommit> commitConsumer) throws VcsException {
+  public LogData readAllHashes(@NotNull VirtualFile root, @NotNull Consumer<TimedVcsCommit> commitConsumer) {
     LOG.debug("readAllHashes");
     try {
       myFullLogSemaphore.acquire();
@@ -125,7 +123,7 @@ public class TestVcsLogProvider implements VcsLogProvider {
   }
 
   @Override
-  public void readAllFullDetails(@NotNull VirtualFile root, @NotNull Consumer<VcsFullCommitDetails> commitConsumer) throws VcsException {
+  public void readAllFullDetails(@NotNull VirtualFile root, @NotNull Consumer<VcsFullCommitDetails> commitConsumer) {
     throw new UnsupportedOperationException();
   }
 
@@ -133,7 +131,7 @@ public class TestVcsLogProvider implements VcsLogProvider {
   public void readFullDetails(@NotNull VirtualFile root,
                               @NotNull List<String> hashes,
                               @NotNull Consumer<VcsFullCommitDetails> commitConsumer,
-                              boolean fast) throws VcsException {
+                              boolean fast) {
     throw new UnsupportedOperationException();
   }
 
@@ -143,8 +141,7 @@ public class TestVcsLogProvider implements VcsLogProvider {
 
   @NotNull
   @Override
-  public List<? extends VcsShortCommitDetails> readShortDetails(@NotNull VirtualFile root, @NotNull List<String> hashes)
-    throws VcsException {
+  public List<? extends VcsShortCommitDetails> readShortDetails(@NotNull VirtualFile root, @NotNull List<String> hashes) {
     throw new UnsupportedOperationException();
   }
 
@@ -174,20 +171,20 @@ public class TestVcsLogProvider implements VcsLogProvider {
   @Override
   public List<TimedVcsCommit> getCommitsMatchingFilter(@NotNull VirtualFile root,
                                                        @NotNull VcsLogFilterCollection filterCollection,
-                                                       int maxCount) throws VcsException {
+                                                       int maxCount) {
     if (myFilteredCommitsProvider == null) throw new UnsupportedOperationException();
     return myFilteredCommitsProvider.fun(filterCollection);
   }
 
   @Nullable
   @Override
-  public VcsUser getCurrentUser(@NotNull VirtualFile root) throws VcsException {
+  public VcsUser getCurrentUser(@NotNull VirtualFile root) {
     return DEFAULT_USER;
   }
 
   @NotNull
   @Override
-  public Collection<String> getContainingBranches(@NotNull VirtualFile root, @NotNull Hash commitHash) throws VcsException {
+  public Collection<String> getContainingBranches(@NotNull VirtualFile root, @NotNull Hash commitHash) {
     throw new UnsupportedOperationException();
   }
 
@@ -207,7 +204,7 @@ public class TestVcsLogProvider implements VcsLogProvider {
     myRefreshSemaphore.unblock();
   }
 
-  public void blockFullLog() throws InterruptedException {
+  public void blockFullLog() {
     myFullLogSemaphore.block();
   }
 
@@ -264,12 +261,12 @@ public class TestVcsLogProvider implements VcsLogProvider {
     }
 
     @Override
-    public void serialize(@NotNull DataOutput out, @NotNull VcsRefType type) throws IOException {
+    public void serialize(@NotNull DataOutput out, @NotNull VcsRefType type) {
     }
 
     @NotNull
     @Override
-    public VcsRefType deserialize(@NotNull DataInput in) throws IOException {
+    public VcsRefType deserialize(@NotNull DataInput in) {
       throw new UnsupportedOperationException();
     }
 
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/AnnotationShortNameTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/AnnotationShortNameTest.java
index eb9dfb6f1173..069261273a23 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/AnnotationShortNameTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/AnnotationShortNameTest.java
@@ -26,7 +26,7 @@ import static com.intellij.openapi.vcs.actions.ShortNameType.LASTNAME;
  * @author Konstantin Bulenkov
  */
 public class AnnotationShortNameTest extends TestCase {
-  public void testShortNames() throws Exception {
+  public void testShortNames() {
     doTest(FIRSTNAME, "Vasya Pavlovich Pupkin <asdasd@localhost>", "Vasya");
     doTest(LASTNAME, "Vasya Pavlovich Pupkin <asdasd@localhost>", "Pupkin");
     doTest(FIRSTNAME, "Vasya Pavlovich Pupkin", "Vasya");
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/BaseLineStatusTrackerTestCase.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/BaseLineStatusTrackerTestCase.java
index b3f06d89eac6..4bf70b4f6a0f 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/BaseLineStatusTrackerTestCase.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/BaseLineStatusTrackerTestCase.java
@@ -116,7 +116,7 @@ public abstract class BaseLineStatusTrackerTestCase extends LightPlatformTestCas
     }
   }
 
-  protected void checkCantTrim() throws Throwable {
+  protected void checkCantTrim() {
     List<Range> ranges = myTracker.getRanges();
     for (Range range : ranges) {
       if (range.getType() != Range.MODIFIED) continue;
@@ -135,14 +135,14 @@ public abstract class BaseLineStatusTrackerTestCase extends LightPlatformTestCas
     }
   }
 
-  protected void checkCantMerge() throws Throwable {
+  protected void checkCantMerge() {
     List<Range> ranges = myTracker.getRanges();
     for (int i = 0; i < ranges.size() - 1; i++) {
       assertFalse(ranges.get(i).getLine2() == ranges.get(i + 1).getLine1());
     }
   }
 
-  protected void checkInnerRanges() throws Throwable {
+  protected void checkInnerRanges() {
     List<Range> ranges = myTracker.getRangesInner();
 
     for (Range range : ranges) {
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/DirectoryMappingListTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/DirectoryMappingListTest.java
index aa0c04eb51d8..e83e335995cf 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/DirectoryMappingListTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/DirectoryMappingListTest.java
@@ -35,7 +35,6 @@ import junit.framework.Assert;
 import org.jetbrains.annotations.NonNls;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Arrays;
 
 /**
@@ -80,7 +79,7 @@ public class DirectoryMappingListTest extends PlatformTestCase {
     super.tearDown();
   }
 
-  public void testMappingsFilter() throws Exception {
+  public void testMappingsFilter() {
     final ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
     ((MockAbstractVcs) vcsManager.findVcsByName("mock")).setAllowNestedRoots(true);
 
@@ -113,7 +112,7 @@ public class DirectoryMappingListTest extends PlatformTestCase {
     assertEquals(5, filePaths.length);
   }
 
-  public void testSamePrefix() throws Exception {
+  public void testSamePrefix() {
     myMappings.setMapping(myRootPath + "/a", "CVS");
     myMappings.setMapping(myRootPath + "/a-b", "mock2");
     assertEquals(3, myMappings.getDirectoryMappings().size());
@@ -123,12 +122,12 @@ public class DirectoryMappingListTest extends PlatformTestCase {
     assertEquals("CVS", myMappings.getVcsFor(myProjectRoot.findChild("a")));
   }
 
-  public void testSamePrefixEmpty() throws Exception {
+  public void testSamePrefixEmpty() {
     myMappings.setMapping(myRootPath + "/a", "CVS");
     assertEquals("", myMappings.getVcsFor(myProjectRoot.findChild("a-b")));
   }
 
-  public void testSame() throws Exception {
+  public void testSame() {
     myMappings.removeDirectoryMapping(new VcsDirectoryMapping("", ""));
     myMappings.setMapping(myRootPath + "/parent/path", "CVS");
 
@@ -149,7 +148,7 @@ public class DirectoryMappingListTest extends PlatformTestCase {
     }
   }
 
-  public void testHierarchy() throws Exception {
+  public void testHierarchy() {
     myMappings.removeDirectoryMapping(new VcsDirectoryMapping("", ""));
     myMappings.setMapping(myRootPath + "/parent", "CVS");
 
@@ -165,7 +164,7 @@ public class DirectoryMappingListTest extends PlatformTestCase {
     }
   }
 
-  public void testNestedInnerCopy() throws Exception {
+  public void testNestedInnerCopy() {
     myMappings.removeDirectoryMapping(new VcsDirectoryMapping("", ""));
     myMappings.setMapping(myRootPath + "/parent", "CVS");
     myMappings.setMapping(myRootPath + "/parent/child", "mock");
@@ -188,7 +187,7 @@ public class DirectoryMappingListTest extends PlatformTestCase {
     }
   }
 
-  private static void createFiles(final String[] paths) throws IOException {
+  private static void createFiles(final String[] paths) {
     for (String path : paths) {
       final File file = new File(FileUtil.toSystemDependentName(path));
       assert file.mkdirs() || file.isDirectory() : file;
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ErrorMessageTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ErrorMessageTest.java
index e7d41027e196..de1b45231ad9 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ErrorMessageTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/ErrorMessageTest.java
@@ -19,7 +19,7 @@ import junit.framework.TestCase;
 import org.jetbrains.annotations.NonNls;
 
 @NonNls public class ErrorMessageTest extends TestCase {
-  public void test() throws Exception{
+  public void test() {
 
     doTest(1, 1, "One error and one warning found.");
     doTest(0, 1, "No errors and one warning found.");
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/HackSearchTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/HackSearchTest.java
index 2e9e56d37967..a0d7286dc9bc 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/HackSearchTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/HackSearchTest.java
@@ -36,25 +36,25 @@ public class HackSearchTest extends TestCase {
     mySearch = new HackSearch<>(o -> new Z(o.getInt()), o -> new Z(o.getInt()), new ZComparator());
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     final int idx = mySearch.search(Arrays.asList(new S[]{s(1), s(2), s(4), s(10)}), new T(5));
     Assert.assertEquals(3, idx);
   }
 
-  public void testSame() throws Exception {
+  public void testSame() {
     final int idx = mySearch.search(Arrays.asList(new S[]{s(1), s(2), s(4), s(5), s(10)}), new T(5));
     Assert.assertEquals(3, idx);
   }
 
-  public void testBefore() throws Exception {
+  public void testBefore() {
     final int idx = mySearch.search(Arrays.asList(new S[]{s(10), s(20), s(40), s(50), s(60)}), new T(5));
     Assert.assertEquals(0, idx);
   }
-  public void testFirst() throws Exception {
+  public void testFirst() {
     final int idx = mySearch.search(Arrays.asList(new S[]{s(1), s(2), s(4), s(5), s(10)}), new T(1));
     Assert.assertEquals(0, idx);
   }
-  public void testLast() throws Exception {
+  public void testLast() {
     final int idx = mySearch.search(Arrays.asList(new S[]{s(1), s(2), s(4), s(5), s(10)}), new T(15));
     Assert.assertEquals(5, idx);
   }
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/IgnoreIdeaLevelTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/IgnoreIdeaLevelTest.java
index d44fa8ad39a8..ddccccdac3f2 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/IgnoreIdeaLevelTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/IgnoreIdeaLevelTest.java
@@ -72,7 +72,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
     Disposer.register(getTestRootDisposable(), dialog.getDisposable());
   }
 
-  private void createOutsideModule() throws IOException {
+  private void createOutsideModule() {
     final VirtualFile baseDir = myProject.getBaseDir();
     assertNotNull(baseDir);
     final VirtualFile baseParent = baseDir.getParent();
@@ -129,10 +129,10 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
     private VirtualFile myF3Outside;
     private VirtualFile myF4Outside;
 
-    private FileStructure(final VirtualFile baseDir, final VirtualFile outsideDir) throws Throwable {
+    private FileStructure(final VirtualFile baseDir, final VirtualFile outsideDir) {
       new WriteAction() {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           try {
             myABase = baseDir.createChildDirectory(this, "a");
             myBBase = myABase.createChildDirectory(this, "b");
@@ -158,7 +158,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
     }
   }
 
-  public void testRoots() throws Exception {
+  public void testRoots() {
     assertEquals(2, myVcsManager.getAllVcsRoots().length);
   }
 
@@ -204,7 +204,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testSimple() throws Throwable {
+  public void testSimple() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     final IgnoredFileBean bean1 = IgnoredBeanFactory.ignoreFile(fs.myF1Base.getPath(), myProject);
@@ -223,7 +223,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testSimpleStrasse() throws Throwable {
+  public void testSimpleStrasse() {
     final VirtualFile file = createFileInCommand(myProject.getBaseDir(), "Straße", "123");
     final VirtualFile file2 = createFileInCommand(myProject.getBaseDir(), "Strasse", "123");
 
@@ -239,7 +239,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testPatterns() throws Throwable {
+  public void testPatterns() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     final IgnoredFileBean bean1 = IgnoredBeanFactory.withMask("*1.txt");
@@ -254,7 +254,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testDirs() throws Throwable {
+  public void testDirs() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     final IgnoredFileBean bean1 = IgnoredBeanFactory.ignoreUnderDirectory(fs.myBBase.getPath(), myProject);
@@ -279,7 +279,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testTypedAbsolute() throws Throwable {
+  public void testTypedAbsolute() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     String baseUnder = myProject.getBaseDir().getPath();
@@ -302,7 +302,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testTypedAbsoluteSeparator() throws Throwable {
+  public void testTypedAbsoluteSeparator() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     String baseUnder = myProject.getBaseDir().getPath();
@@ -326,7 +326,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testTypedRelativeInsideSeparator() throws Throwable {
+  public void testTypedRelativeInsideSeparator() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     final IgnoredFileBean bean1 = IgnoredBeanFactory.ignoreUnderDirectory("a" + File.separator + "b", myProject);
@@ -344,7 +344,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testTypedRelativeInside() throws Throwable {
+  public void testTypedRelativeInside() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     final IgnoredFileBean bean1 = IgnoredBeanFactory.ignoreUnderDirectory("a/b", myProject);
@@ -362,7 +362,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testTypedRelativeOutsideSeparator() throws Throwable {
+  public void testTypedRelativeOutsideSeparator() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     String baseUnder = myModuleRoot.getPath();
@@ -386,7 +386,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testTypedRelativeOutside() throws Throwable {
+  public void testTypedRelativeOutside() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
 
     String baseUnder = myModuleRoot.getPath();
@@ -409,7 +409,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testDoNotAddAlreadyIgnoredDirectory() throws Throwable {
+  public void testDoNotAddAlreadyIgnoredDirectory() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
     myClManager.addDirectoryToIgnoreImplicitly(fs.myABase.getPath());
     myClManager.addDirectoryToIgnoreImplicitly(fs.myBBase.getPath());
@@ -418,7 +418,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testRemoveChildIgnoredDirectoryWhenParentIsAdded() throws Throwable {
+  public void testRemoveChildIgnoredDirectoryWhenParentIsAdded() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
     myClManager.addDirectoryToIgnoreImplicitly(fs.myBBase.getPath());
     myClManager.addDirectoryToIgnoreImplicitly(fs.myCBase.getPath());
@@ -427,7 +427,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testManuallyRemovedFromIgnored() throws Throwable {
+  public void testManuallyRemovedFromIgnored() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
     myClManager.getIgnoredFilesComponent().setDirectoriesManuallyRemovedFromIgnored(Collections.singleton(fs.myBBase.getPath()));
     myClManager.addDirectoryToIgnoreImplicitly(fs.myBBase.getPath());
@@ -436,7 +436,7 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
   }
 
   @Test
-  public void testRemovingFromImplicitlyIgnored() throws Throwable {
+  public void testRemovingFromImplicitlyIgnored() {
     final FileStructure fs = new FileStructure(myProject.getBaseDir(), myModuleRoot);
     myClManager.addDirectoryToIgnoreImplicitly(fs.myBBase.getPath());
     myClManager.addDirectoryToIgnoreImplicitly(fs.myCBase.getPath());
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerRevertAutoTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerRevertAutoTest.java
index ed269c89b94f..de60c38e6c26 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerRevertAutoTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/LineStatusTrackerRevertAutoTest.java
@@ -152,7 +152,7 @@ public class LineStatusTrackerRevertAutoTest extends BaseLineStatusTrackerTestCa
     assertEquals(myDocument.getText(), myUpToDateDocument.getText());
   }
 
-  private void checkRevertComplex(int iterations) throws Exception {
+  private void checkRevertComplex(int iterations) {
     BitSet lines = new BitSet();
 
     for (int i = 0; i < iterations; i++) {
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PatchAutoInitTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PatchAutoInitTest.java
index c4d2489062b6..78f77bfb2c1d 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PatchAutoInitTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/PatchAutoInitTest.java
@@ -39,7 +39,7 @@ import java.util.List;
 public class PatchAutoInitTest extends PlatformTestCase {
   private static final String BINARY_FILENAME = "binary.png";
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     final VirtualFile root = myProject.getBaseDir();
     final VirtualFile dir = createChildDirectory(root, "dir");
     createChildData(dir, "somefile.txt");
@@ -77,7 +77,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
   }
 
   // 1. several files with different bases; one can be matched to 2 bases
-  public void testDiffBases() throws Exception {
+  public void testDiffBases() {
     final VirtualFile root = myProject.getBaseDir();
 
     PsiTestUtil.addContentRoot(myModule, root);
@@ -115,7 +115,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
     checkPath(result, "c/" + BINARY_FILENAME, Arrays.asList(b, f), 0);
   }
 
-  public void testBestBinaryVariant() throws Exception {
+  public void testBestBinaryVariant() {
     final VirtualFile root = myProject.getBaseDir();
 
     PsiTestUtil.addContentRoot(myModule, root);
@@ -145,19 +145,19 @@ public class PatchAutoInitTest extends PlatformTestCase {
   }
 
   // inspired by IDEA-109608
-  public void testFileAdditionGoesIntoCorrectFolder() throws Exception {
+  public void testFileAdditionGoesIntoCorrectFolder() {
     String path = "platform/util/src/com/intellij/util/io/SomeNewFile.java";
     TextFilePatch patch = createFileAddition(path);
     checkSingleFileOperationAmongSimilarFolders(path, patch);
   }
 
-  public void testFileDeletionFromCorrectFolder() throws Exception {
+  public void testFileDeletionFromCorrectFolder() {
     String path = "platform/util/src/com/intellij/util/io/G.java";
     TextFilePatch patch = createFileDeletion(path);
     checkSingleFileOperationAmongSimilarFolders(path, patch);
   }
 
-  public void testFileModificationFromCorrectFolder() throws Exception {
+  public void testFileModificationFromCorrectFolder() {
     String path = "platform/platform-impl/src/io/B.java";
     TextFilePatch patch = create(path);
     checkSingleFileOperationAmongSimilarFolders(path, patch);
@@ -183,7 +183,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
   }
 
   // inspired by IDEA-118644
-  public void testFileAdditionToNonexistentSubfolder() throws Exception {
+  public void testFileAdditionToNonexistentSubfolder() {
     final VirtualFile root = myProject.getBaseDir();
     PsiTestUtil.addContentRoot(myModule, root);
     VfsTestUtil.createDir(root, "platform/editor-ui-ex/src/com/intellij/openapi/editor/colors");
@@ -200,7 +200,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
     checkPath(result, path, Collections.singletonList(root), 0);
   }
 
-  public void testFileAdditionGeneratedFromSuperRoot() throws Exception {
+  public void testFileAdditionGeneratedFromSuperRoot() {
     final VirtualFile root = myProject.getBaseDir();
     PsiTestUtil.addContentRoot(myModule, root);
     VfsTestUtil.createDir(root, "editor-ui-ex/src/com/intellij/openapi/editor/colors");
@@ -236,7 +236,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
   }
 
   // 2. files can be for 1 dir and 1 strip distance
-  public void testOneBaseAndStrip() throws Exception {
+  public void testOneBaseAndStrip() {
     final VirtualFile root = myProject.getBaseDir();
 
     PsiTestUtil.addContentRoot(myModule, root);
@@ -267,7 +267,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
   }
 
   // 3. files can be with 2 base dirs and 1-one distance, 2-different distances
-  public void testOneBaseAndDifferentStrips() throws Exception {
+  public void testOneBaseAndDifferentStrips() {
     final VirtualFile root = myProject.getBaseDir();
 
     PsiTestUtil.addContentRoot(myModule, root);
@@ -303,7 +303,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
     checkPath(result, "h1/c/f2.txt", Collections.singletonList(e), 0);
   }
 
-  public void testPreviousFirstVariantAlsoMatches() throws Exception {
+  public void testPreviousFirstVariantAlsoMatches() {
     final VirtualFile root = myProject.getBaseDir();
 
     PsiTestUtil.addContentRoot(myModule, root);
@@ -328,7 +328,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
     checkPath(result, "c/" + BINARY_FILENAME, Collections.singletonList(b), 2);
   }
 
-  public void testDefaultStrategyWorks() throws Exception {
+  public void testDefaultStrategyWorks() {
     final VirtualFile root = myProject.getBaseDir();
 
     PsiTestUtil.addContentRoot(myModule, root);
@@ -356,7 +356,7 @@ public class PatchAutoInitTest extends PlatformTestCase {
     checkPath(result, "h1/c/f10.txt", Collections.singletonList(root), 0);
   }
 
-  public void testExactWins() throws Exception {
+  public void testExactWins() {
     final VirtualFile root = myProject.getBaseDir();
 
     PsiTestUtil.addContentRoot(myModule, root);
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/RollbackTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/RollbackTest.java
index 8bdb255d52cd..763277344cfd 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/RollbackTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/RollbackTest.java
@@ -103,7 +103,7 @@ public class RollbackTest extends BaseLineStatusTrackerTestCase{
     doTestRollback("\n1\n2\n3\n4\n5\n6\n7", () -> deleteString(5, 13), Range.DELETED);
   }
 
-  public void testRollbackEmptyLastLineDeletion() throws FilesTooBigForDiffException {
+  public void testRollbackEmptyLastLineDeletion() {
     String text1 = "1\n2\n3\n\n";
     String text2 = "1\n2\n3\n";
     createDocument(text2, text1);
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/BufferedListConsumerTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/BufferedListConsumerTest.java
index cab971bfebad..f3ed797d1d63 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/BufferedListConsumerTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/BufferedListConsumerTest.java
@@ -29,7 +29,7 @@ import java.util.*;
 public class BufferedListConsumerTest extends FileBasedTest {
 
   @Test
-  public void testHugeWriteRead() throws Exception {
+  public void testHugeWriteRead() {
     List<Thread> threads = new ArrayList<>();
     final Random random = new Random(17);
     final Set<Long> src = new HashSet<>(200);
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedChangesCacheTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedChangesCacheTest.java
index 91300298b9b5..8612206fa319 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedChangesCacheTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedChangesCacheTest.java
@@ -84,7 +84,7 @@ public class CommittedChangesCacheTest extends PlatformTestCase {
   }
 
   @Override
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     new RunAll(
       () -> {
         if (myConnection != null) myConnection.disconnect();
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java
index 24c406fc92da..4181bed52cbb 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedListsSequencesZipperTest.java
@@ -31,42 +31,42 @@ import static org.junit.Assert.assertTrue;
 public class CommittedListsSequencesZipperTest {
 
   @Test
-  public void testSimple() throws Exception {
+  public void testSimple() {
     long[][] valuesWithCount = {{1, 3}, {2, 2}, {3, 1}, {5, 1}, {7, 2}, {8, 1}, {17, 1}, {18, 1}, {21, 2}};
 
     check(valuesWithCount, list(1, 2, 7, 8, 18, 21), list(1, 2, 5, 7, 21), list(1, 3, 17));
   }
 
   @Test
-  public void testVar1() throws Exception {
+  public void testVar1() {
     long[][] valuesWithCount = {{1, 1}, {2, 1}, {3, 1}, {5, 1}, {6, 1}, {7, 1}, {11, 1}, {17, 1}, {18, 1}, {22, 1}, {111, 1}};
 
     check(valuesWithCount, list(1, 7, 11, 111), list(2, 6, 18, 22), list(3, 5, 17));
   }
 
   @Test
-  public void testVar2() throws Exception {
+  public void testVar2() {
     long[][] valuesWithCount = {{1, 1}, {2, 1}, {3, 1}, {5, 1}, {6, 1}, {7, 2}, {11, 1}, {17, 1}, {18, 1}, {22, 1}, {111, 1}};
 
     check(valuesWithCount, list(1, 7, 11, 111), list(2, 6, 7, 18, 22), list(3, 5, 17));
   }
 
   @Test
-  public void testVar3() throws Exception {
+  public void testVar3() {
     long[][] valuesWithCount = {{1, 2}, {2, 1}, {3, 1}, {5, 1}, {6, 1}, {7, 1}, {11, 1}, {17, 1}, {18, 1}, {22, 1}, {111, 1}};
 
     check(valuesWithCount, list(1, 7, 11, 111), list(1, 2, 6, 18, 22), list(3, 5, 17));
   }
 
   @Test
-  public void testVar4() throws Exception {
+  public void testVar4() {
     long[][] valuesWithCount = {{1, 1}, {2, 1}, {3, 1}, {5, 1}, {6, 1}, {7, 1}, {11, 1}, {17, 1}, {18, 1}, {22, 1}, {111, 3}};
 
     check(valuesWithCount, list(1, 7, 11, 111), list(2, 6, 18, 22, 111), list(3, 5, 17, 111));
   }
 
   @Test
-  public void testSame() throws Exception {
+  public void testSame() {
     long[][] valuesWithCount = {{1, 3}, {7, 3}, {11, 3}, {111, 3}};
 
     check(valuesWithCount, list(1, 7, 11, 111), list(1, 7, 11, 111), list(1, 7, 11, 111));
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/ExternalChangesDetectionVcsTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/ExternalChangesDetectionVcsTest.java
index 2490c396d6dc..f37c56ccd37c 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/ExternalChangesDetectionVcsTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/ExternalChangesDetectionVcsTest.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -53,7 +52,7 @@ public class ExternalChangesDetectionVcsTest extends AbstractJunitVcsTestCase  {
   private File myClientRoot;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory();
@@ -82,7 +81,7 @@ public class ExternalChangesDetectionVcsTest extends AbstractJunitVcsTestCase  {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         myVcsManager.unregisterVcs(myVcs);
@@ -189,7 +188,7 @@ public class ExternalChangesDetectionVcsTest extends AbstractJunitVcsTestCase  {
     public void getChanges(@NotNull VcsDirtyScope dirtyScope,
                            @NotNull final ChangelistBuilder builder,
                            @NotNull ProgressIndicator progress,
-                           @NotNull ChangeListManagerGate addGate) throws VcsException {
+                           @NotNull ChangeListManagerGate addGate) {
       for (FilePath path : dirtyScope.getDirtyFiles()) {
         builder.processUnversionedFile(path.getVirtualFile());
       }
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/FilterDescendantFilesTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/FilterDescendantFilesTest.java
index 45f8d0bfd23a..590672cbf3fc 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/FilterDescendantFilesTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/FilterDescendantFilesTest.java
@@ -26,13 +26,12 @@ import junit.framework.Assert;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 public class FilterDescendantFilesTest extends PlatformTestCase {
   @Test
-  public void testSecondModuleSameLevelAsProject() throws Throwable {
+  public void testSecondModuleSameLevelAsProject() {
     final File tmpDir = createDir(new File(FileUtil.getTempDirectory()), "tmpDir");
     final File child1 = createDir(tmpDir, "child1");
     final File child2 = createDir(tmpDir, "child2");
@@ -44,7 +43,7 @@ public class FilterDescendantFilesTest extends PlatformTestCase {
   }
 
   @Test
-  public void testUsual() throws Throwable {
+  public void testUsual() {
     File tmp = new File(FileUtil.getTempDirectory());
     final File tmpDir = createDir(tmp, "tmpDir");
     final File child1 = createDir(tmpDir, "child1");
@@ -71,7 +70,7 @@ public class FilterDescendantFilesTest extends PlatformTestCase {
     return result;
   }
 
-  private File createDir(final File parent, final String name) throws IOException {
+  private File createDir(final File parent, final String name) {
     final File result = new File(parent, name);
     for (int i = 0; i < 100; i++) {
       if (result.mkdirs()) break;
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/MockCommittedChangesProvider.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/MockCommittedChangesProvider.java
index 1eef1f5cfc6e..d63091340c4b 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/MockCommittedChangesProvider.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/MockCommittedChangesProvider.java
@@ -71,7 +71,7 @@ public class MockCommittedChangesProvider implements CachingCommittedChangesProv
   }
 
   @Override
-  public List<CommittedChangeListImpl> getCommittedChanges(ChangeBrowserSettings settings, RepositoryLocation location, final int maxCount) throws VcsException {
+  public List<CommittedChangeListImpl> getCommittedChanges(ChangeBrowserSettings settings, RepositoryLocation location, final int maxCount) {
     myRefreshCount++;
     return myChangeLists;
   }
@@ -80,8 +80,7 @@ public class MockCommittedChangesProvider implements CachingCommittedChangesProv
   public void loadCommittedChanges(ChangeBrowserSettings settings,
                                    RepositoryLocation location,
                                    int maxCount,
-                                   AsynchConsumer<CommittedChangeList> consumer)
-    throws VcsException {
+                                   AsynchConsumer<CommittedChangeList> consumer) {
     ++ myRefreshCount;
     for (CommittedChangeListImpl changeList : myChangeLists) {
       consumer.consume(changeList);
@@ -90,7 +89,7 @@ public class MockCommittedChangesProvider implements CachingCommittedChangesProv
   }
 
   @Override
-  public Pair<CommittedChangeListImpl, FilePath> getOneList(VirtualFile file, VcsRevisionNumber number) throws VcsException {
+  public Pair<CommittedChangeListImpl, FilePath> getOneList(VirtualFile file, VcsRevisionNumber number) {
     ++ myRefreshCount;
     return new Pair<>(myChangeLists.get(0), VcsUtil.getFilePath(file));
   }
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/RequestsMergerTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/RequestsMergerTest.java
index 18ddf015de5a..7d89b6acd32c 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/RequestsMergerTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/RequestsMergerTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
 public class RequestsMergerTest extends TestCase {
-  public void testManyIntoOne() throws Exception {
+  public void testManyIntoOne() {
     final MyTestVictim victim = new MyTestVictim();
     final RequestsMerger merger = new RequestsMerger(victim, victim);
 
diff --git a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/SelectionManagerTest.java b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/SelectionManagerTest.java
index 46d483b34927..d2451102fe6d 100644
--- a/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/SelectionManagerTest.java
+++ b/platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/SelectionManagerTest.java
@@ -55,7 +55,7 @@ public class SelectionManagerTest extends PlatformTestCase {
     myCm = new SelectionManager(2, 10, MyConvertor.getInstance());
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     assertClear();
     myCm.toggleSelection(myFs.getNode(myFs.myMiddle1));
     afterMiddle1();
@@ -63,7 +63,7 @@ public class SelectionManagerTest extends PlatformTestCase {
     assertClear();
   }
 
-  public void testSimpleRemove() throws Exception {
+  public void testSimpleRemove() {
     assertClear();
     myCm.toggleSelection(myFs.getNode(myFs.myMiddle1));
     afterMiddle1();
@@ -71,7 +71,7 @@ public class SelectionManagerTest extends PlatformTestCase {
     assertClear();
   }
 
-  public void testCannotChangeChild() throws Exception {
+  public void testCannotChangeChild() {
     assertClear();
     myCm.toggleSelection(myFs.getNode(myFs.myMiddle1));
     afterMiddle1();
@@ -111,7 +111,7 @@ public class SelectionManagerTest extends PlatformTestCase {
     assertNodeState(myFs.myLeaf2, TreeNodeState.HAVE_SELECTED_ABOVE, false);
   }
 
-  public void testLimit() throws Exception {
+  public void testLimit() {
     assertClear();
 
     myCm.toggleSelection(myFs.getNode(myFs.myInner11));
@@ -143,7 +143,7 @@ public class SelectionManagerTest extends PlatformTestCase {
     assertClear();
   }
 
-  public void testCanExpand() throws Exception {
+  public void testCanExpand() {
     assertClear();
     myCm.toggleSelection(myFs.getNode(myFs.myInner11));
     afterInner11();
@@ -153,7 +153,7 @@ public class SelectionManagerTest extends PlatformTestCase {
     assertClear();
   }
 
-  public void testTwoTrees() throws Exception {
+  public void testTwoTrees() {
     final Map<VirtualFile, DefaultMutableTreeNode> middle1map = myFs.createNodeMap(myFs.myMiddle1);
     assertClear();
     myCm.toggleSelection(middle1map.get(myFs.myInner11));
diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/UpdateBreakpointsAfterRenameTest.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/UpdateBreakpointsAfterRenameTest.java
index 30e0a1e2b09d..a77137b1340a 100644
--- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/UpdateBreakpointsAfterRenameTest.java
+++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/UpdateBreakpointsAfterRenameTest.java
@@ -28,7 +28,7 @@ import java.io.File;
  * @author nik
  */
 public class UpdateBreakpointsAfterRenameTest extends XBreakpointsTestCase {
-  public void testRenameFile() throws Exception {
+  public void testRenameFile() {
     final VirtualFile file = createFile("file.txt");
     XLineBreakpoint<?> b = putBreakpoint(file);
     rename(file, "file2.txt");
@@ -36,7 +36,7 @@ public class UpdateBreakpointsAfterRenameTest extends XBreakpointsTestCase {
     assertSame(b, getBreakpointManager().findBreakpointAtLine(XDebuggerTestCase.MY_LINE_BREAKPOINT_TYPE, file, 0));
   }
 
-  public void testMoveFile() throws Exception {
+  public void testMoveFile() {
     final VirtualFile file = createFile("dir/a.txt");
     final VirtualFile targetDir = createFile("dir2/b.txt").getParent();
     final XLineBreakpoint<?> b = putBreakpoint(file);
@@ -44,7 +44,7 @@ public class UpdateBreakpointsAfterRenameTest extends XBreakpointsTestCase {
     assertTrue(b.getFileUrl().endsWith("dir2/a.txt"));
   }
 
-  public void testRenameParentDir() throws Exception {
+  public void testRenameParentDir() {
     final VirtualFile file = createFile("dir/x.txt");
     final XLineBreakpoint<?> b = putBreakpoint(file);
     rename(file.getParent(), "dir2");
diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerSettingsTest.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerSettingsTest.java
index 5d0bc95106dc..4d2a42c91712 100644
--- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerSettingsTest.java
+++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerSettingsTest.java
@@ -38,7 +38,7 @@ public class XDebuggerSettingsTest extends PlatformLiteFixture {
     getApplication().registerService(XDebuggerSettingsManager.class, XDebuggerSettingManagerImpl.class);
   }
 
-  public void testSerialize() throws Exception {
+  public void testSerialize() {
     XDebuggerSettingManagerImpl settingsManager = XDebuggerSettingManagerImpl.getInstanceImpl();
 
     MyDebuggerSettings settings = MyDebuggerSettings.getInstance();
diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java
index bbac804a3065..f340fbfa5cc7 100644
--- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java
+++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java
@@ -48,7 +48,6 @@ import org.jetbrains.concurrency.Promise;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.Semaphore;
@@ -80,7 +79,7 @@ public class XDebuggerTestUtil {
   public static XLineBreakpoint toggleBreakpoint(Project project, VirtualFile file, int line) {
     return new WriteAction<XLineBreakpoint>() {
       @Override
-      protected void run(@NotNull Result<XLineBreakpoint> result) throws Throwable {
+      protected void run(@NotNull Result<XLineBreakpoint> result) {
         Promise<XLineBreakpoint> promise =
           ((XDebuggerUtilImpl)XDebuggerUtil.getInstance()).toggleAndReturnLineBreakpoint(project, file, line, false);
 
@@ -122,11 +121,11 @@ public class XDebuggerTestUtil {
     return session.getSuspendContext().getActiveExecutionStack();
   }
 
-  public static List<XExecutionStack> collectThreads(@NotNull XDebugSession session) throws InterruptedException {
+  public static List<XExecutionStack> collectThreads(@NotNull XDebugSession session) {
     return collectThreadsWithErrors(session).first;
   }
 
-  public static Pair<List<XExecutionStack>, String> collectThreadsWithErrors(@NotNull XDebugSession session) throws InterruptedException {
+  public static Pair<List<XExecutionStack>, String> collectThreadsWithErrors(@NotNull XDebugSession session) {
     XTestExecutionStackContainer container = new XTestExecutionStackContainer();
     session.getSuspendContext().computeExecutionStacks(container);
     return container.waitFor(TIMEOUT_MS);
@@ -147,25 +146,25 @@ public class XDebuggerTestUtil {
     return builder.getBuilder().toString();
   }
 
-  public static List<XStackFrame> collectFrames(@NotNull XExecutionStack thread) throws InterruptedException {
+  public static List<XStackFrame> collectFrames(@NotNull XExecutionStack thread) {
     return collectFrames(thread, TIMEOUT_MS * 2);
   }
 
-  public static List<XStackFrame> collectFrames(XExecutionStack thread, long timeout) throws InterruptedException {
+  public static List<XStackFrame> collectFrames(XExecutionStack thread, long timeout) {
     return collectFramesWithError(thread, timeout).first;
   }
 
-  public static Pair<List<XStackFrame>, String> collectFramesWithError(XExecutionStack thread, long timeout) throws InterruptedException {
+  public static Pair<List<XStackFrame>, String> collectFramesWithError(XExecutionStack thread, long timeout) {
     XTestStackFrameContainer container = new XTestStackFrameContainer();
     thread.computeStackFrames(0, container);
     return container.waitFor(timeout);
   }
 
-  public static Pair<List<XStackFrame>, XStackFrame> collectFramesWithSelected(@NotNull XDebugSession session, long timeout) throws InterruptedException {
+  public static Pair<List<XStackFrame>, XStackFrame> collectFramesWithSelected(@NotNull XDebugSession session, long timeout) {
     return collectFramesWithSelected(getActiveThread(session), timeout);
   }
 
-  public static Pair<List<XStackFrame>, XStackFrame> collectFramesWithSelected(XExecutionStack thread, long timeout) throws InterruptedException {
+  public static Pair<List<XStackFrame>, XStackFrame> collectFramesWithSelected(XExecutionStack thread, long timeout) {
     XTestStackFrameContainer container = new XTestStackFrameContainer();
     thread.computeStackFrames(0, container);
     List<XStackFrame> all = container.waitFor(timeout).first;
@@ -176,11 +175,11 @@ public class XDebuggerTestUtil {
    * @deprecated use {@link XDebuggerTestUtil#collectChildren(XValueContainer)}
    */
   @Deprecated
-  public static List<XValue> collectVariables(XStackFrame frame) throws InterruptedException {
+  public static List<XValue> collectVariables(XStackFrame frame) {
     return collectChildren(frame);
   }
 
-  public static List<XValue> collectChildren(XValueContainer value) throws InterruptedException {
+  public static List<XValue> collectChildren(XValueContainer value) {
     XTestCompositeNode container = new XTestCompositeNode();
     value.computeChildren(container);
     return container.waitFor(TIMEOUT_MS).first;
@@ -208,7 +207,7 @@ public class XDebuggerTestUtil {
     return callback.waitFor(timeout);
   }
 
-  public static void waitForSwing() throws InterruptedException, InvocationTargetException {
+  public static void waitForSwing() throws InterruptedException {
     final com.intellij.util.concurrency.Semaphore s = new com.intellij.util.concurrency.Semaphore();
     s.down();
     ApplicationManager.getApplication().invokeLater(() -> s.up());
@@ -231,11 +230,11 @@ public class XDebuggerTestUtil {
     throw new AssertionError("var '" + name + "' not found among " + names);
   }
 
-  public static XTestValueNode computePresentation(@NotNull XValue value) throws InterruptedException {
+  public static XTestValueNode computePresentation(@NotNull XValue value) {
     return computePresentation(value, TIMEOUT_MS);
   }
 
-  public static XTestValueNode computePresentation(XValue value, long timeout) throws InterruptedException {
+  public static XTestValueNode computePresentation(XValue value, long timeout) {
     XTestValueNode node = new XTestValueNode();
     if (value instanceof XNamedValue) {
       node.myName = ((XNamedValue)value).getName();
@@ -249,7 +248,7 @@ public class XDebuggerTestUtil {
                                     @Nullable String name,
                                     @Nullable String type,
                                     @Nullable String value,
-                                    @Nullable Boolean hasChildren) throws InterruptedException {
+                                    @Nullable Boolean hasChildren) {
     XTestValueNode node = computePresentation(var);
 
     if (name != null) assertEquals(name, node.myName);
@@ -305,7 +304,7 @@ public class XDebuggerTestUtil {
                                                 @Nullable String name,
                                                 @Nullable String type,
                                                 @Nullable @Language("RegExp") String valuePattern,
-                                                @Nullable Boolean hasChildren) throws InterruptedException {
+                                                @Nullable Boolean hasChildren) {
     XTestValueNode node = computePresentation(var);
     if (name != null) assertEquals(name, node.myName);
     if (type != null) assertEquals(type, node.myType);
@@ -323,7 +322,7 @@ public class XDebuggerTestUtil {
 
   public static void assertVariableTypeMatches(@NotNull XValue var,
                                                @Nullable String name,
-                                               @Nullable @Language("RegExp") String typePattern) throws InterruptedException {
+                                               @Nullable @Language("RegExp") String typePattern) {
     XTestValueNode node = computePresentation(var);
     if (name != null) {
       assertEquals(name, node.myName);
@@ -373,7 +372,7 @@ public class XDebuggerTestUtil {
     assertVariableFullValue(findVar(vars, name), value);
   }
 
-  public static void assertVariables(List<XValue> vars, String... names) throws InterruptedException {
+  public static void assertVariables(List<XValue> vars, String... names) {
     List<String> expectedNames = new ArrayList<>(Arrays.asList(names));
 
     List<String> actualNames = new ArrayList<>();
@@ -386,7 +385,7 @@ public class XDebuggerTestUtil {
     UsefulTestCase.assertOrderedEquals(actualNames, expectedNames);
   }
 
-  public static void assertVariablesContain(List<XValue> vars, String... names) throws InterruptedException {
+  public static void assertVariablesContain(List<XValue> vars, String... names) {
     List<String> expectedNames = new ArrayList<>(Arrays.asList(names));
 
     List<String> actualNames = new ArrayList<>();
@@ -441,7 +440,7 @@ public class XDebuggerTestUtil {
   @NotNull
   public static String getConsoleText(final @NotNull ConsoleViewImpl consoleView) {
     new WriteAction() {
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         consoleView.flushDeferredText();
       }
     }.execute();
@@ -457,7 +456,7 @@ public class XDebuggerTestUtil {
     XBreakpointUtil.breakpointTypes().select(exceptionType).findFirst().ifPresent(type ->
       new WriteAction() {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           breakpoint.set(breakpointManager.addBreakpoint(type, properties));
         }
       }.execute()
@@ -471,7 +470,7 @@ public class XDebuggerTestUtil {
     for (final XBreakpoint b : breakpoints) {
       new WriteAction() {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           breakpointManager.removeBreakpoint(b);
         }
       }.execute();
@@ -501,7 +500,7 @@ public class XDebuggerTestUtil {
         if (lineBreakpoint.getLine() == line) {
           new WriteAction() {
             @Override
-            protected void run(@NotNull Result result) throws Throwable {
+            protected void run(@NotNull Result result) {
               lineBreakpoint.setCondition(condition);
             }
           }.execute();
@@ -519,7 +518,7 @@ public class XDebuggerTestUtil {
         if (lineBreakpoint.getLine() == line) {
           new WriteAction() {
             @Override
-            protected void run(@NotNull Result result) throws Throwable {
+            protected void run(@NotNull Result result) {
               lineBreakpoint.setLogExpression(logExpression);
               lineBreakpoint.setLogMessage(true);
             }
@@ -531,7 +530,7 @@ public class XDebuggerTestUtil {
 
   public static void disposeDebugSession(final XDebugSession debugSession) {
     new WriteAction() {
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         XDebugSessionImpl session = (XDebugSessionImpl)debugSession;
         Disposer.dispose(session.getSessionTab());
         Disposer.dispose(session.getConsoleView());
diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDependentBreakpointsTest.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDependentBreakpointsTest.java
index 7047a2f06114..f0342d9a1f2f 100644
--- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDependentBreakpointsTest.java
+++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDependentBreakpointsTest.java
@@ -41,7 +41,7 @@ public class XDependentBreakpointsTest extends XBreakpointsTestCase {
     super.tearDown();
   }
 
-  public void testDelete() throws Exception {
+  public void testDelete() {
     XLineBreakpoint<?> master = createMaster();
     XLineBreakpoint<?> slave = createSlave();
     myDependentBreakpointManager.setMasterBreakpoint(slave, master, true);
@@ -55,7 +55,7 @@ public class XDependentBreakpointsTest extends XBreakpointsTestCase {
     assertEmpty(myDependentBreakpointManager.getAllSlaveBreakpoints());
   }
 
-  public void testSerialize() throws Exception {
+  public void testSerialize() {
     XLineBreakpoint<?> master = createMaster();
     XLineBreakpoint<?> slave = createSlave();
     myDependentBreakpointManager.setMasterBreakpoint(slave, master, true);
diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/impl/actions/AttachToLocalProcessActionTest.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/impl/actions/AttachToLocalProcessActionTest.java
index ab62cf3588f4..195702baf697 100644
--- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/impl/actions/AttachToLocalProcessActionTest.java
+++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/impl/actions/AttachToLocalProcessActionTest.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.xdebugger.impl.actions;
 
-import com.intellij.execution.ExecutionException;
 import com.intellij.execution.process.ProcessInfo;
 import com.intellij.openapi.progress.DumbProgressIndicator;
 import com.intellij.openapi.project.Project;
@@ -36,7 +35,7 @@ import java.util.List;
 import static com.intellij.xdebugger.impl.actions.AttachToLocalProcessAction.*;
 
 public class AttachToLocalProcessActionTest extends PlatformTestCase {
-  public void testCollectingAttachItems_Empty() throws Exception {
+  public void testCollectingAttachItems_Empty() {
     // no providers
     assertItems("");
 
@@ -44,14 +43,14 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
     assertItems("", new TestDebuggerProvider(), new TestDebuggerProvider());
   }
 
-  public void testCollectingAttachItems_OneDebugger() throws Exception {
+  public void testCollectingAttachItems_OneDebugger() {
     assertItems("--------\n" +
                 "1 exec1: dbg\n" +
                 "2 exec2: dbg\n",
                 new TestDebuggerProvider("dbg"));
   }
 
-  public void testCollectingAttachItems_DebuggerPerProcess() throws Exception {
+  public void testCollectingAttachItems_DebuggerPerProcess() {
     // from one provider
     assertItems("--------\n" +
                 "1 exec1: dbg1\n" +
@@ -60,7 +59,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
                 new TestDebuggerProvider(2, XLocalAttachGroup.DEFAULT, "dbg2"));
   }
 
-  public void testCollectingAttachItems_SeveralDebuggers() throws Exception {
+  public void testCollectingAttachItems_SeveralDebuggers() {
     // from one provider
     assertItems("--------\n" +
                 "1 exec1: dbg1\n" +
@@ -113,7 +112,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
                 new TestDebuggerProvider("dbg"));
   }
 
-  public void testCollectingAttachItems_Groups() throws Exception {
+  public void testCollectingAttachItems_Groups() {
     // one group
     assertItems("----group----\n" +
                 "1 exec1: dbg1\n" +
@@ -154,7 +153,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
                 new TestDebuggerProvider(new TestAttachGroup("", 1), "dbg1", "dbg2"));
   }
 
-  public void testCollectingAttachItems_Groups_SortingGroups() throws Exception {
+  public void testCollectingAttachItems_Groups_SortingGroups() {
     assertItems("----group1----\n" +
                 "1 exec1: dbg1\n" +
                 "    dbg1\n" +
@@ -215,7 +214,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
                 new TestDebuggerProvider(new TestAttachGroup("group2", -1), "dbg1", "dbg2"));
   }
 
-  public void testCollectingAttachItems_Groups_SortingItems() throws Exception {
+  public void testCollectingAttachItems_Groups_SortingItems() {
     assertItems("----group----\n" +
                 "1 exec1: dbg1\n" +
                 "2 exec2: dbg1\n",
@@ -236,7 +235,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
                 }, "dbg1"));
   }
 
-  public void testCollectingAttachItems_Groups_CustomItemTitles() throws Exception {
+  public void testCollectingAttachItems_Groups_CustomItemTitles() {
     assertItems("----group----\n" +
                 "1 custom: dbg1\n" +
                 "2 custom: dbg1\n",
@@ -249,7 +248,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
                 }, "dbg1"));
   }
 
-  public void testHistory() throws Exception {
+  public void testHistory() {
     ProcessInfo info1 = new ProcessInfo(1, "command line 1", "exec1", "args1");
     ProcessInfo info2 = new ProcessInfo(1, "command line 2", "exec1", "args1");
     ProcessInfo info3 = new ProcessInfo(1, "command line 3", "exec1", "args1");
@@ -294,7 +293,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
     assertOrderedEquals(getHistory(getProject()), historyItem4, historyItem5, historyItem3, historyItem2);
   }
 
-  public void testHistory_UpdatingPreviousItems() throws Exception {
+  public void testHistory_UpdatingPreviousItems() {
     TestAttachGroup group1 = new TestAttachGroup("group1", 1);
     TestAttachGroup group2 = new TestAttachGroup("group2", 2);
 
@@ -314,7 +313,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
     assertOrderedEquals(getHistory(getProject()), historyItem2);
   }
 
-  public void testHistoryGroup() throws Exception {
+  public void testHistoryGroup() {
     TestAttachGroup group1 = new TestAttachGroup("group1", 1);
     TestAttachGroup group2 = new TestAttachGroup("group2", 2);
     List<XLocalAttachDebugger> debuggers1 = createDebuggers("gdb1", "lldb1");
@@ -614,7 +613,7 @@ public class AttachToLocalProcessActionTest extends PlatformTestCase {
       }
 
       @Override
-      public void attachDebugSession(@NotNull Project project, @NotNull ProcessInfo processInfo) throws ExecutionException {
+      public void attachDebugSession(@NotNull Project project, @NotNull ProcessInfo processInfo) {
       }
     });
   }
diff --git a/plugins/IntelliLang/IntelliLang-tests/test/org/intellij/plugins/intelliLang/ReferenceInjectionTest.java b/plugins/IntelliLang/IntelliLang-tests/test/org/intellij/plugins/intelliLang/ReferenceInjectionTest.java
index 7c43fe7bffe3..883dec82c773 100644
--- a/plugins/IntelliLang/IntelliLang-tests/test/org/intellij/plugins/intelliLang/ReferenceInjectionTest.java
+++ b/plugins/IntelliLang/IntelliLang-tests/test/org/intellij/plugins/intelliLang/ReferenceInjectionTest.java
@@ -19,7 +19,7 @@ import org.jdom.Element;
  *         Date: 02.08.13
  */
 public class ReferenceInjectionTest extends LightCodeInsightFixtureTestCase {
-  public void testInjectReference() throws Exception {
+  public void testInjectReference() {
     myFixture.configureByText("foo.xml", "<foo xmlns=\"http://foo.bar\" \n" +
                                          "     xxx=\"ba<caret>r\"/>");
     assertNull(myFixture.getReferenceAtCaretPosition());
@@ -40,7 +40,7 @@ public class ReferenceInjectionTest extends LightCodeInsightFixtureTestCase {
     assertNull(myFixture.getReferenceAtCaretPosition());
   }
 
-  public void testSurviveSerialization() throws Exception {
+  public void testSurviveSerialization() {
     myFixture.configureByText("foo.xml", "<foo xmlns=\"http://foo.bar\" \n" +
                                          "     xxx=\"ba<caret>r\"/>");
     assertNull(myFixture.getReferenceAtCaretPosition());
@@ -59,7 +59,7 @@ public class ReferenceInjectionTest extends LightCodeInsightFixtureTestCase {
     assertNull(myFixture.getReferenceAtCaretPosition());
   }
 
-  public void testInjectIntoTagValue() throws Exception {
+  public void testInjectIntoTagValue() {
     myFixture.configureByText("foo.xml", "<foo xmlns=\"http://foo.bar\" <bar>x<caret>xx</bar>/>");
     assertNull(myFixture.getReferenceAtCaretPosition());
 
@@ -70,7 +70,7 @@ public class ReferenceInjectionTest extends LightCodeInsightFixtureTestCase {
     assertNull(myFixture.getReferenceAtCaretPosition());
   }
 
-  public void testInjectIntoJava() throws Exception {
+  public void testInjectIntoJava() {
     myFixture.configureByText("Foo.java", "class Foo {\n" +
                                           "    String bar() {\n" +
                                           "        return \"ba<caret>r.xml\";\n" +
@@ -87,7 +87,7 @@ public class ReferenceInjectionTest extends LightCodeInsightFixtureTestCase {
     assertNull(getInjectedReferences());
   }
 
-  public void testInjectByAnnotation() throws Exception {
+  public void testInjectByAnnotation() {
     myFixture.configureByText("Foo.java", "class Foo {\n" +
                                           "    @org.intellij.lang.annotations.Language(\"file-reference\")\n" +
                                           "    String bar() {\n" +
@@ -97,7 +97,7 @@ public class ReferenceInjectionTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testTernary() throws Exception {
+  public void testTernary() {
     myFixture.configureByText("Foo.java", "class Foo {\n" +
                                           "    void bar() {\n" +
                                           "        @org.intellij.lang.annotations.Language(\"encoding-reference\")\n" +
@@ -107,7 +107,7 @@ public class ReferenceInjectionTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testEmptyLiteral() throws Exception {
+  public void testEmptyLiteral() {
     myFixture.configureByText("Foo.java", "class Foo {\n" +
                                           "    void bar() {\n" +
                                           "        @org.intellij.lang.annotations.Language(\"encoding-reference\")\n" +
diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java
index 30dcdce0c87a..db7fadaf72d5 100644
--- a/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java
+++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java
@@ -43,7 +43,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     AntSupport.markFileAsAntFile(myVFile, myFile.getProject(), true);
   }
 
-  public void testSimpleProperty() throws Exception {
+  public void testSimpleProperty() {
     configureByFile("test1.xml");
     performNormalCompletion();
     assertNotNull(getItems());
@@ -51,7 +51,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     select();
   }
 
-  public void testSimplePropertyWithDot1() throws Exception {
+  public void testSimplePropertyWithDot1() {
     configureByFile("test2.xml");
     performNormalCompletion();
     assertNotNull(getItems());
@@ -59,7 +59,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     select();
   }
 
-  public void testSimplePropertyWithDot2() throws Exception {
+  public void testSimplePropertyWithDot2() {
     configureByFile("test4.xml");
     performNormalCompletion();
     assertNotNull(getItems());
@@ -67,7 +67,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     select();
   }
 
-  public void testSimplePropertyWithDot3() throws Exception {
+  public void testSimplePropertyWithDot3() {
     configureByFile("/test5.xml");
     performNormalCompletion();
     assertNotNull(getItems());
@@ -75,7 +75,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     select();
   }
 
-  public void testReplace1() throws Exception {
+  public void testReplace1() {
     configureByFile("test10.xml");
     performNormalCompletion();
     assertNotNull(getItems());
@@ -83,7 +83,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     checkResultByFile("test10-out.xml");
   }
 
-  public void testSimplePropertyWithDot4() throws Exception {
+  public void testSimplePropertyWithDot4() {
     configureByFile("/test6.xml");
     performNormalCompletion();
     assertNotNull(getItems());
@@ -91,7 +91,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     select();
   }
 
-  public void testSimplePropertyWithDotAndMulityReference() throws Exception {
+  public void testSimplePropertyWithDotAndMulityReference() {
     configureByFile("test7.xml");
     performNormalCompletion();
     final LookupElement[] items = getItems();
@@ -100,7 +100,7 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     select();
   }
 
-  public void testSimplePropertyWithNoPrefix() throws Exception {
+  public void testSimplePropertyWithNoPrefix() {
     configureByFile("test3.xml");
     performNormalCompletion();
     assertNotNull(getItems());
@@ -108,26 +108,26 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     select();
   }
 
-  public void testInsertion1() throws Exception {
+  public void testInsertion1() {
     configureByFile("test8.xml");
     performNormalCompletion();
 
     checkResultByFile("/test8-out.xml");
   }
 
-  public void testInsertion2() throws Exception {
+  public void testInsertion2() {
     configureByFile("test9.xml");
     performNormalCompletion();
     checkResultByFile("/test8-out.xml");
   }
 
-  public void testTargetCompletion() throws Exception {
+  public void testTargetCompletion() {
     configureByFile("targetCompletion.xml");
     performNormalCompletion();
     checkResultByFile("/targetCompletion-out.xml");
   }
 
-  public void testTargetCompletion2() throws Exception {
+  public void testTargetCompletion2() {
     final String filePath = "targetCompletion2.xml";
 
     configureByFile(filePath);
@@ -137,14 +137,14 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     checkResultByFile("/targetCompletion2-out.xml");
   }
 
-  public void testEntityCompletion() throws Exception {
+  public void testEntityCompletion() {
     configureByFile("EntityCompletion.xml");
     performNormalCompletion();
 
     checkResultByFile("EntityCompletion-out.xml");
   }
 
-  public void testTargetAttributesCompletion() throws Exception {
+  public void testTargetAttributesCompletion() {
     final String testName = getTestName(false);
     configureByFile(testName + ".xml");
     performNormalCompletion();
@@ -156,33 +156,33 @@ public class AntCompletionTest extends LightCodeInsightTestCase {
     checkResultByFile(testName + "-out.xml");
   }
 
-  public void testEndTagCompletion() throws Exception {
+  public void testEndTagCompletion() {
     doTest();
   }
 
-  public void testTargetIfAttrEasterEgg() throws Exception {
+  public void testTargetIfAttrEasterEgg() {
     doTest();
   }
 
-  public void testTargetUnlessAttrEasterEgg() throws Exception {
+  public void testTargetUnlessAttrEasterEgg() {
     doTest();
   }
 
   // TODO implement refs to params
-  public void _testMacrodefParam() throws Exception {
+  public void _testMacrodefParam() {
     doTest();
   }
 
   // TODO implement refs to params
-  public void _testMacrodefParam1() throws Exception {
+  public void _testMacrodefParam1() {
     doTest();
   }
 
-  public void testMacrodefNestedElement() throws Exception {
+  public void testMacrodefNestedElement() {
     doTest();
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     final String testName = getTestName(false);
     configureByFile(testName + ".xml");
     performNormalCompletion();
diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java
index e3a849843e66..ba7f7f513009 100644
--- a/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java
+++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java
@@ -105,7 +105,7 @@ public class AntHighlightingTest extends DaemonAnalyzerTestCase {
     doTest();
   }
 
-  public void testBigFilePerformance() throws Exception {
+  public void testBigFilePerformance() {
     try {
       myIgnoreInfos = true;
       PlatformTestUtil.startPerformanceTest("Big ant file highlighting", 15_000, () -> {
diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java
index ac79faae04e2..4a7bf9aa04f5 100644
--- a/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java
+++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java
@@ -33,7 +33,7 @@ public class AntMultiFileCompletionTest extends UsefulTestCase {
     return PluginPathManager.getPluginHomePath("ant") + "/tests/data/psi/completion/";
   }
 
-  public void testPropertyCompletion() throws Throwable {
+  public void testPropertyCompletion() {
     final String testName = "PropertyCompletion";
     doTestFor(
       new String [] { testName, testName + ".properties" },
@@ -41,13 +41,13 @@ public class AntMultiFileCompletionTest extends UsefulTestCase {
     );
   }
 
-  public void testPropertyCompletion2() throws Throwable {
+  public void testPropertyCompletion2() {
     final String testName = "PropertyCompletion2";
     final String[] fileNames = new String [] { testName + ".xml", "PropertyCompletion.properties" };
     myFixture.testCompletionTyping(fileNames, "\n", testName + "_after.xml");
   }
 
-  private void doTestFor(final String[] fileNames, final String ext) throws Throwable {
+  private void doTestFor(final String[] fileNames, final String ext) {
 
     String initialTest = fileNames[0];
     for(int i = 0; i < fileNames.length; ++i) {
diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java
index 18c2c9d9bc70..2b220af9e16a 100644
--- a/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java
+++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java
@@ -45,83 +45,83 @@ public class AntParsingTest extends ParsingTestCase {
     return PluginPathManager.getPluginHomePath("ant") + "/tests/data/psi";
   }
 
-  public void testSingleProject() throws Exception {
+  public void testSingleProject() {
     doTest(true);
   }
 
-  public void testProjectWithDefaultTarget() throws Exception {
+  public void testProjectWithDefaultTarget() {
     doTest(true);
   }
 
-  public void testProjectWithDescriptions() throws Exception {
+  public void testProjectWithDescriptions() {
     doTest(true);
   }
 
-  public void testProjectWithDependentTargets() throws Exception {
+  public void testProjectWithDependentTargets() {
     doTest(true);
   }
 
-  public void testSimpleProperties() throws Exception {
+  public void testSimpleProperties() {
     doTest(true);
   }
 
-  public void testPropertyLocation() throws Exception {
+  public void testPropertyLocation() {
     doTest(true);
   }
 
-  public void testPropertyFile() throws Exception {
+  public void testPropertyFile() {
     doTest(true);
   }
 
-  public void testSimpleAntCall() throws Exception {
+  public void testSimpleAntCall() {
     doTest(true);
   }
 
-  public void testAntCallNestedTargets() throws Exception {
+  public void testAntCallNestedTargets() {
     doTest(true);
   }
 
-  public void testAntComments() throws Exception {
+  public void testAntComments() {
     doTest(true);
   }
 
-  public void testPrologEpilogue() throws Exception {
+  public void testPrologEpilogue() {
     doTest(true);
   }
 
-  public void testMacroDef() throws Exception {
+  public void testMacroDef() {
     doTest(true);
   }
 
-  public void testPresetDef() throws Exception {
+  public void testPresetDef() {
     doTest(true);
   }
 
-  public void testForwardMacroDef() throws Exception {
+  public void testForwardMacroDef() {
     doTest(true);
   }
 
-  public void testSequentialParallel() throws Exception {
+  public void testSequentialParallel() {
     doTest(true);
   }
 
-  public void testAvailable() throws Exception {
+  public void testAvailable() {
     doTest(true);
   }
 
-  public void testChecksum() throws Exception {
+  public void testChecksum() {
     doTest(true);
   }
 
-  public void testChecksum1() throws Exception {
+  public void testChecksum1() {
     doTest(true);
   }
 
-  public void testCondition() throws Exception {
+  public void testCondition() {
     doTest(true);
   }
 
-  public void testUptodate() throws Exception {
+  public void testUptodate() {
     doTest(true);
   }
 
@@ -129,47 +129,47 @@ public class AntParsingTest extends ParsingTestCase {
     doTest(SystemInfo.isWindows ? "_w" : "_u");
   }
 
-  public void testBasename() throws Exception {
+  public void testBasename() {
     doTest(true);
   }
 
-  public void testLoadFile() throws Exception {
+  public void testLoadFile() {
     doTest(true);
   }
 
-  public void testTempFile() throws Exception {
+  public void testTempFile() {
     doTest(true);
   }
 
-  public void testLength() throws Exception {
+  public void testLength() {
     doTest(true);
   }
 
-  public void testPathConvert() throws Exception {
+  public void testPathConvert() {
     doTest(true);
   }
 
-  public void testWhichResource() throws Exception {
+  public void testWhichResource() {
     doTest(true);
   }
 
-  public void testP4Counter() throws Exception {
+  public void testP4Counter() {
     doTest(true);
   }
 
-  public void testJarLibResolve() throws Exception {
+  public void testJarLibResolve() {
     doTest(true);
   }
 
-  public void testAntTask() throws Exception {
+  public void testAntTask() {
     doTest(true);
   }
 
-  public void testJava() throws Exception {
+  public void testJava() {
     doTest(true);
   }
 
-   public void testBuildNumber() throws Exception {
+   public void testBuildNumber() {
     doTest(true);
   }
 }
\ No newline at end of file
diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java
index 3988e3dbe144..d52c8586360f 100644
--- a/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java
+++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java
@@ -29,75 +29,75 @@ import org.jetbrains.annotations.NotNull;
 
 public class AntRenameTest extends LightCodeInsightTestCase {
 
-  public void testSimpleProperty() throws Exception {
+  public void testSimpleProperty() {
     doTest();
   }
 
-  public void testSimplePropertyReference() throws Exception {
+  public void testSimplePropertyReference() {
     doTest();
   }
 
-  public void testParam() throws Exception {
+  public void testParam() {
     doTest();
   }
 
-  public void testParamReference() throws Exception {
+  public void testParamReference() {
     doTest();
   }
 
-  public void testRefid() throws Exception {
+  public void testRefid() {
     doTest();
   }
 
-  public void testRefidReference() throws Exception {
+  public void testRefidReference() {
     doTest();
   }
 
-  public void testRefidReferenceInDependieTarget() throws Exception {
+  public void testRefidReferenceInDependieTarget() {
     doTest();
   }
 
-  public void testSingleTarget() throws Exception {
+  public void testSingleTarget() {
     doTest();
   }
 
-  public void testSingleTargetReference() throws Exception {
+  public void testSingleTargetReference() {
     doTest();
   }
 
-  public void testAntCall() throws Exception {
+  public void testAntCall() {
     doTest();
   }
 
-  public void testAntCallReference() throws Exception {
+  public void testAntCallReference() {
     doTest();
   }
 
-  public void testDependsTarget1() throws Exception {
+  public void testDependsTarget1() {
     doTest();
   }
 
-  public void testDependsTarget2() throws Exception {
+  public void testDependsTarget2() {
     doTest();
   }
 
-  public void testDependsTargetReference1() throws Exception {
+  public void testDependsTargetReference1() {
     doTest();
   }
 
-  public void testDependsTargetReference2() throws Exception {
+  public void testDependsTargetReference2() {
     doTest();
   }
 
-  public void testTargetProperties() throws Exception {
+  public void testTargetProperties() {
     doTest();
   }
 
-  public void testTstampProperty() throws Exception {
+  public void testTstampProperty() {
     doTest();
   }
 
-  public void testTstampProperty1() throws Exception {
+  public void testTstampProperty1() {
     doTest();
   }
 
@@ -113,19 +113,19 @@ public class AntRenameTest extends LightCodeInsightTestCase {
   }
   */
 
-  public void testInputProperty() throws Exception {
+  public void testInputProperty() {
     doTest();
   }
 
-  public void testInputProperty1() throws Exception {
+  public void testInputProperty1() {
     doTest();
   }
 
-  public void testRenameByRef() throws Exception {
+  public void testRenameByRef() {
     doTest();
   }
 
-  public void testRenameByDeclaration() throws Exception {
+  public void testRenameByDeclaration() {
     doTest();
   }
 
@@ -135,7 +135,7 @@ public class AntRenameTest extends LightCodeInsightTestCase {
     return PluginPathManager.getPluginHomePath("ant").replace('\\', '/') + "/tests/data/psi/rename/";
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     final String filename = getTestName(true) + ".xml";
     VirtualFile vfile = VirtualFileManager.getInstance().findFileByUrl("file://" + getTestDataPath() + filename);
     String text = FileDocumentManager.getInstance().getDocument(vfile).getText();
diff --git a/plugins/devkit/testSources/inspections/InspectionDescriptionNotFoundInspectionTest.java b/plugins/devkit/testSources/inspections/InspectionDescriptionNotFoundInspectionTest.java
index c9f18595e1dc..135f0668c053 100644
--- a/plugins/devkit/testSources/inspections/InspectionDescriptionNotFoundInspectionTest.java
+++ b/plugins/devkit/testSources/inspections/InspectionDescriptionNotFoundInspectionTest.java
@@ -17,7 +17,6 @@ package org.jetbrains.idea.devkit.inspections;
 
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.LocalInspectionEP;
-import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.lang.LanguageExtensionPoint;
 import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -37,7 +36,7 @@ public class InspectionDescriptionNotFoundInspectionTest extends JavaCodeInsight
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addLibrary("core-api", PathUtil.getJarPathForClass(LanguageExtensionPoint.class));
     moduleBuilder.addLibrary("analysis-api", PathUtil.getJarPathForClass(LocalInspectionEP.class));
     moduleBuilder.addLibrary("platform-resources", Paths.get(PathUtil.getJarPathForClass(LocalInspectionEP.class))
diff --git a/plugins/devkit/testSources/inspections/InspectionMappingConsistencyInspectionTest.java b/plugins/devkit/testSources/inspections/InspectionMappingConsistencyInspectionTest.java
index 24d5fcac14c2..2d9dde944da1 100644
--- a/plugins/devkit/testSources/inspections/InspectionMappingConsistencyInspectionTest.java
+++ b/plugins/devkit/testSources/inspections/InspectionMappingConsistencyInspectionTest.java
@@ -28,16 +28,16 @@ import com.intellij.util.PathUtil;
 @TestDataPath("$CONTENT_ROOT/testData/inspections/inspectionMappingConsistency")
 public class InspectionMappingConsistencyInspectionTest extends JavaCodeInsightFixtureTestCase {
 
-  public void testInspectionMappings() throws Throwable {
+  public void testInspectionMappings() {
     myFixture.testHighlighting("inspectionMapping.xml", "bundle.properties");
   }
 
-  public void testInspectionMappingsWithDefaultBundle() throws Throwable {
+  public void testInspectionMappingsWithDefaultBundle() {
     myFixture.testHighlighting("inspectionMappingWithDefaultBundle.xml", "bundle.properties");
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     String pathForClass = PathUtil.getJarPathForClass(LocalInspectionEP.class);
     moduleBuilder.addLibrary("lang-api", pathForClass);
   }
diff --git a/plugins/devkit/testSources/inspections/PsiElementConcatenationInspectionTest.java b/plugins/devkit/testSources/inspections/PsiElementConcatenationInspectionTest.java
index 81b9eced9bd6..2a0b6fc0859b 100644
--- a/plugins/devkit/testSources/inspections/PsiElementConcatenationInspectionTest.java
+++ b/plugins/devkit/testSources/inspections/PsiElementConcatenationInspectionTest.java
@@ -57,7 +57,7 @@ public class PsiElementConcatenationInspectionTest extends LightQuickFixParamete
     return PluginPathManager.getPluginHomePath("devkit") + "/testData";
   }
 
-  public void test() throws Exception {
+  public void test() {
     doAllTests();
   }
 
diff --git a/plugins/devkit/testSources/inspections/UniqueToolbarIdInspectionTest.java b/plugins/devkit/testSources/inspections/UniqueToolbarIdInspectionTest.java
index af430773d141..bfd1314625c1 100644
--- a/plugins/devkit/testSources/inspections/UniqueToolbarIdInspectionTest.java
+++ b/plugins/devkit/testSources/inspections/UniqueToolbarIdInspectionTest.java
@@ -43,7 +43,7 @@ public class UniqueToolbarIdInspectionTest extends PluginModuleTestCase {
                        "}");
   }
 
-  public void testUsingEmptyToolbarId() throws Exception {
+  public void testUsingEmptyToolbarId() {
     myFixture.testHighlighting("UniqueToolbarIdTestDataClass.java");
   }
 }
diff --git a/plugins/devkit/testSources/navigation/DescriptionTypeRelatedItemLineMarkerProviderTest.java b/plugins/devkit/testSources/navigation/DescriptionTypeRelatedItemLineMarkerProviderTest.java
index 9d4fe2b60ebe..d94d03ab6efb 100644
--- a/plugins/devkit/testSources/navigation/DescriptionTypeRelatedItemLineMarkerProviderTest.java
+++ b/plugins/devkit/testSources/navigation/DescriptionTypeRelatedItemLineMarkerProviderTest.java
@@ -38,7 +38,7 @@ public class DescriptionTypeRelatedItemLineMarkerProviderTest extends JavaCodeIn
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     String pathForClass = PathUtil.getJarPathForClass(LocalInspectionEP.class);
     moduleBuilder.addLibrary("lang-api", pathForClass);
     String platformApiJar = PathUtil.getJarPathForClass(JBList.class);
diff --git a/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java b/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java
index 733444008f1a..dea2020fbb63 100644
--- a/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java
+++ b/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java
@@ -35,7 +35,7 @@ public class ExtensionDeclarationRelatedItemLineMarkerProviderTest extends JavaC
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     String extensionsJar = PathUtil.getJarPathForClass(ExtensionPointName.class);
     moduleBuilder.addLibrary("extensions", extensionsJar);
     String platformApiJar = PathUtil.getJarPathForClass(JBList.class);
diff --git a/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java b/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java
index 1c6d13f47bff..2dc42176b262 100644
--- a/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java
+++ b/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java
@@ -35,7 +35,7 @@ public class ExtensionPointDeclarationRelatedItemLineMarkerProviderTest extends
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     String extensionsJar = PathUtil.getJarPathForClass(ExtensionPointName.class);
     moduleBuilder.addLibrary("extensions", extensionsJar);
     String platformApiJar = PathUtil.getJarPathForClass(JBList.class);
diff --git a/plugins/devkit/testSources/testAssistant/TestDataGuessByExistingFilesUtilTest.java b/plugins/devkit/testSources/testAssistant/TestDataGuessByExistingFilesUtilTest.java
index b86cda0edcdc..60a62c3f0ab1 100644
--- a/plugins/devkit/testSources/testAssistant/TestDataGuessByExistingFilesUtilTest.java
+++ b/plugins/devkit/testSources/testAssistant/TestDataGuessByExistingFilesUtilTest.java
@@ -53,7 +53,7 @@ public class TestDataGuessByExistingFilesUtilTest extends TestDataPathTestCase {
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addLibrary("junit3", JavaSdkUtil.getJunit3JarPath());
   }
 
@@ -63,7 +63,7 @@ public class TestDataGuessByExistingFilesUtilTest extends TestDataPathTestCase {
     assertEquals("TestName", result);
   }
 
-  public void testCollectTestDataByExistingFilesBeforeAndAfter() throws IOException {
+  public void testCollectTestDataByExistingFilesBeforeAndAfter() {
     PsiMethod testMethod = getTestMethodWithBeforeAndAfterTestData();
     List<String> result = TestDataGuessByExistingFilesUtil.collectTestDataByExistingFiles(testMethod);
     verifyResultForBeforeAndAfter(result);
@@ -76,7 +76,7 @@ public class TestDataGuessByExistingFilesUtilTest extends TestDataPathTestCase {
     verifyResultForBeforeAndAfter(result);
   }
 
-  public void testCollectTestDataByExistingFilesBeforeAndSame() throws IOException {
+  public void testCollectTestDataByExistingFilesBeforeAndSame() {
     PsiMethod testMethod = getTestMethodWithBeforeAndSameTestData();
     List<String> result = TestDataGuessByExistingFilesUtil.collectTestDataByExistingFiles(testMethod);
     verifyResultForBeforeAndSame(result);
@@ -89,7 +89,7 @@ public class TestDataGuessByExistingFilesUtilTest extends TestDataPathTestCase {
     verifyResultForBeforeAndSame(result);
   }
 
-  public void testCollectTestDataByExistingFilesAfterAndSame() throws IOException {
+  public void testCollectTestDataByExistingFilesAfterAndSame() {
     PsiMethod testMethod = getTestMethodWithAfterAndSameTestData();
     List<String> result = TestDataGuessByExistingFilesUtil.collectTestDataByExistingFiles(testMethod);
     verifyResultForAfterAndSame(result);
@@ -102,7 +102,7 @@ public class TestDataGuessByExistingFilesUtilTest extends TestDataPathTestCase {
     verifyResultForAfterAndSame(result);
   }
 
-  public void testCollectTestDataByExistingFilesOnlySame() throws IOException {
+  public void testCollectTestDataByExistingFilesOnlySame() {
     PsiMethod testMethod = getTestMethodWithOnlySameTestData();
     List<String> result = TestDataGuessByExistingFilesUtil.collectTestDataByExistingFiles(testMethod);
     verifyResultForOnlySame(result);
diff --git a/plugins/devkit/testSources/testAssistant/TestDataPathCompletionTest.java b/plugins/devkit/testSources/testAssistant/TestDataPathCompletionTest.java
index 40debeca9f2b..1c250aac2bad 100644
--- a/plugins/devkit/testSources/testAssistant/TestDataPathCompletionTest.java
+++ b/plugins/devkit/testSources/testAssistant/TestDataPathCompletionTest.java
@@ -20,7 +20,7 @@ import com.intellij.testFramework.TestDataPath;
 
 @TestDataPath("$CONTENT_ROOT/testData/completionTestDataPath")
 public class TestDataPathCompletionTest extends TestDataPathTestCase {
-  public void testProjectRoot() throws Exception {
+  public void testProjectRoot() {
     doTest();
   }
 
diff --git a/plugins/devkit/testSources/testAssistant/TestDataPathResolvingTest.java b/plugins/devkit/testSources/testAssistant/TestDataPathResolvingTest.java
index 1deff1609d8c..98aa5b1daecf 100644
--- a/plugins/devkit/testSources/testAssistant/TestDataPathResolvingTest.java
+++ b/plugins/devkit/testSources/testAssistant/TestDataPathResolvingTest.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
 
 @TestDataPath("$CONTENT_ROOT/testData/resolveTestDataPath/")
 public class TestDataPathResolvingTest extends TestDataPathTestCase {
-  public void testProjectRootReference() throws Exception {
+  public void testProjectRootReference() {
     doTest(PsiManager.getInstance(myFixture.getProject()).findDirectory(myFixture.getProject().getBaseDir()));
   }
 
diff --git a/plugins/devkit/testSources/testAssistant/TestDataPathTestCase.java b/plugins/devkit/testSources/testAssistant/TestDataPathTestCase.java
index e52d1d1eeb0b..de05301d9bd5 100644
--- a/plugins/devkit/testSources/testAssistant/TestDataPathTestCase.java
+++ b/plugins/devkit/testSources/testAssistant/TestDataPathTestCase.java
@@ -46,7 +46,7 @@ abstract public class TestDataPathTestCase extends JavaCodeInsightFixtureTestCas
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addContentRoot(myFixture.getTempDirPath());
   }
 }
diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java
index 7628edef23f3..632765e7b887 100644
--- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java
+++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseEmlTest.java
@@ -82,7 +82,7 @@ public class EclipseEmlTest extends IdeaTestCase {
     return module;
   }
 
-  protected static void checkModule(String path, Module module) throws WriteExternalException, IOException, JDOMException {
+  protected static void checkModule(String path, Module module) throws WriteExternalException {
     ModuleRootModel rootModel = ModuleRootManager.getInstance(module);
     final Element root = new Element("component");
     IdeaSpecificSettings.writeIdeaSpecificClasspath(root, rootModel);
diff --git a/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java b/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java
index c6c4d62b8a61..503494455aca 100644
--- a/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java
+++ b/plugins/git4idea/tests/git4idea/history/GitHistoryUtilsTest.java
@@ -227,7 +227,7 @@ public class GitHistoryUtilsTest extends GitSingleRepoTest {
     }
   }
 
-  private static TestCommit move(String file, File dir, String message) throws Exception {
+  private static TestCommit move(String file, File dir, String message) {
     final String NAME = "PostHighlightingPass.java";
     mv(file, dir.getPath());
     file = new File(dir, NAME).getPath();
diff --git a/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java b/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
index 75599fe2c4c2..3c344b3b3c02 100644
--- a/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
+++ b/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
@@ -150,38 +150,38 @@ public class GitLogParserTest extends GitPlatformTest {
     doTestOneRecord(STATUS);
   }
 
-  public void test_char_0001_in_commit_message() throws VcsException {
+  public void test_char_0001_in_commit_message() {
     doTestCustomCommitMessage("Commit \u0001subject", "Commit \u0001subject");
   }
 
-  public void test_double_char_0001_in_commit_message() throws VcsException {
+  public void test_double_char_0001_in_commit_message() {
     doTestCustomCommitMessage("Commit \u0001\u0001subject", "Commit subject");
   }
 
-  public void test_char_0003_in_commit_message() throws VcsException {
+  public void test_char_0003_in_commit_message() {
     doTestCustomCommitMessage("Commit \u0003subject", "Commit \u0003subject");
   }
 
-  public void test_double_char_0003_in_commit_message() throws VcsException {
+  public void test_double_char_0003_in_commit_message() {
     doTestCustomCommitMessage("Commit \u0003\u0003subject", "Commit \u0003\u0003subject");
   }
 
-  public void test_both_chars_0001_and_0003_in_commit_message() throws VcsException {
+  public void test_both_chars_0001_and_0003_in_commit_message() {
     doTestCustomCommitMessage("Subject \u0001of the \u0003# weirdmessage", "Subject \u0001of the \u0003# weirdmessage");
   }
 
   // this is not fixed, keeping the test for the record and possible future fix
   @SuppressWarnings("unused")
-  public void _test_both_double_chars_0001_and_0003_in_commit_message() throws VcsException {
+  public void _test_both_double_chars_0001_and_0003_in_commit_message() {
     doTestCustomCommitMessage("Subject \u0001\u0001of the \u0003\u0003# weirdmessage",
                               "Subject of the \u0003\u0003# weirdmessage");
   }
 
-  public void test_char_0001_twice_in_commit_message() throws VcsException {
+  public void test_char_0001_twice_in_commit_message() {
     doTestCustomCommitMessage("Subject \u0001of the \u0001# weird message", "Subject \u0001of the \u0001# weird message");
   }
 
-  public void test_double_char_0001_twice_in_commit_message() throws VcsException {
+  public void test_double_char_0001_twice_in_commit_message() {
     doTestCustomCommitMessage("Subject \u0001\u0001of the \u0001\u0001# weird message", "Subject of the # weird message");
   }
 
diff --git a/plugins/git4idea/tests/git4idea/log/GitBranchComparatorTest.java b/plugins/git4idea/tests/git4idea/log/GitBranchComparatorTest.java
index ff385a8a3f35..7795991678fb 100644
--- a/plugins/git4idea/tests/git4idea/log/GitBranchComparatorTest.java
+++ b/plugins/git4idea/tests/git4idea/log/GitBranchComparatorTest.java
@@ -19,59 +19,58 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsRef;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Comparator;
 
 public class GitBranchComparatorTest extends GitRefManagerTest {
 
-  public void test_tracked_remote_branch_is_more_important_than_its_local_branch() throws IOException {
+  public void test_tracked_remote_branch_is_more_important_than_its_local_branch() {
     check("origin/139", given("origin/139", "139"));
   }
 
-  public void test_tracked_remote_branch_is_more_important_than_any_local_branch() throws IOException {
+  public void test_tracked_remote_branch_is_more_important_than_any_local_branch() {
     check("origin/139", given("feature", "origin/139", "139"));
   }
 
-  public void test_untracked_remote_branch_is_less_important_than_any_local_branch() throws IOException {
+  public void test_untracked_remote_branch_is_less_important_than_any_local_branch() {
     check("feature", given("feature", "origin/139"));
   }
 
-  public void test_master_is_more_important_than_other_local_branches() throws IOException {
+  public void test_master_is_more_important_than_other_local_branches() {
     check("master", given("feature", "master"));
   }
 
-  public void test_origin_master_is_more_important_than_other_remote_branches() throws IOException {
+  public void test_origin_master_is_more_important_than_other_remote_branches() {
     check("origin/master", given("origin/139", "master", "139", "origin/master", "origin/135"));
   }
 
-  public void test_local_branch_is_more_important_than_tag() throws IOException {
+  public void test_local_branch_is_more_important_than_tag() {
     check("feature", given("refs/tags/v1", "feature", "refs/tags/v2"));
   }
 
-  public void test_two_local_non_tracking_branches_are_compared_lexicographically() throws IOException {
+  public void test_two_local_non_tracking_branches_are_compared_lexicographically() {
     check("feature", given("zoo", "feature"));
   }
 
-  public void test_tracking_local_branch_is_more_important_than_nontracking_local_branch() throws IOException {
+  public void test_tracking_local_branch_is_more_important_than_nontracking_local_branch() {
     Collection<VcsRef> refs = given("zoo", "origin/zoo", "feature");
     refs = ContainerUtil.filter(refs, ref -> !ref.getName().equals("origin/zoo"));
     assertEquals("zoo", getTheMostPowerfulRef(refs).getName());
   }
 
-  public void test_two_remote_non_tracking_branches_are_compared_lexicographically()  throws IOException {
+  public void test_two_remote_non_tracking_branches_are_compared_lexicographically() {
     check("github/zoo", given("origin/feature", "origin/zoo", "github/zoo"));
   }
 
-  public void test_local_branch_is_more_important_than_HEAD() throws IOException {
+  public void test_local_branch_is_more_important_than_HEAD() {
     check("feature", given("feature", "HEAD"));
   }
 
-  public void test_tag_is_more_important_than_HEAD() throws IOException {
+  public void test_tag_is_more_important_than_HEAD() {
     check("refs/tags/v1", given("refs/tags/v1", "HEAD"));
   }
 
-  private void check(@NotNull String expectedBest, @NotNull Collection<VcsRef> givenBranches) throws IOException {
+  private void check(@NotNull String expectedBest, @NotNull Collection<VcsRef> givenBranches) {
     VcsRef actualBest = getTheMostPowerfulRef(givenBranches);
     assertEquals(expect(expectedBest).get(0), actualBest);
   }
diff --git a/plugins/git4idea/tests/git4idea/log/GitLabelComparatorTest.java b/plugins/git4idea/tests/git4idea/log/GitLabelComparatorTest.java
index 77042741085c..2204da09aeae 100644
--- a/plugins/git4idea/tests/git4idea/log/GitLabelComparatorTest.java
+++ b/plugins/git4idea/tests/git4idea/log/GitLabelComparatorTest.java
@@ -19,7 +19,6 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsRef;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -30,53 +29,53 @@ public class GitLabelComparatorTest extends GitRefManagerTest {
     check(Collections.emptyList(), Collections.emptyList());
   }
 
-  public void testSingle() throws IOException {
+  public void testSingle() {
     check(given("HEAD"),
           expect("HEAD"));
   }
 
-  public void test_HEAD_is_at_left_from_branch() throws IOException {
+  public void test_HEAD_is_at_left_from_branch() {
     check(given("master", "HEAD"),
           expect("HEAD", "master"));
   }
 
-  public void testLocalBranchesAreComparedAsStrings() throws IOException {
+  public void testLocalBranchesAreComparedAsStrings() {
     check(given("release", "feature"),
           expect("feature", "release"));
   }
 
-  public void test_tag_is_to_the_right_of_remote_branch() throws IOException {
+  public void test_tag_is_to_the_right_of_remote_branch() {
     check(given("refs/tags/v1", "origin/master"),
           expect("origin/master", "refs/tags/v1"));
   }
 
-  public void test_master_is_to_the_left_of_other_local_branches() throws IOException {
+  public void test_master_is_to_the_left_of_other_local_branches() {
     check(given("feature", "master"),
           expect("master", "feature"));
   }
 
-  public void test_origin_master_is_to_the_left_of_other_remote_branches() throws IOException {
+  public void test_origin_master_is_to_the_left_of_other_remote_branches() {
     check(given("origin/master", "origin/aaa"),
           expect("origin/master", "origin/aaa"));
   }
 
-  public void test_remote_tracking_branch_is_to_the_left_of_other_remote_branches() throws IOException {
+  public void test_remote_tracking_branch_is_to_the_left_of_other_remote_branches() {
     check(given("feature", "origin/aaa", "origin/feature"),
           expect("feature", "origin/feature", "origin/aaa"));
   }
 
-  public void test_complex_1() throws IOException {
+  public void test_complex_1() {
     check(given("refs/tags/v1", "feature", "HEAD", "master"),
           expect("HEAD", "master", "feature", "refs/tags/v1"));
   }
 
-  public void test_complex_2() throws IOException {
+  public void test_complex_2() {
     check(given("origin/master", "origin/great_feature", "refs/tags/v1", "release", "HEAD", "master"),
           expect("HEAD", "master", "release", "origin/master", "origin/great_feature", "refs/tags/v1"));
   }
 
   // may happen e.g. in multi-repo case
-  public void testTwoMasters() throws IOException {
+  public void testTwoMasters() {
     check(given("master", "master"),
           expect("master", "master"));
   }
diff --git a/plugins/git4idea/tests/git4idea/log/GitLogProviderTest.java b/plugins/git4idea/tests/git4idea/log/GitLogProviderTest.java
index 595711f14e29..2fab798b6cdd 100644
--- a/plugins/git4idea/tests/git4idea/log/GitLogProviderTest.java
+++ b/plugins/git4idea/tests/git4idea/log/GitLogProviderTest.java
@@ -32,7 +32,6 @@ import git4idea.test.GitSingleRepoTest;
 import git4idea.test.GitTestUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -284,7 +283,7 @@ public class GitLogProviderTest extends GitSingleRepoTest {
     tac("b.txt");
   }
 
-  private static void prepareLongHistory(int size) throws IOException {
+  private static void prepareLongHistory(int size) {
     for (int i = 0; i < size; i++) {
       String file = "a" + (i % 10) + ".txt";
       if (i < 10) {
diff --git a/plugins/git4idea/tests/git4idea/log/GitRefGroupsTest.java b/plugins/git4idea/tests/git4idea/log/GitRefGroupsTest.java
index 96d7cbcf7283..e75fa9607964 100644
--- a/plugins/git4idea/tests/git4idea/log/GitRefGroupsTest.java
+++ b/plugins/git4idea/tests/git4idea/log/GitRefGroupsTest.java
@@ -23,23 +23,22 @@ import com.intellij.vcs.log.VcsRef;
 import com.intellij.vcs.log.impl.SingletonRefGroup;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
 public class GitRefGroupsTest extends GitRefManagerTest {
-  public void test_single_tracked_branch() throws IOException {
+  public void test_single_tracked_branch() {
     check(given("HEAD", "master", "origin/master"), ContainerUtil.list("HEAD"), Pair.create("Local", ContainerUtil.list("master")),
           Pair.create("Tracked", ContainerUtil.list("origin/master")),
           Pair.create("origin/...", ContainerUtil.list("origin/master")));
   }
 
-  public void test_single_local_branch() throws IOException {
+  public void test_single_local_branch() {
     check(given("HEAD", "master"), ContainerUtil.list("HEAD"), Pair.create("Local", ContainerUtil.list("master")));
   }
 
-  public void test_local_tracked_and_remote_branch() throws IOException {
+  public void test_local_tracked_and_remote_branch() {
     check(given("HEAD", "master", "origin/master", "origin/remote_branch", "local_branch"), ContainerUtil.list("HEAD"),
           Pair.create("Local", ContainerUtil.list("master", "local_branch")), Pair.create("Tracked", ContainerUtil.list("origin/master")),
           Pair.create("origin/...", ContainerUtil.list("origin/master", "origin/remote_branch")));
diff --git a/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java b/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java
index 439649edfc8e..549e3451ca7e 100644
--- a/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java
+++ b/plugins/git4idea/tests/git4idea/log/GitRefManagerTest.java
@@ -13,7 +13,6 @@ import git4idea.test.GitSingleRepoTest;
 import git4idea.test.GitTestUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -24,7 +23,7 @@ import static git4idea.test.GitExecutor.git;
 public abstract class GitRefManagerTest extends GitSingleRepoTest {
 
   @NotNull
-  protected Collection<VcsRef> given(@NotNull String... refs) throws IOException {
+  protected Collection<VcsRef> given(@NotNull String... refs) {
     Collection<VcsRef> result = ContainerUtil.newArrayList();
     cd(myProjectRoot);
     Hash hash = HashImpl.build(git("rev-parse HEAD"));
diff --git a/plugins/git4idea/tests/git4idea/log/GitUserFilterTest.java b/plugins/git4idea/tests/git4idea/log/GitUserFilterTest.java
index 5b7ed9099890..3319607a06a4 100644
--- a/plugins/git4idea/tests/git4idea/log/GitUserFilterTest.java
+++ b/plugins/git4idea/tests/git4idea/log/GitUserFilterTest.java
@@ -22,8 +22,6 @@ import git4idea.test.GitSingleRepoTest;
 import git4idea.test.GitTestUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-
 import static git4idea.test.GitExecutor.modify;
 
 public class GitUserFilterTest extends GitSingleRepoTest {
@@ -34,7 +32,7 @@ public class GitUserFilterTest extends GitSingleRepoTest {
     super.setUp();
     myVcsLogUserFilterTest = new VcsLogUserFilterTest(GitTestUtil.findGitLogProvider(myProject), myProject) {
       @NotNull
-      protected String commit(@NotNull VcsUser user) throws IOException {
+      protected String commit(@NotNull VcsUser user) {
         GitTestUtil.setupUsername(user.getName(), user.getEmail());
         String commit = modify("file.txt");
         GitTestUtil.setupDefaultUsername();
diff --git a/plugins/git4idea/tests/git4idea/push/GitPushTargetTest.java b/plugins/git4idea/tests/git4idea/push/GitPushTargetTest.java
index b6ee56083383..215590727873 100644
--- a/plugins/git4idea/tests/git4idea/push/GitPushTargetTest.java
+++ b/plugins/git4idea/tests/git4idea/push/GitPushTargetTest.java
@@ -31,22 +31,22 @@ public class GitPushTargetTest extends GitSingleRepoTest {
     addRemote("origin");
   }
 
-  public void test_no_push_spec() throws Exception {
+  public void test_no_push_spec() {
     GitPushTarget target = GitPushTarget.getFromPushSpec(myRepo, ObjectUtils.assertNotNull(myRepo.getCurrentBranch()));
     assertNull(target);
   }
 
-  public void test_refs_for_master() throws Exception {
+  public void test_refs_for_master() {
     setPushSpec("origin", "HEAD:refs/for/master");
     assertSpecialTargetRef("refs/for/master", "origin");
   }
 
-  public void test_wildcard_special_ref() throws Exception {
+  public void test_wildcard_special_ref() {
     setPushSpec("origin", "refs/heads/*:refs/for/*");
     assertSpecialTargetRef("refs/for/master", "origin");
   }
 
-  public void test_complex_remote_name() throws Exception {
+  public void test_complex_remote_name() {
     addRemote("my/remote");
     setPushSpec("my/remote", "HEAD:refs/for/master");
     setTracking("master", "my/remote", "refs/heads/master");
@@ -54,13 +54,13 @@ public class GitPushTargetTest extends GitSingleRepoTest {
     assertSpecialTargetRef("refs/for/master", "my/remote");
   }
 
-  public void test_standard_fetch_refspec() throws Exception {
+  public void test_standard_fetch_refspec() {
     setPushSpec("origin", "refs/heads/*:refs/remotes/origin/*");
     assertStandardRemoteBranch("master",
                                ObjectUtils.assertNotNull(myRepo.getBranches().findBranchByName("origin/master")));
   }
 
-  public void test_tracked_remote_is_preferable_over_origin() throws Exception {
+  public void test_tracked_remote_is_preferable_over_origin() {
     addRemote("github");
     setPushSpec("origin", "HEAD:refs/for/origin");
     setPushSpec("github", "HEAD:refs/for/github");
diff --git a/plugins/git4idea/tests/git4idea/rebase/GitRebaserReorderCommitsTest.java b/plugins/git4idea/tests/git4idea/rebase/GitRebaserReorderCommitsTest.java
index ae1c2b34f647..49cfdead1e81 100644
--- a/plugins/git4idea/tests/git4idea/rebase/GitRebaserReorderCommitsTest.java
+++ b/plugins/git4idea/tests/git4idea/rebase/GitRebaserReorderCommitsTest.java
@@ -23,7 +23,6 @@ import git4idea.test.GitTestUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.ide.BuiltInServerManager;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -89,7 +88,7 @@ public class GitRebaserReorderCommitsTest extends GitSingleRepoTest {
     assertCommits(myFirstCommit, hashes[2], hashes[1], hashes[0]);
   }
 
-  private static String[] makeCommits(int number) throws IOException {
+  private static String[] makeCommits(int number) {
     String[] hashes = new String[number];
     for (int i = 0; i < hashes.length; i++) {
       hashes[i] = makeCommit();
@@ -98,13 +97,13 @@ public class GitRebaserReorderCommitsTest extends GitSingleRepoTest {
   }
 
   @NotNull
-  private static String makeCommit() throws IOException {
+  private static String makeCommit() {
     touch(Math.random() + ".txt", "initial" + Math.random());
     addCommit("some commit");
     return last();
   }
 
-  private static void assertCommits(String... commits) throws IOException {
+  private static void assertCommits(String... commits) {
     final String[] hashes = git("rev-list --reverse HEAD").split("\n");
     assertEquals(commits.length, hashes.length);
     for (int i = 0; i < commits.length; i++) {
diff --git a/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java b/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java
index 7132cf8bab26..25fb8ec8b8ca 100644
--- a/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java
+++ b/plugins/git4idea/tests/git4idea/repo/GitConfigTest.java
@@ -53,7 +53,7 @@ public class GitConfigTest extends GitPlatformTest {
   }
 
   //inspired by IDEA-135557
-  public void test_branch_with_hash_symbol() throws IOException {
+  public void test_branch_with_hash_symbol() {
     createRepository();
     addRemote("http://example.git");
     git("update-ref refs/remotes/origin/a#branch HEAD");
@@ -71,7 +71,7 @@ public class GitConfigTest extends GitPlatformTest {
   }
 
   // IDEA-143363 Check that remote.pushdefault (generic, without remote name) doesn't fail the config parsing procedure
-  public void test_remote_unspecified_section() throws Exception {
+  public void test_remote_unspecified_section() {
     createRepository();
     addRemote("git@github.com:foo/bar.git");
     git("config remote.pushdefault origin");
@@ -79,7 +79,7 @@ public class GitConfigTest extends GitPlatformTest {
     assertSingleRemoteInConfig();
   }
 
-  public void test_invalid_section_with_remote_prefix_is_ignored() throws Exception {
+  public void test_invalid_section_with_remote_prefix_is_ignored() {
     createRepository();
     addRemote("git@github.com:foo/bar.git");
     git("config remote-cfg.newkey newval");
diff --git a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java
index 4df7dfd35778..905b9b00a3d4 100644
--- a/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java
+++ b/plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderTest.java
@@ -76,7 +76,7 @@ public class GitRepositoryReaderTest extends GitPlatformTest {
 
   @After
   @Override
-  public void tearDown() throws Exception {
+  public void tearDown() {
     try {
       if (myTempDir != null) {
         FileUtil.delete(myTempDir);
diff --git a/plugins/git4idea/tests/git4idea/tests/GitUpperDirectorySearchTest.java b/plugins/git4idea/tests/git4idea/tests/GitUpperDirectorySearchTest.java
index 5eccc7d388ce..0467ae899c4b 100644
--- a/plugins/git4idea/tests/git4idea/tests/GitUpperDirectorySearchTest.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitUpperDirectorySearchTest.java
@@ -46,7 +46,7 @@ public class GitUpperDirectorySearchTest {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         myProjectFixture.tearDown();
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTest.java
index 830944558fdd..d3f8e2cb4c2c 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTest.java
@@ -32,14 +32,14 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
   protected Editor myEditor;
 
   @Override
-  protected void afterTest() throws Exception {
+  protected void afterTest() {
     if (myEditor != null) {
       EditorFactory.getInstance().releaseEditor(myEditor);
       myEditor = null;
     }
   }
 
-  public void testCreateFromFile() throws Throwable {
+  public void testCreateFromFile() {
     List<FileContent> expected = new ArrayList<>();
     expected.add(new FileContent("file.txt", "file.txt content"));
 
@@ -51,7 +51,7 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
     checkEquals(expected, actual);
   }
 
-  public void testCreateFromDirectory() throws Throwable {
+  public void testCreateFromDirectory() {
     List<FileContent> expected = new ArrayList<>();
     expected.add(new FileContent("folder_file1", "file1 content"));
     expected.add(new FileContent("folder_file2", "file2 content"));
@@ -65,7 +65,7 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
     checkEquals(expected, actual);
   }
 
-  public void testCreateFromEmptyDirectory() throws Throwable {
+  public void testCreateFromEmptyDirectory() {
     List<FileContent> expected = new ArrayList<>();
 
     VirtualFile file = myProjectRoot.findFileByRelativePath("folder/empty_folder");
@@ -76,7 +76,7 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
     checkEquals(expected, actual);
   }
 
-  public void testCreateFromEmptyFile() throws Throwable {
+  public void testCreateFromEmptyFile() {
     List<FileContent> expected = new ArrayList<>();
 
     VirtualFile file = myProjectRoot.findFileByRelativePath("folder/empty_file");
@@ -87,7 +87,7 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
     checkEquals(expected, actual);
   }
 
-  public void testCreateFromFiles() throws Throwable {
+  public void testCreateFromFiles() {
     List<FileContent> expected = new ArrayList<>();
     expected.add(new FileContent("file.txt", "file.txt content"));
     expected.add(new FileContent("file2", "file2 content"));
@@ -106,7 +106,7 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
     checkEquals(expected, actual);
   }
 
-  public void testCreateFromEmptyFiles() throws Throwable {
+  public void testCreateFromEmptyFiles() {
     List<FileContent> expected = new ArrayList<>();
 
     VirtualFile[] files = VirtualFile.EMPTY_ARRAY;
@@ -116,7 +116,7 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
     checkEquals(expected, actual);
   }
 
-  public void testCreateFromEditor() throws Throwable {
+  public void testCreateFromEditor() {
     VirtualFile file = myProjectRoot.findFileByRelativePath("file.txt");
     assertNotNull(file);
 
@@ -134,7 +134,7 @@ public class GithubCreateGistContentTest extends GithubCreateGistContentTestBase
     checkEquals(expected, actual);
   }
 
-  public void testCreateFromEditorWithoutFile() throws Throwable {
+  public void testCreateFromEditorWithoutFile() {
     VirtualFile file = myProjectRoot.findFileByRelativePath("file.txt");
     assertNotNull(file);
 
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTestBase.java
index d801da88fda4..7c73dc631b9a 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTestBase.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistContentTestBase.java
@@ -28,7 +28,7 @@ import java.util.List;
 public abstract class GithubCreateGistContentTestBase extends GithubTest {
 
   @Override
-  protected void beforeTest() throws Exception {
+  protected void beforeTest() {
     createProjectFiles();
   }
 
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java
index 6a9112536d09..fb09b6161db1 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTest.java
@@ -31,7 +31,7 @@ import java.util.List;
 public class GithubCreateGistTest extends GithubCreateGistTestBase {
   private final ProgressIndicator myIndicator = DumbProgressIndicator.INSTANCE;
 
-  public void testSimple() throws Throwable {
+  public void testSimple() {
     List<FileContent> expected = createContent();
 
     String url = GithubCreateGistAction.createGist(myProject, getAuthDataHolder(), myIndicator, expected, true, GIST_DESCRIPTION, null);
@@ -45,7 +45,7 @@ public class GithubCreateGistTest extends GithubCreateGistTestBase {
     checkGistContent(expected);
   }
 
-  public void testAnonymous() throws Throwable {
+  public void testAnonymous() {
     List<FileContent> expected = createContent();
 
     String url = GithubCreateGistAction
@@ -65,7 +65,7 @@ public class GithubCreateGistTest extends GithubCreateGistTestBase {
     GIST = null;
   }
 
-  public void testUnusedFilenameField() throws Throwable {
+  public void testUnusedFilenameField() {
     List<FileContent> expected = createContent();
 
     String url =
@@ -80,7 +80,7 @@ public class GithubCreateGistTest extends GithubCreateGistTestBase {
     checkGistContent(expected);
   }
 
-  public void testUsedFilenameField() throws Throwable {
+  public void testUsedFilenameField() {
     List<FileContent> content = Collections.singletonList(new FileContent("file.txt", "file.txt content"));
     List<FileContent> expected = Collections.singletonList(new FileContent("filename", "file.txt content"));
 
@@ -96,7 +96,7 @@ public class GithubCreateGistTest extends GithubCreateGistTestBase {
     checkGistContent(expected);
   }
 
-  public void testPublic() throws Throwable {
+  public void testPublic() {
     List<FileContent> expected = createContent();
 
     String url = GithubCreateGistAction.createGist(myProject, getAuthDataHolder(), myIndicator, expected, false, GIST_DESCRIPTION, null);
@@ -110,7 +110,7 @@ public class GithubCreateGistTest extends GithubCreateGistTestBase {
     checkGistContent(expected);
   }
 
-  public void testEmpty() throws Throwable {
+  public void testEmpty() {
     List<FileContent> expected = Collections.emptyList();
 
     String url = GithubCreateGistAction.createGist(myProject, getAuthDataHolder(), myIndicator, expected, true, GIST_DESCRIPTION, null);
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java
index b44833ee62f6..d310ccdee381 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java
@@ -42,7 +42,7 @@ public abstract class GithubCreateGistTestBase extends GithubTest {
   protected String GIST_DESCRIPTION;
 
   @Override
-  protected void beforeTest() throws Exception {
+  protected void beforeTest() {
     long time = Clock.getTime();
     GIST_DESCRIPTION = getTestName(false) + "_" + DateFormatUtil.formatDate(time);
   }
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java
index 354dddb866a0..b70f67b93ef1 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java
@@ -21,7 +21,7 @@ import com.intellij.notification.NotificationType;
  * @author Aleksey Pivovarov
  */
 public class GithubCreatePullRequestTest extends GithubCreatePullRequestTestBase {
-  public void testSimple() throws Exception {
+  public void testSimple() {
     registerDefaultCreatePullRequestDialogHandler("master", myLogin1);
 
     GithubCreatePullRequestAction.createPullRequest(myProject, myProjectRoot);
@@ -31,7 +31,7 @@ public class GithubCreatePullRequestTest extends GithubCreatePullRequestTestBase
     checkLastCommitPushed();
   }
 
-  public void testParent() throws Exception {
+  public void testParent() {
     registerDefaultCreatePullRequestDialogHandler("file2", myLogin2);
     addRemote(myLogin2);
 
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java
index 51d4c610ef69..e44247a033fb 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.plugins.github;
 
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Clock;
 import com.intellij.testFramework.VfsTestUtil;
@@ -45,7 +44,7 @@ public abstract class GithubCreatePullRequestTestBase extends GithubTest {
   protected String BRANCH_NAME;
 
   @Override
-  protected void beforeTest() throws Exception {
+  protected void beforeTest() {
     Random rnd = new Random();
     long time = Clock.getTime();
     BRANCH_NAME = "branch_" + getTestName(false) + "_" + DateFormatUtil.formatDate(time).replace('/', '-') + "_" + rnd.nextLong();
@@ -60,7 +59,7 @@ public abstract class GithubCreatePullRequestTestBase extends GithubTest {
   }
 
   @Override
-  protected void afterTest() throws Exception {
+  protected void afterTest() {
     deleteRemoteBranch();
   }
 
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubRequestQueringTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubRequestQueringTest.java
index a85fee484d2c..d19c3c63a965 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubRequestQueringTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubRequestQueringTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assume.assumeNotNull;
 public class GithubRequestQueringTest extends GithubTest {
 
   @Override
-  protected void beforeTest() throws Exception {
+  protected void beforeTest() {
     assumeNotNull(myLogin2);
   }
 
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java
index 785eda66b95e..b994c99388c7 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java
@@ -35,7 +35,7 @@ public class GithubShareProjectTest extends GithubShareProjectTestBase {
     checkLastCommitPushed();
   }
 
-  public void testGithubAlreadyExists() throws Throwable {
+  public void testGithubAlreadyExists() {
     final boolean[] dialogShown = new boolean[1];
     TestDialog oldTestDialog = Messages.setTestDialog(new TestDialog() {
       @Override
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java
index 8347de4d452c..9d4cc40660e7 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java
@@ -37,7 +37,7 @@ public abstract class GithubShareProjectTestBase extends GithubTest {
   protected String PROJECT_NAME;
 
   @Override
-  protected void beforeTest() throws Exception {
+  protected void beforeTest() {
     Random rnd = new Random();
     long time = Clock.getTime();
     PROJECT_NAME = "new_project_from_" + getTestName(false) + "_" + DateFormatUtil.formatDate(time).replace('/', '-') + "_" + rnd.nextLong();
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubUrlUtilTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubUrlUtilTest.java
index fb8de40a4e86..b737f1e92e07 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubUrlUtilTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubUrlUtilTest.java
@@ -46,7 +46,7 @@ public class GithubUrlUtilTest extends TestCase {
     }
   }
 
-  public void testRemoveTrailingSlash() throws Throwable {
+  public void testRemoveTrailingSlash() {
     TestCase<String> tests = new TestCase<>();
 
     tests.add("http://github.com/", "http://github.com");
@@ -58,7 +58,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> removeTrailingSlash(in));
   }
 
-  public void testRemoveProtocolPrefix() throws Throwable {
+  public void testRemoveProtocolPrefix() {
     TestCase<String> tests = new TestCase<>();
 
     tests.add("github.com/user/repo/", "github.com/user/repo/");
@@ -80,7 +80,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> removeProtocolPrefix(in));
   }
 
-  public void testIsGithubUrl1() throws Throwable {
+  public void testIsGithubUrl1() {
     TestCase<Boolean> tests = new TestCase<>();
 
     tests.add("http://github.com/user/repo", true);
@@ -109,7 +109,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> isGithubUrl(in, "http://GitHub.com"));
   }
 
-  public void testIsGithubUrl2() throws Throwable {
+  public void testIsGithubUrl2() {
     TestCase<Boolean> tests = new TestCase<>();
 
     tests.add("http://git.code.example.co.jp/user/repo", true);
@@ -126,7 +126,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> isGithubUrl(in, "git.code.example.co.jp/api"));
   }
 
-  public void testGetApiUrlWithoutProtocol() throws Throwable {
+  public void testGetApiUrlWithoutProtocol() {
     TestCase<String> tests = new TestCase<>();
 
     tests.add("github.com", "api.github.com");
@@ -143,7 +143,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> getApiUrlWithoutProtocol(in));
   }
 
-  public void testGetUserAndRepositoryFromRemoteUrl() throws Throwable {
+  public void testGetUserAndRepositoryFromRemoteUrl() {
     TestCase<GithubFullPath> tests = new TestCase<>();
 
     tests.add("http://github.com/username/reponame/", new GithubFullPath("username", "reponame"));
@@ -168,7 +168,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> getUserAndRepositoryFromRemoteUrl(in));
   }
 
-  public void testMakeGithubRepoFromRemoteUrl() throws Throwable {
+  public void testMakeGithubRepoFromRemoteUrl() {
     TestCase<String> tests = new TestCase<>();
 
     tests.add("http://github.com/username/reponame/", "https://github.com/username/reponame");
@@ -194,7 +194,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> makeGithubRepoUrlFromRemoteUrl(in, "https://github.com"));
   }
 
-  public void testGetHostFromUrl() throws Throwable {
+  public void testGetHostFromUrl() {
     TestCase<String> tests = new TestCase<>();
 
     tests.add("github.com", "github.com");
@@ -221,7 +221,7 @@ public class GithubUrlUtilTest extends TestCase {
     runTestCase(tests, in -> getHostFromUrl(in));
   }
 
-  public void testGetApiUrl() throws Throwable {
+  public void testGetApiUrl() {
     TestCase<String> tests = new TestCase<>();
 
     tests.add("github.com", "https://api.github.com");
diff --git a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java
index 5f807cf6ded0..36f0ba516922 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java
@@ -201,7 +201,7 @@ public abstract class GithubTest extends GitPlatformTest {
     }
   }
 
-  protected void beforeTest() throws Exception {
+  protected void beforeTest() {
   }
 
   protected void afterTest() throws Exception {
diff --git a/plugins/google-app-engine/testSource/com/intellij/appengine/highlighting/AppEngineDescriptorHighlightingTest.java b/plugins/google-app-engine/testSource/com/intellij/appengine/highlighting/AppEngineDescriptorHighlightingTest.java
index f9b8bcf9fd83..bd8416134d60 100644
--- a/plugins/google-app-engine/testSource/com/intellij/appengine/highlighting/AppEngineDescriptorHighlightingTest.java
+++ b/plugins/google-app-engine/testSource/com/intellij/appengine/highlighting/AppEngineDescriptorHighlightingTest.java
@@ -24,17 +24,17 @@ import com.intellij.xml.util.CheckXmlFileWithXercesValidatorInspection;
  */
 @TestDataPath("$CONTENT_ROOT/testData/highlighting/descriptor/")
 public class AppEngineDescriptorHighlightingTest extends AppEngineCodeInsightTestCase {
-  public void testAppEngineWeb() throws Exception {
+  public void testAppEngineWeb() {
     myCodeInsightFixture.configureByFile("appengine-web.xml");
     checkXmlHighlighting();
   }
 
-  public void testJdoConfig() throws Exception {
+  public void testJdoConfig() {
     myCodeInsightFixture.configureByFile("jdoconfig.xml");
     checkXmlHighlighting();
   }
 
-  public void testApplication() throws Exception {
+  public void testApplication() {
     myCodeInsightFixture.configureByFile("appengine-application.xml");
     checkXmlHighlighting();
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java
index 7cb1ec16930f..bf46684a8a62 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java
@@ -28,11 +28,11 @@ import java.io.File;
  */
 public class AddGradleDslPluginActionTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testApplyPlugin() throws Exception {
+  public void testApplyPlugin() {
     doTest("testApplyPlugin.gradle", "java");
   }
 
-  public void testApplyPluginInsideClosure() throws Exception {
+  public void testApplyPluginInsideClosure() {
     myFixture.configureByFile("testApplyPluginInsideClosure.gradle");
     doTest("testApplyPluginInsideClosure.gradle", "java");
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/MvnDependencyPasteTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/MvnDependencyPasteTest.java
index 5726853ad7fd..6aac6f9f88b2 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/MvnDependencyPasteTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/MvnDependencyPasteTest.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class MvnDependencyPasteTest extends LightCodeInsightTestCase {
 
-  public void testPastedGradleDependency() throws Exception {
+  public void testPastedGradleDependency() {
     configureFromFileText("pom.xml", getDependency("group", "artifact", "1.0", "runtime", null));
     selectWholeFile();
     performCut();
@@ -38,7 +38,7 @@ public class MvnDependencyPasteTest extends LightCodeInsightTestCase {
                       "}");
   }
 
-  public void testDependencyWithClassifier() throws Exception {
+  public void testDependencyWithClassifier() {
     configureFromFileText("pom.xml", getDependency("group", "artifact", "1.0", "runtime", "jdk14"));
     selectWholeFile();
     performCut();
@@ -50,7 +50,7 @@ public class MvnDependencyPasteTest extends LightCodeInsightTestCase {
                       "}");
   }
   
-  public void test_DoNotConvertIfCoordinatesNotClear() throws Exception {
+  public void test_DoNotConvertIfCoordinatesNotClear() {
     String noArtifact = getDependency("group", null, "1.0", "runtime", null);
     configureFromFileText("pom.xml", noArtifact);
 
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java
index 2a7ece0f2744..91563ed2afc1 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterTest.java
@@ -23,7 +23,7 @@ import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
  */
 public class GradleConsoleFilterTest extends CodeInsightFixtureTestCase {
 
-  public void testApplyFilter() throws Exception {
+  public void testApplyFilter() {
     doTest("Build file 'C:\\project\\build.gradle' line: 7", "C:\\project\\build.gradle", 7);
     doTest("Build file '/project/build.gradle' line: 7", "/project/build.gradle", 7);
     doTest("  build file 'C:\\project\\build.gradle': 49: unexpected token: 5 @ line 49, column 28.", "C:\\project\\build.gradle", 49);
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleClassFinderTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleClassFinderTest.java
index 2ce927ad4877..182e43db85fc 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleClassFinderTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleClassFinderTest.java
@@ -39,7 +39,7 @@ public class GradleClassFinderTest extends GradleImportingTestCase {
    */
   @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass")
   @Parameterized.Parameters(name = "with Gradle-{0}")
-  public static Collection<Object[]> data() throws Throwable {
+  public static Collection<Object[]> data() {
     return Arrays.asList(new Object[][]{{BASE_GRADLE_VERSION}});
   }
 
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
index 936b081ea89d..29dfc2ac8d44 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
@@ -95,7 +95,7 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes
     assumeThat(gradleVersion, versionMatcherRule.getMatcher());
     new WriteAction() {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         Sdk oldJdk = ProjectJdkTable.getInstance().findJdk(GRADLE_JDK_NAME);
         if (oldJdk != null) {
           ProjectJdkTable.getInstance().removeJdk(oldJdk);
@@ -122,7 +122,7 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes
     try {
       new WriteAction() {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           Sdk old = ProjectJdkTable.getInstance().findJdk(GRADLE_JDK_NAME);
           if (old != null) {
             SdkConfigurationUtil.removeSdk(old);
@@ -138,7 +138,7 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes
   }
 
   @Override
-  protected void collectAllowedRoots(final List<String> roots) throws IOException {
+  protected void collectAllowedRoots(final List<String> roots) {
     roots.add(myJdkHome);
     roots.addAll(collectRootsInside(myJdkHome));
     roots.add(PathManager.getConfigPath());
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
index 5715e892b738..c9e6efb272b2 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
@@ -48,7 +48,7 @@ public class GradleMiscImportingTest extends GradleImportingTestCase {
    */
   @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass")
   @Parameterized.Parameters(name = "with Gradle-{0}")
-  public static Collection<Object[]> data() throws Throwable {
+  public static Collection<Object[]> data() {
     return Arrays.asList(new Object[][]{{BASE_GRADLE_VERSION}});
   }
 
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleProjectOpenProcessorTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleProjectOpenProcessorTest.java
index af8eb7228752..7d6e1dd8f8ee 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleProjectOpenProcessorTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleProjectOpenProcessorTest.java
@@ -64,7 +64,7 @@ public class GradleProjectOpenProcessorTest extends GradleImportingTestCase {
    */
   @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass")
   @Parameterized.Parameters(name = "with Gradle-{0}")
-  public static Collection<Object[]> data() throws Throwable {
+  public static Collection<Object[]> data() {
     return Arrays.asList(new Object[][]{{BASE_GRADLE_VERSION}});
   }
 
@@ -73,7 +73,7 @@ public class GradleProjectOpenProcessorTest extends GradleImportingTestCase {
     super.setUp();
     new WriteAction() {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         for (Sdk sdk : ProjectJdkTable.getInstance().getAllJdks()) {
           if (GRADLE_JDK_NAME.equals(sdk.getName())) continue;
           ProjectJdkTable.getInstance().removeJdk(sdk);
@@ -88,7 +88,7 @@ public class GradleProjectOpenProcessorTest extends GradleImportingTestCase {
     try {
       new WriteAction() {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           for (Sdk sdk : removedSdks) {
             SdkConfigurationUtil.addSdk(sdk);
           }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java
index 3196f9801e71..e5bfb432df42 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java
@@ -30,12 +30,12 @@ import java.io.File;
  */
 public class AddGradleDslDependencyActionTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testAddMavenDependencyInEmptyFile() throws Exception {
+  public void testAddMavenDependencyInEmptyFile() {
     AddGradleDslDependencyAction.TEST_THREAD_LOCAL.set(ContainerUtil.list(new MavenId("testGroupId", "testArtifactId", "1.0")));
     doTest("testAddMavenDependencyInEmptyFile.gradle");
   }
 
-  public void testAddMavenDependencyIntoExistingBlock() throws Exception {
+  public void testAddMavenDependencyIntoExistingBlock() {
     AddGradleDslDependencyAction.TEST_THREAD_LOCAL.set(ContainerUtil.list(new MavenId("testGroupId", "testArtifactId", "1.0")));
     doTest("testAddMavenDependencyIntoExistingBlock.gradle");
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelperTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelperTest.java
index 20bdb70a4289..72da00ca99c3 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelperTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelperTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals;
 public class GradleExecutionHelperTest {
 
   @Test
-  public void testPasswordObfuscation() throws Exception {
+  public void testPasswordObfuscation() {
     List<String> originalArgs = ImmutableList.of(
       "--configure-on-demand",
       "-Pandroid.injected.invoked.from.ide=true",
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/BaseProjectImportErrorHandlerTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/BaseProjectImportErrorHandlerTest.java
index a8f4267572a6..c5ed8b465861 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/BaseProjectImportErrorHandlerTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/BaseProjectImportErrorHandlerTest.java
@@ -33,7 +33,7 @@ public class BaseProjectImportErrorHandlerTest {
   private String myProjectPath;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     myErrorHandler = new BaseProjectImportErrorHandler();
     myProjectPath = "basic";
   }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtilTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtilTest.java
index f068aaf07bb1..e6f2f3ae771a 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtilTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtilTest.java
@@ -37,7 +37,7 @@ public class GradleProjectResolverUtilTest {
   public static final ProjectRule myProjectRule = new ProjectRule();
 
   @Test
-  public void testGetGradlePath() throws Exception {
+  public void testGetGradlePath() {
     assertNull(GradleProjectResolverUtil.getGradlePath(null));
 
     final Module rootModule = createModuleMock("rootModule");
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 a0bf88732cd0..543352751b6d 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
@@ -198,7 +198,7 @@ public abstract class AbstractModelBuilderTest {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     if (testDir != null) {
       FileUtil.delete(testDir);
     }
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java
index 6baa51252d32..36a3ac63018d 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImplTest.java
@@ -42,7 +42,7 @@ public class ModelBuildScriptClasspathBuilderImplTest extends AbstractModelBuild
 
   @Test
   @TargetVersions("2.0+")
-  public void testModelBuildScriptClasspathBuilder() throws Exception {
+  public void testModelBuildScriptClasspathBuilder() {
 
     DomainObjectSet<? extends IdeaModule> ideaModules = allModels.getIdeaProject().getModules();
 
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImplTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImplTest.java
index f4f2c37b9cb3..6a4107ee5131 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImplTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModuleExtendedModelBuilderImplTest.java
@@ -43,7 +43,7 @@ public class ModuleExtendedModelBuilderImplTest extends AbstractModelBuilderTest
   }
 
   @Test
-  public void testGradleSourcesSetsInterpretation() throws Exception {
+  public void testGradleSourcesSetsInterpretation() {
     final int modulesSize = 9;
 
     DomainObjectSet<? extends IdeaModule> ideaModules = allModels.getIdeaProject().getModules();
@@ -136,7 +136,7 @@ public class ModuleExtendedModelBuilderImplTest extends AbstractModelBuilderTest
   }
 
   @Test
-  public void testJavaExtendedModel() throws Exception {
+  public void testJavaExtendedModel() {
     final Map<String, ModuleExtendedModel> modulesMap = getModulesMap(ModuleExtendedModel.class);
     assertEquals(3, modulesMap.size());
 
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImplTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImplTest.java
index 5a2650eadefc..28b4488e0806 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImplTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/ScalaModelBuilderImplTest.java
@@ -41,7 +41,7 @@ public class ScalaModelBuilderImplTest extends AbstractModelBuilderTest {
   }
 
   @Test
-  public void testScalaModel() throws Exception {
+  public void testScalaModel() {
     DomainObjectSet<? extends IdeaModule> ideaModules = allModels.getIdeaProject().getModules();
 
     List<ScalaModel> scalaModels = ContainerUtil.mapNotNull(ideaModules,
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/WebConfigurationBuilderImplTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/WebConfigurationBuilderImplTest.java
index 115bff2b6eb3..7e8347569165 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/WebConfigurationBuilderImplTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/WebConfigurationBuilderImplTest.java
@@ -41,7 +41,7 @@ public class WebConfigurationBuilderImplTest extends AbstractModelBuilderTest {
   }
 
   @Test
-  public void testDefaultWarModel() throws Exception {
+  public void testDefaultWarModel() {
     DomainObjectSet<? extends IdeaModule> ideaModules = allModels.getIdeaProject().getModules();
 
     List<WebConfiguration> ideaModule = ContainerUtil.mapNotNull(ideaModules,
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/internal/ExtraModelBuilderTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/internal/ExtraModelBuilderTest.java
index 40b215962873..b4371af27e03 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/internal/ExtraModelBuilderTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/internal/ExtraModelBuilderTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue;
 public class ExtraModelBuilderTest {
 
   @Test
-  public void testVersionMatching() throws Exception {
+  public void testVersionMatching() {
 
     assertTrue(isMatching("1.8", TestModelBuilderService_v_1_8.class));
     assertTrue(isMatching("1.8-rc-1", TestModelBuilderService_v_1_8.class));
diff --git a/plugins/groovy/structuralsearch-groovy/testSrc/com/intellij/structuralsearch/GroovyStructuralSearchTest.java b/plugins/groovy/structuralsearch-groovy/testSrc/com/intellij/structuralsearch/GroovyStructuralSearchTest.java
index b4c8d39bc62c..0a523b775001 100644
--- a/plugins/groovy/structuralsearch-groovy/testSrc/com/intellij/structuralsearch/GroovyStructuralSearchTest.java
+++ b/plugins/groovy/structuralsearch-groovy/testSrc/com/intellij/structuralsearch/GroovyStructuralSearchTest.java
@@ -23,7 +23,7 @@ import org.jetbrains.plugins.groovy.GroovyFileType;
  */
 public class GroovyStructuralSearchTest extends StructuralSearchTestCase {
 
-  public void test1() throws Exception {
+  public void test1() {
     String s = "def int x = 0;\n" +
                "def y = 0;\n" +
                "int z = 10;\n" +
@@ -38,7 +38,7 @@ public class GroovyStructuralSearchTest extends StructuralSearchTestCase {
     doTest(s, "int $x$ = $value$", 2, 2);
   }
 
-  public void test2() throws Exception {
+  public void test2() {
     String s = "def void f(int x) {}\n" +
                "def f(int x) {\n" +
                "  System.out.println(\"hello\");\n" +
@@ -66,7 +66,7 @@ public class GroovyStructuralSearchTest extends StructuralSearchTestCase {
     doTest(s, "def '_T1('_T2*) {'_T3*}", 6, 1);
   }
 
-  public void test3() throws Exception {
+  public void test3() {
     String s = "public class C implements I1, I2 {\n" +
                "  void f() {\n" +
                "    def a = 1;\n" +
@@ -85,7 +85,7 @@ public class GroovyStructuralSearchTest extends StructuralSearchTestCase {
     doTest(s, "def a = 1\n def b = 2", 1, 0);
   }
 
-  public void test4() throws Exception {
+  public void test4() {
     String s = "for (a in list) {\n" +
                "  println(\"hello1\");\n" +
                "  println(\"hello2\");\n" +
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyGotoTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyGotoTest.java
index 119560560ed8..b89d82cbc177 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyGotoTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyGotoTest.java
@@ -48,27 +48,27 @@ public class GroovyGotoTest extends LightCodeInsightFixtureTestCase {
     assertTrue(verifier.value(target));
   }
 
-  public void testNewExpression() throws Throwable {
+  public void testNewExpression() {
     doTest(element -> element instanceof GrMethod && ((GrMethod)element).isConstructor() && ((GrMethod)element).getParameters().length == 0);
   }
 
-  public void testNewExpressionWithNamedArgs() throws Throwable {
+  public void testNewExpressionWithNamedArgs() {
     doTest(element -> element instanceof PsiClass);
   }
 
-  public void testNewExpressionWithMapParameter() throws Throwable {
+  public void testNewExpressionWithMapParameter() {
     doTest(element -> element instanceof GrMethod && ((GrMethod)element).isConstructor() && ((GrMethod)element).getParameters().length == 1);
   }
 
-  public void testNewExpressionWithAnonymousClass() throws Throwable {
+  public void testNewExpressionWithAnonymousClass() {
     doTest(element -> element instanceof GrMethod && ((GrMethod)element).isConstructor() && ((GrMethod)element).getParameters().length == 2);
   }
 
-  public void testGroovyDocParameter1() throws Throwable {
+  public void testGroovyDocParameter1() {
     doTest(element -> element instanceof GrParameter && ((GrParameter)element).getName().equals("x"));
   }
 
-  public void testGroovyDocParameter2() throws Throwable {
+  public void testGroovyDocParameter2() {
     doTest(element -> element instanceof GrParameter && ((GrParameter)element).getName().equals("x"));
   }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/ReferenceCompletionTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/ReferenceCompletionTest.java
index 30eaebab80ef..d25cb9800ac7 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/ReferenceCompletionTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/ReferenceCompletionTest.java
@@ -23,31 +23,31 @@ import org.jetbrains.plugins.groovy.util.TestUtils;
  */
 public class ReferenceCompletionTest extends CompletionTestBase {
 
-  public void testEscapedReference() throws Throwable { doTest(); }
-  public void testGrvy1021() throws Throwable { doTest(); }
-  public void testGrvy1021a() throws Throwable { doTest(); }
-  public void testGrvy1021b() throws Throwable { doTest(); }
-  public void testGrvy1156() throws Throwable { doTest(); }
-  public void testGrvy117() throws Throwable { doTest(); }
-  public void testGrvy1272() throws Throwable { doTest(); }
-  public void testGRVY1316() throws Throwable { doTest(); }
-  public void testGrvy194() throws Throwable { doTest(); }
-  public void testGrvy194_1() throws Throwable { doTest(); }
-  public void testGRVY223() throws Throwable { doTest(); }
-  public void testGrvy487() throws Throwable { doTest(); }
-  public void testGrvy491() throws Throwable { doTest(); }
-  public void testGrvy76() throws Throwable { doTest(); }
-  public void testGrvy959() throws Throwable { doTest(); }
-  public void testOnDemand() throws Throwable { doTest(); }
-  public void testStaticMethod() throws Throwable { doTest(); }
-  public void testThrowVariable() throws Throwable { doTest(); }
-  public void testTupleCompl1() throws Throwable { doTest(); }
-  public void testTupleLongListAssign() throws Throwable { doTest(); }
-  public void testTupleObjCompl() throws Throwable { doTest(); }
-  public void testTupleShortListAss() throws Throwable { doTest(); }
-  public void testTupleTypedCompl() throws Throwable { doTest(); }
-  public void testType() throws Throwable { doTest(); }
-  public void testUntyped() throws Throwable { doTest(); }
+  public void testEscapedReference() { doTest(); }
+  public void testGrvy1021() { doTest(); }
+  public void testGrvy1021a() { doTest(); }
+  public void testGrvy1021b() { doTest(); }
+  public void testGrvy1156() { doTest(); }
+  public void testGrvy117() { doTest(); }
+  public void testGrvy1272() { doTest(); }
+  public void testGRVY1316() { doTest(); }
+  public void testGrvy194() { doTest(); }
+  public void testGrvy194_1() { doTest(); }
+  public void testGRVY223() { doTest(); }
+  public void testGrvy487() { doTest(); }
+  public void testGrvy491() { doTest(); }
+  public void testGrvy76() { doTest(); }
+  public void testGrvy959() { doTest(); }
+  public void testOnDemand() { doTest(); }
+  public void testStaticMethod() { doTest(); }
+  public void testThrowVariable() { doTest(); }
+  public void testTupleCompl1() { doTest(); }
+  public void testTupleLongListAssign() { doTest(); }
+  public void testTupleObjCompl() { doTest(); }
+  public void testTupleShortListAss() { doTest(); }
+  public void testTupleTypedCompl() { doTest(); }
+  public void testType() { doTest(); }
+  public void testUntyped() { doTest(); }
 
   @Override
   protected String getBasePath() {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/secondUnsafeCall/SecondUnsafeCallTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/secondUnsafeCall/SecondUnsafeCallTest.java
index 6753a9e093e2..1bd8d0bb5ce1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/secondUnsafeCall/SecondUnsafeCallTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/secondUnsafeCall/SecondUnsafeCallTest.java
@@ -29,7 +29,7 @@ public class SecondUnsafeCallTest extends LightCodeInsightFixtureTestCase {
     return TestUtils.getTestDataPath() + "groovy/inspections/secondUnsafeCall";
   }
 
-  public void doTest() throws Exception {
+  public void doTest() {
     final List<String> data = TestUtils.readInput(getTestDataPath() + "/" + getTestName(true) + ".test");
 
     myFixture.configureByText("a.groovy", data.get(0));
@@ -40,10 +40,10 @@ public class SecondUnsafeCallTest extends LightCodeInsightFixtureTestCase {
     myFixture.checkResult(data.get(1));
   }
 
-  public void test4Calls() throws Throwable { doTest(); }
-  public void testMethodCall() throws Throwable { doTest(); }
-  public void testMethodsCalls() throws Throwable { doTest(); }
-  public void testSecondUnsafeCall1() throws Throwable { doTest(); }
-  public void testVarInit() throws Throwable { doTest(); }
+  public void test4Calls() { doTest(); }
+  public void testMethodCall() { doTest(); }
+  public void testMethodsCalls() { doTest(); }
+  public void testSecondUnsafeCall1() { doTest(); }
+  public void testVarInit() { doTest(); }
 
 }
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/removeParenthesis/RemoveUnnecessaryParenthesisTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/removeParenthesis/RemoveUnnecessaryParenthesisTest.java
index a9e601284783..fdba206a0c12 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/removeParenthesis/RemoveUnnecessaryParenthesisTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/removeParenthesis/RemoveUnnecessaryParenthesisTest.java
@@ -26,7 +26,7 @@ public class RemoveUnnecessaryParenthesisTest extends LightCodeInsightFixtureTes
     return TestUtils.getTestDataPath() + "intentions/removeParenth/";
   }
 
-  public void testRemoveUnnecessaryParenthesis() throws Throwable {
+  public void testRemoveUnnecessaryParenthesis() {
     doTest();
   }
 
@@ -37,7 +37,7 @@ public class RemoveUnnecessaryParenthesisTest extends LightCodeInsightFixtureTes
     myFixture.checkResultByFile(getTestName(false) + "_after.groovy");
   }
 
-  public void testNothingInsideClosure() throws Throwable {
+  public void testNothingInsideClosure() {
     myFixture.configureByFile(getTestName(false) + ".groovy");
     assertEmpty(myFixture.filterAvailableIntentions("Remove Unnecessary Parentheses"));
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/strings/RemoveUnnecessaryBracesInGStringTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/strings/RemoveUnnecessaryBracesInGStringTest.java
index b3aa9eade01c..be11b45f825e 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/strings/RemoveUnnecessaryBracesInGStringTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/strings/RemoveUnnecessaryBracesInGStringTest.java
@@ -28,15 +28,15 @@ public class RemoveUnnecessaryBracesInGStringTest extends GrIntentionTestCase {
     return TestUtils.getTestDataPath() + "intentions/removeUnnecessaryBraces/";
   }
 
-  public void testIntention() throws Exception {
+  public void testIntention() {
     doTest("Remove unnecessary braces in GString", true);
   }
 
-  public void testRefWithQualifier() throws Exception {
+  public void testRefWithQualifier() {
     doTest("Remove unnecessary braces in GString", true);
   }
 
-  public void testNoIntention() throws Exception {
+  public void testNoIntention() {
     doTest("Remove unnecessary braces in GString", false);
   }
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLineMarkerTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLineMarkerTest.java
index 792b195c4d41..e2b7362fa4be 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLineMarkerTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyLineMarkerTest.java
@@ -34,36 +34,36 @@ public class GroovyLineMarkerTest extends LightCodeInsightFixtureTestCase {
     return TestUtils.getTestDataPath() + "lineMarker/";
   }
 
-  public void testInterface() throws Throwable {
+  public void testInterface() {
     doSimpleTest(3);}
-  public void testGStringMethodName() throws Throwable {
+  public void testGStringMethodName() {
     doSimpleTest(3);}
-  public void testStringMethodName() throws Throwable {
+  public void testStringMethodName() {
     doSimpleTest(3);}
-  public void testAllGStringMethodName() throws Throwable {
+  public void testAllGStringMethodName() {
     doSimpleTest(3);}
 
-  public void testJavaToGroovy() throws Throwable {
+  public void testJavaToGroovy() {
     myFixture.configureByFiles(getTestName(false)+".groovy", getTestName(false)+".java");
     doTest(1);
   }
 
-  public void testGroovyToJava() throws Throwable {
+  public void testGroovyToJava() {
     myFixture.configureByFiles(getTestName(false)+".groovy", getTestName(false)+".java");
     doTest(2);
   }
 
-  public void testJavaToGroovy2() throws Throwable {
+  public void testJavaToGroovy2() {
     myFixture.configureByFiles("JavaToGroovy.java", "JavaToGroovy.groovy");
     doTest(2);
   }
 
-  public void testGroovyToJava2() throws Throwable {
+  public void testGroovyToJava2() {
     myFixture.configureByFiles("GroovyToJava.java", "GroovyToJava.groovy");
     doTest(1);
   }
 
-  private void doSimpleTest(int count) throws Throwable{
+  private void doSimpleTest(int count) {
     myFixture.configureByFile(getTestName(false)+".groovy");
     doTest(count);
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/updown/GroovyMoveStatementTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/updown/GroovyMoveStatementTest.java
index 84d03bd8f74d..70b792fd24fb 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/updown/GroovyMoveStatementTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/updown/GroovyMoveStatementTest.java
@@ -32,13 +32,13 @@ public class GroovyMoveStatementTest extends GroovyEditorActionTestBase {
     return TestUtils.getTestDataPath() + "groovy/actions/moveStatement/";
   }
 
-  public void testClazz2() throws Throwable { bothTest(); }
+  public void testClazz2() { bothTest(); }
 
-  public void testClos2() throws Throwable { bothTest(); }
+  public void testClos2() { bothTest(); }
 
-  public void testMeth1() throws Throwable { bothTest(); }
+  public void testMeth1() { bothTest(); }
 
-  public void testMeth2() throws Throwable {
+  public void testMeth2() {
     final List<String> data = TestUtils.readInput(getTestDataPath() + getTestName(true) + ".test");
 
     myFixture.configureByText(GroovyFileType.GROOVY_FILE_TYPE, data.get(0));
@@ -46,63 +46,63 @@ public class GroovyMoveStatementTest extends GroovyEditorActionTestBase {
     myFixture.checkResult(data.get(1));
   }
 
-  public void testMeth3() throws Throwable { bothTest(); }
-  public void testMeth4() throws Throwable { bothTest(); }
+  public void testMeth3() { bothTest(); }
+  public void testMeth4() { bothTest(); }
 
-  public void testIfst() throws Throwable { bothTest(); }
-  public void testIfst2() throws Throwable { bothTest(); }
+  public void testIfst() { bothTest(); }
+  public void testIfst2() { bothTest(); }
 
-  public void testSimple1() throws Throwable { bothTest(); }
-  public void testSimple2() throws Throwable { bothTest(); }
+  public void testSimple1() { bothTest(); }
+  public void testSimple2() { bothTest(); }
 
-  public void testTryst1() throws Throwable { bothTest(); }
-  public void testTryst2() throws Throwable { bothTest(); }
+  public void testTryst1() { bothTest(); }
+  public void testTryst2() { bothTest(); }
 
-  public void testStatementOutsideClosure() throws Throwable { bothTest(); }
-  public void testVariableOutsideClosure() throws Throwable { bothTest(); }
-  public void testVariableOutsideClosureDown() throws Throwable { bothTest(); }
-  public void testStatementInsideClosure() throws Throwable { bothTest(); }
+  public void testStatementOutsideClosure() { bothTest(); }
+  public void testVariableOutsideClosure() { bothTest(); }
+  public void testVariableOutsideClosureDown() { bothTest(); }
+  public void testStatementInsideClosure() { bothTest(); }
 
-  public void testMoveGroovydocWithMethod() throws Throwable { bothTest(); }
-  public void testLeaveGroovydocWithMethod() throws Throwable { bothTest(); }
-  public void testMoveMethodWithGroovydoc() throws Throwable { bothTest(); }
-  public void testMoveGroovyDocWithField() throws Throwable { bothTest(); }
+  public void testMoveGroovydocWithMethod() { bothTest(); }
+  public void testLeaveGroovydocWithMethod() { bothTest(); }
+  public void testMoveMethodWithGroovydoc() { bothTest(); }
+  public void testMoveGroovyDocWithField() { bothTest(); }
   
-  public void testMoveSecondFieldUp() throws Throwable { bothTest(); }
-  public void testMoveFirstFieldDown() throws Throwable { bothTest(); }
+  public void testMoveSecondFieldUp() { bothTest(); }
+  public void testMoveFirstFieldDown() { bothTest(); }
 
-  public void testVariableOverMethodInScript() throws Throwable { bothTest(); }
-  public void testVariableOverClassInScript() throws Throwable { bothTest(); }
+  public void testVariableOverMethodInScript() { bothTest(); }
+  public void testVariableOverClassInScript() { bothTest(); }
 
-  public void testUpFromLastOffset() throws Throwable { bothTest(); }
+  public void testUpFromLastOffset() { bothTest(); }
   
-  public void testClosureWithPrequel() throws Throwable { bothTest(); }
+  public void testClosureWithPrequel() { bothTest(); }
 
-  public void testMultiLineVariable() throws Throwable { bothTest(); }
-  public void testClosureVariableByRBrace() throws Throwable { bothTest(); }
+  public void testMultiLineVariable() { bothTest(); }
+  public void testClosureVariableByRBrace() { bothTest(); }
 
-  public void testInsideMultilineString() throws Throwable { bothTest(); }
-  public void testAroundMultilineString() throws Throwable { bothTest(); }
-  public void testAroundMultilineString2() throws Throwable { bothTest(); }
+  public void testInsideMultilineString() { bothTest(); }
+  public void testAroundMultilineString() { bothTest(); }
+  public void testAroundMultilineString2() { bothTest(); }
 
-  public void testInSwitchCaseUp1() throws Throwable { bothTest(); }
-  public void testInSwitchCaseUp2() throws Throwable { bothTest(); }
-  public void testInSwitchCaseUp3() throws Throwable { bothTest(); }
-  public void testInSwitchCaseUp4() throws Throwable { bothTest(); }
-  public void testInSwitchCaseUp5() throws Throwable { bothTest(); }
+  public void testInSwitchCaseUp1() { bothTest(); }
+  public void testInSwitchCaseUp2() { bothTest(); }
+  public void testInSwitchCaseUp3() { bothTest(); }
+  public void testInSwitchCaseUp4() { bothTest(); }
+  public void testInSwitchCaseUp5() { bothTest(); }
 
-  public void testTwoStatements() throws Throwable { bothTest(); }
+  public void testTwoStatements() { bothTest(); }
 
-  public void testStatementToEmptySpace() throws Throwable { bothTest(); }
-  public void testStatementToEmptySpace2() throws Throwable { bothTest(); }
-  public void testStatementToEmptySpace3() throws Throwable { bothTest(); }
+  public void testStatementToEmptySpace() { bothTest(); }
+  public void testStatementToEmptySpace2() { bothTest(); }
+  public void testStatementToEmptySpace3() { bothTest(); }
 
-  public void testStatementsWithSemicolons() throws Throwable { bothTest(); }
-  public void testStatementsWithComments() throws Throwable { bothTest(); }
-  public void testMoveIntoEmptyLine() throws Throwable { bothTest(); }
-  public void testMoveIntoEmptyLine2() throws Throwable { bothTest(); }
+  public void testStatementsWithSemicolons() { bothTest(); }
+  public void testStatementsWithComments() { bothTest(); }
+  public void testMoveIntoEmptyLine() { bothTest(); }
+  public void testMoveIntoEmptyLine2() { bothTest(); }
 
-  public void testClassesWithFields() throws Throwable { bothTest(); }
+  public void testClassesWithFields() { bothTest(); }
 
   private void bothTest() {
     final List<String> data = TestUtils.readInput(getTestDataPath() + getTestName(true) + ".test");
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/dynamic/DynamicTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/dynamic/DynamicTest.java
index 511751080859..5d83ea2505b7 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/dynamic/DynamicTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/dynamic/DynamicTest.java
@@ -42,7 +42,7 @@ public class DynamicTest extends JavaCodeInsightFixtureTestCase {
     return TestUtils.getTestDataPath() + "dynamic/";
   }
 
-  public void testMethod() throws Throwable {
+  public void testMethod() {
     final GrReferenceExpression referenceExpression = doDynamicFix();
 
     final PsiType[] psiTypes = PsiUtil.getArgumentTypes(referenceExpression, false);
@@ -60,12 +60,12 @@ public class DynamicTest extends JavaCodeInsightFixtureTestCase {
     return classElement;
   }
 
-  public void testProperty() throws Throwable {
+  public void testProperty() {
     final String name = doDynamicFix().getReferenceName();
     assert getDClassElement().getPropertyByName(name) != null;
   }
 
-  private GrReferenceExpression doDynamicFix() throws Throwable {
+  private GrReferenceExpression doDynamicFix() {
     myFixture.enableInspections(new GrUnresolvedAccessInspection());
 
     final List<IntentionAction> actions = myFixture.getAvailableIntentions(getTestName(false) + ".groovy");
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/gotosuper/GroovyGoToSuperTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/gotosuper/GroovyGoToSuperTest.java
index f31e1853818c..db8c6f646b57 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/gotosuper/GroovyGoToSuperTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/gotosuper/GroovyGoToSuperTest.java
@@ -34,11 +34,11 @@ public class GroovyGoToSuperTest extends LightCodeInsightFixtureTestCase {
     return TestUtils.getTestDataPath() + "groovy/gotoSuper/";
   }
 
-  public void testGts1() throws Throwable { doTest(); }
-  public void testGts2() throws Throwable { doTest(); }
-  public void testGts3() throws Throwable { doTest(); }
+  public void testGts1() { doTest(); }
+  public void testGts2() { doTest(); }
+  public void testGts3() { doTest(); }
 
-  private void doTest() throws Throwable {
+  private void doTest() {
     final List<String> data = TestUtils.readInput(getTestDataPath() + getTestName(true) + ".test");
     myFixture.configureByText(GroovyFileType.GROOVY_FILE_TYPE, data.get(0));
     final CodeInsightActionHandler handler = CodeInsightActions.GOTO_SUPER.forLanguage(GroovyLanguage.INSTANCE);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/AllSuperMethodsTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/AllSuperMethodsTest.java
index 80ee74772afc..2ab569123c99 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/AllSuperMethodsTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/AllSuperMethodsTest.java
@@ -9,14 +9,14 @@ public class AllSuperMethodsTest extends OverridingTester {
     return super.getBasePath() + "allSuperMethods";
   }
 
-  public void testExtendsAndImplements() throws Throwable { doTest(); }
-  public void testExtendsClass() throws Throwable { doTest(); }
-  public void testImplementsImplements() throws Throwable { doTest(); }
-  public void testImplementsInterface() throws Throwable { doTest(); }
-  public void testManyOverrMethods2() throws Throwable { doTest(); }
-  public void testManySuperMethods() throws Throwable { doTest(); }
-  public void testMethodWithoutParameters() throws Throwable { doTest(); }
-  public void testMethodWithParameters() throws Throwable { doTest(); }
+  public void testExtendsAndImplements() { doTest(); }
+  public void testExtendsClass() { doTest(); }
+  public void testImplementsImplements() { doTest(); }
+  public void testImplementsInterface() { doTest(); }
+  public void testManyOverrMethods2() { doTest(); }
+  public void testManySuperMethods() { doTest(); }
+  public void testMethodWithoutParameters() { doTest(); }
+  public void testMethodWithParameters() { doTest(); }
 
   @Override
   PsiMethod[] findMethod(PsiMethod method) {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/DeepestSuperMethodsTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/DeepestSuperMethodsTest.java
index d7fbf5c1ef27..41ad053db27e 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/DeepestSuperMethodsTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/DeepestSuperMethodsTest.java
@@ -4,12 +4,12 @@ import com.intellij.psi.PsiMethod;
 
 public class DeepestSuperMethodsTest extends OverridingTester {
 
-  public void testManyOverridingMethods() throws Throwable { doTest(); }
-  public void testManyOverrMethods2() throws Throwable { doTest(); }
-  public void testManyOverrMethods3() throws Throwable { doTest(); }
-  public void testManyOverrMethods4() throws Throwable { doTest(); }
-  public void testOverrideClassMethod() throws Throwable { doTest(); }
-  public void testOverrideInterfaceMethod() throws Throwable { doTest(); }
+  public void testManyOverridingMethods() { doTest(); }
+  public void testManyOverrMethods2() { doTest(); }
+  public void testManyOverrMethods3() { doTest(); }
+  public void testManyOverrMethods4() { doTest(); }
+  public void testOverrideClassMethod() { doTest(); }
+  public void testOverrideInterfaceMethod() { doTest(); }
 
 
   @Override
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/OverridingTester.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/OverridingTester.java
index 528945c474bf..e26f94454311 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/OverridingTester.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/OverridingTester.java
@@ -15,7 +15,7 @@ public abstract class OverridingTester extends LightCodeInsightFixtureTestCase {
     return TestUtils.getTestDataPath() + "overriding/";
   }
 
-  public void doTest() throws Throwable {
+  public void doTest() {
     final String testFile = getTestName(true) + ".test";
     final List<String> strings = TestUtils.readInput(getTestDataPath() + "/" + testFile);
     GroovyFileBase psiFile = (GroovyFileBase) myFixture.addFileToProject("foo.groovy", strings.get(0));
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/PsiEventsTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/PsiEventsTest.java
index 448ad4529321..788681459000 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/PsiEventsTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/PsiEventsTest.java
@@ -1,20 +1,20 @@
 package org.jetbrains.plugins.groovy.lang.psi;
 
-import com.intellij.testFramework.PsiTestCase;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.util.Ref;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiTreeChangeAdapter;
 import com.intellij.psi.PsiTreeChangeEvent;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.command.CommandProcessor;
-import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.testFramework.PsiTestCase;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * @author ven
  */
 public class PsiEventsTest extends PsiTestCase {
-  public void testEditingInDocComment() throws  Exception {
+  public void testEditingInDocComment() {
     final Ref<Boolean> gotIt = new Ref<>(false);
     getPsiManager().addPsiTreeChangeListener(new PsiTreeChangeAdapter() {
       @Override
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveLabelTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveLabelTest.java
index f3e0bec8ac7b..5a70ddec5dd6 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveLabelTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveLabelTest.java
@@ -31,21 +31,21 @@ public class ResolveLabelTest extends GroovyResolveTestCase {
     return TestUtils.getTestDataPath()+"resolve/label";
   }
 
-  public void testLabelResolve() throws Exception {
+  public void testLabelResolve() {
     final PsiReference ref = configureByFile(getTestName(true)+"/"+getTestName(false) + ".groovy");
     final PsiElement resolved = ref.resolve();
     assertNotNull(resolved);
     assertInstanceOf(resolved, GrLabeledStatement.class);
   }
 
-  public void testLabelResolve2() throws Exception {
+  public void testLabelResolve2() {
     final PsiReference ref = configureByFile(getTestName(true)+"/"+getTestName(false) + ".groovy");
     final PsiElement resolved = ref.resolve();
     assertNotNull(resolved);
     assertInstanceOf(resolved, GrLabeledStatement.class);
   }
 
-  public void testLabelNotResolved() throws Exception {
+  public void testLabelNotResolved() {
     final PsiReference ref = configureByFile(getTestName(true)+"/"+getTestName(false) + ".groovy");
     final PsiElement resolved = ref.resolve();
     assertNull(resolved);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/stubs/StubsTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/stubs/StubsTest.java
index 24c4f13f9419..d9af70a38e4a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/stubs/StubsTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/stubs/StubsTest.java
@@ -19,19 +19,19 @@ import java.util.List;
  */
 public class StubsTest extends LightCodeInsightFixtureTestCase {
   
-  public void testConfig_object() throws Throwable { doTest(); }
-  public void testSlurper() throws Throwable { doTest(); }
-  public void testStub1() throws Throwable { doTest(); }
-  public void testStub_field1() throws Throwable { doTest(); }
-  public void testStub_method1() throws Throwable { doTest(); }
-  public void testTypeParameters() throws Throwable { doTest(); }
+  public void testConfig_object() { doTest(); }
+  public void testSlurper() { doTest(); }
+  public void testStub1() { doTest(); }
+  public void testStub_field1() { doTest(); }
+  public void testStub_method1() { doTest(); }
+  public void testTypeParameters() { doTest(); }
 
   @Override
   protected String getBasePath() {
     return TestUtils.getTestDataPath() + "groovy/stubs";
   }
 
-  public void doTest() throws Exception {
+  public void doTest() {
     final List<String> data = TestUtils.readInput(getTestDataPath() + "/" + getTestName(true) + ".test");
     String fileText = data.get(0);
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/GrTurnRefsToSuperTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/GrTurnRefsToSuperTest.java
index f6bb75b4379d..d7866cd317df 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/GrTurnRefsToSuperTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/GrTurnRefsToSuperTest.java
@@ -25,11 +25,11 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.util.TestUtils;
 
 public class GrTurnRefsToSuperTest extends MultiFileTestCase {
-  public void testNoReturnType() throws Exception {
+  public void testNoReturnType() {
     doTest("ClassB", "ClassB1", false);
   }
 
-  private void doTest(@NonNls final String className, @NonNls final String superClassName, final boolean replaceInstanceOf) throws Exception {
+  private void doTest(@NonNls final String className, @NonNls final String superClassName, final boolean replaceInstanceOf) {
     doTest((rootDir, rootAfter) -> this.performAction(className, superClassName, replaceInstanceOf), true);
   }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceVariable/IntroduceVariableValidatorTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceVariable/IntroduceVariableValidatorTest.java
index 14ca3d5dc0df..c4c955c8bdbf 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceVariable/IntroduceVariableValidatorTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceVariable/IntroduceVariableValidatorTest.java
@@ -34,7 +34,6 @@ import org.jetbrains.plugins.groovy.refactoring.introduce.GrIntroduceHandlerBase
 import org.jetbrains.plugins.groovy.refactoring.introduce.variable.GroovyVariableValidator;
 import org.jetbrains.plugins.groovy.util.TestUtils;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -47,22 +46,22 @@ public class IntroduceVariableValidatorTest extends LightCodeInsightFixtureTestC
     return TestUtils.getTestDataPath() + "groovy/refactoring/introduceVariableValidator/";
   }
 
-  public void testAll1() throws Throwable { doTest(); }
-  public void testAll2() throws Throwable { doTest(); }
-  public void testClass1() throws Throwable { doTest(); }
-  public void testClass2() throws Throwable { doTest(); }
-  public void testE() throws Throwable { doTest(); }
-  public void testFile1() throws Throwable { doTest(); }
-  public void testFile2() throws Throwable { doTest(); }
-  public void testLoop1() throws Throwable { doTest(); }
-  public void testLoop2() throws Throwable { doTest(); }
-  public void testLoop3() throws Throwable { doTest(); }
-  public void testSimple() throws Throwable { doTest(); }
+  public void testAll1() { doTest(); }
+  public void testAll2() { doTest(); }
+  public void testClass1() { doTest(); }
+  public void testClass2() { doTest(); }
+  public void testE() { doTest(); }
+  public void testFile1() { doTest(); }
+  public void testFile2() { doTest(); }
+  public void testLoop1() { doTest(); }
+  public void testLoop2() { doTest(); }
+  public void testLoop3() { doTest(); }
+  public void testSimple() { doTest(); }
 
   protected static final String ALL_MARKER = "<all>";
   protected boolean replaceAllOccurences = false;
 
-  private String processFile(String fileText) throws IncorrectOperationException, InvalidDataException, IOException {
+  private String processFile(String fileText) throws IncorrectOperationException, InvalidDataException {
     String result = "";
     int startOffset = fileText.indexOf(TestUtils.BEGIN_MARKER);
     if (startOffset < 0) {
@@ -97,7 +96,7 @@ public class IntroduceVariableValidatorTest extends LightCodeInsightFixtureTestC
   }
 
 
-  public void doTest() throws Exception {
+  public void doTest() {
     final List<String> data = TestUtils.readInput(getTestDataPath() + getTestName(true) + ".test");
     assertEquals(StringUtil.trimEnd(data.get(1), "\n"), processFile(data.get(0)));
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
index 1518df513a50..25f517986a31 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
@@ -16,10 +16,11 @@
 
 package org.jetbrains.plugins.groovy.refactoring.move;
 
-import com.intellij.openapi.application.Result;
-import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
-import com.intellij.openapi.vfs.*;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VfsUtilCore;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.refactoring.PackageWrapper;
@@ -44,15 +45,15 @@ public class GroovyMoveScriptTest extends LightCodeInsightFixtureTestCase {
     return TestUtils.getTestDataPath() + "refactoring/move/moveScript/";
   }
 
-  public void testMoveScriptBasic() throws Exception {
+  public void testMoveScriptBasic() {
     doTest(new String[]{"a/Script.groovy"}, "b");
   }
 
-  public void testUpdateReferences() throws Exception {
+  public void testUpdateReferences() {
     doTest(new String[]{"a/Script.groovy"}, "b");
   }
 
-  public void testMultiMove() throws Exception {
+  public void testMultiMove() {
     doTest(new String[]{"a/Script.groovy", "a/Script2.groovy"}, "b");
   }
 
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java b/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java
index e4fb41f0e5b0..7286a0bb7ff5 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/annotation/HgAnnotationTest.java
@@ -1,7 +1,6 @@
 package hg4idea.test.annotation;
 
 import com.intellij.openapi.util.Clock;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.text.DateFormatUtil;
@@ -51,7 +50,7 @@ public class HgAnnotationTest extends HgPlatformTest {
     super.tearDown();
   }
 
-  public void testAnnotationWithVerboseOption() throws VcsException {
+  public void testAnnotationWithVerboseOption() {
     myRepository.refresh(false, true);
     final VirtualFile file = myRepository.findFileByRelativePath(firstCreatedFile);
     assert file != null;
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java b/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java
index d5537ef42272..37f240c04401 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/history/HgBrowseChangesTest.java
@@ -21,10 +21,8 @@ import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import hg4idea.test.HgPlatformTest;
 import org.zmlx.hg4idea.HgVcs;
-import org.zmlx.hg4idea.execution.HgCommandException;
 import org.zmlx.hg4idea.provider.HgRepositoryLocation;
 
-import java.text.ParseException;
 import java.util.List;
 
 import static com.intellij.openapi.vcs.Executor.cd;
@@ -59,7 +57,7 @@ public class HgBrowseChangesTest extends HgPlatformTest {
     dateAfter = ChangeBrowserSettings.DATE_FORMAT.format(now.getTime());
   }
 
-  public void testLogRevisionWithDataFilter() throws HgCommandException, ParseException, VcsException {
+  public void testLogRevisionWithDataFilter() throws VcsException {
     mySettings.USE_DATE_AFTER_FILTER = true;
     mySettings.USE_DATE_BEFORE_FILTER = true;
     mySettings.DATE_BEFORE = dateBefore;
@@ -67,32 +65,32 @@ public class HgBrowseChangesTest extends HgPlatformTest {
     doTest();
   }
 
-  public void testLogRevisionWithAfterDataFilter() throws HgCommandException, ParseException, VcsException {
+  public void testLogRevisionWithAfterDataFilter() throws VcsException {
     mySettings.USE_DATE_AFTER_FILTER = true;
     mySettings.DATE_AFTER = dateAfter;
     doTest();
   }
 
-  public void testLogRevisionWithBeforeDataFilter() throws HgCommandException, ParseException, VcsException {
+  public void testLogRevisionWithBeforeDataFilter() throws VcsException {
     mySettings.USE_DATE_BEFORE_FILTER = true;
     mySettings.DATE_BEFORE = dateBefore;
     doTest();
   }
 
-  public void testLogRevisionWithBeforeFilter() throws HgCommandException, ParseException, VcsException {
+  public void testLogRevisionWithBeforeFilter() throws VcsException {
 
     mySettings.USE_CHANGE_BEFORE_FILTER = true;
     mySettings.CHANGE_BEFORE = "1";
     doTest();
   }
 
-  public void testLogRevisionWithAfterFilter() throws HgCommandException, ParseException, VcsException {
+  public void testLogRevisionWithAfterFilter() throws VcsException {
     mySettings.USE_CHANGE_AFTER_FILTER = true;
     mySettings.CHANGE_AFTER = "0";
     doTest();
   }
 
-  public void testLogRevisionWithFilter() throws HgCommandException, ParseException, VcsException {
+  public void testLogRevisionWithFilter() throws VcsException {
 
     mySettings.USE_CHANGE_BEFORE_FILTER = true;
     mySettings.USE_CHANGE_AFTER_FILTER = true;
@@ -105,7 +103,7 @@ public class HgBrowseChangesTest extends HgPlatformTest {
     doTest();
   }
 
-  private void doTest() throws HgCommandException, VcsException {
+  private void doTest() throws VcsException {
     CommittedChangesProvider provider = myVcs.getCommittedChangesProvider();
     assert provider != null;
     //noinspection unchecked
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java b/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java
index 754577337366..ed4232e36bc8 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/history/HgHistoryTest.java
@@ -120,7 +120,7 @@ public class HgHistoryTest extends HgPlatformTest {
     }
   }
 
-  public void testUncommittedRenamedFileHistory() throws HgCommandException {
+  public void testUncommittedRenamedFileHistory() {
     cd(myRepository);
     VirtualFile subDir = myRepository.findFileByRelativePath(subDirName);
     assert subDir != null;
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java
index d3d58d9a9be0..0109523d0890 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java
@@ -16,7 +16,6 @@
 package hg4idea.test.merge;
 
 import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.merge.MergeData;
 import com.intellij.openapi.vcs.merge.MergeProvider;
 import com.intellij.openapi.vfs.CharsetToolkit;
@@ -27,8 +26,6 @@ import hg4idea.test.HgTestUtil;
 import org.testng.Assert;
 import org.zmlx.hg4idea.HgVcs;
 
-import java.io.IOException;
-
 import static com.intellij.openapi.vcs.Executor.*;
 import static hg4idea.test.HgExecutor.*;
 
@@ -45,7 +42,7 @@ public class HgMergeProviderTest extends HgPlatformTest {
     assertNotNull(myMergeProvider);
   }
 
-  public void testMerge2BranchesIfFileCreatedSeparatelyInBoth() throws VcsException {
+  public void testMerge2BranchesIfFileCreatedSeparatelyInBoth() {
     cd(myRepository);
     hg("branch branchA");
     hg("commit -m 'create branchA' ");
@@ -62,7 +59,7 @@ public class HgMergeProviderTest extends HgPlatformTest {
     verifyMergeData(myRepository.findChild(aFile), "", "default", "a");
   }
 
-  public void testMerge2Branches() throws VcsException {
+  public void testMerge2Branches() {
     cd(myRepository);
     String aFile = "A.txt";
     touch(aFile, "base");
@@ -166,7 +163,7 @@ public class HgMergeProviderTest extends HgPlatformTest {
    *
    * @return References to the files in parent and child repositories respectively.
    */
-  private Pair<VirtualFile, VirtualFile> prepareFileInBothRepositories() throws IOException {
+  private Pair<VirtualFile, VirtualFile> prepareFileInBothRepositories() {
     cd(myRepository);
     String aFile = "A.txt";
     touch(aFile, "basic");
@@ -184,8 +181,7 @@ public class HgMergeProviderTest extends HgPlatformTest {
     return Pair.create(parentFile, childFile);
   }
 
-  private void verifyMergeData(final VirtualFile file, String expectedBase, String expectedLocal, String expectedServer)
-    throws VcsException {
+  private void verifyMergeData(final VirtualFile file, String expectedBase, String expectedLocal, String expectedServer) {
     EdtTestUtil.runInEdtAndWait(() -> {
       MergeData mergeData = myMergeProvider.loadRevisions(file);
       assertEquals(expectedBase, mergeData.ORIGINAL);
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgRevertUncommittedMergeTest.java b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgRevertUncommittedMergeTest.java
index 3e7677ace4e2..9b1c7d1ff276 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgRevertUncommittedMergeTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgRevertUncommittedMergeTest.java
@@ -15,7 +15,6 @@
  */
 package hg4idea.test.merge;
 
-import com.intellij.openapi.vcs.VcsException;
 import hg4idea.test.HgPlatformTest;
 import org.zmlx.hg4idea.command.HgRevertCommand;
 import org.zmlx.hg4idea.execution.HgCommandResult;
@@ -31,7 +30,7 @@ import static hg4idea.test.HgExecutor.hgMergeWith;
 
 public class HgRevertUncommittedMergeTest extends HgPlatformTest {
 
-  public void testRevertAfterMerge() throws VcsException {
+  public void testRevertAfterMerge() {
     cd(myRepository);
     hg("branch branchA");
     String aFile = "A.txt";
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/validator/HgReferenceValidatorTest.java b/plugins/hg4idea/testSrc/hg4idea/test/validator/HgReferenceValidatorTest.java
index a8e3ed9a4bfc..5e2debbdca18 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/validator/HgReferenceValidatorTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/validator/HgReferenceValidatorTest.java
@@ -62,7 +62,7 @@ public class HgReferenceValidatorTest extends HgPlatformTest {
 
   @Override
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         HgReferenceValidatorTest.super.tearDown();
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDeleteTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDeleteTest.java
index 5dfca9270200..37fdd848e0fb 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDeleteTest.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDeleteTest.java
@@ -41,7 +41,7 @@ public class HgDeleteTest extends HgSingleUserTest {
   }
 
   @Test
-  public void testDeleteNewFile() throws Exception {
+  public void testDeleteNewFile() {
     VirtualFile file = createFileInCommand("a.txt", "new file content");
     deleteFileInCommand(file);
     Assert.assertFalse(file.exists());
@@ -73,7 +73,7 @@ public class HgDeleteTest extends HgSingleUserTest {
    * 3. File shouldn't be prompted for removal from repository.
    */
   @Test
-  public void testNewlyAddedFileShouldNotBePromptedForRemoval() throws Exception {
+  public void testNewlyAddedFileShouldNotBePromptedForRemoval() {
     showConfirmation(VcsConfiguration.StandardConfirmation.REMOVE);
     final VirtualFile vf = createFileInCommand("a.txt", null);
     final HgMockVcsHelper helper = registerMockVcsHelper();
@@ -95,7 +95,7 @@ public class HgDeleteTest extends HgSingleUserTest {
    * 5. File shouldn't be prompted for removal from repository.
    */
   @Test
-  public void testJustDeletedAndThenAddedFileShouldNotBePromptedForRemoval() throws Exception {
+  public void testJustDeletedAndThenAddedFileShouldNotBePromptedForRemoval() {
     VirtualFile vf = createFileInCommand("a.txt", null);
     myChangeListManager.commitFiles(vf);
     deleteFileInCommand(vf);
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java
index e245ae0ba0d4..30fb7e1666f3 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java
@@ -17,15 +17,14 @@ package org.zmlx.hg4idea.test;
 
 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
 /**
@@ -101,7 +100,7 @@ public class HgTestRepository {
    * @param filename relative path to the file.
    * @return The created file.
    */
-  public VirtualFile createFile(String filename) throws FileNotFoundException {
+  public VirtualFile createFile(String filename) {
     return createFile(filename, "initial content");
   }
 
@@ -111,7 +110,7 @@ public class HgTestRepository {
    * @param content  initial content for the file.
    * @return The created file.
    */
-  public VirtualFile createFile(String filename, String content) throws FileNotFoundException {
+  public VirtualFile createFile(String filename, String content) {
     return myTest.createFileInCommand(filename, content);
   }
 
diff --git a/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationInspectionTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationInspectionTest.java
index e18557c6fb94..a70fd510ca04 100644
--- a/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationInspectionTest.java
+++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationInspectionTest.java
@@ -76,7 +76,7 @@ public class CapitalizationInspectionTest extends LightCodeInsightFixtureTestCas
     final IntentionAction action = myFixture.filterAvailableIntentions("Properly capitalize").get(0);
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         action.invoke(getProject(), myFixture.getEditor(), getFile());
       }
     }.execute();
diff --git a/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationTest.java
index d41e3cf64def..a36b44c9ebd0 100644
--- a/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationTest.java
+++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/CapitalizationTest.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nls;
 
 public class CapitalizationTest extends TestCase {
 
-  public void testCapitalization() throws Exception {
+  public void testCapitalization() {
     assertTrue(TitleCapitalizationInspection.checkCapitalization("Fix SQL issues", Nls.Capitalization.Sentence));
     assertTrue(TitleCapitalizationInspection.checkCapitalization("Fix I18n issues", Nls.Capitalization.Sentence));
     assertTrue(TitleCapitalizationInspection.checkCapitalization("Fix C issues", Nls.Capitalization.Sentence));
diff --git a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/DuplicateStringLiteralInspectionTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/DuplicateStringLiteralInspectionTest.java
index 98e11fa752ac..615bd7f9c4fd 100644
--- a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/DuplicateStringLiteralInspectionTest.java
+++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/DuplicateStringLiteralInspectionTest.java
@@ -38,7 +38,7 @@ public class DuplicateStringLiteralInspectionTest extends JavaCodeInsightFixture
     super.tearDown();
   }
 
-  public void testPropertyKey() throws Exception {
+  public void testPropertyKey() {
     myInspection.IGNORE_PROPERTY_KEYS = true;
     try {
       myFixture.testHighlighting("PropertyKey.java");
diff --git a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/I18NInspectionTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/I18NInspectionTest.java
index 5f92a1054f51..4f71e39ae9a4 100644
--- a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/I18NInspectionTest.java
+++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/I18NInspectionTest.java
@@ -13,22 +13,22 @@ import com.intellij.testFramework.InspectionTestCase;
  * @author lesya
  */
 public class I18NInspectionTest extends InspectionTestCase {
-  private void doTest() throws Exception {
+  private void doTest() {
     doTest(new I18nInspection());
   }
-  private void doTest(I18nInspection tool) throws Exception {
+  private void doTest(I18nInspection tool) {
     doTest("i18n/" + getTestName(true), tool);
   }
 
-  public void testHardCodedStringLiteralAsParameter() throws Exception{ doTest(); }
-  public void testReturnTypeInheritsNonNlsAnnotationFromParent() throws Exception{ doTest(); }
-  public void testRecursiveInheritance() throws Exception { doTest(); }
-  public void testParameterInheritsNonNlsAnnotationFromSuper() throws Exception { doTest(); }
-  public void testLocalVariables() throws Exception { doTest(); }
-  public void testFields() throws Exception{ doTest(); }
-  public void testAnonymousClassConstructorParameter() throws Exception { doTest(); }
-  public void testStringBufferNonNls() throws Exception { doTest(); }
-  public void testEnum() throws Exception {
+  public void testHardCodedStringLiteralAsParameter() { doTest(); }
+  public void testReturnTypeInheritsNonNlsAnnotationFromParent() { doTest(); }
+  public void testRecursiveInheritance() { doTest(); }
+  public void testParameterInheritsNonNlsAnnotationFromSuper() { doTest(); }
+  public void testLocalVariables() { doTest(); }
+  public void testFields() { doTest(); }
+  public void testAnonymousClassConstructorParameter() { doTest(); }
+  public void testStringBufferNonNls() { doTest(); }
+  public void testEnum() {
      final JavaPsiFacade facade = getJavaFacade();
      final LanguageLevel effectiveLanguageLevel = LanguageLevelProjectExtension.getInstance(facade.getProject()).getLanguageLevel();
      LanguageLevelProjectExtension.getInstance(facade.getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
@@ -40,19 +40,19 @@ public class I18NInspectionTest extends InspectionTestCase {
      }
    }
 
-  public void testVarargNonNlsParameter() throws Exception { doTest(); }
-  public void testInitializerInAnonymousClass() throws Exception{ doTest(); }
-  public void testNonNlsArray() throws Exception{ doTest(); }
-  public void testParameterInNewAnonymousClass() throws Exception{ doTest(); }
-  public void testConstructorCallOfNonNlsVariable() throws Exception{ doTest(); }
-  public void testSwitchOnNonNlsString() throws Exception{ doTest(); }
-  public void testNonNlsComment() throws Exception{
+  public void testVarargNonNlsParameter() { doTest(); }
+  public void testInitializerInAnonymousClass() { doTest(); }
+  public void testNonNlsArray() { doTest(); }
+  public void testParameterInNewAnonymousClass() { doTest(); }
+  public void testConstructorCallOfNonNlsVariable() { doTest(); }
+  public void testSwitchOnNonNlsString() { doTest(); }
+  public void testNonNlsComment() {
     I18nInspection inspection = new I18nInspection();
     inspection.nonNlsCommentPattern = "MYNON-NLS";
     inspection.cacheNonNlsCommentPattern();
     doTest(inspection);
   }
-  public void testAnnotationArgument() throws Exception{ doTest(); }
+  public void testAnnotationArgument() { doTest(); }
 
   @Override
   protected String getTestDataPath() {
diff --git a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspectionTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspectionTest.java
index 071a1762903a..8dd1a415f0a9 100644
--- a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspectionTest.java
+++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspectionTest.java
@@ -20,24 +20,24 @@ import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.testFramework.InspectionTestCase;
 
 public class InvalidPropertyKeyInspectionTest extends InspectionTestCase {
-  private void doTest() throws Exception {
+  private void doTest() {
     LocalInspectionToolWrapper tool = new LocalInspectionToolWrapper(new InvalidPropertyKeyInspection());
     doTest("invalidPropertyKey/" + getTestName(true), tool, "java 1.5");
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doTest();
   }
 
-  public void testImplicit() throws Exception {
+  public void testImplicit() {
     doTest();
   }
 
-  public void testImplicit2() throws Exception {
+  public void testImplicit2() {
     doTest();
   }
 
-  public void testImplicit3() throws Exception {
+  public void testImplicit3() {
     doTest();
   }
 
diff --git a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/UnusedMessageFormatParameterInspectionTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/UnusedMessageFormatParameterInspectionTest.java
index 1b1ec4e6ed87..a5623bb7e230 100644
--- a/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/UnusedMessageFormatParameterInspectionTest.java
+++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/UnusedMessageFormatParameterInspectionTest.java
@@ -5,23 +5,23 @@ import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.testFramework.InspectionTestCase;
 
 public class UnusedMessageFormatParameterInspectionTest extends InspectionTestCase {
-  private void doTest() throws Exception {
+  private void doTest() {
     doTest("unusedParameter/" + getTestName(true), new UnusedMessageFormatParameterInspection());
   }
 
-  public void testSimpleString() throws Exception {
+  public void testSimpleString() {
     doTest();
   }
 
-  public void testCorruptedValue() throws Exception{
+  public void testCorruptedValue() {
     doTest();
   }
 
-  public void testWithChoiceFormat() throws Exception{
+  public void testWithChoiceFormat() {
     doTest();
   }
 
-  public void testRegexp() throws Exception {
+  public void testRegexp() {
     doTest();
   }
 
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyNoArtifactTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyNoArtifactTest.java
index dff5e22f402b..181a1d26e4dc 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyNoArtifactTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyNoArtifactTest.java
@@ -14,14 +14,14 @@ import java.io.IOException;
  */
 public class JavaFxFieldToPropertyNoArtifactTest extends JavaFxFieldToPropertyTest {
 
-  public void testArtifactPresenceFieldToProperty() throws Exception {
+  public void testArtifactPresenceFieldToProperty() {
     configureByFiles(null, getTestName(false) + ".java");
     final IntentionAction intentionAction = getIntentionAction();
     // no artifact, no fxml, no javafx.* imports: the intention shouldn't be available
     assertNull(intentionAction);
   }
 
-  public void testAddRemoveFxmlFile() throws Exception {
+  public void testAddRemoveFxmlFile() {
     final VirtualFile sourceRootDir = configureByFiles(null, getTestName(false) + ".java");
     IntentionAction intentionAction = getIntentionAction();
     assertNull(intentionAction);
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java
index b4e2e083959a..27233760b0f0 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/JavaFxFieldToPropertyTest.java
@@ -90,7 +90,7 @@ public class JavaFxFieldToPropertyTest extends DaemonAnalyzerTestCase {
     checkResultByFile(getTestName(false) + "_after.java");
   }
 
-  protected IntentionAction getIntentionAction() throws Exception {
+  protected IntentionAction getIntentionAction() {
     final List<HighlightInfo> infos = doHighlighting();
     final Editor editor = getEditor();
     final PsiFile file = getFile();
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/RefactoringFieldTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/RefactoringFieldTest.java
index 162a8462507c..c89b157ee0b1 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/RefactoringFieldTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/RefactoringFieldTest.java
@@ -26,13 +26,13 @@ import org.jetbrains.plugins.javaFX.fxml.AbstractJavaFXTestCase;
 
 public class RefactoringFieldTest extends AbstractJavaFXTestCase {
 
-  public void testPropertyRename() throws Exception {
+  public void testPropertyRename() {
     myFixture.configureByFile(getTestName(false) + ".java");
     performRename("newName");
     myFixture.checkResultByFile(getTestName(false) + "_after.java");
   }
 
-  public void testPropertyDelete() throws Exception {
+  public void testPropertyDelete() {
     myFixture.configureByFile(getTestName(false) + ".java");
     performDelete();
     myFixture.checkResultByFile(getTestName(false) + "_after.java");
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDefaultTagInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDefaultTagInspectionTest.java
index ffd87deec708..982f711dd6ba 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDefaultTagInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXDefaultTagInspectionTest.java
@@ -27,31 +27,31 @@ public class JavaFXDefaultTagInspectionTest extends AbstractJavaFXQuickFixTest {
   }
 
 
-  public void testChildren() throws Exception {
+  public void testChildren() {
     doLaunchQuickfixTest("children");
   }
 
-  public void testEmptyChildren() throws Exception {
+  public void testEmptyChildren() {
     doLaunchQuickfixTest("children");
   }
 
-  public void testFxCollectionsHighlighting() throws Exception {
+  public void testFxCollectionsHighlighting() {
     doHighlightingTest();
   }
 
-  public void testEmptyListHighlighting() throws Exception {
+  public void testEmptyListHighlighting() {
     doHighlightingTest();
   }
 
-  public void testEmptyCollapsedListHighlighting() throws Exception {
+  public void testEmptyCollapsedListHighlighting() {
     doHighlightingTest();
   }
 
-  public void testStylesheets() throws Exception {
+  public void testStylesheets() {
     checkQuickFixNotAvailable("stylesheets");
   }
 
-  private void doHighlightingTest() throws Exception {
+  private void doHighlightingTest() {
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     myFixture.checkHighlighting();
   }
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index bde99c5f25af..6a1dedcbb00a 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -32,75 +32,75 @@ import org.jetbrains.annotations.NotNull;
  */
 public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
 
-  public void testLoginForm() throws Exception {
+  public void testLoginForm() {
     doTest();
   }
 
-  public void testUnresolvedTopLevelController() throws Exception {
+  public void testUnresolvedTopLevelController() {
     doTest();
   }
 
-  public void testController() throws Exception {
+  public void testController() {
     doTest();
   }
 
-  public void testCoercedTypes() throws Exception {
+  public void testCoercedTypes() {
     doTest();
   }
 
-  public void testRootTagCoercedUnchecked() throws Exception {
+  public void testRootTagCoercedUnchecked() {
     doTest();
   }
 
-  public void testStaticProperties() throws Exception {
+  public void testStaticProperties() {
     doTest();
   }
 
-  public void testStaticPropertiesCustomLayout() throws Exception {
+  public void testStaticPropertiesCustomLayout() {
     myFixture.addClass("import javafx.scene.layout.GridPane;\n" +
                        "public class MyGridPane extends GridPane {}\n");
     myFixture.testHighlighting(false, false, false, getTestName(true) + ".fxml");
   }
 
-  public void testEnumValues() throws Exception {
+  public void testEnumValues() {
     doTest();
   }
 
-  public void testDefaultTagProperties() throws Exception {
+  public void testDefaultTagProperties() {
     doTest();
   }
 
-  public void testDefaultTagInList() throws Exception {
+  public void testDefaultTagInList() {
     doTest();
   }
 
-  public void testUnresolvedImport() throws Exception {
+  public void testUnresolvedImport() {
     doTest();
   }
 
-  public void testImageIcon() throws Exception {
+  public void testImageIcon() {
     myFixture.copyFileToProject("appIcon.png");
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     myFixture.testHighlighting(false, false, false, getTestName(true) + ".fxml");
   }
 
-  public void testControllerIdRef() throws Exception {
+  public void testControllerIdRef() {
     doTestIdController();
   }
 
-  public void testEventHandlers() throws Exception {
+  public void testEventHandlers() {
     myFixture.testHighlighting(false, false, false, getTestName(true) + ".fxml");
   }
 
-  public void testPackageLocalController() throws Exception {
+  public void testPackageLocalController() {
     doTest(getTestName(false) + ".java");
   }
 
-  public void testNoParamsHandler() throws Exception {
+  public void testNoParamsHandler() {
     doTest(getTestName(false) + ".java");
   }
 
-  private void doTestIdController() throws Exception {
+  private void doTestIdController() {
     final String controllerClassName = getTestName(false) + "Controller";
     myFixture.configureByFiles(getTestName(true) + ".fxml", controllerClassName + ".java");
     final PsiClass controllerClass = myFixture.findClass(controllerClassName);
@@ -112,27 +112,27 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     assertEquals(controllerClass.getFields()[0], reference.resolve());
   }
 
-  public void testConstantNavigation() throws Exception {
+  public void testConstantNavigation() {
     doTestNavigation("java.lang.Double", "NEGATIVE_INFINITY");
   }
 
-  public void testEnumNavigation() throws Exception {
+  public void testEnumNavigation() {
     doTestNavigation("javafx.geometry.Pos", "CENTER");
   }
 
-  public void testCustomComponentFields() throws Exception {
+  public void testCustomComponentFields() {
     doTestNavigation("CustomVBox", "tf", "custom/" + getTestName(true) + ".fxml", "custom/CustomVBox.java");
   }
 
-  public void testCustomComponentFieldsWithSameProperties() throws Exception {
+  public void testCustomComponentFieldsWithSameProperties() {
     doTest("custom/" + getTestName(true) + ".fxml", "custom/" + getTestName(false) + ".java");
   }
 
-  public void testCustomComponent_Fields() throws Exception {
+  public void testCustomComponent_Fields() {
     doTest("custom/" + getTestName(true) + ".fxml", "custom/_CustomVBox.java");
   }
 
-  public void testInjectedController() throws Exception {
+  public void testInjectedController() {
     myFixture.copyFileToProject("injected/MyController.java");
     myFixture.copyFileToProject("injected/FooVBox.java");
 
@@ -147,19 +147,19 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     }
   }
 
-  public void testControllerInExpression() throws Exception{
+  public void testControllerInExpression() {
     doTest(getTestName(true) + ".fxml", getTestName(false) + ".java", getTestName(false) + "Wrapper.java");
   }
 
-  public void testNamedColor() throws Exception {
+  public void testNamedColor() {
     doTestNavigation(JavaFxCommonNames.JAVAFX_SCENE_COLOR, "ORANGE");
   }
 
-  private void doTestNavigation(String resultClassName, String resultFieldName) throws Exception {
+  private void doTestNavigation(String resultClassName, String resultFieldName) {
     doTestNavigation(resultClassName, resultFieldName, ArrayUtil.EMPTY_STRING_ARRAY);
   }
 
-  private void doTestNavigation(String resultClassName, String resultFieldName, String... additionalPaths) throws Exception {
+  private void doTestNavigation(String resultClassName, String resultFieldName, String... additionalPaths) {
     if (additionalPaths.length == 0) {
       myFixture.configureByFiles(getTestName(true) + ".fxml");
     } else {
@@ -175,7 +175,7 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     assertEquals(resultField, reference.resolve());
   }
 
-  public void testNavigationFromMainToFxml() throws Exception {
+  public void testNavigationFromMainToFxml() {
     myFixture.configureByFiles(getTestName(false) + ".java", getTestName(true) + ".fxml");
     final int offset = myFixture.getCaretOffset();
     final PsiReference reference = myFixture.getFile().findReferenceAt(offset);
@@ -187,63 +187,63 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     assertEquals(getTestName(true) + ".fxml", containingFile.getName());
   }
 
-  public void testSourceAttrRecognition() throws Exception {
+  public void testSourceAttrRecognition() {
     doTest();
   }
 
-  public void testReferenceAttributes() throws Exception {
+  public void testReferenceAttributes() {
     doTest();
   }
 
-  public void testVariables() throws Exception {
+  public void testVariables() {
     doTest();
   }
 
-  public void testDefineAttributes() throws Exception {
+  public void testDefineAttributes() {
     doTest();
   }
 
-  public void testDefinedElements() throws Exception {
+  public void testDefinedElements() {
     doTest();
   }
 
-  public void testPropertyElementsWithAnyAttributes() throws Exception {
+  public void testPropertyElementsWithAnyAttributes() {
     doTest();
   }
 
-  public void testHandlerWithoutController() throws Exception {
+  public void testHandlerWithoutController() {
     doTest();
   }
 
-  public void testHandlerWithoutPageLanguage() throws Exception {
+  public void testHandlerWithoutPageLanguage() {
     doTest();
   }
 
-  public void testIdOutOfHierarchy() throws Exception {
+  public void testIdOutOfHierarchy() {
     doTest("btn.fxml", "MyController.java");
   }
 
-  public void testIncludeBtn() throws Exception {
+  public void testIncludeBtn() {
     doTest("btn.fxml");
   }
 
-  public void testWrongBindingType() throws Exception {
+  public void testWrongBindingType() {
     doTest(getTestName(false) + ".java");
   }
 
-  public void testAllowIncludeTagInsideDefine() throws Exception {
+  public void testAllowIncludeTagInsideDefine() {
     doTest("btn.fxml");
   }
 
-  public void testValueOfAcceptance() throws Exception {
+  public void testValueOfAcceptance() {
     doTest();
   }
 
-  public void testInstantiationAcceptance() throws Exception {
+  public void testInstantiationAcceptance() {
     doTest();
   }
 
-  public void testInstantiationAcceptanceWithNameArg() throws Exception {
+  public void testInstantiationAcceptanceWithNameArg() {
     myFixture.addClass("package p;\n" +
                        "public class Root extends javafx.scene.layout.GridPane{\n" +
                        "  public Root(@javafx.beans.NamedArg(\"axis\") javafx.scene.Node node ) {\n" +
@@ -255,47 +255,47 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     doTest(getTestName(true) + ".fxml");
   }
 
-  public void testFqnTagNames() throws Exception {
+  public void testFqnTagNames() {
     doTest();
   }
 
-  public void testRootTag() throws Exception {
+  public void testRootTag() {
     doTest();
   }
 
-  public void testUnresolvedRootTag() throws Exception {
+  public void testUnresolvedRootTag() {
     doTest();
   }
 
-  public void testRootTagWithoutType() throws Exception {
+  public void testRootTagWithoutType() {
     doTest();
   }
 
-  public void testRootTagWithImport() throws Exception {
+  public void testRootTagWithImport() {
     doTest();
   }
 
-  public void testReadOnly() throws Exception {
+  public void testReadOnly() {
     doTest();
   }
 
-  public void testReadOnly1() throws Exception {
+  public void testReadOnly1() {
     doTest();
   }
 
-  public void testScriptSource() throws Exception {
+  public void testScriptSource() {
     doTest("s1.js");
   }
 
-  public void testPropertyNameExpression() throws Exception {
+  public void testPropertyNameExpression() {
     doTest();
   }
 
-  public void testPropertyChainExpression() throws Exception {
+  public void testPropertyChainExpression() {
     doTest();
   }
 
-  public void testIncorrectPropertyExpressionSyntax() throws Exception {
+  public void testIncorrectPropertyExpressionSyntax() {
     doTest();
   }
 
@@ -309,135 +309,135 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     myFixture.testHighlighting(false, false, false, paths[0]);
   }
 
-  public void testExpressionBinding() throws Exception {
+  public void testExpressionBinding() {
     doTest();
   }
 
-  public void testPropertyWithoutField() throws Exception {
+  public void testPropertyWithoutField() {
     doTest();
   }
 
-  public void testRootTagProperties() throws Exception {
+  public void testRootTagProperties() {
     doTest();
   }
 
-  public void testBooleanPropertyWithoutField() throws Exception {
+  public void testBooleanPropertyWithoutField() {
     doTest();
   }
 
-  public void testShortNamesInRootType() throws Exception {
+  public void testShortNamesInRootType() {
     doTest();
   }
 
-  public void testLineChartInstantiation() throws Exception {
+  public void testLineChartInstantiation() {
     doTest();
   }
 
-  public void testUnexpectedNode() throws Exception {
+  public void testUnexpectedNode() {
     doTest();
   }
 
-  public void testDefaultPropertyField() throws Exception {
+  public void testDefaultPropertyField() {
     doTest();
   }
 
-  public void testPrimitiveSubtags() throws Exception {
+  public void testPrimitiveSubtags() {
     doTest();
   }
 
-  public void testReferencePosition() throws Exception {
+  public void testReferencePosition() {
     doTest();
   }
 
-  public void testAcceptReferenceInsideDefine() throws Exception {
+  public void testAcceptReferenceInsideDefine() {
     doTest();
   }
 
-  public void testRootTagOnDifferentLevels() throws Exception {
+  public void testRootTagOnDifferentLevels() {
     doTest();
   }
 
-  public void testAbsenceOfDefineAttributes() throws Exception {
+  public void testAbsenceOfDefineAttributes() {
     doTest();
   }
 
-  public void testCopyReference() throws Exception {
+  public void testCopyReference() {
     doTest();
   }
 
-  public void testConstantValue() throws Exception {
+  public void testConstantValue() {
     doTest();
   }
 
-  public void testEnumConstantValue() throws Exception {
+  public void testEnumConstantValue() {
     doTest();
   }
 
-  public void testNestedClassConstants() throws Exception {
+  public void testNestedClassConstants() {
     doTest("model/" + getTestName(false) + "Model.java");
   }
 
-  public void testBoxedConstantValue() throws Exception {
+  public void testBoxedConstantValue() {
     doTest();
   }
 
-  public void testLiteralValue() throws Exception {
+  public void testLiteralValue() {
     doTest();
   }
 
-  public void testNullObjectValue() throws Exception {
+  public void testNullObjectValue() {
     doTest();
   }
 
-  public void testNullPrimitiveValue() throws Exception {
+  public void testNullPrimitiveValue() {
     doTest();
   }
 
-  public void testFactoryMethod() throws Exception {
+  public void testFactoryMethod() {
     doTest();
   }
 
-  public void testPrivateControllerMethod() throws Exception {
+  public void testPrivateControllerMethod() {
     doTest(getTestName(false) + ".java");
   }
 
-  public void testPropertyTagCompatibleClass() throws Exception {
+  public void testPropertyTagCompatibleClass() {
     doTest();
   }
 
-  public void testPropertyTagCompatiblePrimitive() throws Exception {
+  public void testPropertyTagCompatiblePrimitive() {
     doTest();
   }
 
-  public void testPropertyTagIncompatibleClass() throws Exception {
+  public void testPropertyTagIncompatibleClass() {
     doTest();
   }
 
-  public void testPropertyTagIncompatiblePrimitive() throws Exception {
+  public void testPropertyTagIncompatiblePrimitive() {
     doTest();
   }
 
-  public void testPropertyTagUnrelatedClass() throws Exception {
+  public void testPropertyTagUnrelatedClass() {
     doWarningsTest();
   }
 
-  public void testPropertyTagUnrelatedPrimitive() throws Exception {
+  public void testPropertyTagUnrelatedPrimitive() {
     doWarningsTest();
   }
 
-  public void testCharsetInInclude() throws Exception {
+  public void testCharsetInInclude() {
     myFixture.addFileToProject("sample.fxml", "<?import javafx.scene.layout.GridPane?>\n" +
                                                  "<fx:root type=\"javafx.scene.layout.GridPane\" xmlns:fx=\"http://javafx.com/fxml\"/>\n");
     doWarningsTest();
   }
 
-  public void testIncludedForm() throws Exception {
+  public void testIncludedForm() {
     myFixture.addFileToProject("sample.fxml", "<?import javafx.scene.layout.GridPane?>\n" +
                                               "<fx:root type=\"javafx.scene.layout.GridPane\" xmlns:fx=\"http://javafx.com/fxml\"/>\n");
     doWarningsTest();
   }
   
-  public void testInjectedControllerFields() throws Exception {
+  public void testInjectedControllerFields() {
     myFixture.addFileToProject("sample.fxml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                                               "<?import javafx.scene.control.*?>\n" +
                                               "<?import javafx.scene.layout.*?>\n" +
@@ -447,32 +447,32 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     myFixture.testHighlighting(true, false, false, getTestName(false) + ".java");
   }
 
-  public void testAbsoluteRemoteUrl() throws Exception {
+  public void testAbsoluteRemoteUrl() {
     doTest();
   }
 
-  public void testMultipleStylesheetsAttribute() throws Exception {
+  public void testMultipleStylesheetsAttribute() {
     myFixture.addFileToProject("mystyle.css", ".myStyle {}");
     myFixture.addFileToProject("very/deeply/located/small.css", ".small {}");
     doTest();
   }
 
-  public void testMultipleStylesheetsTag() throws Exception {
+  public void testMultipleStylesheetsTag() {
     myFixture.addFileToProject("mystyle.css", ".myStyle {}");
     myFixture.addFileToProject("very/deeply/located/small.css", ".small {}");
     doTest();
   }
 
-  public void testPrivateEventHandler() throws Exception {
+  public void testPrivateEventHandler() {
     myFixture.configureByFiles(getTestName(true) + ".fxml", getTestName(false) + ".java");
     myFixture.testHighlighting(true, true, true, getTestName(false) + ".java");
   }
 
-  public void testFxIdInSuperclass() throws Exception {
+  public void testFxIdInSuperclass() {
     doTestControllerSuperclass();
   }
 
-  public void testEventHandlerInSuperclass() throws Exception {
+  public void testEventHandlerInSuperclass() {
     doTestControllerSuperclass();
   }
 
@@ -490,13 +490,13 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     myFixture.testHighlighting(true, true, true, superclass + ".java");
   }
 
-  public void testResourceKeyInAttribute() throws Exception {
+  public void testResourceKeyInAttribute() {
     myFixture.addFileToProject("messages.properties", "string.key=My text\n" +
                                                       "double.key=123.456\n");
     doTest();
   }
 
-  public void testFxIdUsedInSameNode() throws Exception {
+  public void testFxIdUsedInSameNode() {
     myFixture.configureByFiles(getTestName(true) + ".fxml", getTestName(false) + ".java");
     doTest();
   }
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXOptimizeImportsTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXOptimizeImportsTest.java
index 9db7f2f3e319..3a30407ebac3 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXOptimizeImportsTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXOptimizeImportsTest.java
@@ -20,31 +20,31 @@ import com.intellij.openapi.application.PluginPathManager;
 import org.jetbrains.annotations.NotNull;
 
 public class JavaFXOptimizeImportsTest extends AbstractJavaFXTestCase {
-  public void testCollapseOnDemand() throws Exception {
+  public void testCollapseOnDemand() {
     doTest();
   }
 
-  public void testRemoveUnused() throws Exception {
+  public void testRemoveUnused() {
     doTest();
   }
 
-  public void testDblImports() throws Exception {
+  public void testDblImports() {
     doTest();
   }
 
-  public void testStaticPropertiesAttrAndCustomComponents() throws Exception {
+  public void testStaticPropertiesAttrAndCustomComponents() {
     myFixture.addClass("import javafx.scene.layout.GridPane;\n" +
                        "public class MyGridPane extends GridPane {}\n");
     doTest();
   }
 
-  public void testStaticPropertiesTagAndCustomComponents() throws Exception {
+  public void testStaticPropertiesTagAndCustomComponents() {
     myFixture.addClass("import javafx.scene.layout.GridPane;\n" +
                        "public class MyGridPane extends GridPane {}\n");
     doTest();
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     myFixture.configureByFile(getTestName(true) + ".fxml");
     new OptimizeImportsProcessor(getProject(), myFixture.getFile()).run();
     myFixture.checkResultByFile(getTestName(true) + "_after.fxml");
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
index 99ad1d041a4d..1ebcbef2a985 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
@@ -53,71 +53,71 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
     return JAVA_FX_WITH_GROOVY_DESCRIPTOR;
   }
 
-  public void testCreateControllerMethod() throws Exception {
+  public void testCreateControllerMethod() {
     doTest("Create method 'void bar(ActionEvent)'", ".java");
   }
 
-  public void testCreateControllerMethodInGroovy() throws Exception {
+  public void testCreateControllerMethodInGroovy() {
     doTest("Create method 'void bar(ActionEvent)'", ".groovy");
   }
 
-  public void testCreateControllerMethodGeneric() throws Exception {
+  public void testCreateControllerMethodGeneric() {
     doTest("Create method 'void onSort(SortEvent)'", ".java");
   }
 
-  public void testCreateControllerMethodHalfRaw() throws Exception {
+  public void testCreateControllerMethodHalfRaw() {
     doTest("Create method 'void onSort(SortEvent)'", ".java");
   }
 
-  public void testCreateFieldPublicVisibility() throws Exception {
+  public void testCreateFieldPublicVisibility() {
     doTestWithDefaultVisibility("Create field 'btn'", "CreateField", PsiModifier.PUBLIC, ".java");
   }
 
-  public void testCreateFieldProtectedVisibility() throws Exception {
+  public void testCreateFieldProtectedVisibility() {
     doTestWithDefaultVisibility("Create field 'btn'", "CreateField", PsiModifier.PROTECTED, ".java");
   }
 
-  public void testCreateFieldPrivateVisibility() throws Exception {
+  public void testCreateFieldPrivateVisibility() {
     doTestWithDefaultVisibility("Create field 'btn'", "CreateField", PsiModifier.PRIVATE, ".java");
   }
 
-  public void testCreateFieldPackageLocalVisibility() throws Exception {
+  public void testCreateFieldPackageLocalVisibility() {
     doTestWithDefaultVisibility("Create field 'btn'", "CreateField", PsiModifier.PACKAGE_LOCAL, ".java");
   }
 
-  public void testCreateFieldEscalateVisibility() throws Exception {
+  public void testCreateFieldEscalateVisibility() {
     doTestWithDefaultVisibility("Create field 'btn'", "CreateField", VisibilityUtil.ESCALATE_VISIBILITY, ".java");
   }
 
-  public void testCreateMethodPublicVisibility() throws Exception {
+  public void testCreateMethodPublicVisibility() {
     doTestWithDefaultVisibility("Create method 'void onAction(ActionEvent)'", "CreateMethod", PsiModifier.PUBLIC, ".java");
   }
 
-  public void testCreateMethodProtectedVisibility() throws Exception {
+  public void testCreateMethodProtectedVisibility() {
     doTestWithDefaultVisibility("Create method 'void onAction(ActionEvent)'", "CreateMethod", PsiModifier.PROTECTED, ".java");
   }
 
-  public void testCreateMethodPrivateVisibility() throws Exception {
+  public void testCreateMethodPrivateVisibility() {
     doTestWithDefaultVisibility("Create method 'void onAction(ActionEvent)'", "CreateMethod", PsiModifier.PRIVATE, ".java");
   }
 
-  public void testCreateMethodPackageLocalVisibility() throws Exception {
+  public void testCreateMethodPackageLocalVisibility() {
     doTestWithDefaultVisibility("Create method 'void onAction(ActionEvent)'", "CreateMethod", PsiModifier.PACKAGE_LOCAL, ".java");
   }
 
-  public void testCreateMethodEscalateVisibility() throws Exception {
+  public void testCreateMethodEscalateVisibility() {
     doTestWithDefaultVisibility("Create method 'void onAction(ActionEvent)'", "CreateMethod", VisibilityUtil.ESCALATE_VISIBILITY,
                                 ".java");
   }
 
-  public void testCreateFieldEmptyName() throws Exception {
+  public void testCreateFieldEmptyName() {
     String path = getTestName(true) + ".fxml";
     final IntentionAction intention =
       myFixture.getAvailableIntention("Create field 'btn'", path, getTestName(false) + ".java");
     assertNull(intention);
   }
 
-  public void testRegisterPageLanguage() throws Exception {
+  public void testRegisterPageLanguage() {
     myFixture.configureByFile(getTestName(true) + ".fxml");
     final IntentionAction intention = myFixture.findSingleIntention("Specify page language");
     assertNotNull(intention);
@@ -129,7 +129,7 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
     myFixture.checkResultByFile(getTestName(true) + ".fxml", getTestName(true) + "_after.fxml", true);
   }
 
-  public void testWrapWithDefine() throws Exception {
+  public void testWrapWithDefine() {
     final IntentionAction intention =
       myFixture.getAvailableIntention("Wrap \"lb\" with fx:define", getTestName(true) + ".fxml");
     assertNotNull(intention);
@@ -140,7 +140,7 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
   private void doTestWithDefaultVisibility(final String actionName,
                                            final String inputName,
                                            final String defaultVisibility,
-                                           final String extension) throws Exception {
+                                           final String extension) {
     JavaCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).getCustomSettings(JavaCodeStyleSettings.class);
     String savedVisibility = settings.VISIBILITY;
     try {
@@ -152,11 +152,11 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  private void doTest(final String actionName, final String extension) throws Exception {
+  private void doTest(final String actionName, final String extension) {
     doTest(actionName, getTestName(false), getTestName(false), extension);
   }
 
-  private void doTest(final String actionName, final String inputName, final String outputName, final String extension) throws Exception {
+  private void doTest(final String actionName, final String inputName, final String outputName, final String extension) {
     String path = PlatformTestUtil.lowercaseFirstLetter(inputName, true) + ".fxml";
     final IntentionAction intention =
       myFixture.getAvailableIntention(actionName, path, inputName + extension);
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java
index 888446423da7..7faeff5d37b0 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java
@@ -40,27 +40,27 @@ import java.util.Arrays;
 
 public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
 
-  public void testCustomComponent() throws Exception {
+  public void testCustomComponent() {
     doTest(getTestName(false) + "1");
   }
 
-  public void testInRoot() throws Exception {
+  public void testInRoot() {
     doTest(getTestName(false) + "1");
   }
 
-  public void testControllerField() throws Exception {
+  public void testControllerField() {
     doTest("newFieldName");
   }
 
-  public void testControllerFieldWithRefs() throws Exception {
+  public void testControllerFieldWithRefs() {
     doTest("newFieldName");
   }
 
-  public void testHandler() throws Exception {
+  public void testHandler() {
     doTest("newHandlerName");
   }
 
-  public void testPrivateSuperHandler() throws Exception {
+  public void testPrivateSuperHandler() {
     final String newName = "newHandlerName";
     final String fxmlPath = getTestName(true) + ".fxml";
     final String fxmlPathAfter = getTestName(true) + "_after.fxml";
@@ -76,15 +76,15 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     assertMethodExists(psiClass, newName);
   }
 
-  public void testCustomComponentTag() throws Exception {
+  public void testCustomComponentTag() {
     doTest("Foo", true);
   }
 
-  public void testCustomComponentPropertyTag() throws Exception {
+  public void testCustomComponentPropertyTag() {
     doTest("Foo", true);
   }
 
-  public void testFromReference() throws Exception {
+  public void testFromReference() {
     final String newName = "lbl1";
     doTest(newName);
     final PsiClass controllerClass = myFixture.findClass(getTestName(false));
@@ -92,7 +92,7 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     assertFieldExists(controllerClass, newName);
   }
 
-  public void testIdWithRefs() throws Exception {
+  public void testIdWithRefs() {
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     PsiElement element = TargetElementUtil
       .findTargetElement(getEditor(), TargetElementUtil.ELEMENT_NAME_ACCEPTED | TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED);
@@ -101,15 +101,15 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     myFixture.checkResultByFile(getTestName(true) + "_after.fxml");
   }
 
-  public void testControllerBare() throws Exception {
+  public void testControllerBare() {
     doTestErrorHint("Foo", "Cannot rename built-in property");
   }
 
-  public void testControllerInExpr() throws Exception {
+  public void testControllerInExpr() {
     doTestErrorHint("Foo", "Cannot rename built-in property");
   }
 
-  private void doTestErrorHint(String newName, String message) throws Exception {
+  private void doTestErrorHint(String newName, String message) {
     try {
       doTest(newName, true);
       fail(message);
@@ -119,15 +119,15 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     }
   }
 
-  public void testPropertyRenameHandlerPresent() throws Exception {
+  public void testPropertyRenameHandlerPresent() {
     doTestPropertyRenameHandler(getTestName(true) + ".fxml", getTestName(false) + ".java");
   }
 
-  public void testPropertyRenameHandlerPresentForStatic() throws Exception {
+  public void testPropertyRenameHandlerPresentForStatic() {
     doTestPropertyRenameHandler(getTestName(true) + ".fxml", "container/MyCustomContainer.java");
   }
 
-  public void doTestPropertyRenameHandler(String... files) throws Exception {
+  public void doTestPropertyRenameHandler(String... files) {
     myFixture.configureByFiles(files);
     final MapDataContext dataContext = new MapDataContext();
     dataContext.put(CommonDataKeys.EDITOR, getEditor());
@@ -135,15 +135,15 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     assertTrue(renameHandler instanceof JavaFxPropertyRenameHandler);
   }
 
-  public void testStaticPropertyImportClass() throws Exception {
+  public void testStaticPropertyImportClass() {
     doTestStaticProperty("newPropName2", "container.MyCustomContainer");
   }
 
-  public void testStaticPropertyImportPackage() throws Exception {
+  public void testStaticPropertyImportPackage() {
     doTestStaticProperty("newPropName2", "container.MyCustomContainer");
   }
 
-  public void doTestStaticProperty(@NonNls String newName, String className) throws Exception {
+  public void doTestStaticProperty(@NonNls String newName, String className) {
     myFixture.configureByFiles(getTestName(true) + ".fxml", className.replace('.', '/') + ".java");
 
     final MapDataContext dataContext = new MapDataContext();
@@ -162,7 +162,7 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     assertMethodExists(psiClass, "set" + propName);
   }
 
-  public void testStaticPropertyMethod() throws Exception {
+  public void testStaticPropertyMethod() {
     final String className="container.MyCustomContainer";
     final String methodName = "setStaticProp";
     final String newName = "setNewMethodName";
@@ -181,21 +181,21 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     assertMethodExists(psiClass, newName);
   }
 
-  public void testStaticPropertyFromLibrary() throws Exception {
+  public void testStaticPropertyFromLibrary() {
     doTestErrorHint("Foo", RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("error.cannot.be.renamed")));
   }
 
-  public void testControllerMethod() throws Exception {
+  public void testControllerMethod() {
     final PsiClass psiClass = doTestHandler("newName", null);
     assertMethodExists(psiClass, "getNewName");
   }
 
-  public void testNestedControllerIdFromFxml() throws Exception {
+  public void testNestedControllerIdFromFxml() {
     doTestHandler("newName", getTestName(false) + "Internal");
     myFixture.checkResultByFile(getTestName(false) + ".java", getTestName(false) + "_after.java", false);
   }
 
-  public void testNestedControllerIdFromJava() throws Exception {
+  public void testNestedControllerIdFromJava() {
     myFixture.configureByFiles(getTestName(false) + ".java", getTestName(false) + "Internal.java", getTestName(true) + ".fxml");
     final PsiElement elementAtCaret = myFixture.getElementAtCaret();
     new RenameProcessor(getProject(), elementAtCaret, "newName", false, false).run();
@@ -211,11 +211,11 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     doTestProperty("newName", true);
   }
 
-  public void testModelIdProperty() throws Exception {
+  public void testModelIdProperty() {
     doTestProperty("newName", "model.Data", false);
   }
 
-  public void testModelFieldProperty() throws Exception {
+  public void testModelFieldProperty() {
     doTestProperty("newName", "model.Data", false);
   }
 
@@ -226,11 +226,11 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     myFixture.checkResultByFile(getTestName(true) + ".properties", getTestName(true) + "_after.properties", false);
   }
 
-  public void doTestProperty(String name, boolean isBoolean) throws Exception {
+  public void doTestProperty(String name, boolean isBoolean) {
     doTestProperty(name, null, isBoolean);
   }
 
-  public void doTestProperty(@NonNls String name, String className, boolean isBoolean) throws Exception {
+  public void doTestProperty(@NonNls String name, String className, boolean isBoolean) {
     final PsiClass psiClass = doTestHandler(name, className);
     final String propName = name.substring(0, 1).toUpperCase() + name.substring(1);
     assertMethodExists(psiClass, (isBoolean ? "is" : "get") + propName);
@@ -240,7 +240,7 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
   }
 
   @NotNull
-  public PsiClass doTestHandler(String newName, String className) throws Exception {
+  public PsiClass doTestHandler(String newName, String className) {
     if (className == null) {
       className = getTestName(false);
       myFixture.configureByFiles(getTestName(true) + ".fxml", getTestName(false) + ".java");
@@ -271,11 +271,11 @@ public class JavaFXRenameTest extends AbstractJavaFXRenameTest {
     assertOrderedEquals(Arrays.stream(methods).map(PsiMethod::getName).toArray(), name);
   }
 
-  private void doTest(final String newName) throws Exception {
+  private void doTest(final String newName) {
     doTest(newName, false);
   }
 
-  private void doTest(final String newName, boolean inline) throws Exception {
+  private void doTest(final String newName, boolean inline) {
     myFixture.configureByFiles(getTestName(true) + ".fxml", getTestName(false) + ".java");
     PsiElement element = TargetElementUtil
       .findTargetElement(getEditor(), TargetElementUtil.ELEMENT_NAME_ACCEPTED | TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED);
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnresolvedFxIdReferenceInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnresolvedFxIdReferenceInspectionTest.java
index f5efd5700e69..40f989f6bd16 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnresolvedFxIdReferenceInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnresolvedFxIdReferenceInspectionTest.java
@@ -32,24 +32,24 @@ public class JavaFXUnresolvedFxIdReferenceInspectionTest extends AbstractJavaFXQ
     myFixture.enableInspections(new JavaFxUnresolvedFxIdReferenceInspection());
   }
 
-  public void testUnknownRef() throws Exception {
+  public void testUnknownRef() {
     doTest("Controller", VisibilityUtil.ESCALATE_VISIBILITY);
   }
 
-  public void testRootType() throws Exception {
+  public void testRootType() {
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     final List<IntentionAction> intentionActions = myFixture.filterAvailableIntentions(getHint("unknown"));
     assertEmpty(intentionActions);
   }
 
-  public void testIncludeBtnWithController() throws Exception {
+  public void testIncludeBtnWithController() {
     myFixture.addFileToProject("btn.fxml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                                            "<?import javafx.scene.control.*?>\n" +
                                            "<Button/>");
     doTest("MyController", VisibilityUtil.ESCALATE_VISIBILITY);
   }
 
-  public void testFieldsFromControllerSuper() throws Exception {
+  public void testFieldsFromControllerSuper() {
     myFixture.addClass("import javafx.scene.control.RadioButton;\n" +
                        "public class SuperController {\n" +
                        "    public RadioButton option1;\n" +
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnusedImportInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnusedImportInspectionTest.java
index a52eccbed9ab..a71f3ff92092 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnusedImportInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXUnusedImportInspectionTest.java
@@ -27,7 +27,7 @@ public class JavaFXUnusedImportInspectionTest extends AbstractJavaFXTestCase {
   }
 
 
-  public void testUnusedUnrelatedImports() throws Exception {
+  public void testUnusedUnrelatedImports() {
     myFixture.configureByFile(getTestName(true) + ".fxml");
     myFixture.checkHighlighting();
   }
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCoercingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCoercingTest.java
index a1b160fc5cca..a9911272e3c8 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCoercingTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCoercingTest.java
@@ -27,31 +27,31 @@ import org.jetbrains.annotations.NotNull;
  */
 public class JavaFxCoercingTest extends AbstractJavaFXTestCase {
 
-  public void testReferencedTag() throws Exception {
+  public void testReferencedTag() {
     doTest();
   }
 
-  public void testInvalidInteger() throws Exception {
+  public void testInvalidInteger() {
     doTest();
   }
 
-  public void testInvalidDouble() throws Exception {
+  public void testInvalidDouble() {
     doTest();
   }
 
-  public void testRootTagSubtagsCoercing() throws Exception {
+  public void testRootTagSubtagsCoercing() {
     doTest();
   }
 
-  public void testFactoryCoercing() throws Exception {
+  public void testFactoryCoercing() {
     doTest();
   }
 
-  public void testPrimitiveCoercing() throws Exception {
+  public void testPrimitiveCoercing() {
     doTest();
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     myFixture.testHighlighting(false, false, false, getTestName(true) + ".fxml");
   }
 
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxColorRgbInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxColorRgbInspectionTest.java
index e9f58f8c55c1..d898b5bf1a99 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxColorRgbInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxColorRgbInspectionTest.java
@@ -13,15 +13,15 @@ public class JavaFxColorRgbInspectionTest extends AbstractJavaFXTestCase {
     myFixture.enableInspections(new JavaFxColorRgbInspection());
   }
 
-  public void testAttributeHighlighting() throws Exception {
+  public void testAttributeHighlighting() {
     doTestHighlighting();
   }
 
-  public void testTagHighlighting() throws Exception {
+  public void testTagHighlighting() {
     doTestHighlighting();
   }
 
-  public void testFxReference() throws Exception {
+  public void testFxReference() {
     doTestHighlighting();
   }
 
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
index fb8af5fbf582..49feeeacb424 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
@@ -22,7 +22,9 @@ import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
 
@@ -36,39 +38,39 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     doTest();
   }
 
-  public void testStaticProperties() throws Exception {
+  public void testStaticProperties() {
     doTest("GridPane.columnIndex");
   }
   
-  public void testStaticPropertiesTag() throws Exception {
+  public void testStaticPropertiesTag() {
     doTest("GridPane.columnIndex");
   }
 
-  public void testSimplePropertyTag() throws Exception {
+  public void testSimplePropertyTag() {
     doTest("text");
   }
 
-  public void testListPropertyTag() throws Exception {
+  public void testListPropertyTag() {
     doTest("children");
   }
 
-  public void testClassInsideList() throws Exception {
+  public void testClassInsideList() {
     doTest("Button");
   }
 
-  public void testClassDefaultProperty() throws Exception {
+  public void testClassDefaultProperty() {
     doTest("Button");
   }
 
-  public void testClassInsertImport() throws Exception {
+  public void testClassInsertImport() {
     doTest("Button");
   }
 
-  public void testDefaultProperty() throws Exception {
+  public void testDefaultProperty() {
     doTest("fx:id");
   }
 
-  public void testDefaultTag() throws Exception {
+  public void testDefaultTag() {
     doTest("fx:script");
   }
 
@@ -76,19 +78,19 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     doTest();
   }
 
-  public void testEnumConstantValue() throws Exception {
+  public void testEnumConstantValue() {
     doTest("TOP_LEFT");
   }
 
-  public void testConstants() throws Exception {
+  public void testConstants() {
     doTest("NEGATIVE_INFINITY");
   }
 
-  public void testReferencedAttributes() throws Exception {
+  public void testReferencedAttributes() {
     doTest("text");
   }
 
-  public void testFactoryMethods() throws Exception {
+  public void testFactoryMethods() {
     doTest("observableArrayList");
   }
 
@@ -96,89 +98,89 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     doTest();
   }
 
-  public void testExpressionBinding() throws Exception {
+  public void testExpressionBinding() {
     doTest("text");
   }
 
-  public void testStylesheets() throws Exception {
+  public void testStylesheets() {
     doTest("mystyle.css", "mystyle.css");
   }
 
-  public void testStylesheetsStringValue() throws Exception {
+  public void testStylesheetsStringValue() {
     doTest("mystyle.css", "mystyle.css");
   }
 
-  public void testListAttributes() throws Exception {
+  public void testListAttributes() {
     doTest("stylesheets");
   }
 
-  public void testNamedColors() throws Exception {
+  public void testNamedColors() {
     doTest("blue");
   }
 
-  public void testRootTagNameLayout() throws Exception {
+  public void testRootTagNameLayout() {
     doTest("GridPane");
   }
 
-  public void testChildrenInsideGridPaneRoot() throws Exception {
+  public void testChildrenInsideGridPaneRoot() {
     doTest("children");
   }
 
-  public void testClassInsideObjectProperty() throws Exception {
+  public void testClassInsideObjectProperty() {
     doTest("Insets");
   }
 
-  public void testPrimitiveProperties() throws Exception {
+  public void testPrimitiveProperties() {
     doTest("top");
   }
 
-  public void testPrimitiveSubtags() throws Exception {
+  public void testPrimitiveSubtags() {
     configureAndComplete();
     assertDoesntContain(myFixture.getLookupElementStrings(), "geomBoundsInvalid");
   }
 
-  public void testDefaultPropertyWrappedField() throws Exception {
+  public void testDefaultPropertyWrappedField() {
     configureAndComplete();
     assertContainsElements(myFixture.getLookupElementStrings(), "image", "Image");
   }
 
-  public void testInfinity() throws Exception {
+  public void testInfinity() {
     configureAndComplete();
     assertContainsElements(myFixture.getLookupElementStrings(), "Infinity", "-Infinity", "NaN", "-NaN");
   }
 
-  public void testNoInfinity() throws Exception {
+  public void testNoInfinity() {
     configureAndComplete();
     assertDoesntContain(myFixture.getLookupElementStrings(), "Infinity");
   }
 
-  public void testBooleanValues() throws Exception {
+  public void testBooleanValues() {
     configureAndComplete();
     assertContainsElements(myFixture.getLookupElementStrings(), "true", "false");
   }
 
-  public void testBooleanValuesNonStatic() throws Exception {
+  public void testBooleanValuesNonStatic() {
     configureAndComplete();
     assertContainsElements(myFixture.getLookupElementStrings(), "true", "false");
   }
 
-  public void testPropertyNameWithoutField() throws Exception {
+  public void testPropertyNameWithoutField() {
     configureAndComplete();
     assertContainsElements(myFixture.getLookupElementStrings(), "disable");
   }
 
-  public void testPropertyTagSubclass() throws Exception {
+  public void testPropertyTagSubclass() {
     configureAndComplete();
     assertContainsElements(myFixture.getLookupElementStrings(), "Color", "ImagePattern", "LinearGradient", "RadialGradient");
     assertDoesntContain(myFixture.getLookupElementStrings(), "Paint");
   }
 
-  public void testNullFxId() throws Exception {
+  public void testNullFxId() {
     configureAndComplete();
     assertDoesntContain(myFixture.getLookupElementStrings(), "null");
   }
 
-  public void testSubclassesAndDefaultProperty() throws Exception {
+  public void testSubclassesAndDefaultProperty() {
     configureAndComplete();
     final List<String> lookupElementStrings = myFixture.getLookupElementStrings();
     assertNotNull(lookupElementStrings);
@@ -187,82 +189,82 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     assertTrue(lookupElementStrings.toString(), lookupElementStrings.lastIndexOf(buttonVariant) == lookupElementStrings.indexOf(buttonVariant));
   }
 
-  public void testDefaultPropertyIncludeOnce() throws Exception {
+  public void testDefaultPropertyIncludeOnce() {
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     myItems = myFixture.completeBasic();
     assertContainsElements(myFixture.getLookupElementStrings(), "fx:reference");
     assertEquals(3, myItems.length);
   }
 
-  public void testAcceptableSourceOnly() throws Exception {
+  public void testAcceptableSourceOnly() {
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     myItems = myFixture.completeBasic();
     assertEmpty(myItems);
   }
 
-  public void testIncludedRootAttributes() throws Exception {
+  public void testIncludedRootAttributes() {
     myFixture.addFileToProject("foo.fxml", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                                    "<?import javafx.scene.layout.*?>\n" +
                                    "<VBox xmlns:fx=\"http://javafx.com/fxml\"/>");
     doTest("layoutY");
   }
 
-  public void testIncludedRootRootAttributes() throws Exception {
+  public void testIncludedRootRootAttributes() {
     myFixture.addFileToProject("sample.fxml", "?import javafx.scene.layout.GridPane?>\n" +
                                               "<fx:root type=\"javafx.scene.layout.GridPane\" xmlns:fx=\"http://javafx.com/fxml\" />");
     doTest("blendMode");
   }
 
-  public void testAllowPropertyTypeClass() throws Exception {
+  public void testAllowPropertyTypeClass() {
     doTest("ColumnConstraints");
   }
 
-  public void testEventHandlerMethod() throws Exception {
+  public void testEventHandlerMethod() {
     configureAndComplete(getTestName(false) + ".java", getTestName(false) + "Super.java");
     assertSameElements(myFixture.getLookupElementStrings(), "onMyKeyTyped", "onSuperKeyTyped");
   }
 
-  public void testEventHandlerMethodTypeParam() throws Exception {
+  public void testEventHandlerMethodTypeParam() {
     configureAndComplete(getTestName(false) + ".java", getTestName(false) + "Super.java");
     assertSameElements(myFixture.getLookupElementStrings(), "onMyKeyTyped", "onSuperKeyTyped");
   }
 
-  public void testRawCollectionItem() throws Exception {
+  public void testRawCollectionItem() {
     configureAndComplete();
     assertDoesntContain(myFixture.getLookupElementStrings(), "T", "Object", "java.lang.Object");
   }
 
-  public void testFxIdExactOptionsLabel() throws Exception {
+  public void testFxIdExactOptionsLabel() {
     configureAndComplete("FxIdExactOptionsController.java", "FxIdExactOptionsModel.java");
     assertSameElements(myFixture.getLookupElementStrings(), "parentPrivateLabel", "parentPublicLabel", "privateLabel", "publicLabel", "parentControl", "control", "grandLabel");
   }
 
-  public void testFxIdExactOptionsDefine() throws Exception {
+  public void testFxIdExactOptionsDefine() {
     configureAndComplete("FxIdExactOptionsController.java", "FxIdExactOptionsModel.java");
     assertSameElements(myFixture.getLookupElementStrings(), "parentModel", "model");
   }
 
-  public void testFxIdGuessedOptionsRoot() throws Exception {
+  public void testFxIdGuessedOptionsRoot() {
     configureAndComplete("FxIdGuessedOptionsController.java");
     assertSameElements(myFixture.getLookupElementStrings(), "pane", "box", "model");
   }
 
-  public void testFxIdGuessedOptionsNode() throws Exception {
+  public void testFxIdGuessedOptionsNode() {
     configureAndComplete("FxIdGuessedOptionsController.java");
     assertSameElements(myFixture.getLookupElementStrings(), "pane", "node", "box", "model");
   }
 
-  public void testFxIdGuessedOptionsDefine() throws Exception {
+  public void testFxIdGuessedOptionsDefine() {
     configureAndComplete("FxIdGuessedOptionsController.java");
     assertSameElements(myFixture.getLookupElementStrings(), "pane", "node", "box", "model", "text", "target");
   }
 
-  public void testFxIdGuessedOptionsNested() throws Exception {
+  public void testFxIdGuessedOptionsNested() {
     configureAndComplete("FxIdGuessedOptionsController.java");
     assertSameElements(myFixture.getLookupElementStrings(),"pane", "node", "box", "model", "text", "target");
   }
 
-  public void testInheritedConstant() throws Exception {
+  public void testInheritedConstant() {
     configureAndComplete("InheritedConstantData.java", "InheritedConstantSuperData.java");
     assertSameElements(myFixture.getLookupElementStrings(), "MY_TEXT", "SUPER_TEXT");
   }
@@ -293,7 +295,7 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     complete();
   }
 
-  public void testOnlyCssAsStylesheets() throws Exception {
+  public void testOnlyCssAsStylesheets() {
     myFixture.addFileToProject("my.fxml", "");
     myFixture.addFileToProject("my.png", "");
     myFixture.addFileToProject("sample.css", ".root{}");
@@ -311,7 +313,7 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     }
   }
 
-  public void testReadOnly() throws Exception {
+  public void testReadOnly() {
     configureByFile(getTestName(true) + ".fxml");
     assertTrue(myItems.length > 0);
     LookupElement selectionElement = null;
@@ -341,15 +343,15 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     assertSameElements(myFixture.getLookupElementStrings(), "double.key", "string.key");
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     doTest(null);
   }
 
-  private void doTest(final String selection) throws Exception {
+  private void doTest(final String selection) {
     doTest(selection, null);
   }
 
-  private void doTest(final String selection, String additionalPath) throws Exception {
+  private void doTest(final String selection, String additionalPath) {
     final String mainFxml = getTestName(true) + ".fxml";
     if (additionalPath != null) {
       myFixture.configureByFiles(mainFxml, additionalPath);
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
index 25c1cf48a092..8b7e9d3c34df 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
@@ -18,66 +18,66 @@ public class JavaFxEventHandlerInspectionTest extends AbstractJavaFXTestCase {
   }
 
 
-  public void testHighlightExact() throws Exception {
+  public void testHighlightExact() {
     doHighlightingTest();
   }
 
-  public void testHighlightNonVoid() throws Exception {
+  public void testHighlightNonVoid() {
     final JavaFxEventHandlerInspection inspection = new JavaFxEventHandlerInspection();
     inspection.myDetectNonVoidReturnType = true;
     myFixture.enableInspections(inspection);
     doHighlightingTest();
   }
 
-  public void testHighlightAmbiguous() throws Exception {
+  public void testHighlightAmbiguous() {
     doHighlightingTest();
   }
 
-  public void testHighlightGeneric() throws Exception {
+  public void testHighlightGeneric() {
     doHighlightingTest();
   }
 
-  public void testHighlightRaw() throws Exception {
+  public void testHighlightRaw() {
     doHighlightingTest();
   }
 
-  public void testHighlightHalfRaw() throws Exception {
+  public void testHighlightHalfRaw() {
     doHighlightingTest();
   }
 
-  public void testHighlightSpecific() throws Exception {
+  public void testHighlightSpecific() {
     doHighlightingTest();
   }
 
-  public void testHighlightSuper() throws Exception {
+  public void testHighlightSuper() {
     doHighlightingTest();
   }
 
-  public void testHighlightWildcard() throws Exception {
+  public void testHighlightWildcard() {
     doHighlightingTest();
   }
 
-  public void testQuickfixRaw() throws Exception {
+  public void testQuickfixRaw() {
     doQuickfixTest("Create method 'void onSort(SortEvent)'");
   }
 
-  public void testQuickfixHalfRaw() throws Exception {
+  public void testQuickfixHalfRaw() {
     doQuickfixTest("Create method 'void onSort(SortEvent)'");
   }
 
-  public void testQuickfixSpecific() throws Exception {
+  public void testQuickfixSpecific() {
     doQuickfixTest("Create method 'void onSort(SortEvent)'");
   }
 
-  public void testQuickfixNoField() throws Exception {
+  public void testQuickfixNoField() {
     doQuickfixTest("Create method 'void onSort(SortEvent)'");
   }
 
-  public void testQuickfixFieldType()throws Exception {
+  public void testQuickfixFieldType() {
     doQuickfixTest("Change field 'table' type to 'javafx.scene.control.TableView<java.util.Map<java.lang.String,java.lang.Double>>'");
   }
 
-  public void testQuickfixNoFieldNested() throws Exception {
+  public void testQuickfixNoFieldNested() {
     final JavaCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).getCustomSettings(JavaCodeStyleSettings.class);
     final boolean oldImports = settings.INSERT_INNER_CLASS_IMPORTS;
     try {
@@ -89,16 +89,16 @@ public class JavaFxEventHandlerInspectionTest extends AbstractJavaFXTestCase {
     }
   }
 
-  public void testQuickfixSuper() throws Exception {
+  public void testQuickfixSuper() {
     doQuickfixTest("Create method 'void click(MouseEvent)'");
   }
 
-  private void doHighlightingTest() throws Exception {
+  private void doHighlightingTest() {
     myFixture.configureByFiles(getTestName(true) + ".fxml", getTestName(false) + ".java");
     myFixture.checkHighlighting();
   }
 
-  private void doQuickfixTest(final String actionName) throws Exception {
+  private void doQuickfixTest(final String actionName) {
     String path = getTestName(true) + ".fxml";
     final IntentionAction intention = myFixture.getAvailableIntention(actionName, path, getTestName(false) + ".java");
     assertNotNull(intention);
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxGenerateDefaultPropertyValuesScript.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxGenerateDefaultPropertyValuesScript.java
index bf09f287b566..dc897f99eeb2 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxGenerateDefaultPropertyValuesScript.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxGenerateDefaultPropertyValuesScript.java
@@ -51,7 +51,7 @@ public class JavaFxGenerateDefaultPropertyValuesScript extends Application {
   }
 
   @Override
-  public void start(Stage primaryStage) throws Exception {
+  public void start(Stage primaryStage) {
     Button b = new Button();
     b.setText("Generate");
     b.setOnAction(event -> generate());
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxMigrationTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxMigrationTest.java
index 1826e3bda069..f697acf6819b 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxMigrationTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxMigrationTest.java
@@ -14,15 +14,15 @@ import org.jetbrains.annotations.NotNull;
  */
 public class JavaFxMigrationTest extends LightCodeInsightFixtureTestCase {
 
-  public void testImportClasses() throws Exception {
+  public void testImportClasses() {
     doTest();
   }
 
-  public void testImportSkinPackage() throws Exception {
+  public void testImportSkinPackage() {
     doTest();
   }
 
-  public void testImportCssPackage() throws Exception {
+  public void testImportCssPackage() {
     doTest();
   }
 
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxRedundantPropertyValueInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxRedundantPropertyValueInspectionTest.java
index 0cf505859bad..ee0023287e00 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxRedundantPropertyValueInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxRedundantPropertyValueInspectionTest.java
@@ -13,35 +13,35 @@ public class JavaFxRedundantPropertyValueInspectionTest extends AbstractJavaFXQu
     myFixture.enableInspections(new JavaFxRedundantPropertyValueInspection());
   }
 
-  public void testModifiedAttribute() throws Exception {
+  public void testModifiedAttribute() {
     checkQuickFixNotAvailable("alignment");
   }
 
-  public void testImmediateAttribute() throws Exception {
+  public void testImmediateAttribute() {
     doLaunchQuickfixTest("alignment");
   }
 
-  public void testInheritedAttribute() throws Exception {
+  public void testInheritedAttribute() {
     doLaunchQuickfixTest("maxHeight");
   }
 
-  public void testModifiedTag() throws Exception {
+  public void testModifiedTag() {
     checkQuickFixNotAvailable("alignment");
   }
 
-  public void testImmediateTag() throws Exception {
+  public void testImmediateTag() {
     doLaunchQuickfixTest("alignment");
   }
 
-  public void testInheritedTag() throws Exception {
+  public void testInheritedTag() {
     doLaunchQuickfixTest("maxHeight");
   }
 
-  public void testAttributeHighlighting() throws Exception {
+  public void testAttributeHighlighting() {
     doTestHighlighting();
   }
 
-  public void testTagHighlighting() throws Exception {
+  public void testTagHighlighting() {
     doTestHighlighting();
   }
 
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxResourcePropertyValueInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxResourcePropertyValueInspectionTest.java
index ff1d779e56a7..a1679ee6b3ee 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxResourcePropertyValueInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxResourcePropertyValueInspectionTest.java
@@ -9,7 +9,7 @@ import org.jetbrains.plugins.javaFX.resources.JavaFxResourcePropertyValueInspect
  */
 public class JavaFxResourcePropertyValueInspectionTest extends AbstractJavaFXTestCase {
 
-  public void testResourceKeyInEnumAttribute() throws Exception {
+  public void testResourceKeyInEnumAttribute() {
     myFixture.addFileToProject("messages.properties", "correct.alignment=BASELINE_RIGHT\n" +
                                                       "incorrect.alignment=INCORRECT_VALUE\n");
     doTest();
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxSdkSetupNotificationTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxSdkSetupNotificationTest.java
index 13d6b603d875..9b45dea38d79 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxSdkSetupNotificationTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxSdkSetupNotificationTest.java
@@ -14,23 +14,23 @@ import org.jetbrains.annotations.NotNull;
 public class JavaFxSdkSetupNotificationTest extends SdkSetupNotificationTestBase {
   private static final String SAMPLE_FXML = "<?import javafx.scene.layout.VBox?>\n<VBox/>";
 
-  public void testJavaFxAsLibrary() throws Exception {
+  public void testJavaFxAsLibrary() {
     ModuleRootModificationUtil.updateModel(myModule, model -> AbstractJavaFXTestCase.addJavaFxJarAsLibrary(myModule, model));
     final EditorNotificationPanel panel = configureBySdkAndText(IdeaTestUtil.getMockJdk18(), false, "sample.fxml", SAMPLE_FXML);
     assertNull(panel);
   }
 
-  public void testJavaFxInProjectSdk() throws Exception {
+  public void testJavaFxInProjectSdk() {
     final EditorNotificationPanel panel = configureBySdkAndText(getTestJdk(), false, "sample.fxml", SAMPLE_FXML);
     assertNull(panel);
   }
 
-  public void testJavaFxInModuleSdk() throws Exception {
+  public void testJavaFxInModuleSdk() {
     final EditorNotificationPanel panel = configureBySdkAndText(getTestJdk(), true, "sample.fxml", SAMPLE_FXML);
     assertNull(panel);
   }
 
-  public void testNoJavaFx() throws Exception {
+  public void testNoJavaFx() {
     final EditorNotificationPanel panel = configureBySdkAndText(IdeaTestUtil.getMockJdk17(), false, "sample.fxml", SAMPLE_FXML);
     assertSdkSetupPanelShown(panel, "The JavaFX runtime is not configured");
   }
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/packaging/JavaFxAntTaskTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/packaging/JavaFxAntTaskTest.java
index 728d48355bbe..0c7c39ab36d0 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/packaging/JavaFxAntTaskTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/packaging/JavaFxAntTaskTest.java
@@ -37,7 +37,7 @@ public class JavaFxAntTaskTest extends TestCase {
   private static final String PRELOADER_JAR = "preloaderJar";
   private static final String SIGNED = "signed";
 
-  public void testJarDeployNoInfo() throws Exception {
+  public void testJarDeployNoInfo() {
     doTest("<fx:fileset id=\"all_but_jarDeployNoInfo\" dir=\"temp\" includes=\"**/*.jar\">\n" +
            "<exclude name=\"jarDeployNoInfo.jar\">\n" +
            "</exclude>\n" +
@@ -66,7 +66,7 @@ public class JavaFxAntTaskTest extends TestCase {
            "</fx:deploy>\n", Collections.emptyMap());
   }
 
-  public void testJarDeployTitle() throws Exception {
+  public void testJarDeployTitle() {
     doTest("<fx:fileset id=\"all_but_jarDeployTitle\" dir=\"temp\" includes=\"**/*.jar\">\n" +
            "<exclude name=\"jarDeployTitle.jar\">\n" +
            "</exclude>\n" +
@@ -101,7 +101,7 @@ public class JavaFxAntTaskTest extends TestCase {
            "</fx:deploy>\n", Collections.singletonMap(TITLE, "My App"));
   }
 
-  public void testJarDeployIcon() throws Exception {
+  public void testJarDeployIcon() {
     doTest("<fx:fileset id=\"all_but_jarDeployIcon\" dir=\"temp\" includes=\"**/*.jar\">\n" +
            "<exclude name=\"jarDeployIcon.jar\">\n" +
            "</exclude>\n" +
@@ -155,7 +155,7 @@ public class JavaFxAntTaskTest extends TestCase {
              .build());
   }
 
-  public void testJarDeployIconAbsolute() throws Exception {
+  public void testJarDeployIconAbsolute() {
     doTest("<fx:fileset id=\"all_but_jarDeployIconAbsolute\" dir=\"temp\" includes=\"**/*.jar\">\n" +
            "<exclude name=\"jarDeployIconAbsolute.jar\">\n" +
            "</exclude>\n" +
@@ -207,7 +207,7 @@ public class JavaFxAntTaskTest extends TestCase {
            Collections.singletonMap(ICONS, "/project_dir/app_icon.png,/project_dir/app_icon.icns,/project_dir/app_icon.ico"));
   }
 
-  public void testJarDeployVersion() throws Exception {
+  public void testJarDeployVersion() {
     doTest("<fx:fileset id=\"all_but_jarDeployVersion\" dir=\"temp\" includes=\"**/*.jar\">\n" +
            "<exclude name=\"jarDeployVersion.jar\">\n" +
            "</exclude>\n" +
@@ -240,7 +240,7 @@ public class JavaFxAntTaskTest extends TestCase {
            "</fx:deploy>\n", Collections.singletonMap(VERSION, "4.2"));
   }
 
-  public void testJarDeployTemplate() throws Exception {
+  public void testJarDeployTemplate() {
     doTest("<fx:fileset id=\"all_but_jarDeployTemplate\" dir=\"temp\" includes=\"**/*.jar\">\n" +
            "<exclude name=\"jarDeployTemplate.jar\">\n" +
            "</exclude>\n" +
@@ -275,7 +275,7 @@ public class JavaFxAntTaskTest extends TestCase {
              .build());
   }
 
-  public void testJarDeploySigned() throws Exception {
+  public void testJarDeploySigned() {
     doTest("<fx:fileset id=\"all_but_jarDeploySigned\" dir=\"temp\" includes=\"**/*.jar\">\n" +
            "<exclude name=\"jarDeploySigned.jar\">\n" +
            "</exclude>\n" +
@@ -306,7 +306,7 @@ public class JavaFxAntTaskTest extends TestCase {
            "</fx:deploy>\n", Collections.singletonMap(SIGNED, "true"));
   }
 
-  public void testJarDeployPreloader() throws Exception {
+  public void testJarDeployPreloader() {
     final HashMap<String, String> options = new HashMap<>();
     options.put(PRELOADER_CLASS, "MyPreloader");
     options.put(PRELOADER_JAR, "preloader.jar");
diff --git a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java
index 4d0041024ea7..edc717caa873 100644
--- a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java
+++ b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java
@@ -23,7 +23,7 @@ import java.util.List;
 public abstract class AbstractJavaFXQuickFixTest extends AbstractJavaFXTestCase {
   protected abstract String getHint(String tagName);
 
-  protected void doLaunchQuickfixTest(final String tagName) throws Exception {
+  protected void doLaunchQuickfixTest(final String tagName) {
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     final IntentionAction singleIntention = myFixture.findSingleIntention(getHint(tagName));
     assertNotNull(singleIntention);
@@ -31,7 +31,7 @@ public abstract class AbstractJavaFXQuickFixTest extends AbstractJavaFXTestCase
     myFixture.checkResultByFile(getTestName(true) + "_after.fxml");
   }
 
-  protected void checkQuickFixNotAvailable(String tagName) throws Exception {
+  protected void checkQuickFixNotAvailable(String tagName) {
     myFixture.configureByFiles(getTestName(true) + ".fxml");
     final List<IntentionAction> intentions = myFixture.getAvailableIntentions();
     final IntentionAction intention = CodeInsightTestUtil.findIntentionByText(intentions, getHint(tagName));
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java
index 9bcd6938db7c..677ae20279c6 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitDependencyScopeSuggesterTest.java
@@ -30,26 +30,26 @@ import com.intellij.util.ArrayUtil;
  */
 public class JUnitDependencyScopeSuggesterTest extends JavaCodeInsightFixtureTestCase {
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addLibrary("junit3", JavaSdkUtil.getJunit3JarPath());
     moduleBuilder.addLibrary("junit4", ArrayUtil.toStringArray(JavaSdkUtil.getJUnit4JarPaths()));
     moduleBuilder.addLibrary("ideaRt", JavaSdkUtil.getIdeaRtJarPath());
     moduleBuilder.addLibrary("empty");
   }
 
-  public void testJunit3() throws Exception {
+  public void testJunit3() {
     assertSame(DependencyScope.TEST, getScope("junit3"));
   }
 
-  public void testJunit4() throws Exception {
+  public void testJunit4() {
     assertSame(DependencyScope.TEST, getScope("junit4"));
   }
 
-  public void testOrdinaryLibrary() throws Exception {
+  public void testOrdinaryLibrary() {
     assertNull(getScope("ideaRt"));
   }
 
-  public void testEmptyLibrary() throws Exception {
+  public void testEmptyLibrary() {
     assertNull(getScope("empty"));
   }
 
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java
index 047646a0eb55..a9cf0a28d80f 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitExpectedPatternsTest.java
@@ -21,12 +21,12 @@ import org.junit.Test;
 
 public class JUnitExpectedPatternsTest {
   @Test
-  public void testArrayComparison() throws Exception {
+  public void testArrayComparison() {
     Assert.assertNotNull(ExpectedPatterns.createExceptionNotification("arrays first differed at element [0]; expected: java.lang.String<Text> but was: java.lang.StringBuilder<Text>"));
   }
 
   @Test
-  public void testHamcrestAssertThatWithReason() throws Exception {
+  public void testHamcrestAssertThatWithReason() {
     Assert.assertNotNull(ExpectedPatterns.createExceptionNotification("reason\n" +
                                                                       "Expected: is \"aaa\\naa\"\n" +
                                                                       "     but: was \"bbb\\nbb\""));
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitOpenSourceAtExceptionTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitOpenSourceAtExceptionTest.java
index 4229ccbd5215..4269cfe05b5e 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitOpenSourceAtExceptionTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitOpenSourceAtExceptionTest.java
@@ -36,7 +36,7 @@ public class JUnitOpenSourceAtExceptionTest extends LightCodeInsightFixtureTestC
     myFixture.addClass("package junit.framework; public class TestCase {}");
   }
 
-  public void testStackTraceParseerAcceptsJavaStacktrace() throws Exception {
+  public void testStackTraceParseerAcceptsJavaStacktrace() {
     myFixture.addClass("abstract class ATest extends junit.framework.TestCase {" +
                        "  public void testMe() {\n" +
                        "    int i = 0;\n" +
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
index 557223afb52a..1a49a0e61f7b 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitRerunFailedTestsTest.java
@@ -44,7 +44,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     myFixture.addClass("package junit.framework; public class TestCase {}");
   }
 
-  public void testIncludeMethodsToRerunFromChildClass() throws Exception {
+  public void testIncludeMethodsToRerunFromChildClass() {
     myFixture.addClass("abstract class ATest extends junit.framework.TestCase {" +
                        "  public void testMe() {}\n" +
                        "}");
@@ -73,7 +73,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     assertEquals("ChildTest,testMe", presentation);
   }
 
-  public void testParameterizedTestNavigation() throws Exception {
+  public void testParameterizedTestNavigation() {
     myFixture.addClass("package org.junit.runner;\n" +
                        "public @interface RunWith {\n" +
                        "    Class<? extends Runner> value();\n" +
@@ -121,7 +121,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     assertEquals("MyTest,testName1[0.java]", TestMethods.getTestPresentation(parameterizedTestProxy, project, searchScope));
   }
 
-  public void testIgnoreRenamedMethodInRerunFailed() throws Exception {
+  public void testIgnoreRenamedMethodInRerunFailed() {
     final PsiClass baseClass = myFixture.addClass("abstract class ATest extends junit.framework.TestCase {" +
                                                  "  public void testMe() {}\n" +
                                                  "}");
@@ -139,7 +139,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     assertNull(TestMethods.getTestPresentation(testProxy, project, searchScope));
   }
 
-  public void testInnerClass() throws Exception {
+  public void testInnerClass() {
     myFixture.addClass("public class TestClass {\n" +
                        "    public static class Tests extends junit.framework.TestCase {\n" +
                        "        public void testFoo() throws Exception {}\n" +
@@ -158,7 +158,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     assertEquals("testFoo", name);
   }
 
-  public void testLocatorForIgnoredClass() throws Exception {
+  public void testLocatorForIgnoredClass() {
     PsiClass aClass = myFixture.addClass("@org.junit.Ignore" +
                                          "public class TestClass {\n" +
                                          "    @org.junit.Test" +
@@ -174,7 +174,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     assertEquals(aClass, element);
   }
 
-  public void testPresentationForJunit5MethodsWithParameters() throws Exception {
+  public void testPresentationForJunit5MethodsWithParameters() {
     myFixture.addClass("class A {}" +
                        "public class TestClass {\n" +
                        "    @org.junit.platform.commons.annotation.Testable" +
@@ -186,7 +186,7 @@ public class JUnitRerunFailedTestsTest extends LightCodeInsightFixtureTestCase
     assertEquals("TestClass,testFoo(A)", presentation);
   }
 
-  public void testMultipleClassesInOneFile() throws Exception {
+  public void testMultipleClassesInOneFile() {
     myFixture.configureByText("a.java", "public class Test1 {<caret>} public class Test2 {}");
 
     final IdeaTestApplication testApplication = IdeaTestApplication.getInstance();
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
index 03537e3101fa..ada90bb76d13 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
@@ -25,7 +25,6 @@ import org.junit.runner.Description;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 
-import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -33,11 +32,10 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class JUnitTreeByDescriptionHierarchyTest {
   @Test
-  public void testEmptySuite() throws Exception {
+  public void testEmptySuite() {
     doTest(Description.createSuiteDescription("empty suite"), "##teamcity[enteredTheMatrix]\n" +
                                                               "##teamcity[treeEnded]\n");
   }
@@ -490,7 +488,7 @@ public class JUnitTreeByDescriptionHierarchyTest {
   }
 
   @Test
-  public void testLongOutputPreservesTestName() throws Exception {
+  public void testLongOutputPreservesTestName() {
     StringBuffer buf = new StringBuffer();
     for (int i = 0; i < 1000; i++) {
       buf.append(DebugUtil.currentStackTrace());
@@ -811,7 +809,7 @@ public class JUnitTreeByDescriptionHierarchyTest {
   private static JUnit4TestListener createListener(final StringBuffer buf) {
     return new JUnit4TestListener(new PrintStream(new OutputStream() {
       @Override
-      public void write(int b) throws IOException {
+      public void write(int b) {
         buf.append(new String(new byte[]{(byte)b}));
       }
     })) {
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitUnusedMethodsTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitUnusedMethodsTest.java
index edc6d6994fdf..458c35c738c7 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitUnusedMethodsTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitUnusedMethodsTest.java
@@ -29,7 +29,7 @@ public class JUnitUnusedMethodsTest extends LightCodeInsightFixtureTestCase {
     myFixture.enableInspections(new UnusedDeclarationInspection(true));
   }
 
-  public void testRecognizeTestMethodInParameterizedClass() throws Exception {
+  public void testRecognizeTestMethodInParameterizedClass() {
     myFixture.configureByText("A.java", "import org.junit.Test;\n" +
                                         "import org.junit.runner.RunWith;\n" +
                                         "import org.junit.runners.Parameterized;\n" +
diff --git a/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit4IntegrationTest.java b/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit4IntegrationTest.java
index 79dbb865a531..2cb7215e72c0 100644
--- a/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit4IntegrationTest.java
+++ b/plugins/junit5_rt_tests/test/com/intellij/junit4/JUnit4IntegrationTest.java
@@ -67,7 +67,7 @@ public class JUnit4IntegrationTest extends JUnitAbstractIntegrationTest {
   public String myJUnitVersion;
 
   @Before
-  public void before() throws Throwable {
+  public void before() {
     EdtTestUtil.runInEdtAndWait(() -> {
       setUp();
       Module module = createEmptyModule();
@@ -91,7 +91,7 @@ public class JUnit4IntegrationTest extends JUnitAbstractIntegrationTest {
   }
 
   @After
-  public void after() throws Throwable {
+  public void after() {
     EdtTestUtil.runInEdtAndWait(() -> {
       tearDown();
     });
@@ -103,7 +103,7 @@ public class JUnit4IntegrationTest extends JUnitAbstractIntegrationTest {
   }
 
   @Test
-  public void ignoredTestMethod() throws Throwable {
+  public void ignoredTestMethod() {
     EdtTestUtil.runInEdtAndWait(() -> {
       PsiClass psiClass = findClass(getModule1(), CLASS_NAME);
       assertNotNull(psiClass);
diff --git a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5ConditionsTest.java b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5ConditionsTest.java
index 6486f61cbad9..3f8b31b31b98 100644
--- a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5ConditionsTest.java
+++ b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5ConditionsTest.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
 
 class JUnit5ConditionsTest {
   @Test
-  void disabledConditions() throws Exception {
+  void disabledConditions() {
     String[] disabledClasses = {DisabledClass.class.getName(), MetaDisabledClass.class.getName()};
     Arrays.stream(disabledClasses)
       .flatMap(klass -> Arrays.stream(new String[]{klass, klass + ",test1"}))
diff --git a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java
index 953b182a0f10..33af5d2dbc20 100644
--- a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java
+++ b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5EventsTest.java
@@ -29,7 +29,6 @@ import org.junit.platform.launcher.TestPlan;
 import org.opentest4j.AssertionFailedError;
 import org.opentest4j.MultipleFailuresError;
 
-import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
@@ -46,7 +45,7 @@ class JUnit5EventsTest {
     myBuf = new StringBuffer();
     myExecutionListener = new JUnit5TestExecutionListener(new PrintStream(new OutputStream() {
       @Override
-      public void write(int b) throws IOException {
+      public void write(int b) {
         myBuf.append(new String(new byte[]{(byte)b}));
       }
     })) {
diff --git a/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenServerEmbedderTest.java b/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenServerEmbedderTest.java
index 0fc588e7127b..a423276ef27c 100644
--- a/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenServerEmbedderTest.java
+++ b/plugins/maven/maven2-server-impl/test/org/jetbrains/idea/maven/embedder/MavenServerEmbedderTest.java
@@ -60,7 +60,7 @@ public class MavenServerEmbedderTest extends MavenImportingTestCase {
     myEmbedder = new MavenEmbedderWrapper(null) {
       @NotNull
       @Override
-      protected MavenServerEmbedder create() throws RemoteException {
+      protected MavenServerEmbedder create() {
         return myEmbedderImpl;
       }
     };
@@ -81,7 +81,7 @@ public class MavenServerEmbedderTest extends MavenImportingTestCase {
     assertEquals(getRepositoryFile(), myEmbedderImpl.getLocalRepositoryFile());
   }
 
-  public void _testReleasingTwice() throws Exception {
+  public void _testReleasingTwice() {
     myEmbedder.release();
     myEmbedder.release();
   }
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java
index c86a63fee25e..459c383f5a08 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java
@@ -518,7 +518,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase {
     e.execute(new EmptyProgressIndicator());
   }
 
-  protected void removeFromLocalRepository(String relativePath) throws IOException {
+  protected void removeFromLocalRepository(String relativePath) {
     FileUtil.delete(new File(getRepositoryPath(), relativePath));
   }
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenPluginInfoReaderTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenPluginInfoReaderTest.java
index 96cf53954465..60997619c075 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenPluginInfoReaderTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenPluginInfoReaderTest.java
@@ -33,13 +33,13 @@ public class MavenPluginInfoReaderTest extends MavenTestCase {
     p = MavenArtifactUtil.readPluginInfo(getRepositoryFile(), id);
   }
 
-  public void testLoadingPluginInfo() throws Exception {
+  public void testLoadingPluginInfo() {
     assertEquals("org.apache.maven.plugins", p.getGroupId());
     assertEquals("maven-compiler-plugin", p.getArtifactId());
     assertEquals("2.0.2", p.getVersion());
   }
 
-  public void testGoals() throws Exception {
+  public void testGoals() {
     assertEquals("compiler", p.getGoalPrefix());
 
     List<String> qualifiedGoals = new ArrayList<>();
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
index a8403e8f3484..fef727a4ae3a 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java
@@ -236,7 +236,7 @@ public abstract class MavenTestCase extends UsefulTestCase {
   }
 
   @Override
-  protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
+  protected void invokeTestRunnable(@NotNull Runnable runnable) {
     runnable.run();
   }
 
@@ -305,7 +305,7 @@ public abstract class MavenTestCase extends UsefulTestCase {
     return f;
   }
 
-  protected void deleteSettingsXml() throws IOException {
+  protected void deleteSettingsXml() {
     new WriteCommandAction.Simple(myProject) {
       @Override
       protected void run() throws Throwable {
@@ -336,11 +336,11 @@ public abstract class MavenTestCase extends UsefulTestCase {
     updateSettingsXml("");
   }
 
-  protected Module createModule(String name) throws IOException {
+  protected Module createModule(String name) {
     return createModule(name, StdModuleTypes.JAVA);
   }
 
-  protected Module createModule(final String name, final ModuleType type) throws IOException {
+  protected Module createModule(final String name, final ModuleType type) {
     return new WriteCommandAction<Module>(myProject) {
       @Override
       protected void run(@NotNull Result<Module> moduleResult) throws Throwable {
@@ -352,15 +352,15 @@ public abstract class MavenTestCase extends UsefulTestCase {
     }.execute().getResultObject();
   }
 
-  protected VirtualFile createProjectPom(@NonNls String xml) throws IOException {
+  protected VirtualFile createProjectPom(@NonNls String xml) {
     return myProjectPom = createPomFile(myProjectRoot, xml);
   }
 
-  protected VirtualFile createModulePom(String relativePath, String xml) throws IOException {
+  protected VirtualFile createModulePom(String relativePath, String xml) {
     return createPomFile(createProjectSubDir(relativePath), xml);
   }
 
-  protected VirtualFile createPomFile(final VirtualFile dir, String xml) throws IOException {
+  protected VirtualFile createPomFile(final VirtualFile dir, String xml) {
     VirtualFile f = dir.findChild("pom.xml");
     if (f == null) {
       f = new WriteAction<VirtualFile>() {
@@ -403,19 +403,19 @@ public abstract class MavenTestCase extends UsefulTestCase {
     return createProfilesFile(createProjectSubDir(relativePath), xml, false);
   }
 
-  private static VirtualFile createProfilesFile(VirtualFile dir, String xml, boolean oldStyle) throws IOException {
+  private static VirtualFile createProfilesFile(VirtualFile dir, String xml, boolean oldStyle) {
     return createProfilesFile(dir, createValidProfiles(xml, oldStyle));
   }
 
-  protected VirtualFile createFullProfilesXml(String content) throws IOException {
+  protected VirtualFile createFullProfilesXml(String content) {
     return createProfilesFile(myProjectRoot, content);
   }
 
-  protected VirtualFile createFullProfilesXml(String relativePath, String content) throws IOException {
+  protected VirtualFile createFullProfilesXml(String relativePath, String content) {
     return createProfilesFile(createProjectSubDir(relativePath), content);
   }
 
-  private static VirtualFile createProfilesFile(final VirtualFile dir, String content) throws IOException {
+  private static VirtualFile createProfilesFile(final VirtualFile dir, String content) {
     VirtualFile f = dir.findChild("profiles.xml");
     if (f == null) {
       f = new WriteAction<VirtualFile>() {
@@ -446,7 +446,7 @@ public abstract class MavenTestCase extends UsefulTestCase {
            "</profilesXml>";
   }
 
-  protected void deleteProfilesXml() throws IOException {
+  protected void deleteProfilesXml() {
     new WriteCommandAction.Simple(myProject) {
       @Override
       protected void run() throws Throwable {
@@ -488,7 +488,7 @@ public abstract class MavenTestCase extends UsefulTestCase {
     return file;
   }
 
-  private static void setFileContent(final VirtualFile file, final String content, final boolean advanceStamps) throws IOException {
+  private static void setFileContent(final VirtualFile file, final String content, final boolean advanceStamps) {
     new WriteAction<VirtualFile>() {
       @Override
       protected void run(@NotNull Result<VirtualFile> result) throws Throwable {
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
index 5c19ea5b3411..dfbdf945a0f7 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
@@ -49,7 +49,6 @@ import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
 import com.intellij.usages.UsageTarget;
 import com.intellij.usages.UsageTargetUtil;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NonNls;
@@ -97,13 +96,13 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     return PsiManager.getInstance(myProject).findFile(f);
   }
 
-  protected void configTest(VirtualFile f) throws IOException {
+  protected void configTest(VirtualFile f) {
     if (Comparing.equal(myConfigTimestamps.get(f), f.getTimeStamp())) return;
     myFixture.configureFromExistingVirtualFile(f);
     myConfigTimestamps.put(f, f.getTimeStamp());
   }
 
-  protected void type(VirtualFile f, char c) throws IOException {
+  protected void type(VirtualFile f, char c) {
     configTest(f);
     myFixture.type(c);
   }
@@ -113,7 +112,7 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     return findPsiFile(f).findReferenceAt(getEditorOffset(f));
   }
 
-  protected PsiReference getReferenceAt(VirtualFile f, int offset) throws IOException {
+  protected PsiReference getReferenceAt(VirtualFile f, int offset) {
     configTest(f);
     return findPsiFile(f).findReferenceAt(offset);
   }
@@ -123,11 +122,11 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     return findPsiFile(f).findElementAt(getEditorOffset(f));
   }
 
-  protected Editor getEditor() throws IOException {
+  protected Editor getEditor() {
     return getEditor(myProjectPom);
   }
 
-  protected Editor getEditor(VirtualFile f) throws IOException {
+  protected Editor getEditor(VirtualFile f) {
     configTest(f);
     return myFixture.getEditor();
   }
@@ -136,15 +135,15 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     return getEditorOffset(myProjectPom);
   }
 
-  protected int getEditorOffset(VirtualFile f) throws IOException {
+  protected int getEditorOffset(VirtualFile f) {
     return getEditor(f).getCaretModel().getOffset();
   }
 
-  protected PsiFile getTestPsiFile() throws IOException {
+  protected PsiFile getTestPsiFile() {
     return getTestPsiFile(myProjectPom);
   }
 
-  private PsiFile getTestPsiFile(VirtualFile f) throws IOException {
+  private PsiFile getTestPsiFile(VirtualFile f) {
     configTest(f);
     return myFixture.getFile();
   }
@@ -245,20 +244,20 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     return ref;
   }
 
-  protected void assertCompletionVariants(VirtualFile f, String... expected) throws IOException {
+  protected void assertCompletionVariants(VirtualFile f, String... expected) {
     List<String> actual = getCompletionVariants(f);
     assertUnorderedElementsAreEqual(actual, expected);
   }
 
-  protected void assertCompletionVariantsInclude(VirtualFile f, String... expected) throws IOException {
+  protected void assertCompletionVariantsInclude(VirtualFile f, String... expected) {
     assertContain(getCompletionVariants(f), expected);
   }
 
-  protected void assertCompletionVariantsDoNotInclude(VirtualFile f, String... expected) throws IOException {
+  protected void assertCompletionVariantsDoNotInclude(VirtualFile f, String... expected) {
     assertDoNotContain(getCompletionVariants(f), expected);
   }
 
-  protected List<String> getCompletionVariants(VirtualFile f) throws IOException {
+  protected List<String> getCompletionVariants(VirtualFile f) {
     configTest(f);
     LookupElement[] variants = myFixture.completeBasic();
 
@@ -288,11 +287,11 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     checkHighlighting(myProjectPom);
   }
 
-  protected void checkHighlighting(VirtualFile f) throws IOException {
+  protected void checkHighlighting(VirtualFile f) {
     checkHighlighting(f, true, false, true);
   }
 
-  protected void checkHighlighting(VirtualFile f, boolean checkWarnings, boolean checkInfos, boolean checkWeakWarnings) throws IOException {
+  protected void checkHighlighting(VirtualFile f, boolean checkWarnings, boolean checkInfos, boolean checkWeakWarnings) {
     configTest(myProjectPom);
     try {
       myFixture.testHighlighting(checkWarnings, checkInfos, checkWeakWarnings, f);
@@ -302,11 +301,11 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     }
   }
 
-  protected IntentionAction getIntentionAtCaret(String intentionName) throws IOException {
+  protected IntentionAction getIntentionAtCaret(String intentionName) {
     return getIntentionAtCaret(myProjectPom, intentionName);
   }
 
-  protected IntentionAction getIntentionAtCaret(VirtualFile pomFile, String intentionName) throws IOException {
+  protected IntentionAction getIntentionAtCaret(VirtualFile pomFile, String intentionName) {
     configTest(pomFile);
     try {
       List<IntentionAction> intentions = myFixture.getAvailableIntentions();
@@ -349,7 +348,7 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     renameHandler.invoke(myProject, PsiElement.EMPTY_ARRAY, context);
   }
 
-  private MapDataContext createDataContext(VirtualFile f) throws IOException {
+  private MapDataContext createDataContext(VirtualFile f) {
     MapDataContext context = new MapDataContext();
     context.put(CommonDataKeys.EDITOR, getEditor(f));
     context.put(CommonDataKeys.PSI_FILE, getTestPsiFile(f));
@@ -386,7 +385,7 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase {
     return ContainerUtil.map(result, psiReference -> psiReference.getElement());
   }
 
-  protected void assertHighlighted(VirtualFile file, HighlightInfo... expected) throws IOException {
+  protected void assertHighlighted(VirtualFile file, HighlightInfo... expected) {
     Editor editor = getEditor(file);
     HighlightUsagesHandler.invoke(myProject, editor, getTestPsiFile(file));
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java
index 73ac857e5c6a..cb40ffb0f484 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java
@@ -38,7 +38,7 @@ public class MavenModelReadingAndWritingTest extends MavenImportingTestCase {
                   "<version>1</version>");
   }
 
-  public void testReading() throws Exception {
+  public void testReading() {
     MavenDomProjectModel model = getDomModel();
 
     assertEquals("test", model.getGroupId().getStringValue());
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java
index b8185781afda..adab5057253f 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.java
@@ -172,7 +172,7 @@ public class MavenModelValidationTest extends MavenDomWithIndicesTestCase {
     checkHighlighting();
   }
 
-  public void testAddingStructureReadingProblemsToParentTag() throws Exception {
+  public void testAddingStructureReadingProblemsToParentTag() {
     myFixture.saveText(myProjectPom,
                      "<project>" +
                      "  <modelVersion>4.0.0</modelVersion>" +
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.java
index 67866c5d66b7..f7ec5fca00bd 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.java
@@ -240,7 +240,7 @@ public class MavenTypingTest extends MavenDomTestCase {
     assertTypeResultInRegularFile(myProjectPom, c, createPomXml(xml));
   }
 
-  private void assertTypeResultInRegularFile(VirtualFile f, char c, String expected) throws IOException {
+  private void assertTypeResultInRegularFile(VirtualFile f, char c, String expected) {
     type(f, c);
     myFixture.checkResult(expected);
   }
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
index ad8cb0d5b7ce..98388a0b85f3 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenClasspathsAndSearchScopesTest.java
@@ -31,7 +31,10 @@ import com.intellij.openapi.vfs.*;
 import com.intellij.psi.search.DelegatingGlobalSearchScope;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testFramework.PsiTestUtil;
-import com.intellij.util.*;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.CommonProcessors;
+import com.intellij.util.PathsList;
+import com.intellij.util.ReflectionUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.MavenImportingTestCase;
@@ -1124,7 +1127,7 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
     // Create directories for m5 and m6 which we will use for this test.
     new WriteCommandAction.Simple(myProject) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         createProjectSubDirs("m5/src/main/java",
                              "m5/src/test/java",
 
@@ -1265,7 +1268,7 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
 
     new WriteCommandAction.Simple(myProject) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         ModuleRootModificationUtil.addDependency(nonMavenM1, nonMavenM2, DependencyScope.COMPILE, true);
         ModuleRootModificationUtil.addDependency(nonMavenM2, modules.get(0), DependencyScope.COMPILE, true);
         createProjectSubDirs("nonMavenM1/src/main/java", "nonMavenM1/src/test/java",
@@ -1372,7 +1375,7 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
     assertPaths(expectedPaths, actualPathsList.getPathList());
   }
 
-  private void assertModuleScopes(String... modules) throws Exception {
+  private void assertModuleScopes(String... modules) {
     for (String each : modules) {
       assertModuleSearchScope(each,
                               getProjectPath() + "/" + each + "/src/main/java",
@@ -1380,33 +1383,33 @@ public class MavenClasspathsAndSearchScopesTest extends MavenImportingTestCase {
     }
   }
 
-  private void assertModuleSearchScope(String moduleName, String... paths) throws Exception {
+  private void assertModuleSearchScope(String moduleName, String... paths) {
     assertSearchScope(moduleName, Scope.MODULE, null, paths);
   }
 
-  private void assertAllProductionSearchScope(String moduleName, String... paths) throws Exception {
+  private void assertAllProductionSearchScope(String moduleName, String... paths) {
     assertCompileProductionSearchScope(moduleName, paths);
     assertRuntimeProductionSearchScope(moduleName, paths);
   }
 
-  private void assertAllTestsSearchScope(String moduleName, String... paths) throws Exception {
+  private void assertAllTestsSearchScope(String moduleName, String... paths) {
     assertCompileTestsSearchScope(moduleName, paths);
     assertRuntimeTestsSearchScope(moduleName, paths);
   }
 
-  private void assertCompileProductionSearchScope(String moduleName, String... paths) throws Exception {
+  private void assertCompileProductionSearchScope(String moduleName, String... paths) {
     assertSearchScope(moduleName, Scope.COMPILE, Type.PRODUCTION, paths);
   }
 
-  private void assertCompileTestsSearchScope(String moduleName, String... paths) throws Exception {
+  private void assertCompileTestsSearchScope(String moduleName, String... paths) {
     assertSearchScope(moduleName, Scope.COMPILE, Type.TESTS, paths);
   }
 
-  private void assertRuntimeProductionSearchScope(String moduleName, String... paths) throws Exception {
+  private void assertRuntimeProductionSearchScope(String moduleName, String... paths) {
     assertSearchScope(moduleName, Scope.RUNTIME, Type.PRODUCTION, paths);
   }
 
-  private void assertRuntimeTestsSearchScope(String moduleName, String... paths) throws Exception {
+  private void assertRuntimeTestsSearchScope(String moduleName, String... paths) {
     assertSearchScope(moduleName, Scope.RUNTIME, Type.TESTS, paths);
   }
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ArchetypesTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ArchetypesTest.java
index 3aa456bfb078..03c99ffbfe53 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ArchetypesTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ArchetypesTest.java
@@ -29,7 +29,7 @@ import java.util.Collections;
 import java.util.Map;
 
 public class ArchetypesTest extends MavenTestCase {
-  public void testGenerating() throws Exception {
+  public void testGenerating() {
     if (!hasMavenInstallation()) return;
 
     File dir = new File(myDir.getPath(), "generated");
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
index a55db38e4cce..883617ab7143 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
@@ -2372,7 +2372,7 @@ public class DependenciesImportingTest extends MavenImportingTestCase {
 
     new WriteAction() {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         ModifiableRootModel rootModel = ModuleRootManager.getInstance(getModule("m1")).getModifiableModel();
         OrderEntry[] orderEntries = rootModel.getOrderEntries().clone();
         assert orderEntries.length == 4;
@@ -2422,7 +2422,7 @@ public class DependenciesImportingTest extends MavenImportingTestCase {
 
     new WriteAction() {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         ModifiableRootModel rootModel = ModuleRootManager.getInstance(getModule("m1")).getModifiableModel();
         OrderEntry[] orderEntries = rootModel.getOrderEntries().clone();
         assert orderEntries.length == 4;
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenModuleBuilderTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenModuleBuilderTest.java
index de3679eacaf0..befa77955cad 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenModuleBuilderTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenModuleBuilderTest.java
@@ -45,7 +45,7 @@ public class MavenModuleBuilderTest extends MavenImportingTestCase {
     setModuleNameAndRoot("module", getProjectPath());
   }
 
-  public void testCreatingBlank() throws Exception {
+  public void testCreatingBlank() {
     if (!hasMavenInstallation()) return;
 
     MavenId id = new MavenId("org.foo", "module", "1.0");
@@ -68,7 +68,7 @@ public class MavenModuleBuilderTest extends MavenImportingTestCase {
     assertTestSources("module", "src/test/java");
   }
 
-  public void testInheritJdkFromProject() throws Exception {
+  public void testInheritJdkFromProject() {
     if (!hasMavenInstallation()) return;
 
     createNewModule(new MavenId("org.foo", "module", "1.0"));
@@ -76,7 +76,7 @@ public class MavenModuleBuilderTest extends MavenImportingTestCase {
     assertTrue(manager.isSdkInherited());
   }
 
-  public void testCreatingFromArchetype() throws Exception {
+  public void testCreatingFromArchetype() {
     if (!hasMavenInstallation()) return;
 
     setArchetype(new MavenArchetype("org.apache.maven.archetypes", "maven-archetype-quickstart", "1.0", null, null));
@@ -310,7 +310,7 @@ public class MavenModuleBuilderTest extends MavenImportingTestCase {
     myBuilder.setArchetype(archetype);
   }
 
-  private void createNewModule(MavenId id) throws Exception {
+  private void createNewModule(MavenId id) {
     myBuilder.setProjectId(id);
 
     new WriteAction() {
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java
index 84b859042da7..2d7413bb303f 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java
@@ -36,22 +36,22 @@ public abstract class MavenPerformanceTest extends MavenImportingTestCase {
     myProjectsManager.resetManagedFilesAndProfilesInTests(Collections.singletonList(file), MavenExplicitProfiles.NONE);
   }
 
-  public void testReading() throws Exception {
+  public void testReading() {
     measure(4000, () -> waitForReadingCompletion());
   }
 
-  public void testImporting() throws Exception {
+  public void testImporting() {
     waitForReadingCompletion();
     measure(8, () -> myProjectsManager.importProjects());
   }
 
-  public void testReImporting() throws Exception {
+  public void testReImporting() {
     waitForReadingCompletion();
     myProjectsManager.importProjects();
     measure(2, () -> myProjectsManager.importProjects());
   }
 
-  public void testResolving() throws Exception {
+  public void testResolving() {
     waitForReadingCompletion();
     List<MavenProject> mavenProjects = myProjectsManager.getProjects();
     Collections.sort(mavenProjects, (o1, o2) -> o1.getPath().compareToIgnoreCase(o2.getPath()));
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ReimportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ReimportingTest.java
index c086447beb7d..a6299422b630 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ReimportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/ReimportingTest.java
@@ -56,12 +56,12 @@ public class ReimportingTest extends MavenImportingTestCase {
     importProject();
   }
 
-  public void testKeepingModuleGroups() throws Exception {
+  public void testKeepingModuleGroups() {
     final Module m = getModule("project");
 
     new WriteCommandAction.Simple(myProject) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         ModifiableModuleModel model = ModuleManager.getInstance(myProject).getModifiableModel();
         model.setModuleGroupPath(m, new String[]{"group"});
         model.commit();
@@ -143,7 +143,7 @@ public class ReimportingTest extends MavenImportingTestCase {
     assertEquals(1, counter.get());
   }
 
-  public void testDoesNotAskToRemoveManuallyAdderModules() throws Exception {
+  public void testDoesNotAskToRemoveManuallyAdderModules() {
     createModule("userModule");
     assertModules("project", "m1", "m2", "userModule");
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
index e276f5670ffe..f1175e19270d 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
@@ -1145,7 +1145,7 @@ public class StructureImportingTest extends MavenImportingTestCase {
     assertModuleLibDeps("project", "Maven: junit:junit:3.8.1");
   }
 
-  public void testProjectWithOldProfilesXmlFile() throws Exception {
+  public void testProjectWithOldProfilesXmlFile() {
     ignore(); // not supported by 2.2
   }
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java
index bad592ee329d..b90c2ef6dda3 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/WorkingWithOpenProjectTest.java
@@ -51,7 +51,7 @@ public class WorkingWithOpenProjectTest extends MavenImportingTestCase {
     PsiTestUtil.addContentRoot(getModule("project"), root);  // should not throw an exception
   }
   
-  public void _testSavingAllDocumentBeforeReimport() throws Exception {
+  public void _testSavingAllDocumentBeforeReimport() {
     // cannot make it work die to order of document listeners
 
     myProjectsManager.listenForExternalChanges();
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesManagerTest.java
index 0ab997624182..c15ec21a0acc 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesManagerTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesManagerTest.java
@@ -48,7 +48,7 @@ public class MavenIndicesManagerTest extends MavenIndicesTestCase {
     }
   }
 
-  public void testEnsuringLocalRepositoryIndex() throws Exception {
+  public void testEnsuringLocalRepositoryIndex() {
     File dir1 = myIndicesFixture.getRepositoryHelper().getTestData("dir/foo");
     File dir2 = myIndicesFixture.getRepositoryHelper().getTestData("dir\\foo");
     File dir3 = myIndicesFixture.getRepositoryHelper().getTestData("dir\\foo\\");
@@ -69,7 +69,7 @@ public class MavenIndicesManagerTest extends MavenIndicesTestCase {
     assertFalse(indices1.get(0).equals(indices2.get(0)));
   }
 
-  public void testEnsuringRemoteRepositoryIndex() throws Exception {
+  public void testEnsuringRemoteRepositoryIndex() {
     File local = myIndicesFixture.getRepositoryHelper().getTestData("dir");
     Pair<String, String> remote1 = Pair.create("id1", "http://foo/bar");
     Pair<String, String> remote2 = Pair.create("id1", "  http://foo\\bar\\\\  ");
@@ -84,7 +84,7 @@ public class MavenIndicesManagerTest extends MavenIndicesTestCase {
     assertEquals(4, myIndicesFixture.getIndicesManager().ensureIndicesExist(myProject, local, asList(remote1, remote2, remote3, remote4, remote5)).size());
   }
 
-  public void testDefaultArchetypes() throws Exception {
+  public void testDefaultArchetypes() {
     assertArchetypeExists("org.apache.maven.archetypes:maven-archetype-quickstart:RELEASE");
   }
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java
index 5ab38e9f93be..0f60aad73762 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java
@@ -61,7 +61,7 @@ public class MavenIndicesTest extends MavenIndicesTestCase {
     }
   }
 
-  private void initIndices() throws Exception {
+  private void initIndices() {
     initIndices("indices");
   }
 
@@ -84,7 +84,7 @@ public class MavenIndicesTest extends MavenIndicesTestCase {
     });
   }
 
-  private void shutdownIndices() throws Exception {
+  private void shutdownIndices() {
     myIndices.close();
     myIndexer.releaseInTests();
   }
@@ -154,7 +154,7 @@ public class MavenIndicesTest extends MavenIndicesTestCase {
     assertUnorderedElementsAreEqual(i.getGroupIds(), "jmock");
   }
 
-  public void testClearingUpdateDirAfterUpdate() throws Exception {
+  public void testClearingUpdateDirAfterUpdate() {
     ignore();
     //MavenIndex i = myIndices.add("id", myRepositoryHelper.getTestDataPath("local1"), MavenIndex.Kind.LOCAL);
     //
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java
index bfe9a2ac6f91..57f66a4d8e7c 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java
@@ -68,7 +68,7 @@ public class MavenIndicesTestFixture {
     myRepositoryHelper.copy(relPath, myLocalRepoDir);
   }
 
-  public void tearDown() throws Exception {
+  public void tearDown() {
     getIndicesManager().doShutdownInTests();
     MavenServerManager.getInstance().shutdown(true);
   }
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java
index 42cd87f9b7f1..1fbdfd0eff9c 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java
@@ -37,7 +37,7 @@ public class MavenProjectIndicesManagerTest extends MavenIndicesTestCase {
     }
   }
 
-  public void testAutomaticallyAddAndUpdateLocalRepository() throws Exception {
+  public void testAutomaticallyAddAndUpdateLocalRepository() {
     List<MavenIndex> indices = myIndicesFixture.getProjectIndicesManager().getIndices();
 
     assertEquals(1, indices.size());
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java
index 032a7000eabd..dd20caaa5bb6 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java
@@ -40,7 +40,7 @@ public class MavenSearcherTest extends MavenIndicesTestCase {
     }
   }
 
-  public void testClassSearch() throws Exception {
+  public void testClassSearch() {
     assertTrue(!getClassSearchResults("").isEmpty());
 
     assertClassSearchResults("TestCas",
@@ -91,7 +91,7 @@ public class MavenSearcherTest extends MavenIndicesTestCase {
     assertClassSearchResults("!@][#$%)(^&*()_"); // shouldn't throw
   }
 
-  public void testArtifactSearch() throws Exception {
+  public void testArtifactSearch() {
     assertArtifactSearchResults("",
                                 "asm:asm:3.3.1 asm:asm:3.3",
                                 "asm:asm-attrs:2.2.1",
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MojoAnnotationInJavadocTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MojoAnnotationInJavadocTest.java
index 436b948a4f99..7237ccaecab4 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MojoAnnotationInJavadocTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/MojoAnnotationInJavadocTest.java
@@ -26,7 +26,7 @@ public class MojoAnnotationInJavadocTest extends InspectionTestCase {
     return PluginPathManager.getPluginHomePath("maven") + "/src/test/data/inspections";
   }
 
-  public void testJavadocMojoValidTags() throws Exception {
+  public void testJavadocMojoValidTags() {
     doTest(getTestName(true), new JavaDocLocalInspection());
   }
 }
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenEmbeddersManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenEmbeddersManagerTest.java
index b53882825ee9..88c131355957 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenEmbeddersManagerTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenEmbeddersManagerTest.java
@@ -37,14 +37,14 @@ public class MavenEmbeddersManagerTest extends MavenTestCase {
     }
   }
 
-  public void testBasics() throws Exception {
+  public void testBasics() {
     MavenEmbedderWrapper one = myManager.getEmbedder(MavenEmbeddersManager.FOR_FOLDERS_RESOLVE, null, null);
     MavenEmbedderWrapper two = myManager.getEmbedder(MavenEmbeddersManager.FOR_DEPENDENCIES_RESOLVE, null, null);
 
     assertNotSame(one, two);
   }
 
-  public void testForSameId() throws Exception {
+  public void testForSameId() {
     MavenEmbedderWrapper one1 = myManager.getEmbedder(MavenEmbeddersManager.FOR_DEPENDENCIES_RESOLVE, null, null);
     MavenEmbedderWrapper one2 = myManager.getEmbedder(MavenEmbeddersManager.FOR_DEPENDENCIES_RESOLVE, null, null);
 
@@ -57,7 +57,7 @@ public class MavenEmbeddersManagerTest extends MavenTestCase {
     assertSame(one1, one3);
   }
 
-  public void testCachingOnlyOne() throws Exception {
+  public void testCachingOnlyOne() {
     MavenEmbedderWrapper one1 = myManager.getEmbedder(MavenEmbeddersManager.FOR_DEPENDENCIES_RESOLVE, null, null);
     MavenEmbedderWrapper one2 = myManager.getEmbedder(MavenEmbeddersManager.FOR_DEPENDENCIES_RESOLVE, null, null);
 
@@ -73,7 +73,7 @@ public class MavenEmbeddersManagerTest extends MavenTestCase {
     assertNotSame(one2, one22);
   }
 
-  public void testResettingAllCachedAndInUse() throws Exception {
+  public void testResettingAllCachedAndInUse() {
     MavenEmbedderWrapper one1 = myManager.getEmbedder(MavenEmbeddersManager.FOR_DEPENDENCIES_RESOLVE, null, null);
     MavenEmbedderWrapper one2 = myManager.getEmbedder(MavenEmbeddersManager.FOR_FOLDERS_RESOLVE, null, null);
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
index 6504ac694e83..5f4f1cfb4cab 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
@@ -239,7 +239,7 @@ public class MavenProjectReaderTest extends MavenTestCase {
     assertEquals("name", p.getName());
   }
 
-  public void testDefaults() throws Exception {
+  public void testDefaults() {
     VirtualFile file = new WriteAction<VirtualFile>() {
       @Override
       protected void run(@NotNull Result<VirtualFile> result) throws Throwable {
@@ -304,7 +304,7 @@ public class MavenProjectReaderTest extends MavenTestCase {
     assertEquals("1", id.getVersion());
   }
 
-  public void testCustomSettings() throws Exception {
+  public void testCustomSettings() {
     VirtualFile file = new WriteAction<VirtualFile>() {
       @Override
       protected void run(@NotNull Result<VirtualFile> result) throws Throwable {
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenSettingsTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenSettingsTest.java
index 909cf461943a..498c3f432a7a 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenSettingsTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenSettingsTest.java
@@ -20,7 +20,7 @@ import org.jetbrains.idea.maven.MavenTestCase;
 import org.jetbrains.idea.maven.utils.MavenSettings;
 
 public class MavenSettingsTest extends MavenTestCase {
-  public void testCloningGeneralSettingsWithoutListeners() throws Exception {
+  public void testCloningGeneralSettingsWithoutListeners() {
     final String[] log = new String[]{""};
 
     MavenGeneralSettings s = new MavenGeneralSettings();
@@ -38,7 +38,7 @@ public class MavenSettingsTest extends MavenTestCase {
     assertEquals("changed ", log[0]);
   }
 
-  public void testCloningImportingSettingsWithoutListeners() throws Exception {
+  public void testCloningImportingSettingsWithoutListeners() {
     final String[] log = new String[]{""};
 
     MavenImportingSettings s = new MavenImportingSettings();
@@ -64,14 +64,14 @@ public class MavenSettingsTest extends MavenTestCase {
     assertEquals("changed ", log[0]);
   }
 
-  public void testImportingSettings() throws Exception {
+  public void testImportingSettings() {
     assertTrue(new MavenImportingSettings().equals(new MavenImportingSettings()));
     MavenImportingConfigurable importingConfigurable = new MavenImportingConfigurable(myProject);
     importingConfigurable.reset();
     assertFalse(importingConfigurable.isModified());
   }
 
-  public void testNotModifiedAfterCreation() throws Exception {
+  public void testNotModifiedAfterCreation() {
     MavenSettings s = new MavenSettings(myProject);
     s.createComponent();
     s.reset();
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeIgnoresTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeIgnoresTest.java
index b75bf2b3bfba..e1d240b4c7b9 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeIgnoresTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeIgnoresTest.java
@@ -44,7 +44,7 @@ public class MavenProjectsTreeIgnoresTest extends MavenProjectsTreeTestCase {
     myRoots = myTree.getRootProjects();
   }
 
-  public void testSendingNotifications() throws Exception {
+  public void testSendingNotifications() {
     myTree.setIgnoredState(Collections.singletonList(myRoots.get(0)), true);
 
     assertEquals("ignored: m1 ", myLog);
@@ -66,7 +66,7 @@ public class MavenProjectsTreeIgnoresTest extends MavenProjectsTreeTestCase {
     myLog = "";
   }
 
-  public void testDoNotSendNotificationsIfNothingChanged() throws Exception {
+  public void testDoNotSendNotificationsIfNothingChanged() {
     myTree.setIgnoredState(Collections.singletonList(myRoots.get(0)), true);
 
     assertEquals("ignored: m1 ", myLog);
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeTestCase.java
index 14a616d84f85..f72cecdc58c9 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeTestCase.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/importing/MavenProjectsTreeTestCase.java
@@ -22,9 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.MavenImportingTestCase;
 import org.jetbrains.idea.maven.model.MavenExplicitProfiles;
 import org.jetbrains.idea.maven.project.MavenProjectsTree;
-import org.jetbrains.idea.maven.utils.MavenProcessCanceledException;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
@@ -33,24 +31,24 @@ import static java.util.Arrays.asList;
 public abstract class MavenProjectsTreeTestCase extends MavenImportingTestCase {
   protected MavenProjectsTree myTree = new MavenProjectsTree(myProject);
 
-  protected void updateAll(VirtualFile... files) throws MavenProcessCanceledException {
+  protected void updateAll(VirtualFile... files) {
     updateAll(Collections.emptyList(), files);
   }
 
-  protected void updateAll(List<String> profiles, VirtualFile... files) throws MavenProcessCanceledException {
+  protected void updateAll(List<String> profiles, VirtualFile... files) {
     myTree.resetManagedFilesAndProfiles(asList(files), new MavenExplicitProfiles(profiles));
     myTree.updateAll(false, getMavenGeneralSettings(), EMPTY_MAVEN_PROCESS);
   }
 
-  protected void update(VirtualFile file) throws MavenProcessCanceledException {
+  protected void update(VirtualFile file) {
     myTree.update(asList(file), false, getMavenGeneralSettings(), EMPTY_MAVEN_PROCESS);
   }
 
-  protected void deleteProject(VirtualFile file) throws MavenProcessCanceledException {
+  protected void deleteProject(VirtualFile file) {
     myTree.delete(asList(file), getMavenGeneralSettings(), EMPTY_MAVEN_PROCESS);
   }
 
-  protected void updateTimestamps(final VirtualFile... files) throws IOException {
+  protected void updateTimestamps(final VirtualFile... files) {
     new WriteAction() {
       @Override
       protected void run(@NotNull Result result) throws Throwable {
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/AlphaUnsortedInspectionTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/AlphaUnsortedInspectionTest.java
index 08b3fdb9983e..650fe13ff7a5 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/AlphaUnsortedInspectionTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/AlphaUnsortedInspectionTest.java
@@ -29,15 +29,15 @@ import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCa
  * @author Dmitry Batkovich
  */
 public class AlphaUnsortedInspectionTest extends LightPlatformCodeInsightFixtureTestCase {
-  public void testUnsorted() throws Exception {
+  public void testUnsorted() {
     doTest();
   }
 
-  public void testSorted() throws Exception {
+  public void testSorted() {
     doTest();
   }
 
-  public void testUnsortedSuppressed() throws Exception {
+  public void testUnsortedSuppressed() {
     final ExtensionPoint<AlphaUnsortedPropertiesFileInspectionSuppressor> ep =
       Extensions.getRootArea().getExtensionPoint(AlphaUnsortedPropertiesFileInspectionSuppressor.EP_NAME);
     final AlphaUnsortedPropertiesFileInspectionSuppressor suppressor = new AlphaUnsortedPropertiesFileInspectionSuppressor() {
@@ -90,7 +90,7 @@ public class AlphaUnsortedInspectionTest extends LightPlatformCodeInsightFixture
                           "e=e");
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     myFixture.testInspection(getTestName(true), new LocalInspectionToolWrapper(new AlphaUnsortedPropertiesFileInspection()));
   }
 
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesEnterTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesEnterTest.java
index 219344ffa978..62a736d9e4f7 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesEnterTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesEnterTest.java
@@ -39,12 +39,12 @@ public class PropertiesEnterTest extends LightPlatformCodeInsightTestCase {
     type('\n');
   }
 
-  public void testEndLine() throws Exception { doTest(); }
-  public void testComment() throws Exception { doTest(); }
-  public void testKey() throws Exception { doTest(); }
-  public void testValue() throws Exception { doTest(); }
-  public void testBackslash() throws Exception { doTest(); }
-  public void testBeforeComment() throws Exception { doTest(); }
+  public void testEndLine() { doTest(); }
+  public void testComment() { doTest(); }
+  public void testKey() { doTest(); }
+  public void testValue() { doTest(); }
+  public void testBackslash() { doTest(); }
+  public void testBeforeComment() { doTest(); }
 
   public void testPerformance() {
     String line = "some.relatively.long.property.name=And here's some property value for that really unique key, nice to have\n";
@@ -56,7 +56,7 @@ public class PropertiesEnterTest extends LightPlatformCodeInsightTestCase {
     }).assertTiming();
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     configureByFile(BASE_PATH + getTestName(false)+".properties");
     typeEnter();
     checkResultByFile(BASE_PATH + getTestName(false)+"_after.properties");
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java
index cf5b89e75fc9..de72e102cae2 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFileTest.java
@@ -41,7 +41,7 @@ public class PropertiesFileTest extends LightPlatformCodeInsightFixtureTestCase
     myPropertyToAdd = (Property)PropertiesElementFactory.createProperty(getProject(), "kkk", "vvv", null);
   }
 
-  public void testAddPropertyAfterComment() throws Exception {
+  public void testAddPropertyAfterComment() {
     final PropertiesFile propertiesFile =
       PropertiesImplUtil.getPropertiesFile(myFixture.configureByText(PropertiesFileType.INSTANCE, "#xxxxx"));
     WriteCommandAction.runWriteCommandAction(getProject(), () -> {
@@ -54,7 +54,7 @@ public class PropertiesFileTest extends LightPlatformCodeInsightFixtureTestCase
     assertPropertyEquals(added, myPropertyToAdd.getName(), myPropertyToAdd.getValue());
   }
 
-  public void testAddPropertyAfterComment2() throws Exception {
+  public void testAddPropertyAfterComment2() {
     final PropertiesFile propertiesFile =
       PropertiesImplUtil.getPropertiesFile(myFixture.configureByText(PropertiesFileType.INSTANCE, "#xxxxx\n"));
     WriteCommandAction.runWriteCommandAction(getProject(), () -> {
@@ -72,7 +72,7 @@ public class PropertiesFileTest extends LightPlatformCodeInsightFixtureTestCase
     assertEquals(value, property.getValue());
   }
 
-  public void testAddPropertyAfterProperty() throws Exception {
+  public void testAddPropertyAfterProperty() {
     final PropertiesFile propertiesFile =
       PropertiesImplUtil.getPropertiesFile(myFixture.configureByText(PropertiesFileType.INSTANCE, "xxx=yyy"));
     WriteCommandAction.runWriteCommandAction(null, () -> {
@@ -85,7 +85,7 @@ public class PropertiesFileTest extends LightPlatformCodeInsightFixtureTestCase
     assertPropertyEquals(properties.get(1), "xxx", "yyy");
     assertPropertyEquals(properties.get(0), myPropertyToAdd.getName(), myPropertyToAdd.getValue());
   }
-  public void testDeleteProperty() throws Exception {
+  public void testDeleteProperty() {
     PropertiesFile propertiesFile =
       PropertiesImplUtil.getPropertiesFile(myFixture.configureByText(PropertiesFileType.INSTANCE, "xxx=yyy\n#s\nzzz=ttt\n\n"));
 
@@ -101,7 +101,7 @@ public class PropertiesFileTest extends LightPlatformCodeInsightFixtureTestCase
     assertPropertyEquals(propertiesAfter.get(0), "xxx", "yyy");
   }
 
-  public void testDeletePropertyWhitespaceAround() throws Exception {
+  public void testDeletePropertyWhitespaceAround() {
     PropertiesFile propertiesFile =
       PropertiesImplUtil.getPropertiesFile(myFixture.configureByText(PropertiesFileType.INSTANCE, "xxx=yyy\nxxx2=tyrt\nxxx3=ttt\n\n"));
 
@@ -111,7 +111,7 @@ public class PropertiesFileTest extends LightPlatformCodeInsightFixtureTestCase
 
     assertEquals("xxx=yyy\nxxx3=ttt\n\n", propertiesFile.getContainingFile().getText());
   }
-  public void testDeletePropertyWhitespaceAhead() throws Exception {
+  public void testDeletePropertyWhitespaceAhead() {
     PropertiesFile propertiesFile =
       PropertiesImplUtil.getPropertiesFile(myFixture.configureByText(PropertiesFileType.INSTANCE, "xxx=yyy\nxxx2=tyrt\nxxx3=ttt\n\n"));
 
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFoldingTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFoldingTest.java
index a1c74a93865f..59df55d5c315 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFoldingTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesFoldingTest.java
@@ -32,7 +32,7 @@ public class PropertiesFoldingTest extends LightPlatformCodeInsightFixtureTestCa
     myFixture.testFolding(getTestDataPath() + getTestName(true) + ".test.properties");
   }
 
-  public void testCustomFolding() throws Exception {
+  public void testCustomFolding() {
     doTest();
   }
 
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesLexerTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesLexerTest.java
index d233efbc4b9d..e2550f5a5c6d 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesLexerTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesLexerTest.java
@@ -52,7 +52,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     if (idx < expectedTokens.length) fail("Not enough tokens");
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doTest("xxx=yyy", new String[]{
       "Properties:KEY_CHARACTERS", "xxx",
       "Properties:KEY_VALUE_SEPARATOR", "=",
@@ -60,7 +60,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testTwoWords() throws Exception {
+  public void testTwoWords() {
     doTest("xxx=yyy zzz", new String[]{
       "Properties:KEY_CHARACTERS", "xxx",
       "Properties:KEY_VALUE_SEPARATOR", "=",
@@ -68,7 +68,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testMulti() throws Exception {
+  public void testMulti() {
     doTest("a  b\n \nx\ty", new String[]{
       "Properties:KEY_CHARACTERS", "a",
       "WHITE_SPACE", "  ",
@@ -80,20 +80,20 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testIncompleteProperty() throws Exception {
+  public void testIncompleteProperty() {
     doTest("a", new String[]{
       "Properties:KEY_CHARACTERS", "a"
     });
   }
 
-  public void testIncompleteProperty2() throws Exception {
+  public void testIncompleteProperty2() {
     doTest("a.2=", new String[]{
       "Properties:KEY_CHARACTERS", "a.2",
       "Properties:KEY_VALUE_SEPARATOR", "="
     });
   }
 
-  public void testEscaping() throws Exception {
+  public void testEscaping() {
     doTest("sdlfkjsd\\l\\\\\\:\\=gk   =   s\\nsssd", new String[]{
       "Properties:KEY_CHARACTERS", "sdlfkjsd\\l\\\\\\:\\=gk",
       "WHITE_SPACE", "   ",
@@ -103,7 +103,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testCRLFEscaping() throws Exception {
+  public void testCRLFEscaping() {
     doTest("sdlfkjsdsssd:a\\\nb", new String[]{
       "Properties:KEY_CHARACTERS", "sdlfkjsdsssd",
       "Properties:KEY_VALUE_SEPARATOR", ":",
@@ -111,7 +111,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testCRLFEscapingKey() throws Exception {
+  public void testCRLFEscapingKey() {
     doTest("x\\\ny:z", new String[]{
       "Properties:KEY_CHARACTERS", "x\\\ny",
       "Properties:KEY_VALUE_SEPARATOR", ":",
@@ -119,27 +119,27 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testWhitespace() throws Exception {
+  public void testWhitespace() {
     doTest("x y", new String[]{
       "Properties:KEY_CHARACTERS", "x",
       "WHITE_SPACE", " ",
       "Properties:VALUE_CHARACTERS", "y"
     });
   }
-  public void testHashInValue() throws Exception {
+  public void testHashInValue() {
     doTest("x=# y", new String[]{
       "Properties:KEY_CHARACTERS", "x",
       "Properties:KEY_VALUE_SEPARATOR", "=",
       "Properties:VALUE_CHARACTERS", "# y"
     });
   }
-  public void testComments() throws Exception {
+  public void testComments() {
     doTest("#hhhh kkkk \n\n", new String[]{
       "Properties:END_OF_LINE_COMMENT", "#hhhh kkkk ",
       "WHITE_SPACE", "\n\n",
     });
   }
-  public void testTabs() throws Exception {
+  public void testTabs() {
     doTest("install/htdocs/imcms/html/link_editor.jsp/1002 = URL\\n\\\n" +
            "\t\\t\\teller meta_id:", new String[]{
       "Properties:KEY_CHARACTERS", "install/htdocs/imcms/html/link_editor.jsp/1002",
@@ -149,7 +149,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
       "Properties:VALUE_CHARACTERS", "URL\\n\\\n" + "\t\\t\\teller meta_id:"
     });
   }
-  public void testIndentedComments() throws Exception {
+  public void testIndentedComments() {
     doTest("   #comm1\n#comm2=n\n\t#comm3", new String[]{
       "WHITE_SPACE", "   ",
       "Properties:END_OF_LINE_COMMENT", "#comm1",
@@ -160,7 +160,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testHighlighting() throws Exception {
+  public void testHighlighting() {
     doTestHL("x y", new String[]{
       "Properties:KEY_CHARACTERS", "x",
       "WHITE_SPACE", " ",
@@ -168,7 +168,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testHighlighting2() throws Exception {
+  public void testHighlighting2() {
     doTestHL("x\\n\\kz y", new String[]{
       "Properties:KEY_CHARACTERS", "x",
       "VALID_STRING_ESCAPE_TOKEN", "\\n",
@@ -179,7 +179,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
     });
   }
 
-  public void testHighlighting3() throws Exception {
+  public void testHighlighting3() {
     doTestHL("x  \\uxyzt\\pz\\tp", new String[]{
       "Properties:KEY_CHARACTERS", "x",
       "WHITE_SPACE", "  ",
@@ -190,7 +190,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
       "Properties:VALUE_CHARACTERS", "p",
     });
   }
-  public void testFramingSpaces() throws Exception {
+  public void testFramingSpaces() {
     doTestHL("\\ x\\ y\\ =\\ z\\ t\\ \\ ", new String[]{
       "VALID_STRING_ESCAPE_TOKEN", "\\ ",
       "Properties:KEY_CHARACTERS", "x",
@@ -206,7 +206,7 @@ public class PropertiesLexerTest extends LightPlatformTestCase {
       "VALID_STRING_ESCAPE_TOKEN", "\\ ",
     });
   }
-  public void testSpecialCharsInValue() throws Exception {
+  public void testSpecialCharsInValue() {
     doTestHL("xxx=\\ x\\ y\\!\\=\\#\\:", new String[]{
       "Properties:KEY_CHARACTERS", "xxx",
       "Properties:KEY_VALUE_SEPARATOR", "=",
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesParsingTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesParsingTest.java
index d03476fb97bd..6b239ec7f424 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesParsingTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/PropertiesParsingTest.java
@@ -41,6 +41,6 @@ public class PropertiesParsingTest extends ParsingTestCase {
     return PluginPathManager.getPluginHomePath("properties") + "/testData/propertiesFile/psi";
   }
 
-  public void testProp1() throws Exception { doTest(true); }
-  public void testComments() throws Exception { doTest(true); }
+  public void testProp1() { doTest(true); }
+  public void testComments() { doTest(true); }
 }
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/TrailingSpacesInPropertyInspectionTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/TrailingSpacesInPropertyInspectionTest.java
index b3b179acaeb8..cc971252ba7a 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/TrailingSpacesInPropertyInspectionTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/TrailingSpacesInPropertyInspectionTest.java
@@ -18,7 +18,7 @@ package com.intellij.lang.properties;
 import com.intellij.codeInspection.TrailingSpacesInPropertyInspection;
 import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.fixtures.*;
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 
 public class TrailingSpacesInPropertyInspectionTest extends LightCodeInsightFixtureTestCase {
   @Override
@@ -26,7 +26,7 @@ public class TrailingSpacesInPropertyInspectionTest extends LightCodeInsightFixt
     return PluginPathManager.getPluginHomePath("properties") + "/testData";
   }
 
-  public void testSimple() throws Exception{
+  public void testSimple() {
     final TrailingSpacesInPropertyInspection inspection = new TrailingSpacesInPropertyInspection();
     myFixture.enableInspections(inspection);
     myFixture.configureByFile("/propertiesFile/highlighting/trailingSpaces.properties");
@@ -34,7 +34,7 @@ public class TrailingSpacesInPropertyInspectionTest extends LightCodeInsightFixt
     myFixture.disableInspections(inspection);
   }
 
-  public void testOnlyNonVisible() throws Exception {
+  public void testOnlyNonVisible() {
     final TrailingSpacesInPropertyInspection inspection = new TrailingSpacesInPropertyInspection();
     inspection.myIgnoreVisibleSpaces = true;
     myFixture.enableInspections(inspection);
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/WrongPropertyKeyValueDelimiterInspectionTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/WrongPropertyKeyValueDelimiterInspectionTest.java
index afb0a79343fd..5c12ed45978b 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/WrongPropertyKeyValueDelimiterInspectionTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/WrongPropertyKeyValueDelimiterInspectionTest.java
@@ -31,7 +31,7 @@ public class WrongPropertyKeyValueDelimiterInspectionTest extends InspectionTest
     return PluginPathManager.getPluginHomePath("properties") + "/testData";
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doTest("wrongPropertyKeyDelimiter/", new WrongPropertyKeyValueDelimiterInspection());
   }
 }
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/editor/PropertiesRtlTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/editor/PropertiesRtlTest.java
index 330edbf1fa78..cae9bc9de6cc 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/editor/PropertiesRtlTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/editor/PropertiesRtlTest.java
@@ -18,7 +18,7 @@ package com.intellij.lang.properties.editor;
 import com.intellij.openapi.editor.impl.AbstractRtlTest;
 
 public class PropertiesRtlTest extends AbstractRtlTest {
-  public void testComment() throws Exception {
+  public void testComment() {
     checkBidiRunBoundaries("# |R", ".properties");
   }
 }
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesIndexTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesIndexTest.java
index 924263969efb..bc8cd46a1a24 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesIndexTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesIndexTest.java
@@ -38,7 +38,7 @@ public class XmlPropertiesIndexTest extends LightPlatformCodeInsightFixtureTestC
     assertTrue(map.containsKey(XmlPropertiesIndex.MARKER_KEY));
   }
 
-  public void testSystemId() throws Exception {
+  public void testSystemId() {
     final VirtualFile file = myFixture.configureByFile("wrong.xml").getVirtualFile();
     Map<XmlPropertiesIndex.Key, String> map = new XmlPropertiesIndex().map(FileContentImpl.createByFile(file));
 
diff --git a/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesTest.java b/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesTest.java
index fc762b739122..4e51b69a0a18 100644
--- a/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesTest.java
+++ b/plugins/properties/testSrc/com/intellij/lang/properties/xml/XmlPropertiesTest.java
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class XmlPropertiesTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testXmlProperties() throws Exception {
+  public void testXmlProperties() {
     myFixture.configureByFile("foo.xml");
     List<PropertiesFile> files = PropertiesReferenceManager.getInstance(getProject()).findPropertiesFiles(myModule, "foo");
     assertEquals(1, files.size());
@@ -44,13 +44,13 @@ public class XmlPropertiesTest extends LightPlatformCodeInsightFixtureTestCase {
     assertEquals(1, properties.size());
   }
 
-  public void testWrongFile() throws Exception {
+  public void testWrongFile() {
     PsiFile psiFile = myFixture.configureByFile("wrong.xml");
     PropertiesFile file = PropertiesImplUtil.getPropertiesFile(psiFile);
     assertNull(file);
   }
 
-  public void testHighlighting() throws Exception {
+  public void testHighlighting() {
     myFixture.testHighlighting("foo.xml");
   }
 
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
index 3bcf1767fa73..1d566280ed03 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java
@@ -346,7 +346,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase  {
       }
     }
 
-    public SubTree(final VirtualFile base) throws Exception {
+    public SubTree(final VirtualFile base) {
       myRootDir = findOrCreateChild(base, "root", null);
       mySourceDir = findOrCreateChild(myRootDir, "source", null);
       myS1File = findOrCreateChild(mySourceDir, "s1.txt", ourS1Contents);
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java
index 2d2dd7a750cf..9b3403593c74 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java
@@ -83,7 +83,7 @@ public class IgnoredFilesTest extends Svn17TestCase {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         myVcsManager.unregisterVcs(myVcs);
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SSLExceptionParserTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SSLExceptionParserTest.java
index b4a4156e3c2a..ca9782d5d421 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SSLExceptionParserTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SSLExceptionParserTest.java
@@ -23,7 +23,7 @@ import javax.net.ssl.SSLProtocolException;
 
 public class SSLExceptionParserTest {
   @Test
-  public void testRealLifeCase() throws Exception {
+  public void testRealLifeCase() {
     final String original = "handshake alert:  unrecognized_name";
     final SSLProtocolException exception = new SSLProtocolException(original);
     final SSLProtocolExceptionParser parser = new SSLProtocolExceptionParser(exception.getMessage());
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAndProxyTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAndProxyTest.java
index 8d69ccab3372..8a87a130a744 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAndProxyTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAndProxyTest.java
@@ -19,7 +19,7 @@ import com.intellij.util.net.HttpConfigurable;
 
 public class SvnAndProxyTest extends Svn17TestCase {
   @Test
-  public void testDirectWhenIdeaHaveProxy() throws Exception {
+  public void testDirectWhenIdeaHaveProxy() {
 
 
   }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java
index 8e1ccf4bf5ae..10b0dd225bb6 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAuthenticationTest.java
@@ -53,7 +53,7 @@ public class SvnAuthenticationTest extends PlatformTestCase {
   }
 
   @Override
-  protected void setUp() throws Exception {
+  protected void setUp() {
     EdtTestUtil.runInEdtAndWait(() -> super.setUp());
 
     myConfiguration = SvnConfiguration.getInstance(myProject);
@@ -78,7 +78,7 @@ public class SvnAuthenticationTest extends PlatformTestCase {
   }
 
   @Override
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         super.tearDown();
@@ -873,7 +873,7 @@ public class SvnAuthenticationTest extends PlatformTestCase {
     SVNJNAUtil.setJNAEnabled(true);
   }
 
-  private static void synchronousBackground(final Runnable runnable) throws InterruptedException {
+  private static void synchronousBackground(final Runnable runnable) {
     final Semaphore semaphore = new Semaphore();
     semaphore.down();
     ApplicationManager.getApplication().executeOnPooledThread(() -> {
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnBusyOnAddTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnBusyOnAddTest.java
index 7cbac100b08e..d833dc96533e 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnBusyOnAddTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnBusyOnAddTest.java
@@ -24,7 +24,6 @@ import junit.framework.TestCase;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Before;
 import org.junit.Test;
-import org.tmatesoft.svn.core.SVNCancelException;
 import org.tmatesoft.svn.core.SVNErrorCode;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
@@ -70,11 +69,11 @@ public class SvnBusyOnAddTest extends TestCase {
       db.open(ISVNWCDb.SVNWCDbOpenMode.ReadWrite, new DefaultSVNOptions(), true, true);
       SVNWCContext context = new SVNWCContext(db, new ISVNEventHandler() {
         @Override
-        public void handleEvent(SVNEvent event, double progress) throws SVNException {
+        public void handleEvent(SVNEvent event, double progress) {
         }
 
         @Override
-        public void checkCancelled() throws SVNCancelException {
+        public void checkCancelled() {
         }
       });
 
@@ -171,11 +170,11 @@ public class SvnBusyOnAddTest extends TestCase {
       db.open(ISVNWCDb.SVNWCDbOpenMode.ReadWrite, new DefaultSVNOptions(), true, true);
       context = new SVNWCContext(db, new ISVNEventHandler() {
         @Override
-        public void handleEvent(SVNEvent event, double progress) throws SVNException {
+        public void handleEvent(SVNEvent event, double progress) {
         }
 
         @Override
-        public void checkCancelled() throws SVNCancelException {
+        public void checkCancelled() {
         }
       });
 
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRepositoryPoolTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRepositoryPoolTest.java
index 1559313092c6..b5211d8c9e71 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRepositoryPoolTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRepositoryPoolTest.java
@@ -131,7 +131,7 @@ public class SvnCachingRepositoryPoolTest extends FileBasedTest {
     Assert.assertEquals(0, group.getInactiveSize());
   }
 
-  private void testBigFlow(final SvnIdeaRepositoryPoolManager poolManager, boolean disposeAfter) throws SVNException, InterruptedException {
+  private void testBigFlow(final SvnIdeaRepositoryPoolManager poolManager, boolean disposeAfter) throws SVNException {
     poolManager.setCreator(svnurl -> new MockSvnRepository(svnurl, ISVNSession.DEFAULT));
     final SVNURL url = SVNURL.parseURIEncoded("http://a.b.c");
     final Random random = new Random(System.currentTimeMillis() & 0x00ff);
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java
index c2f15c10290a..3c8eb6b1e9ee 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java
@@ -3,7 +3,6 @@ package org.jetbrains.idea.svn;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.committed.ChangesBunch;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
@@ -52,8 +51,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase {
 
     @Override
     public List<CommittedChangeList> loadInterval(final SVNRevision fromIncluding, final SVNRevision toIncluding, final int maxCount,
-                                                  final boolean includingYoungest, final boolean includeOldest)
-      throws VcsException {
+                                                  final boolean includingYoungest, final boolean includeOldest) {
       long young = fromIncluding.getNumber();
       young = (young == -1) ? myRevisions.get(myRevisions.size() - 1) : young;
       final long old = toIncluding.getNumber();
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedNativeTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedNativeTest.java
index d98da8141bb1..7c7a926fd95d 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedNativeTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedNativeTest.java
@@ -212,7 +212,7 @@ public class SvnChangesCorrectlyRefreshedNativeTest extends Svn17TestCase {
   }
 
   @Test
-  public void testAddDirEditFileAndAfterRevert() throws Throwable {
+  public void testAddDirEditFileAndAfterRevert() {
     final SubTree subTree = new SubTree(myWorkingCopyDir);
 
     VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty();
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java
index 4479266f2056..e569c175afd9 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java
@@ -211,7 +211,7 @@ public class SvnChangesCorrectlyRefreshedTest extends Svn17TestCase {
   }
   
   @Test
-  public void testAddDirEditFileAndAfterRevert() throws Throwable {
+  public void testAddDirEditFileAndAfterRevert() {
     final SubTree subTree = new SubTree(myWorkingCopyDir);
 
     VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty();
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java
index d74d2a01a6a6..86f7de3e6ca8 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java
@@ -51,13 +51,13 @@ public class SvnCommitTest extends Svn17TestCase {
   }
 
   @Test
-  public void testSimpleCommit() throws Exception {
+  public void testSimpleCommit() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     run2variants(new MyRunner() {
       private String myName = "a.txt";
 
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final VirtualFile file = createFileInCommand(myWorkingCopyDir, myName, "123");
         myDirtyScopeManager.markEverythingDirty();
         myChangeListManager.ensureUpToDate(false);
@@ -66,21 +66,21 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
         myName = "b.txt";
       }
     });
   }
 
   @Test
-  public void testCommitRename() throws Exception {
+  public void testCommitRename() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     run2variants(new MyRunner() {
       private String myName = "a.txt";
       private String myRenamedName = "aRenamed.txt";
 
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final VirtualFile file = createFileInCommand(myWorkingCopyDir, myName, "123");
         myDirtyScopeManager.markEverythingDirty();
         myChangeListManager.ensureUpToDate(false);
@@ -95,7 +95,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
         myName = "b.txt";
         myRenamedName = "bRenamed.txt";
       }
@@ -103,14 +103,14 @@ public class SvnCommitTest extends Svn17TestCase {
   }
 
   @Test
-  public void testRenameReplace() throws Exception {
+  public void testRenameReplace() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     run2variants(new MyRunner() {
       private String myName = "a.txt";
       private String myName2 = "aRenamed.txt";
 
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final VirtualFile file = createFileInCommand(myWorkingCopyDir, myName, "123");
         final VirtualFile file2 = createFileInCommand(myWorkingCopyDir, myName2, "1235");
         myDirtyScopeManager.markEverythingDirty();
@@ -128,7 +128,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
         myName = "b.txt";
         myName2 = "bRenamed.txt";
       }
@@ -136,13 +136,13 @@ public class SvnCommitTest extends Svn17TestCase {
   }
 
   @Test
-  public void testRenameFolder() throws Exception {
+  public void testRenameFolder() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     run2variants(new MyRunner() {
       private String folder = "f";
 
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final VirtualFile dir = createDirInCommand(myWorkingCopyDir, folder);
         final VirtualFile file = createFileInCommand(dir, "a.txt", "123");
         final VirtualFile file2 = createFileInCommand(dir, "b.txt", "1235");
@@ -160,21 +160,21 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
         folder = "f1";
       }
     });
   }
 
   @Test
-  public void testCommitDeletion() throws Exception {
+  public void testCommitDeletion() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
     run2variants(new MyRunner() {
       private String folder = "f";
 
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final VirtualFile dir = createDirInCommand(myWorkingCopyDir, folder);
         final VirtualFile file = createFileInCommand(dir, "a.txt", "123");
         final VirtualFile file2 = createFileInCommand(dir, "b.txt", "1235");
@@ -193,7 +193,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
         folder = "f1";
       }
     });
@@ -206,7 +206,7 @@ public class SvnCommitTest extends Svn17TestCase {
     prepareInnerCopy(false);
     final MyRunner runner = new MyRunner() {
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final File file1 = new File(myWorkingCopyDir.getPath(), "source/s1.txt");
         final File fileInner = new File(myWorkingCopyDir.getPath(), "source/inner1/inner2/inner/t11.txt");
 
@@ -229,7 +229,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
       }
     };
     setNativeAcceleration(true);
@@ -243,7 +243,7 @@ public class SvnCommitTest extends Svn17TestCase {
     prepareInnerCopy(false);
     final MyRunner runner = new MyRunner() {
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final File file1 = new File(myWorkingCopyDir.getPath(), "source/s1.txt");
         final File fileInner = new File(myWorkingCopyDir.getPath(), "source/inner1/inner2/inner/t11.txt");
 
@@ -266,7 +266,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
       }
     };
     setNativeAcceleration(true);
@@ -280,7 +280,7 @@ public class SvnCommitTest extends Svn17TestCase {
     prepareInnerCopy(true);
     final MyRunner runner = new MyRunner() {
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final File file1 = new File(myWorkingCopyDir.getPath(), "source/s1.txt");
         final File fileInner = new File(myWorkingCopyDir.getPath(), "source/inner1/inner2/inner/t11.txt");
 
@@ -301,7 +301,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
       }
     };
     setNativeAcceleration(true);
@@ -315,7 +315,7 @@ public class SvnCommitTest extends Svn17TestCase {
     prepareInnerCopy(true);
     final MyRunner runner = new MyRunner() {
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final File file1 = new File(myWorkingCopyDir.getPath(), "source/s1.txt");
         final File fileInner = new File(myWorkingCopyDir.getPath(), "source/inner1/inner2/inner/t11.txt");
 
@@ -336,7 +336,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
       }
     };
     setNativeAcceleration(true);
@@ -350,7 +350,7 @@ public class SvnCommitTest extends Svn17TestCase {
     prepareExternal();
     final MyRunner runner = new MyRunner() {
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final File file1 = new File(myWorkingCopyDir.getPath(), "source/s1.txt");
         final File fileInner = new File(myWorkingCopyDir.getPath(), "source/external/t11.txt");
 
@@ -371,7 +371,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
       }
     };
     setNativeAcceleration(true);
@@ -385,7 +385,7 @@ public class SvnCommitTest extends Svn17TestCase {
     prepareExternal();
     final MyRunner runner = new MyRunner() {
       @Override
-      protected void run() throws Exception {
+      protected void run() {
         final File file1 = new File(myWorkingCopyDir.getPath(), "source/s1.txt");
         final File fileInner = new File(myWorkingCopyDir.getPath(), "source/external/t11.txt");
 
@@ -406,7 +406,7 @@ public class SvnCommitTest extends Svn17TestCase {
       }
 
       @Override
-      protected void cleanup() throws Exception {
+      protected void cleanup() {
       }
     };
     setNativeAcceleration(false);
@@ -466,7 +466,7 @@ public class SvnCommitTest extends Svn17TestCase {
     Assert.assertNull(changeA);
   }
 
-  protected void run2variants(final MyRunner runner) throws Exception {
+  protected void run2variants(final MyRunner runner) {
     // TODO: Change this to run different variants separately. See SvnTestCase.myUseAcceleration.
     setNativeAcceleration(false);
     runner.run();
@@ -476,7 +476,7 @@ public class SvnCommitTest extends Svn17TestCase {
   }
 
   private static abstract class MyRunner {
-    protected abstract void run() throws Exception;
-    protected abstract void cleanup() throws Exception;
+    protected abstract void run();
+    protected abstract void cleanup();
   }
 }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommittedViewTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommittedViewTest.java
index 78e532e73d2c..8d105b0f2108 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommittedViewTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommittedViewTest.java
@@ -269,7 +269,7 @@ public class SvnCommittedViewTest extends Svn17TestCase {
     }
   }
 
-  protected void checkList(final List<SvnChangeList> lists, final long revision, final Data[] content) throws Exception {
+  protected void checkList(final List<SvnChangeList> lists, final long revision, final Data[] content) {
     SvnChangeList list = null;
     for (SvnChangeList changeList : lists) {
       if (changeList.getNumber() == revision) {
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java
index 2ea1240baf68..34576ee7e33c 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java
@@ -42,7 +42,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testRenameList() throws Exception {
+  public void testRenameList() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -109,7 +109,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testEditComment() throws Exception {
+  public void testEditComment() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -142,7 +142,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testMove() throws Exception {
+  public void testMove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -164,7 +164,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testSetActive() throws Exception {
+  public void testSetActive() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -186,7 +186,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testRemove() throws Exception {
+  public void testRemove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final VirtualFile fileB = createFileInCommand("b.txt", "old content");
@@ -211,7 +211,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testDoubleMove() throws Exception {
+  public void testDoubleMove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -236,7 +236,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testDoubleMoveBack() throws Exception {
+  public void testDoubleMoveBack() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -260,7 +260,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testAddPlusMove() throws Exception {
+  public void testAddPlusMove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -299,7 +299,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase {
   }
 
   @Test
-  public void testComplex() throws Exception {
+  public void testComplex() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final VirtualFile fileB = createFileInCommand("b.txt", "old content");
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnLocalChangesAndRootsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnLocalChangesAndRootsTest.java
index b1374f38d1e6..2b4f997d15fd 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnLocalChangesAndRootsTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnLocalChangesAndRootsTest.java
@@ -35,7 +35,7 @@ public class SvnLocalChangesAndRootsTest extends Svn17TestCase {
   private ChangeListManager myClManager;
 
   @Override
-  public void setUp() throws Exception {
+  public void setUp() {
     /*super.setUp();
 
     myAlienRoot = new File(myTempDirFixture.getTempDirPath(), "alien");
@@ -86,12 +86,12 @@ public class SvnLocalChangesAndRootsTest extends Svn17TestCase {
   }
 
   @Override
-  public void tearDown() throws Exception {
+  public void tearDown() {
     //super.tearDown();
   }
 
   @Test
-  public void testAlienRoot() throws Throwable {
+  public void testAlienRoot() {
     /*final AlienTree alienTree = new AlienTree(myAlienRoot.getAbsolutePath());
 
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
@@ -133,7 +133,7 @@ public class SvnLocalChangesAndRootsTest extends Svn17TestCase {
     private VirtualFile myNonVersionedUpper;
     private final VirtualFile myMappingTarget;
 
-    private SubTree(final VirtualFile base, final VirtualFile projectRoot) throws Throwable {
+    private SubTree(final VirtualFile base, final VirtualFile projectRoot) {
       // todo +-
       myMappingTarget = projectRoot.getParent();
       myOuterDir = createDirInCommand(myMappingTarget, "outer" + System.currentTimeMillis());
@@ -166,7 +166,7 @@ public class SvnLocalChangesAndRootsTest extends Svn17TestCase {
   }
 
   @Test
-  public void testSvnVcsRootAbove() throws Throwable {
+  public void testSvnVcsRootAbove() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
@@ -186,7 +186,7 @@ public class SvnLocalChangesAndRootsTest extends Svn17TestCase {
   }
 
   @Test
-  public void testFakeScopeDontBreakTheView() throws Throwable {
+  public void testFakeScopeDontBreakTheView() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeCallsTranslatorTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeCallsTranslatorTest.java
index 81be0cc12190..c6dab50e1980 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeCallsTranslatorTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeCallsTranslatorTest.java
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
 import org.tmatesoft.svn.core.internal.util.jna.ISVNGnomeKeyringLibrary;
 
 public class SvnNativeCallsTranslatorTest extends TestCase {
-  public void testMac() throws Exception {
+  public void testMac() {
     assertResult(SvnNativeCallsTranslator.forMac(new NativeLogReader.CallInfo("Test", -25293)), false);
     assertResult(SvnNativeCallsTranslator.forMac(new NativeLogReader.CallInfo("Test", 0)), null);
     assertResult(SvnNativeCallsTranslator.forMac(new NativeLogReader.CallInfo("Test", -67249)), false);
@@ -37,7 +37,7 @@ public class SvnNativeCallsTranslatorTest extends TestCase {
     }
   }
 
-  public void testWindows() throws Exception {
+  public void testWindows() {
     assertResult(SvnNativeCallsTranslator.forWindows(new NativeLogReader.CallInfo("ISVNKernel32Library#GetVersionExW", 1)), null);
     assertResult(SvnNativeCallsTranslator.forWindows(new NativeLogReader.CallInfo("ISVNWinCryptLibrary#CryptUnprotectData", "true")), null);
     assertResult(SvnNativeCallsTranslator.forWindows(new NativeLogReader.CallInfo("ISVNWinCryptLibrary#CryptUnprotectData", "false")), false);
@@ -45,7 +45,7 @@ public class SvnNativeCallsTranslatorTest extends TestCase {
     assertResult(SvnNativeCallsTranslator.forWindows(new NativeLogReader.CallInfo("ISVNSecurityLibrary#InitializeSecurityContextW", 0)), null);
   }
 
-  public void testLinux() throws Exception {
+  public void testLinux() {
     assertResult(SvnNativeCallsTranslator.forLinux(new NativeLogReader.CallInfo("ISVNGnomeKeyringLibrary#gnome_keyring_is_available", "true")), null);
     assertResult(SvnNativeCallsTranslator.forLinux(new NativeLogReader.CallInfo("ISVNGnomeKeyringLibrary#gnome_keyring_is_available", "false")), false);
     assertResult(SvnNativeCallsTranslator.forLinux(new NativeLogReader.CallInfo("ISVNGnomeKeyringLibrary#gnome_keyring_find_network_password_sync",
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeLogParserTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeLogParserTest.java
index ed541db780b3..e43cf0c284f7 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeLogParserTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeLogParserTest.java
@@ -33,7 +33,7 @@ public class SvnNativeLogParserTest extends TestCase {
     null
   };
 
-  public void testWindows() throws Exception {
+  public void testWindows() {
     for (int i = 0; i < ourCases.length; i++) {
       final String aCase = ourCases[i];
       final NativeLogReader.CallInfo info = SvnNativeLogParser.parse(aCase);
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java
index ad58cdf6a4b4..febd248e6133 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java
@@ -464,7 +464,7 @@ public class SvnRenameTest extends Svn17TestCase {
     verifySorted(runSvn("status"), "A child", "A + child" + File.separatorChar + "a.txt", "D a.txt");
   }
 
-  private VirtualFile moveToNewPackage(final VirtualFile file, final String packageName) throws Exception {
+  private VirtualFile moveToNewPackage(final VirtualFile file, final String packageName) {
     final VirtualFile[] dir = new VirtualFile[1];
     new WriteCommandAction.Simple(myProject) {
       @Override
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java
index 97782e0cf0e0..e75596050e0b 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java
@@ -35,7 +35,7 @@ public class SvnRootAboveTest extends Svn17TestCase {
   private File myModuleRoot;
 
   @Override
-  public void setUp() throws Exception {
+  public void setUp() {
     /*final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory();
     myTempDirFixture = fixtureFactory.createTempDirTestFixture();
     myTempDirFixture.setUp();
@@ -87,7 +87,7 @@ public class SvnRootAboveTest extends Svn17TestCase {
   }
 
   @Override
-  public void tearDown() throws Exception {
+  public void tearDown() {
     // no setup - no tear down
   }
 
@@ -99,7 +99,7 @@ public class SvnRootAboveTest extends Svn17TestCase {
     private VirtualFile myNonVersionedUpper;
     private final VirtualFile myMappingTarget;
 
-    private SubTree(final VirtualFile base, final VirtualFile projectRoot) throws Throwable {
+    private SubTree(final VirtualFile base, final VirtualFile projectRoot) {
       // todo +-
       myMappingTarget = projectRoot.getParent();
       myOuterDir = createDirInCommand(myMappingTarget, "outer" + System.currentTimeMillis());
@@ -132,7 +132,7 @@ public class SvnRootAboveTest extends Svn17TestCase {
   }
   
   @Test
-  public void testSvnVcsRootAbove() throws Throwable {
+  public void testSvnVcsRootAbove() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
@@ -152,7 +152,7 @@ public class SvnRootAboveTest extends Svn17TestCase {
   }
 
   @Test
-  public void testFakeScopeDontBreakTheView() throws Throwable {
+  public void testFakeScopeDontBreakTheView() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java
index 9434f946d314..8a8a1d92b6b1 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestDirtyScopeStateTest.java
@@ -42,7 +42,7 @@ public class SvnTestDirtyScopeStateTest extends Svn17TestCase {
   }
 
   @Test
-  public void testWhatIsDirty() throws Exception {
+  public void testWhatIsDirty() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
 
     final VcsDirtyScopeManagerImpl vcsDirtyScopeManager = (VcsDirtyScopeManagerImpl) VcsDirtyScopeManager.getInstance(myProject);
@@ -92,7 +92,7 @@ public class SvnTestDirtyScopeStateTest extends Svn17TestCase {
   }
 
   @Test
-  public void testOkToAddScopeUnderWriteAction() throws Exception {
+  public void testOkToAddScopeUnderWriteAction() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
 
     final VcsDirtyScopeManagerImpl vcsDirtyScopeManager = (VcsDirtyScopeManagerImpl) VcsDirtyScopeManager.getInstance(myProject);
@@ -110,7 +110,7 @@ public class SvnTestDirtyScopeStateTest extends Svn17TestCase {
 
     new WriteCommandAction.Simple(myProject) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         vcsDirtyScopeManager.fileDirty(file);
         vcsDirtyScopeManager.fileDirty(fileB);
       }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java
index b07de2de426f..119c50596c5d 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/IgnoredFilesTest.java
@@ -51,7 +51,7 @@ public class IgnoredFilesTest extends Svn16TestCase {
   private VcsDirtyScopeManager myVcsDirtyScopeManager;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory();
@@ -81,7 +81,7 @@ public class IgnoredFilesTest extends Svn16TestCase {
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         myVcsManager.unregisterVcs(myVcs);
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAuthenticationTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAuthenticationTest.java
index 11c3fce5b53e..6165ca5a1ecc 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAuthenticationTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAuthenticationTest.java
@@ -55,7 +55,7 @@ public class SvnAuthenticationTest extends PlatformTestCase {
   }
 
   @Override
-  protected void setUp() throws Exception {
+  protected void setUp() {
     EdtTestUtil.runInEdtAndWait(() -> super.setUp());
 
 
@@ -81,7 +81,7 @@ public class SvnAuthenticationTest extends PlatformTestCase {
   }
 
   @Override
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     EdtTestUtil.runInEdtAndWait(() -> super.tearDown());
 
     FileUtil.delete(new File(myConfiguration.getConfigurationDirectory()));
@@ -869,7 +869,7 @@ public class SvnAuthenticationTest extends PlatformTestCase {
     SVNJNAUtil.setJNAEnabled(true);
   }
 
-  private static void synchronousBackground(final Runnable runnable) throws InterruptedException {
+  private static void synchronousBackground(final Runnable runnable) {
     final Semaphore semaphore = new Semaphore();
     semaphore.down();
     ApplicationManager.getApplication().executeOnPooledThread((Runnable)() -> {
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java
index ef9ce40521f7..2bbf7f9d328b 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java
@@ -3,7 +3,6 @@ package org.jetbrains.idea.svn16;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.committed.ChangesBunch;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
@@ -53,8 +52,7 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase {
 
     @Override
     public List<CommittedChangeList> loadInterval(final SVNRevision fromIncluding, final SVNRevision toIncluding, final int maxCount,
-                                                  final boolean includingYoungest, final boolean includeOldest)
-      throws VcsException {
+                                                  final boolean includingYoungest, final boolean includeOldest) {
       long young = fromIncluding.getNumber();
       young = (young == -1) ? myRevisions.get(myRevisions.size() - 1) : young;
       final long old = toIncluding.getNumber();
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedNativeTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedNativeTest.java
index dcb5d19b6097..dd1fd33e3d39 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedNativeTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedNativeTest.java
@@ -212,7 +212,7 @@ public class SvnChangesCorrectlyRefreshedNativeTest extends Svn17TestCase {
   }
 
   @Test
-  public void testAddDirEditFileAndAfterRevert() throws Throwable {
+  public void testAddDirEditFileAndAfterRevert() {
     final SubTree subTree = new SubTree(myWorkingCopyDir);
 
     VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty();
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java
index 08df427389d7..6ccef32f4480 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java
@@ -66,7 +66,7 @@ public class SvnChangesCorrectlyRefreshedTest extends Svn16TestCase {
     private static final String ourS1Contents = "123";
     private static final String ourS2Contents = "abc";
 
-    private SubTree(final VirtualFile base) throws Exception {
+    private SubTree(final VirtualFile base) {
       myRootDir = createDirInCommand(base, "root");
       mySourceDir = createDirInCommand(myRootDir, "source");
       myS1File = createFileInCommand(mySourceDir, "s1.txt", ourS1Contents);
@@ -237,7 +237,7 @@ public class SvnChangesCorrectlyRefreshedTest extends Svn16TestCase {
   }
   
   @Test
-  public void testAddDirEditFileAndAfterRevert() throws Throwable {
+  public void testAddDirEditFileAndAfterRevert() {
     final SubTree subTree = new SubTree(myWorkingCopyDir);
 
     VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty();
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCommittedViewTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCommittedViewTest.java
index df0762909f8a..34e273ae3fa1 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCommittedViewTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCommittedViewTest.java
@@ -267,7 +267,7 @@ public class SvnCommittedViewTest extends Svn16TestCase {
     }
   }
 
-  protected void checkList(final List<SvnChangeList> lists, final long revision, final Data[] content) throws Exception {
+  protected void checkList(final List<SvnChangeList> lists, final long revision, final Data[] content) {
     SvnChangeList list = null;
     for (SvnChangeList changeList : lists) {
       if (changeList.getNumber() == revision) {
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java
index 31b3c122bb29..d71760f1f25c 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java
@@ -42,7 +42,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testRenameList() throws Exception {
+  public void testRenameList() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -107,7 +107,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testEditComment() throws Exception {
+  public void testEditComment() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -140,7 +140,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testMove() throws Exception {
+  public void testMove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -162,7 +162,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testSetActive() throws Exception {
+  public void testSetActive() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -184,7 +184,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testRemove() throws Exception {
+  public void testRemove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final VirtualFile fileB = createFileInCommand("b.txt", "old content");
@@ -209,7 +209,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testDoubleMove() throws Exception {
+  public void testDoubleMove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -234,7 +234,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testDoubleMoveBack() throws Exception {
+  public void testDoubleMoveBack() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -258,7 +258,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testAddPlusMove() throws Exception {
+  public void testAddPlusMove() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
@@ -297,7 +297,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase {
   }
 
   @Test
-  public void testComplex() throws Exception {
+  public void testComplex() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     final VirtualFile file = createFileInCommand("a.txt", "old content");
     final VirtualFile fileB = createFileInCommand("b.txt", "old content");
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnLocalChangesAndRootsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnLocalChangesAndRootsTest.java
index 6939044ae213..cbaa7d905bc3 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnLocalChangesAndRootsTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnLocalChangesAndRootsTest.java
@@ -36,7 +36,7 @@ public class SvnLocalChangesAndRootsTest extends Svn16TestCase {
   private ChangeListManager myClManager;
 
   @Override
-  public void setUp() throws Exception {
+  public void setUp() {
     /*super.setUp();
 
     myAlienRoot = new File(myTempDirFixture.getTempDirPath(), "alien");
@@ -87,12 +87,12 @@ public class SvnLocalChangesAndRootsTest extends Svn16TestCase {
   }
 
   @Override
-  public void tearDown() throws Exception {
+  public void tearDown() {
     //super.tearDown();
   }
 
   @Test
-  public void testAlienRoot() throws Throwable {
+  public void testAlienRoot() {
     /*final AlienTree alienTree = new AlienTree(myAlienRoot.getAbsolutePath());
 
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
@@ -134,7 +134,7 @@ public class SvnLocalChangesAndRootsTest extends Svn16TestCase {
     private VirtualFile myNonVersionedUpper;
     private final VirtualFile myMappingTarget;
 
-    private SubTree(final VirtualFile base, final VirtualFile projectRoot) throws Throwable {
+    private SubTree(final VirtualFile base, final VirtualFile projectRoot) {
       // todo +-
       myMappingTarget = projectRoot.getParent();
       myOuterDir = createDirInCommand(myMappingTarget, "outer" + System.currentTimeMillis());
@@ -167,7 +167,7 @@ public class SvnLocalChangesAndRootsTest extends Svn16TestCase {
   }
 
   @Test
-  public void testSvnVcsRootAbove() throws Throwable {
+  public void testSvnVcsRootAbove() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
@@ -187,7 +187,7 @@ public class SvnLocalChangesAndRootsTest extends Svn16TestCase {
   }
 
   @Test
-  public void testFakeScopeDontBreakTheView() throws Throwable {
+  public void testFakeScopeDontBreakTheView() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java
index 6152c953263a..d7e94e71f089 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java
@@ -365,7 +365,7 @@ public class SvnRenameTest extends Svn16TestCase {
     verifySorted(runSvn("status"), "? a.txt", "? unversioned");
   }
 
-  private VirtualFile moveToNewPackage(final VirtualFile file, final String packageName) throws Exception {
+  private VirtualFile moveToNewPackage(final VirtualFile file, final String packageName) {
     final VirtualFile[] dir = new VirtualFile[1];
     new WriteCommandAction.Simple(myProject) {
       @Override
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRootAboveTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRootAboveTest.java
index fa896a477133..8963d576e9d2 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRootAboveTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRootAboveTest.java
@@ -36,7 +36,7 @@ public class SvnRootAboveTest extends Svn16TestCase {
   private File myModuleRoot;
 
   @Override
-  public void setUp() throws Exception {
+  public void setUp() {
     /*final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory();
     myTempDirFixture = fixtureFactory.createTempDirTestFixture();
     myTempDirFixture.setUp();
@@ -88,7 +88,7 @@ public class SvnRootAboveTest extends Svn16TestCase {
   }
 
   @Override
-  public void tearDown() throws Exception {
+  public void tearDown() {
     // no setup - no tear down
   }
 
@@ -100,7 +100,7 @@ public class SvnRootAboveTest extends Svn16TestCase {
     private VirtualFile myNonVersionedUpper;
     private final VirtualFile myMappingTarget;
 
-    private SubTree(final VirtualFile base, final VirtualFile projectRoot) throws Throwable {
+    private SubTree(final VirtualFile base, final VirtualFile projectRoot) {
       // todo +-
       myMappingTarget = projectRoot.getParent();
       myOuterDir = createDirInCommand(myMappingTarget, "outer" + System.currentTimeMillis());
@@ -133,7 +133,7 @@ public class SvnRootAboveTest extends Svn16TestCase {
   }
   
   @Test
-  public void testSvnVcsRootAbove() throws Throwable {
+  public void testSvnVcsRootAbove() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
@@ -153,7 +153,7 @@ public class SvnRootAboveTest extends Svn16TestCase {
   }
 
   @Test
-  public void testFakeScopeDontBreakTheView() throws Throwable {
+  public void testFakeScopeDontBreakTheView() {
     /*enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
     enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
 
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestDirtyScopeStateTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestDirtyScopeStateTest.java
index 586a0327ab54..c131f6a34e64 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestDirtyScopeStateTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestDirtyScopeStateTest.java
@@ -39,7 +39,7 @@ public class SvnTestDirtyScopeStateTest extends Svn16TestCase {
   }
 
   @Test
-  public void testWhatIsDirty() throws Exception {
+  public void testWhatIsDirty() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
 
     final VcsDirtyScopeManagerImpl vcsDirtyScopeManager = (VcsDirtyScopeManagerImpl) VcsDirtyScopeManager.getInstance(myProject);
@@ -84,7 +84,7 @@ public class SvnTestDirtyScopeStateTest extends Svn16TestCase {
   }
 
   @Test
-  public void testOkToAddScopeUnderWriteAction() throws Exception {
+  public void testOkToAddScopeUnderWriteAction() {
     enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
 
     final VcsDirtyScopeManagerImpl vcsDirtyScopeManager = (VcsDirtyScopeManagerImpl) VcsDirtyScopeManager.getInstance(myProject);
@@ -101,7 +101,7 @@ public class SvnTestDirtyScopeStateTest extends Svn16TestCase {
 
     new WriteCommandAction.Simple(myProject) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         vcsDirtyScopeManager.fileDirty(file);
         vcsDirtyScopeManager.fileDirty(fileB);
       }
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn18/Svn18TestSuite.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn18/Svn18TestSuite.java
index 1b9ef37cdb85..86375a42b088 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn18/Svn18TestSuite.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn18/Svn18TestSuite.java
@@ -1,7 +1,7 @@
 package org.jetbrains.idea.svn18;
 
 import org.jetbrains.idea.SvnTestCase;
-import org.jetbrains.idea.svn.*;
+import org.jetbrains.idea.svn.SvnMergeInfoTest;
 import org.junit.ClassRule;
 import org.junit.rules.ExternalResource;
 import org.junit.rules.TestRule;
@@ -20,7 +20,7 @@ public class Svn18TestSuite {
   @ClassRule
   public static TestRule configuration = new ExternalResource() {
     @Override
-    protected void before() throws Throwable {
+    protected void before() {
       SvnTestCase.ourGlobalTestDataDir = "testData18";
       SvnTestCase.ourGlobalUseNativeAcceleration = true;
     }
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
index 481bf0de8f70..fcc507585063 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
@@ -9,7 +9,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.tasks.actions.TaskAutoCompletionListProvider;
 import com.intellij.tasks.impl.LocalTaskImpl;
 import com.intellij.tasks.impl.TaskManagerImpl;
-import com.intellij.testFramework.MapDataContext;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import com.intellij.ui.TextFieldWithAutoCompletion;
 
@@ -25,19 +24,19 @@ public class TaskCompletionTest extends LightCodeInsightFixtureTestCase {
     //    super(UsefulTestCase.IDEA_MARKER_CLASS, "PlatformLangXml");
   }
 
-  public void testTaskCompletion() throws Exception {
+  public void testTaskCompletion() {
     doTest("<caret>", "TEST-001 Test task<caret>");
   }
 
-  public void testPrefix() throws Exception {
+  public void testPrefix() {
     doTest("TEST-<caret>", "TEST-001 Test task<caret>");
   }
 
-  public void testSecondWord() throws Exception {
+  public void testSecondWord() {
     doTest("my TEST-<caret>", "my TEST-001 Test task<caret>");
   }
 
-  public void testNumberCompletion() throws Exception {
+  public void testNumberCompletion() {
     configureFile("TEST-0<caret>");
     configureRepository(new LocalTaskImpl("TEST-001", "Test task"), new LocalTaskImpl("TEST-002", "Test task 2"));
     LookupElement[] elements = myFixture.complete(CompletionType.BASIC);
@@ -45,7 +44,7 @@ public class TaskCompletionTest extends LightCodeInsightFixtureTestCase {
     assertEquals(2, elements.length);
   }
 
-  public void testKeepOrder() throws Exception {
+  public void testKeepOrder() {
     configureFile("<caret>");
     configureRepository(new LocalTaskImpl("TEST-002", "Test task 2"),
                         new LocalTaskImpl("TEST-003", "Test task 1"),
@@ -61,7 +60,7 @@ public class TaskCompletionTest extends LightCodeInsightFixtureTestCase {
     assertEquals(Arrays.asList("TEST-002", "TEST-003", "TEST-001", "TEST-004"), myFixture.getLookupElementStrings());
   }
 
-  public void testSIOOBE() throws Exception {
+  public void testSIOOBE() {
     doTest("  <caret>    my", "  TEST-001 Test task    my");
   }
 
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTest.java
index ab3d21176192..8828508abcd1 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTest.java
@@ -39,7 +39,7 @@ import java.util.List;
  * @author Dmitry Avdeev
  */
 public class TaskManagerTest extends TaskManagerTestCase {
-  public void testTaskSwitch() throws Exception {
+  public void testTaskSwitch() {
 
     final Ref<Integer> count = Ref.create(0);
     TaskListener listener = new TaskListenerAdapter() {
@@ -58,7 +58,7 @@ public class TaskManagerTest extends TaskManagerTestCase {
     assertEquals(2, count.get().intValue());
   }
 
-  public void testNotifications() throws Exception {
+  public void testNotifications() {
 
     final Ref<Notification> notificationRef = new Ref<>();
     getProject().getMessageBus().connect(myFixture.getTestRootDisposable()).subscribe(Notifications.TOPIC, new NotificationsAdapter() {
@@ -85,7 +85,7 @@ public class TaskManagerTest extends TaskManagerTestCase {
     assertNotNull(notificationRef.get());
   }
 
-  public void testSharedServers() throws Exception {
+  public void testSharedServers() {
     TaskRepository repository = new YouTrackRepository(new YouTrackRepositoryType());
     repository.setShared(true);
     myTaskManager.setRepositories(Collections.singletonList(repository));
@@ -109,7 +109,7 @@ public class TaskManagerTest extends TaskManagerTestCase {
     assertTrue(repositories[0].isShared());
   }
 
-  public void testIssuesCacheSurvival() throws Exception {
+  public void testIssuesCacheSurvival() {
     final Ref<Boolean> stopper = new Ref<>(Boolean.FALSE);
     TestRepository repository = new TestRepository(new LocalTaskImpl("foo", "bar")) {
       @Override
@@ -128,7 +128,7 @@ public class TaskManagerTest extends TaskManagerTestCase {
     assertEquals(1, issues.size());
   }
 
-  public void testTaskHistoryLength() throws Exception {
+  public void testTaskHistoryLength() {
     TestRepository repository = new TestRepository();
     int historyLength = myTaskManager.getState().taskHistoryLength;
     for (int i = 0; i < historyLength + 100; i++) {
@@ -138,7 +138,7 @@ public class TaskManagerTest extends TaskManagerTestCase {
     assertEquals(Integer.toString(historyLength + 100 - 1), myTaskManager.getLocalTasks().get(historyLength - 1).getId());
   }
 
-  public void testBranchNameSuggestion() throws Exception {
+  public void testBranchNameSuggestion() {
     TaskTestUtil.TaskBuilder task = new TaskTestUtil.TaskBuilder("IDEA-666", "Bad news", null);
     TaskManagerImpl taskManager = myTaskManager;
     assertEquals("IDEA-666", taskManager.suggestBranchName(task));
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java
index 35bb76ef4afe..51d79c9e0f44 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java
@@ -29,7 +29,7 @@ import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
  */
 public class TaskUiTest extends CodeInsightFixtureTestCase {
 
-  public void testTaskComboVisible() throws Exception {
+  public void testTaskComboVisible() {
 
     SwitchTaskAction combo = null;
     ActionGroup group = (ActionGroup)CustomActionsSchema.getInstance().getCorrectedAction(IdeActions.GROUP_MAIN_TOOLBAR);
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TestRepository.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TestRepository.java
index 456af71dc447..f89b9533ee6e 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TestRepository.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TestRepository.java
@@ -1,6 +1,5 @@
 package com.intellij.tasks;
 
-import com.intellij.openapi.util.Condition;
 import com.intellij.tasks.impl.BaseRepository;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +32,7 @@ public class TestRepository extends BaseRepository {
 
   @Nullable
   @Override
-  public Task findTask(@NotNull final String id) throws Exception {
+  public Task findTask(@NotNull final String id) {
     return ContainerUtil.find(myTasks, task -> id.equals(task.getId()));
   }
 
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/ContextTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/ContextTest.java
index 474c66218bf3..308ad1236fd4 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/ContextTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/ContextTest.java
@@ -37,7 +37,7 @@ import java.util.List;
  */
 public class ContextTest extends TaskManagerTestCase {
 
-  public void testSaveContext() throws Exception {
+  public void testSaveContext() {
     WorkingContextManager manager = getContextManager();
 
     manager.saveContext("first", "comment");
@@ -76,7 +76,7 @@ public class ContextTest extends TaskManagerTestCase {
     manager.saveContext("foo", "bar");
   }
 
-  public void testXDebugger() throws Exception {
+  public void testXDebugger() {
     final WorkingContextManager manager = getContextManager();
     final XBreakpointManager breakpointManager = XDebuggerManager.getInstance(getProject()).getBreakpointManager();
 
@@ -96,7 +96,7 @@ public class ContextTest extends TaskManagerTestCase {
     manager.clearContext();
   }
 
-  public void testContextFileName() throws Exception {
+  public void testContextFileName() {
     ProjectImpl project = (ProjectImpl)getProject();
     String name = project.getName();
     try {
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/EditorsContextTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/EditorsContextTest.java
index 6ccfa73f2813..b0ee7669e7e8 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/EditorsContextTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/context/EditorsContextTest.java
@@ -28,7 +28,7 @@ import org.jdom.Element;
 @SkipInHeadlessEnvironment
 public class EditorsContextTest extends FileEditorManagerTestCase {
 
-  public void testDockableContainer() throws Exception {
+  public void testDockableContainer() {
 
     VirtualFile file = getFile("/foo.txt");
     myManager.openFile(file, false);
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/GitlabIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/GitlabIntegrationTest.java
index 167003422848..838ddf9d00b1 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/GitlabIntegrationTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/GitlabIntegrationTest.java
@@ -22,7 +22,7 @@ public class GitlabIntegrationTest extends TaskManagerTestCase {
   private static final String SERVER_URL = "http://trackers-tests.labs.intellij.net:8045";
   private GitlabRepository myRepository;
 
-  public void testCommitMessageFormat() throws Exception {
+  public void testCommitMessageFormat() {
     String issueJson = "{\n" +
                        "    \"id\": 1,\n" +
                        "    \"iid\": 2,\n" +
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java
index 0fea529cece0..f376718e0f71 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java
@@ -70,7 +70,7 @@ public class JiraIntegrationTest extends TaskManagerTestCase {
     assertFalse(issues[0].isClosed());
   }
 
-  public void testLogin() throws Exception {
+  public void testLogin() {
     myRepository.setUsername("german");
     myRepository.setUsername("wrong password");
     //noinspection ConstantConditions
@@ -114,7 +114,7 @@ public class JiraIntegrationTest extends TaskManagerTestCase {
   /**
    * Holds only for JIRA > 5.x.x
    */
-  public void testExtractedErrorMessage() throws Exception {
+  public void testExtractedErrorMessage() {
     myRepository.setSearchQuery("foo < bar");
     try {
       myRepository.getIssues("", 50, 0);
@@ -220,7 +220,7 @@ public class JiraIntegrationTest extends TaskManagerTestCase {
     assertEquals((hours * 60 + minutes) * 60, last.get("timeSpentSeconds").getAsInt());
   }
 
-  public void testParseVersionNumbers() throws Exception {
+  public void testParseVersionNumbers() {
     assertEquals("6.1.9", new JiraVersion("6.1-OD-09-WN").toString());
     assertEquals("5.0.6", new JiraVersion("5.0.6").toString());
     assertEquals("4.4.5", new JiraVersion("4.4.5").toString());
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/RedmineIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/RedmineIntegrationTest.java
index 993f96111c5d..86e7cc9a2c45 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/RedmineIntegrationTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/RedmineIntegrationTest.java
@@ -76,7 +76,7 @@ public class RedmineIntegrationTest extends TaskManagerTestCase {
   // IDEA-122845
   // Redmine doesn't send 401 or 403 errors, when issues are downloaded with wrong credentials (and anonymous access is allowed),
   // so current user information is fetched instead.
-  public void testCredentialsCheck() throws Exception {
+  public void testCredentialsCheck() {
     myRepository.setPassword("wrong-password");
     try {
       //noinspection ConstantConditions
@@ -89,7 +89,7 @@ public class RedmineIntegrationTest extends TaskManagerTestCase {
   }
 
   // IDEA-138740
-  public void testProjectSpecificUrlCheck() throws Exception {
+  public void testProjectSpecificUrlCheck() {
     myRepository.setUrl(REDMINE_2_0_TEST_SERVER_URL + "/projects/prj-1");
     try {
       //noinspection ConstantConditions
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java
index 61862b445ee9..53d8f253038b 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java
@@ -54,90 +54,90 @@ public class CompletionTest extends CodeInsightFixtureTestCase {
     checkCompletionVariants(ContainerUtil.emptyList(), variants);
   }
 
-  public void testBeginningOfLine() throws Exception {
+  public void testBeginningOfLine() {
     checkCompletionVariants(ALL_FIELD_NAMES, "not");
   }
 
-  public void testAfterClause() throws Exception {
+  public void testAfterClause() {
     checkCompletionVariants("and", "or", "order by");
   }
 
-  public void testAfterFieldNameInClause() throws Exception {
+  public void testAfterFieldNameInClause() {
     checkCompletionVariants("was", "changed", "not", "is", "in");
   }
 
-  public void testAfterFieldNameInSortKey() throws Exception {
+  public void testAfterFieldNameInSortKey() {
     checkCompletionVariants("asc", "desc");
   }
 
-  public void testAfterIsKeyword() throws Exception {
+  public void testAfterIsKeyword() {
     checkCompletionVariants("empty", "null", "not");
   }
 
-  public void testAfterIsNotKeywords() throws Exception {
+  public void testAfterIsNotKeywords() {
     checkCompletionVariants("empty", "null");
   }
 
-  public void testAfterNotKeywordInTerminalClause() throws Exception {
+  public void testAfterNotKeywordInTerminalClause() {
     checkCompletionVariants("in");
   }
 
-  public void testAfterChangedKeyword() throws Exception {
+  public void testAfterChangedKeyword() {
     checkCompletionVariants("and", "or", "order by",
                             "on", "by", "during", "after", "before", "to", "from");
   }
 
-  public void testAfterWasClause() throws Exception {
+  public void testAfterWasClause() {
     checkCompletionVariants("and", "or", "order by",
                             "on", "by", "during", "after", "before", "to", "from");
   }
 
-  public void testFunctionType1() throws Exception {
+  public void testFunctionType1() {
     checkCompletionVariants("membersOf");
   }
 
-  public void testFunctionType2() throws Exception {
+  public void testFunctionType2() {
     checkCompletionVariants("currentUser");
   }
 
-  public void testFunctionType3() throws Exception {
+  public void testFunctionType3() {
     checkCompletionVariants("currentUser");
   }
 
-  public void testFunctionType4() throws Exception {
+  public void testFunctionType4() {
     checkCompletionVariants(JqlStandardFunction.allOfType(JqlFieldType.DATE, false));
   }
 
-  public void testFunctionType5() throws Exception {
+  public void testFunctionType5() {
     checkCompletionVariants(JqlStandardFunction.allOfType(JqlFieldType.DATE, false));
   }
 
-  public void testAfterLeftParenthesisInSubClause() throws Exception {
+  public void testAfterLeftParenthesisInSubClause() {
     checkCompletionVariants(ALL_FIELD_NAMES, "not");
   }
 
-  public void testAfterSubClause() throws Exception {
+  public void testAfterSubClause() {
     checkCompletionVariants("and", "or", "order by");
   }
 
-  public void testFunctionArguments() throws Exception {
+  public void testFunctionArguments() {
     // only literals accepted so we can't assume anything
     checkCompletionVariants(ContainerUtil.emptyList());
   }
 
-  public void testAfterNotKeywordInNotClause() throws Exception {
+  public void testAfterNotKeywordInNotClause() {
     checkCompletionVariants(ALL_FIELD_NAMES, "not");
   }
 
-  public void testAfterOrderKeyword() throws Exception {
+  public void testAfterOrderKeyword() {
     checkCompletionVariants("by");
   }
 
-  public void testAfterWasKeyword() throws Exception {
+  public void testAfterWasKeyword() {
     checkCompletionVariants(ALL_FUNCTION_NAMES, "not", "in");
   }
 
-  public void testInList() throws Exception {
+  public void testInList() {
     checkCompletionVariants(ALL_FUNCTION_NAMES);
   }
 }
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/live/TrelloIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/live/TrelloIntegrationTest.java
index 50cea907e25d..5c5b7f604a00 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/live/TrelloIntegrationTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/live/TrelloIntegrationTest.java
@@ -150,7 +150,7 @@ public class TrelloIntegrationTest extends LiveIntegrationTestCase<TrelloReposit
     assertFalse(card.isVisible());
   }
 
-  public void testTestConnection() throws Exception {
+  public void testTestConnection() {
     assertNull(myRepository.createCancellableConnection().call());
 
     myRepository.setPassword("illegal password");
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/GitTaskBranchesTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/GitTaskBranchesTest.java
index e8890d71671a..3d5951dad96f 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/GitTaskBranchesTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/GitTaskBranchesTest.java
@@ -17,7 +17,6 @@ package com.intellij.tasks.vcs;
 
 import com.intellij.dvcs.repo.Repository;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vcs.VcsException;
 import git4idea.branch.GitBranchesCollection;
 import git4idea.config.GitVcsSettings;
 import git4idea.repo.GitRepository;
@@ -26,7 +25,6 @@ import git4idea.test.GitTestUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.io.IOException;
 
 import static com.intellij.openapi.vcs.Executor.touch;
 import static git4idea.test.GitExecutor.git;
@@ -61,7 +59,7 @@ public class GitTaskBranchesTest extends TaskBranchesTest {
   }
 
   @Override
-  protected void createAndCommitChanges(@NotNull Repository repository) throws IOException, VcsException {
+  protected void createAndCommitChanges(@NotNull Repository repository) {
     touch("foo.txt");
     git("add foo.txt");
     git("commit -m commit");
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java
index 698eeba3c397..bdf0e6983a46 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java
@@ -18,7 +18,6 @@ package com.intellij.tasks.vcs;
 import com.intellij.dvcs.repo.Repository;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -31,7 +30,6 @@ import org.zmlx.hg4idea.repo.HgRepository;
 import org.zmlx.hg4idea.util.HgUtil;
 
 import java.io.File;
-import java.io.IOException;
 
 import static com.intellij.openapi.vcs.Executor.cd;
 import static com.intellij.openapi.vcs.Executor.touch;
@@ -69,7 +67,7 @@ public class HgTaskBranchesTest extends TaskBranchesTest {
   }
 
   @Override
-  protected void createAndCommitChanges(@NotNull Repository repository) throws IOException, VcsException {
+  protected void createAndCommitChanges(@NotNull Repository repository) {
     cd(repository.getRoot());
     touch("foo.txt");
     hg("add foo.txt");
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java
index c8917ad3b218..e20ce0c94499 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskBranchesTest.java
@@ -18,7 +18,6 @@ package com.intellij.tasks.vcs;
 import com.intellij.dvcs.repo.Repository;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsTaskHandler;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
@@ -33,7 +32,6 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
@@ -56,7 +54,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     }
   }
 
-  public void testVcsTaskHandler() throws Exception {
+  public void testVcsTaskHandler() {
 
     List<Repository> repositories = initRepositories("community", "idea");
     Repository repository = repositories.get(0);
@@ -96,7 +94,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     assertEquals(2, getNumberOfBranches(repository));
   }
 
-  public void testTaskManager() throws Exception {
+  public void testTaskManager() {
     List<Repository> repositories = initRepositories("community", "idea");
     LocalTask defaultTask = myTaskManager.getActiveTask();
     assertNotNull(defaultTask);
@@ -131,7 +129,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     myTaskManager.activateTask(foo, false);
   }
 
-  public void testCommit() throws Exception {
+  public void testCommit() {
     Repository repository = initRepository("foo");
     LocalTask defaultTask = myTaskManager.getActiveTask();
     LocalTaskImpl foo = myTaskManager.createLocalTask("foo");
@@ -144,7 +142,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     assertEquals(1, getNumberOfBranches(repository));
   }
 
-  public void testOpenTaskDialog() throws Exception {
+  public void testOpenTaskDialog() {
     initRepository("foo");
     String defaultBranchName = getDefaultBranchName();
     LocalTaskImpl task = myTaskManager.createLocalTask("foo");
@@ -166,7 +164,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     UIUtil.dispatchAllInvocationEvents();
   }
 
-  public void testBranchBloating() throws Exception {
+  public void testBranchBloating() {
     Repository repository = initRepository("foo");
     LocalTask defaultTask = myTaskManager.getActiveTask();
     assertNotNull(defaultTask);
@@ -186,7 +184,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     assertEquals(1, defaultTask.getBranches().size());
   }
 
-  public void testCleanupRemovedBranch() throws InterruptedException {
+  public void testCleanupRemovedBranch() {
     Repository repository = initRepository("foo");
     LocalTask defaultTask = myTaskManager.getActiveTask();
     assertNotNull(defaultTask);
@@ -222,7 +220,7 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
     assertTrue(handler.isBranchNameValid(cleanUpBranchName));
   }
 
-  public void _testCurrentTasks() throws Exception {
+  public void _testCurrentTasks() {
     initRepositories("foo", "bar");
     VcsTaskHandler handler = VcsTaskHandler.getAllHandlers(getProject())[0];
     VcsTaskHandler.TaskInfo[] tasks = handler.getAllExistingTasks();
@@ -258,5 +256,5 @@ public abstract class TaskBranchesTest extends PlatformTestCase {
 
   protected abstract int getNumberOfBranches(@NotNull Repository repository);
 
-  protected abstract void createAndCommitChanges(@NotNull Repository repository) throws IOException, VcsException;
+  protected abstract void createAndCommitChanges(@NotNull Repository repository);
 }
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java
index 4bdcb44c71b1..9e3b3ce2ed57 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
-import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs;
 import com.intellij.openapi.vcs.changes.ui.CommitChangeListDialog;
@@ -62,7 +61,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     assertEquals(defaultTask.getChangeLists().get(0), new ChangeListInfo(myChangeListManager.getChangeListsCopy().get(0)));
   }
 
-  public void testSwitchingTasks() throws Exception {
+  public void testSwitchingTasks() {
     final LocalTask defaultTask = myTaskManager.getLocalTasks().get(0);
 
     Task task = myRepository.findTask("TEST-001");
@@ -120,7 +119,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     assertEquals("TEST-001 Summary", anotherChangeList.getName());
   }
 
-  public void testAddChangeListViaCreateChangeListAction() throws Exception {
+  public void testAddChangeListViaCreateChangeListAction() {
     Task task = myRepository.findTask("TEST-001");
     assertNotNull(task);
     activateAndCreateChangelist(task);
@@ -159,7 +158,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     assertEquals("TEST-001 Summary", anotherChangeList.getName());
   }
 
-  public void testRemoveChangelistViaVcsAction() throws Exception {
+  public void testRemoveChangelistViaVcsAction() {
     Task task = myRepository.findTask("TEST-001");
     assertNotNull(task);
     activateAndCreateChangelist(task);
@@ -195,7 +194,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     }
   }
 
-  public void testAddChangeListViaVcsAction() throws Exception {
+  public void testAddChangeListViaVcsAction() {
     Task task = myRepository.findTask("TEST-001");
     assertNotNull(task);
     activateAndCreateChangelist(task);
@@ -249,7 +248,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     myTaskManager.getState().trackContextForNewChangelist = false;
   }
 
-  public void testCreateComment() throws Exception {
+  public void testCreateComment() {
     myRepository.setShouldFormatCommitMessage(true);
     myRepository.setCommitMessageFormat("{id} {summary} {number} {project}");
     Task task = myRepository.findTask("TEST-001");
@@ -264,7 +263,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     assertEquals("TEST-001 Summary 001 TEST", lists.get(0).comment);
   }
 
-  public void testSaveContextOnCommitForExistingTask() throws Exception {
+  public void testSaveContextOnCommitForExistingTask() {
     myTaskManager.getState().saveContextOnCommit = true;
 
     assertEquals(1, myTaskManager.getLocalTasks().size());
@@ -293,7 +292,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     assertEquals(localTask, myTaskManager.getAssociatedTask(changeList)); // association should survive
   }
 
-  public void testSaveContextOnCommit() throws Exception {
+  public void testSaveContextOnCommit() {
     myTaskManager.getState().saveContextOnCommit = true;
 
     assertEquals(1, myTaskManager.getLocalTasks().size());
@@ -343,7 +342,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     return changes;
   }
 
-  public void testProjectWithDash() throws Exception {
+  public void testProjectWithDash() {
     LocalTaskImpl task = new LocalTaskImpl("foo-bar-001", "summary") {
       @Override
       public TaskRepository getRepository() {
@@ -361,7 +360,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     assertEquals("foo-bar-001 summary", name);
   }
 
-  public void testIds() throws Exception {
+  public void testIds() {
     LocalTaskImpl task = new LocalTaskImpl("", "");
     assertEquals("", task.getNumber());
     assertEquals(null, task.getProject());
@@ -379,7 +378,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     assertEquals(null, task.getProject());
   }
 
-  public void testRestoreChangelist() throws Exception {
+  public void testRestoreChangelist() {
     final LocalTaskImpl task = new LocalTaskImpl("foo", "bar");
     activateAndCreateChangelist(task);
     activateAndCreateChangelist(new LocalTaskImpl("next", ""));
@@ -394,7 +393,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     }, InvokeAfterUpdateMode.SYNCHRONOUS_NOT_CANCELLABLE, "foo", ModalityState.NON_MODAL);
   }
 
-  public void testSuggestBranchName() throws Exception {
+  public void testSuggestBranchName() {
     Task task = myRepository.findTask("TEST-001");
     assertNotNull(task);
     assertTrue(task.isIssue());
@@ -523,7 +522,7 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase {
     public void getChanges(@NotNull VcsDirtyScope dirtyScope,
                            @NotNull final ChangelistBuilder builder,
                            @NotNull ProgressIndicator progress,
-                           @NotNull ChangeListManagerGate addGate) throws VcsException {
+                           @NotNull ChangeListManagerGate addGate) {
       for (Change change : myChanges) {
         builder.processChange(change, MockAbstractVcs.getKey());
       }
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java
index 80443f18d2e8..c07ea51fae5e 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java
@@ -76,7 +76,7 @@ public class ConfigurationsTest {
   }
 
   @AfterMethod
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         myProjectFixture.tearDown();
@@ -101,7 +101,7 @@ public class ConfigurationsTest {
     renameClass.setSearchInComments(false);
     renameClass.setSearchInNonJavaFiles(false);
     new WriteCommandAction(project) {
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         renameClass.run();
       }
     }.execute();
@@ -113,7 +113,7 @@ public class ConfigurationsTest {
     renameNotATestMethod.setSearchInComments(false);
     renameNotATestMethod.setSearchInNonJavaFiles(false);
     new WriteCommandAction(project) {
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         renameNotATestMethod.run();
       }
     }.execute();
@@ -137,7 +137,7 @@ public class ConfigurationsTest {
     renameMethod.setSearchInComments(false);
     renameMethod.setSearchInNonJavaFiles(false);
     new WriteCommandAction(project) {
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         renameMethod.run();
       }
     }.execute();
@@ -150,7 +150,7 @@ public class ConfigurationsTest {
     renameNotATestMethod1.setSearchInComments(false);
     renameNotATestMethod1.setSearchInNonJavaFiles(false);
     new WriteCommandAction(project) {
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         renameNotATestMethod1.run();
       }
     }.execute();
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/DetectClassesToRunTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/DetectClassesToRunTest.java
index 68c30d0b23c8..90bf7121b8a3 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/DetectClassesToRunTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/DetectClassesToRunTest.java
@@ -84,7 +84,7 @@ public class DetectClassesToRunTest extends LightCodeInsightFixtureTestCase {
     doTestMethodConfiguration(aClass, aClass.getMethods());
   }
 
-  public void testPackagePrivateMethodWhenAnnotationIsOnClass() throws Exception {
+  public void testPackagePrivateMethodWhenAnnotationIsOnClass() {
     PsiClass aClass = myFixture.addClass("package a; @org.testng.annotations.Test public class MyTestClass {void testOne(){}}");
     assertFalse(new TestNGFramework().isTestMethod(aClass.getMethods()[0], false));
   }
@@ -139,7 +139,7 @@ public class DetectClassesToRunTest extends LightCodeInsightFixtureTestCase {
     doTestMethodConfiguration(aClass, configClass, configClass.getMethods()[0], aClass.getMethods());
   }
 
-  public void testRerunFailedTestWithDependency() throws Exception {
+  public void testRerunFailedTestWithDependency() {
     final PsiClass aClass =
       myFixture.addClass("package a; public class ATest {" +
                          "  @org.testng.annotations.Test()\n" +
@@ -163,7 +163,7 @@ public class DetectClassesToRunTest extends LightCodeInsightFixtureTestCase {
     assertContainsElements(paramsToRerun, "a");
   }
   
-  public void testRerunFailedParameterized() throws Exception {
+  public void testRerunFailedParameterized() {
     @SuppressWarnings("TestNGDataProvider") final PsiClass aClass =
       myFixture.addClass("package a; " +
                          "import org.testng.annotations.DataProvider;\n" +
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGForkTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGForkTest.java
index cfe8809aab4f..9c2568e7544d 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGForkTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGForkTest.java
@@ -48,7 +48,7 @@ public class TestNGForkTest {
       new TestNGForkedSplitter(tempFile.getCanonicalPath(), Collections.singletonList(tempFile.getCanonicalPath())) {
         private boolean myStarted = false;
         @Override
-        protected int startChildFork(List args, File workingDir, String classpath, String repeatCount) throws IOException, InterruptedException {
+        protected int startChildFork(List args, File workingDir, String classpath, String repeatCount) throws IOException {
           Assert.assertEquals(dynamicClasspath, myDynamicClasspath);
           Assert.assertArrayEquals(vmParams, myVMParameters.toArray());
           Assert.assertEquals(workingDirFromFile, workingDir.getName());
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java
index 29301273771f..6d363de370e1 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/TestNGTreeHierarchyTest.java
@@ -28,7 +28,6 @@ import org.testng.xml.XmlInclude;
 import org.testng.xml.XmlSuite;
 import org.testng.xml.XmlTest;
 
-import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
@@ -38,7 +37,7 @@ import java.util.List;
 public class TestNGTreeHierarchyTest {
  
   @Test
-  public void testOneTestMethod() throws Exception {
+  public void testOneTestMethod() {
     final XmlSuite suite = new XmlSuite();
     final XmlTest test = new XmlTest();
     final XmlClass xmlClass = new XmlClass("a.ATest", false);
@@ -56,7 +55,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testSkipTestMethod() throws Exception {
+  public void testSkipTestMethod() {
 
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
@@ -77,7 +76,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testParallelTestExecutionPreserveInvocationCount() throws Exception {
+  public void testParallelTestExecutionPreserveInvocationCount() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     listener.onStart((ISuite)null);
@@ -107,7 +106,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testParallelSameNameTestExecution() throws Exception {
+  public void testParallelSameNameTestExecution() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     listener.onStart((ISuite)null);
@@ -138,7 +137,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testFailureWithoutStart() throws Exception {
+  public void testFailureWithoutStart() {
 
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
@@ -159,7 +158,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testSkipMethodAfterStartTest() throws Exception {
+  public void testSkipMethodAfterStartTest() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     listener.onStart((ISuite)null);
@@ -181,7 +180,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testOneTestMethodWithMultipleInvocationCount() throws Exception {
+  public void testOneTestMethodWithMultipleInvocationCount() {
     final XmlSuite suite = new XmlSuite();
     final XmlTest test = new XmlTest();
     final XmlClass xmlClass = new XmlClass("a.ATest", false);
@@ -207,7 +206,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testConfigurationMethods() throws Exception {
+  public void testConfigurationMethods() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     final String className = "a.ATest";
@@ -256,7 +255,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testConfigurationFailure() throws Exception {
+  public void testConfigurationFailure() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     final String className = "a.ATest";
@@ -279,7 +278,7 @@ public class TestNGTreeHierarchyTest {
   }
   
   @Test
-  public void testAfterMethodWithInjectedTestResult() throws Exception {
+  public void testAfterMethodWithInjectedTestResult() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     final String className = "a.ATest";
@@ -309,7 +308,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testNullParameters() throws Exception {
+  public void testNullParameters() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     final MockTestNGResult result = new MockTestNGResult("ATest", "testMe", null, new Object[]{null, null});
@@ -325,7 +324,7 @@ public class TestNGTreeHierarchyTest {
   }
 
   @Test
-  public void testIncludedMethods() throws Exception {
+  public void testIncludedMethods() {
     final StringBuffer buf = new StringBuffer();
     final IDEATestNGRemoteListener listener = createListener(buf);
     final MockTestNGResult result = new MockTestNGResult("ATest", "testMe", null, new Object[]{null, null}) {
@@ -384,7 +383,7 @@ public class TestNGTreeHierarchyTest {
   private static IDEATestNGRemoteListener createListener(final StringBuffer buf) {
     return new IDEATestNGRemoteListener(new PrintStream(new OutputStream() {
         @Override
-        public void write(int b) throws IOException {
+        public void write(int b) {
           buf.append(new String(new byte[]{(byte)b}));
         }
       })) {
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspectionTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspectionTest.java
index 610a0e084827..19d6e0589e1a 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspectionTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspectionTest.java
@@ -33,7 +33,7 @@ public class AssertsWithoutMessagesTestNGInspectionTest extends JavaCodeInsightF
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addLibrary("testng", PathUtil.getJarPathForClass(DataProvider.class));
   }
 
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java
index afa95696cb29..d4e646d48c42 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java
@@ -34,7 +34,7 @@ public abstract class BaseTestNGInspectionsTest extends JavaCodeInsightFixtureTe
   @NonNls private static final String AFTER = "after";
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.setMockJdkLevel(JavaModuleFixtureBuilder.MockJdkLevel.jdk15);
     moduleBuilder.addLibrary("junit", PathUtil.getJarPathForClass(TestCase.class));
     moduleBuilder.addLibrary("testng", PathUtil.getJarPathForClass(AfterMethod.class));
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DataProviderReturnTypeInspectionTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DataProviderReturnTypeInspectionTest.java
index 765b5c905f2a..51190a374c74 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DataProviderReturnTypeInspectionTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DataProviderReturnTypeInspectionTest.java
@@ -32,7 +32,7 @@ public class DataProviderReturnTypeInspectionTest extends JavaCodeInsightFixture
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addLibrary("testng", PathUtil.getJarPathForClass(DataProvider.class));
   }
 
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DuplicatedDataProviderNamesInspectionTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DuplicatedDataProviderNamesInspectionTest.java
index d84d463dd3b0..33c44634acb9 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DuplicatedDataProviderNamesInspectionTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/DuplicatedDataProviderNamesInspectionTest.java
@@ -33,7 +33,7 @@ public class DuplicatedDataProviderNamesInspectionTest extends JavaCodeInsightFi
   }
 
   @Override
-  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+  protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
     moduleBuilder.addLibrary("testng", PathUtil.getJarPathForClass(DataProvider.class));
   }
 
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDataProviderInspectionTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDataProviderInspectionTest.java
index b282f3a57717..6c8240b5cd4f 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDataProviderInspectionTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDataProviderInspectionTest.java
@@ -20,12 +20,12 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import org.jetbrains.annotations.NotNull;
 
 public class TestNGDataProviderInspectionTest extends LightCodeInsightFixtureTestCase {
-  public void testMissedDataProvider() throws Exception {
+  public void testMissedDataProvider() {
 
     myFixture.testHighlighting(true, false, false, "MissedDataProvider.java");
   }
 
-  public void testInstanceDataProviderFromForeignClass() throws Exception {
+  public void testInstanceDataProviderFromForeignClass() {
     myFixture.testHighlighting(true, false, false, "InstanceDataProviderFromForeignClass.java");
   }
 
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDependsOnInspectionTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDependsOnInspectionTest.java
index 254921b9b46a..af08b2b207ca 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDependsOnInspectionTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/TestNGDependsOnInspectionTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
 
 public class TestNGDependsOnInspectionTest extends LightCodeInsightFixtureTestCase {
   @Test
-  public void testDependencies() throws Exception {
+  public void testDependencies() {
     Runnable runnable = () -> {
       myFixture.addClass("package org.testng.annotations;\n" +
                          "public @interface AfterSuite {  java.lang.String[] dependsOnMethods() default {};}");
@@ -49,7 +49,7 @@ public class TestNGDependsOnInspectionTest extends LightCodeInsightFixtureTestCa
   
   @BeforeMethod
     @Override
-    protected void setUp() throws Exception {
+    protected void setUp() {
       UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
         try {
           TestNGDependsOnInspectionTest.super.setUp();
@@ -64,7 +64,7 @@ public class TestNGDependsOnInspectionTest extends LightCodeInsightFixtureTestCa
   
     @AfterMethod
     @Override
-    protected void tearDown() throws Exception {
+    protected void tearDown() {
       UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
         try {
           TestNGDependsOnInspectionTest.super.tearDown();
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java
index b83c71514f0d..63af9b5a7ed3 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/inspection/UndeclaredTestsInspectionTest.java
@@ -34,7 +34,7 @@ public class UndeclaredTestsInspectionTest extends InspectionTestCase {
   }
 
   @BeforeMethod
-  protected void setUp() throws Exception {
+  protected void setUp() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         UndeclaredTestsInspectionTest.super.setUp();
@@ -46,7 +46,7 @@ public class UndeclaredTestsInspectionTest extends InspectionTestCase {
   }
 
   @AfterMethod
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         UndeclaredTestsInspectionTest.super.tearDown();
@@ -68,7 +68,7 @@ public class UndeclaredTestsInspectionTest extends InspectionTestCase {
   }
 
   @Test(dataProvider = "data")
-  public void doTest(final String name) throws Exception {
+  public void doTest(final String name) {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         TestNGUtil.hasDocTagsSupport = true;
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java
index ca0b829adce7..95b44403f994 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/intention/AddTestNGJarFixTest.java
@@ -41,7 +41,7 @@ public class AddTestNGJarFixTest {
   private LanguageLevel myLanguageLevel;
 
   @BeforeMethod
-  public void setUp() throws Exception {
+  public void setUp() {
     UIUtil.invokeAndWaitIfNeeded(new Runnable() {
       @Override
       public void run() {
@@ -70,7 +70,7 @@ public class AddTestNGJarFixTest {
 
 
   @AfterMethod
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         LanguageLevelProjectExtension.getInstance(myFixture.getProject()).setLanguageLevel(myLanguageLevel);
@@ -90,7 +90,7 @@ public class AddTestNGJarFixTest {
   }
 
   @Test(dataProvider = "data")
-  public void doTest(final String testName) throws Throwable {
+  public void doTest(final String testName) {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         IntentionAction resultAction = null;
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java
index a6a77cc0b1c7..e92c1a53805e 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGDataProviderTest.java
@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
 public class TestNGDataProviderTest extends LightCodeInsightFixtureTestCase {
   @BeforeMethod
   @Override
-  protected void setUp() throws Exception {
+  protected void setUp() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         TestNGDataProviderTest.super.setUp();
@@ -41,7 +41,7 @@ public class TestNGDataProviderTest extends LightCodeInsightFixtureTestCase {
 
   @AfterMethod
   @Override
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         TestNGDataProviderTest.super.tearDown();
@@ -65,7 +65,7 @@ public class TestNGDataProviderTest extends LightCodeInsightFixtureTestCase {
   public void testNothing(){}
 
   @Test(dataProvider = "data")
-  public void test(final String path, final String... results) throws Throwable {
+  public void test(final String path, final String... results) {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         myFixture.addClass("package org.testng.annotations; public @interface DataProvider {}");
diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGSuiteTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGSuiteTest.java
index 8b4ab6c349c1..ff443af9a996 100644
--- a/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGSuiteTest.java
+++ b/plugins/testng/testSources/com/theoryinpractice/testng/referenceContributor/TestNGSuiteTest.java
@@ -27,7 +27,7 @@ import org.testng.annotations.Test;
 public class TestNGSuiteTest extends LightCodeInsightFixtureTestCase {
   @BeforeMethod
   @Override
-  protected void setUp() throws Exception {
+  protected void setUp() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         TestNGSuiteTest.super.setUp();
@@ -40,7 +40,7 @@ public class TestNGSuiteTest extends LightCodeInsightFixtureTestCase {
 
   @AfterMethod
   @Override
-  protected void tearDown() throws Exception {
+  protected void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         TestNGSuiteTest.super.tearDown();
@@ -53,7 +53,7 @@ public class TestNGSuiteTest extends LightCodeInsightFixtureTestCase {
 
   public void testNothing(){}
 
-  public void testTestNGSuiteFile() throws Throwable {
+  public void testTestNGSuiteFile() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         myFixture.addClass("package org.testng.annotations; public @interface DataProvider {}");
diff --git a/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java b/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java
index d27bcafd21aa..439a8d07a1d4 100644
--- a/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java
+++ b/plugins/ui-designer/jps-plugin/testSrc/org/jetbrains/jps/uiDesigner/build/FormsIncrementalBuildingTest.java
@@ -6,11 +6,11 @@ import org.jetbrains.ether.IncrementalTestCase;
  * @author nik
  */
 public class FormsIncrementalBuildingTest extends IncrementalTestCase {
-  public FormsIncrementalBuildingTest() throws Exception {
+  public FormsIncrementalBuildingTest() {
     super("uiDesigner");
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doTest().assertSuccessful();
   }
 }
diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/FormOpeningTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/FormOpeningTest.java
index b477fb442362..90c5b49f06d8 100644
--- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/FormOpeningTest.java
+++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/FormOpeningTest.java
@@ -35,7 +35,7 @@ import java.awt.*;
  */
 public class FormOpeningTest extends FileEditorManagerTestCase {
 
-  public void testOpenInDumbMode() throws Exception {
+  public void testOpenInDumbMode() {
 
     FileEditorManagerEx editorManager = FileEditorManagerEx.getInstanceEx(getProject());
     VirtualFile file = myFixture.copyFileToProject("TestBorder.form");
diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/GridChangeUtilTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/GridChangeUtilTest.java
index 28e201dc1f76..df086e86003c 100644
--- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/GridChangeUtilTest.java
+++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/GridChangeUtilTest.java
@@ -21,8 +21,7 @@ import com.intellij.uiDesigner.radComponents.RadContainer;
 import com.intellij.uiDesigner.radComponents.RadHSpacer;
 import junit.framework.TestCase;
 
-import java.awt.Insets;
-import java.awt.LayoutManager;
+import java.awt.*;
 
 public final class GridChangeUtilTest extends TestCase {
 
@@ -60,7 +59,7 @@ public final class GridChangeUtilTest extends TestCase {
     }
   }
 
-  public void test_invalid_parameters() throws Exception{
+  public void test_invalid_parameters() {
     final RadContainer grid = SampleGrid.create();
 
     try {
@@ -146,7 +145,7 @@ public final class GridChangeUtilTest extends TestCase {
     public static final int S4 = 3;
     public static final int S5 = 1;
 
-    public static RadContainer create() throws Exception{
+    public static RadContainer create() {
 
       final RadContainer grid = createGrid(ORIGINAL_ROWS, ORIGINAL_COLUMNS);
 
@@ -168,7 +167,7 @@ public final class GridChangeUtilTest extends TestCase {
     }
   }
 
-  public void test_split() throws Exception{
+  public void test_split() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.splitColumn(grid, 1);
     assertGridDimensions(grid, SampleGrid.ORIGINAL_ROWS, SampleGrid.ORIGINAL_COLUMNS + 1);
@@ -181,7 +180,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertComponentCellAndSpan(grid, 5, 0, 1);
   }
 
-  public void test_insert_1() throws Exception{
+  public void test_insert_1() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.insertRowOrColumn(grid, 1, false, false);
     assertGridDimensions(grid, SampleGrid.ORIGINAL_ROWS, SampleGrid.ORIGINAL_COLUMNS + 1);
@@ -195,7 +194,7 @@ public final class GridChangeUtilTest extends TestCase {
   }
 
   @SuppressWarnings({"PointlessArithmeticExpression"})
-  public void test_insert_first() throws Exception{
+  public void test_insert_first() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.insertRowOrColumn(grid, 0, false, true);
     assertGridDimensions(grid, SampleGrid.ORIGINAL_ROWS, SampleGrid.ORIGINAL_COLUMNS + 1);
@@ -209,7 +208,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertComponentCellAndSpan(grid, 5, SampleGrid.C5 + 1, SampleGrid.S5);
   }
 
-  public void test_insert_last() throws Exception{
+  public void test_insert_last() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.insertRowOrColumn(grid, SampleGrid.ORIGINAL_COLUMNS-1, false, false);
     assertGridDimensions(grid, SampleGrid.ORIGINAL_ROWS, SampleGrid.ORIGINAL_COLUMNS + 1);
@@ -223,7 +222,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertComponentCellAndSpan(grid, 5, SampleGrid.C5, SampleGrid.S5);
   }
 
-  public void test_insert_after_and_before() throws Exception{
+  public void test_insert_after_and_before() {
     for (int i=0; i < SampleGrid.ORIGINAL_COLUMNS-1; i++){
       final RadContainer afterCurrent = SampleGrid.create();
       GridChangeUtil.insertRowOrColumn(afterCurrent, i, false, false);
@@ -238,7 +237,7 @@ public final class GridChangeUtilTest extends TestCase {
     }
   }
 
-  public void test_delete() throws Exception{
+  public void test_delete() {
     {
       final RadContainer grid = SampleGrid.create();
 
@@ -276,7 +275,7 @@ public final class GridChangeUtilTest extends TestCase {
     }
   }
 
-  public void testMoveRowDown() throws Exception {
+  public void testMoveRowDown() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.moveCells(grid, true, new int[] { 3 }, 6);
     assertEquals(5, grid.getComponent(3).getConstraints().getRow());
@@ -284,7 +283,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertEquals(4, grid.getComponent(5).getConstraints().getRow());
   }
 
-  public void testMoveRowUp() throws Exception {
+  public void testMoveRowUp() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.moveCells(grid, true, new int[] { 5 }, 3);
     assertEquals(4, grid.getComponent(3).getConstraints().getRow());
@@ -292,7 +291,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertEquals(3, grid.getComponent(5).getConstraints().getRow());
   }
 
-  public void testMoveAdjacentRowsDown() throws Exception {
+  public void testMoveAdjacentRowsDown() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.moveCells(grid, true, new int[] { 3, 4 }, 6);
     assertEquals(4, grid.getComponent(3).getConstraints().getRow());
@@ -300,7 +299,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertEquals(3, grid.getComponent(5).getConstraints().getRow());
   }
 
-  public void testMoveAdjacentRowsUp() throws Exception {
+  public void testMoveAdjacentRowsUp() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.moveCells(grid, true, new int[] { 4, 5 }, 3);
     assertEquals(5, grid.getComponent(3).getConstraints().getRow());
@@ -308,7 +307,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertEquals(4, grid.getComponent(5).getConstraints().getRow());
   }
 
-  public void testMoveDisjointRowsDown() throws Exception {
+  public void testMoveDisjointRowsDown() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.moveCells(grid, true, new int[] { 0, 2 }, 5);
     assertEquals(3, grid.getComponent(0).getConstraints().getRow());
@@ -316,7 +315,7 @@ public final class GridChangeUtilTest extends TestCase {
     assertEquals(1, grid.getComponent(3).getConstraints().getRow());
   }
 
-  public void testMoveDisjointRowsUp() throws Exception {
+  public void testMoveDisjointRowsUp() {
     final RadContainer grid = SampleGrid.create();
     GridChangeUtil.moveCells(grid, true, new int[] { 2, 4 }, 0);
     assertEquals(0, grid.getComponent(2).getConstraints().getRow());
diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java
index f91457e29eb4..75c65923e47d 100644
--- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java
+++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java
@@ -47,10 +47,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     super.prepareProject(rootDir);
   }
 
-  public void testRenameClass() throws Exception {
+  public void testRenameClass() {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiClass aClass = myJavaFacade.findClass("UIClass", ProjectScope.getAllScope(myProject));
         Assert.assertNotNull(aClass);
 
@@ -59,10 +59,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenameBoundField() throws Exception {
+  public void testRenameBoundField() {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiClass aClass = myJavaFacade.findClass("UIClass", ProjectScope.getAllScope(myProject));
         Assert.assertNotNull(aClass);
         final PsiField field = aClass.findFieldByName("UIField", false);
@@ -73,10 +73,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenamePackage() throws Exception {
+  public void testRenamePackage() {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiPackage aPackage = JavaPsiFacade.getInstance(myPsiManager.getProject()).findPackage("gov");
         Assert.assertNotNull(aPackage);
 
@@ -86,10 +86,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenamePackageNested() throws Exception {                     // IDEADEV-28864
+  public void testRenamePackageNested() {                     // IDEADEV-28864
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiPackage aPackage = JavaPsiFacade.getInstance(myPsiManager.getProject()).findPackage("org.withoutForms");
         Assert.assertNotNull(aPackage);
 
@@ -98,10 +98,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenamePackageWithComponentClass() throws Exception {         // IDEADEV-5615
+  public void testRenamePackageWithComponentClass() {         // IDEADEV-5615
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiPackage aPackage = JavaPsiFacade.getInstance(myPsiManager.getProject()).findPackage("org.withoutForms");
         Assert.assertNotNull(aPackage);
 
@@ -110,10 +110,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenameEnumConstant() throws Exception {
+  public void testRenameEnumConstant() {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiClass aClass = myJavaFacade.findClass("PropEnum", ProjectScope.getAllScope(myProject));
         Assert.assertNotNull(aClass);
         PsiField enumConstant = aClass.findFieldByName("valueB", false);
@@ -124,10 +124,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenameResourceBundle() throws Exception {
+  public void testRenameResourceBundle() {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiFile file = myPsiManager.findFile(rootDir.findChild("F1.properties"));
         Assert.assertNotNull(file);
 
@@ -137,10 +137,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenameNestedForm() throws Exception {
+  public void testRenameNestedForm() {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiFile file = myPsiManager.findFile(rootDir.findChild("p1").findChild("Form1.form"));
         Assert.assertNotNull(file);
 
@@ -150,10 +150,10 @@ public class RenameUIRelatedTest extends MultiFileTestCase {
     });
   }
 
-  public void testRenameImage() throws Exception {
+  public void testRenameImage() {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         PsiFile file = myPsiManager.findFile(rootDir.findFileByRelativePath("org/withoutForms/child/abstractClass.png"));
         Assert.assertNotNull(file);
 
diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
index d77e6378af03..30f5f2eac82b 100644
--- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
+++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
@@ -236,11 +236,12 @@ public class AsmCodeGeneratorTest extends TestCase {
     return ethalon.isAssignableFrom(object.getClass());
   }
 
-  private static Object invokeMethod(Object obj, String methodName) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+  private static Object invokeMethod(Object obj, String methodName) throws InvocationTargetException, IllegalAccessException {
     return invokeMethod(obj, methodName, ArrayUtil.EMPTY_CLASS_ARRAY, ArrayUtil.EMPTY_OBJECT_ARRAY);
   }
 
-  private static Object invokeMethod(Object obj, String methodName, Class[] params, Object[] args) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+  private static Object invokeMethod(Object obj, String methodName, Class[] params, Object[] args) throws
+                                                                                                   InvocationTargetException, IllegalAccessException {
     final Method method = findMethod(obj.getClass(), methodName, params);
     return method.invoke(obj, args);
   }
diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/inspection/I18NInspectionTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/inspection/I18NInspectionTest.java
index b5ceab50e638..d54b79665a52 100644
--- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/inspection/I18NInspectionTest.java
+++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/inspection/I18NInspectionTest.java
@@ -28,7 +28,7 @@ public class I18NInspectionTest extends InspectionTestCase {
     return PluginPathManager.getPluginHomePath("ui-designer") + "/testData/inspection";
   }
 
-  public void testFormTabbedPaneTitle() throws Exception {
+  public void testFormTabbedPaneTitle() {
     LocalInspectionToolWrapper wrapper = new LocalInspectionToolWrapper(new I18nFormInspection());
     InspectionsKt.enableInspectionTool(getProject(), wrapper, getTestRootDisposable());
     doTest("i18n/" + getTestName(true), new LocalInspectionToolWrapper(new I18nInspection()), "java 1.4", false, false,
diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/refactoring/MoveFileTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/refactoring/MoveFileTest.java
index 24f63e7349b8..3bb27e95e0e5 100644
--- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/refactoring/MoveFileTest.java
+++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/refactoring/MoveFileTest.java
@@ -16,11 +16,9 @@
 package com.intellij.uiDesigner.refactoring;
 
 import com.intellij.openapi.application.PluginPathManager;
-import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.MultiFileTestCase;
@@ -39,15 +37,15 @@ public class MoveFileTest extends MultiFileTestCase {
     return "/move/";
   }
 
-  public void testMoveIcon() throws Exception {
+  public void testMoveIcon() {
     doTest("to", "from/addmodulewizard.png");
   }
 
   //Both names are relative to root directory
-  private void doTest(final String targetDirName, final String fileToMove) throws Exception {
+  private void doTest(final String targetDirName, final String fileToMove) {
     doTest(new PerformAction() {
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) {
         final VirtualFile child = rootDir.findFileByRelativePath(fileToMove);
         assertNotNull("File " + fileToMove + " not found", child);
         PsiFile file = myPsiManager.findFile(child);
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java
index c11cfb07e410..ad998ca2eb58 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ExpressionTest.java
@@ -29,99 +29,99 @@ public class XPath2ExpressionTest extends TestBase {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
   }
 
-  public void testIntegerPlusInteger() throws Throwable {
+  public void testIntegerPlusInteger() {
    assertEquals(INTEGER, doTest(true));
   }
 
-  public void testIntegerPlusDecimal() throws Throwable {
+  public void testIntegerPlusDecimal() {
     assertEquals(DECIMAL, doTest(true));
   }
 
-  public void testIntegerPlusDouble() throws Throwable {
+  public void testIntegerPlusDouble() {
     assertEquals(DOUBLE, doTest(true));
   }
 
-  public void testIntegerIdivInteger() throws Throwable {
+  public void testIntegerIdivInteger() {
     assertEquals(INTEGER, doTest(true));
   }
 
-  public void testIntegerDivInteger() throws Throwable {
+  public void testIntegerDivInteger() {
     assertEquals(DECIMAL, doTest(true));
   }
 
-  public void testDoubleDivInteger() throws Throwable {
+  public void testDoubleDivInteger() {
     assertEquals(DOUBLE, doTest(true));
   }
 
-  public void testDatePlusYmd() throws Throwable {
+  public void testDatePlusYmd() {
     assertEquals(DATE, doTest(true));
   }
 
-  public void testDatePlusDtd() throws Throwable {
+  public void testDatePlusDtd() {
     assertEquals(DATE, doTest(true));
   }
 
-  public void testTimePlusDtd() throws Throwable {
+  public void testTimePlusDtd() {
     assertEquals(TIME, doTest(true));
   }
 
-  public void testDateTimePlusYmd() throws Throwable {
+  public void testDateTimePlusYmd() {
     assertEquals(DATETIME, doTest(true));
   }
 
-  public void testDateTimePlusDtd() throws Throwable {
+  public void testDateTimePlusDtd() {
     assertEquals(DATETIME, doTest(true));
   }
 
-  public void testYmdPlusYmd() throws Throwable {
+  public void testYmdPlusYmd() {
     assertEquals(YEARMONTHDURATION, doTest(true));
   }
 
-  public void testDtdPlusDtd() throws Throwable {
+  public void testDtdPlusDtd() {
     assertEquals(DAYTIMEDURATION, doTest(true));
   }
 
-  public void testDoubleMinusInteger() throws Throwable {
+  public void testDoubleMinusInteger() {
     assertEquals(DOUBLE, doTest(true));
   }
 
-  public void testDateMinusDate() throws Throwable {
+  public void testDateMinusDate() {
     assertEquals(DAYTIMEDURATION, doTest(true));
   }
 
-  public void testDateMinusYmd() throws Throwable {
+  public void testDateMinusYmd() {
     assertEquals(DATE, doTest(false));
   }
 
-  public void testDateMinusDtd() throws Throwable {
+  public void testDateMinusDtd() {
     assertEquals(DATE, doTest(false));
   }
 
-  public void testTimeMinusTime() throws Throwable {
+  public void testTimeMinusTime() {
     assertEquals(DAYTIMEDURATION, doTest(true));
   }
 
-  public void testTimeMinusDtd() throws Throwable {
+  public void testTimeMinusDtd() {
     assertEquals(TIME, doTest(false));
   }
 
-  public void testYmdMinusYmd() throws Throwable {
+  public void testYmdMinusYmd() {
     assertEquals(YEARMONTHDURATION, doTest(true));
   }
 
-  public void testDoubleMultInteger() throws Throwable {
+  public void testDoubleMultInteger() {
     assertEquals(DOUBLE, doTest(true));
   }
 
-  public void testYmdMultInteger() throws Throwable {
+  public void testYmdMultInteger() {
     assertEquals(YEARMONTHDURATION, doTest(true));
   }
 
-  public void testYmdMultDecimal() throws Throwable {
+  public void testYmdMultDecimal() {
     assertEquals(YEARMONTHDURATION, doTest(true));
   }
 
-  protected XPathType doTest(boolean symmetric) throws Throwable {
+  protected XPathType doTest(boolean symmetric) {
     myFixture.configureByFile(getTestFileName() + ".xpath2");
 
     final XPathExpression expression = getExpression();
@@ -148,7 +148,7 @@ public class XPath2ExpressionTest extends TestBase {
     return type;
   }
 
-  private XPathExpression getExpression() throws NoSuchMethodException {
+  private XPathExpression getExpression() {
     final XPathFile file = (XPathFile)myFixture.getFile();
     final XPathExpression expression = file.getExpression();
     assertNotNull(expression);
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTest.java
index 182398e16965..e0a8d386caba 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTest.java
@@ -16,68 +16,68 @@
 package org.intellij.lang.xpath;
 
 public class XPath2HighlightingTest extends XPath2HighlightingTestBase {
-  public void testIfInsideArgumentList() throws Throwable {
+  public void testIfInsideArgumentList() {
     doXPathHighlighting();
   }
 
-  public void testConsecutiveComparison() throws Throwable {
+  public void testConsecutiveComparison() {
     doXPathHighlighting();
   }
 
-  public void testNumberFollowedByToken() throws Throwable {
+  public void testNumberFollowedByToken() {
     doXPathHighlighting();
   }
 
-  public void testNumberFollowedByToken2() throws Throwable {
+  public void testNumberFollowedByToken2() {
     doXPathHighlighting();
   }
 
-  public void testMalformedStringLiteral() throws Throwable {
+  public void testMalformedStringLiteral() {
     doXPathHighlighting();
   }
 
-  public void testQuotedStringLiteral() throws Throwable {
+  public void testQuotedStringLiteral() {
     doXPathHighlighting();
   }
 
-  public void testEmptyStringLiteral() throws Throwable {
+  public void testEmptyStringLiteral() {
     doXPathHighlighting();
   }
 
-  public void testNodeKindTest() throws Throwable {
+  public void testNodeKindTest() {
     doXPathHighlighting();
   }
 
-  public void testIncorrectNodeKindTests() throws Throwable {
+  public void testIncorrectNodeKindTests() {
     doXPathHighlighting();
   }
 
-  public void testValidOperations() throws Throwable {
+  public void testValidOperations() {
     doXPathHighlighting();
   }
 
-  public void testValidOperations2() throws Throwable {
+  public void testValidOperations2() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testPlusOperatorNotApplicable() throws Throwable {
+  public void testPlusOperatorNotApplicable() {
     doXPathHighlighting();
   }
 
-  public void testToOperatorNotApplicable() throws Throwable {
+  public void testToOperatorNotApplicable() {
     doXPathHighlighting();
   }
 
-  public void testIntersectOperatorNotApplicable() throws Throwable {
+  public void testIntersectOperatorNotApplicable() {
     doXPathHighlighting();
   }
 
-  public void testUnionOperatorNotApplicable() throws Throwable {
+  public void testUnionOperatorNotApplicable() {
     doXPathHighlighting();
   }
 
-  public void testInvalidNodeTypePredicate() throws Throwable {
+  public void testInvalidNodeTypePredicate() {
     doXPathHighlighting();
   }
 
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTestBase.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTestBase.java
index 792322a89bc7..8ebe7ff0f09e 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTestBase.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2HighlightingTestBase.java
@@ -24,7 +24,7 @@ public abstract class XPath2HighlightingTestBase extends TestBase {
     myFixture.enableInspections(RedundantTypeConversion.class);
   }
 
-  protected void doXPathHighlighting() throws Throwable {
+  protected void doXPathHighlighting() {
     final String name = getTestFileName();
     myFixture.testHighlighting(true, false, false, name + ".xpath2");
   }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ParsingTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ParsingTest.java
index 5a9e4b61ba1c..15e43d08436b 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ParsingTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2ParsingTest.java
@@ -17,102 +17,102 @@ package org.intellij.lang.xpath;
 
 public class XPath2ParsingTest extends TestBase {
 
-  public void testComments() throws Throwable {
+  public void testComments() {
     doXPathHighlighting();
   }
 
-  public void testNodeComp() throws Throwable {
+  public void testNodeComp() {
     doXPathHighlighting();
   }
 
-  public void testNewOps() throws Throwable {
+  public void testNewOps() {
     doXPathHighlighting();
   }
 
-  public void testSequence() throws Throwable {
+  public void testSequence() {
     doXPathHighlighting();
   }
 
-  public void testEmptySequence() throws Throwable {
+  public void testEmptySequence() {
     doXPathHighlighting();
   }
 
-  public void testRange() throws Throwable {
+  public void testRange() {
     doXPathHighlighting();
   }
 
-  public void testIfThenElse() throws Throwable {
+  public void testIfThenElse() {
     doXPathHighlighting();
   }
 
-  public void testIfThenElseMissing() throws Throwable {
+  public void testIfThenElseMissing() {
     doXPathHighlighting();
   }
 
-  public void testForLoop() throws Throwable {
+  public void testForLoop() {
     doXPathHighlighting();
   }
 
-  public void testSomeEvery() throws Throwable {
+  public void testSomeEvery() {
     doXPathHighlighting();
   }
 
-  public void testTypeExpressions() throws Throwable {
+  public void testTypeExpressions() {
     doXPathHighlighting();
   }
 
-  public void testDoubleLiterals() throws Throwable {
+  public void testDoubleLiterals() {
     doXPathHighlighting();
   }
 
-  public void testWildcardNamespace() throws Throwable {
+  public void testWildcardNamespace() {
     doXPathHighlighting();
   }
 
-  public void testInvalidWildcard() throws Throwable {
+  public void testInvalidWildcard() {
     doXPathHighlighting();
   }
 
-  public void testMissingInstanceOfType() throws Throwable {
+  public void testMissingInstanceOfType() {
     doXPathHighlighting();
   }
 
-  public void testMissingSatisfiesExpression() throws Throwable {
+  public void testMissingSatisfiesExpression() {
     doXPathHighlighting();
   }
 
-  public void testValidTypeOccurrenceIndicators() throws Throwable {
+  public void testValidTypeOccurrenceIndicators() {
     doXPathHighlighting();
   }
 
-  public void testInvalidTypeOccurrenceIndicator1() throws Throwable {
+  public void testInvalidTypeOccurrenceIndicator1() {
     doXPathHighlighting();
   }
 
-  public void testInvalidTypeOccurrenceIndicator2() throws Throwable {
+  public void testInvalidTypeOccurrenceIndicator2() {
     doXPathHighlighting();
   }
 
-  public void testNonKeywords() throws Throwable {
+  public void testNonKeywords() {
     doXPathHighlighting();
   }
 
   // IDEA-70681
-  public void testCastWithMultiplication() throws Throwable {
+  public void testCastWithMultiplication() {
     doXPathHighlighting();
   }
 
   // IDEA-70688
-  public void testKindTestWithStar() throws Throwable {
+  public void testKindTestWithStar() {
     doXPathHighlighting();
   }
 
-  public void testUnionSubExpression() throws Throwable {
+  public void testUnionSubExpression() {
     doXPathHighlighting();
   }
 
   // IDEA-67413
-  private void doXPathHighlighting() throws Throwable {
+  private void doXPathHighlighting() {
     final String name = getTestFileName();
     myFixture.testHighlighting(false, false, false, name + ".xpath2");
   }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2StaticTypeTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2StaticTypeTest.java
index 979c40f9dca9..2ead03a13282 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2StaticTypeTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2StaticTypeTest.java
@@ -22,7 +22,7 @@ import org.intellij.lang.xpath.psi.XPathType;
 
 public class XPath2StaticTypeTest extends TestCase {
 
-  public void testStatic() throws Throwable {
+  public void testStatic() {
     assertTrue(XPathType.isAssignable(XPath2Type.NODE, XPath2Type.ITEM));
 
     assertFalse(XPathType.isAssignable(XPath2Type.NODE, XPath2Type.STRING));
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2TypeTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2TypeTest.java
index 41a56694e55b..0da67f0866af 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2TypeTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPath2TypeTest.java
@@ -17,172 +17,172 @@ package org.intellij.lang.xpath;
 
 public class XPath2TypeTest extends XPath2HighlightingTestBase {
 
-  public void testQNameToQName() throws Throwable {
+  public void testQNameToQName() {
     doXPathHighlighting();
   }
 
-  public void testQNameToBoolean() throws Throwable {
+  public void testQNameToBoolean() {
     doXPathHighlighting();
   }
 
-  public void testStringToQName() throws Throwable {
+  public void testStringToQName() {
     doXPathHighlighting();
   }
 
-  public void testStringToBoolean() throws Throwable {
+  public void testStringToBoolean() {
     doXPathHighlighting();
   }
 
-  public void testUriToBoolean() throws Throwable {
+  public void testUriToBoolean() {
     doXPathHighlighting();
   }
 
-  public void testUriToStringSequence() throws Throwable {
+  public void testUriToStringSequence() {
     doXPathHighlighting();
   }
 
-  public void testNumberToNode() throws Throwable {
+  public void testNumberToNode() {
     doXPathHighlighting();
   }
 
-  public void testNodeToNode() throws Throwable {
+  public void testNodeToNode() {
     doXPathHighlighting();
   }
 
-  public void testNodeToDouble() throws Throwable {
+  public void testNodeToDouble() {
     doXPathHighlighting();
   }
 
-  public void testAnyToString() throws Throwable {
+  public void testAnyToString() {
     doXPathHighlighting();
   }
 
-  public void testStringToAny() throws Throwable {
+  public void testStringToAny() {
     doXPathHighlighting();
   }
 
-  public void testIntegerToString() throws Throwable {
+  public void testIntegerToString() {
     doXPathHighlighting();
   }
 
-  public void testIntSeqToAnySeq() throws Throwable {
+  public void testIntSeqToAnySeq() {
     doXPathHighlighting();
   }
 
-  public void testIntSeqToStringSeq() throws Throwable {
+  public void testIntSeqToStringSeq() {
     doXPathHighlighting();
   }
 
-  public void testDynamicContext1() throws Throwable {
+  public void testDynamicContext1() {
     doXPathHighlighting();
   }
 
-  public void testDynamicContext2() throws Throwable {
+  public void testDynamicContext2() {
     doXPathHighlighting();
   }
 
-  public void testDynamicContext3() throws Throwable {
+  public void testDynamicContext3() {
     doXPathHighlighting();
   }
 
-  public void testStringFunctionOnPath() throws Throwable {
+  public void testStringFunctionOnPath() {
     doXPathHighlighting();
   }
 
-  public void testInvalidPath() throws Throwable {
+  public void testInvalidPath() {
     doXPathHighlighting();
   }
 
-  public void testToNumericIDEA67335() throws Throwable {
+  public void testToNumericIDEA67335() {
     doXPathHighlighting();
   }
 
-  public void testBooleanComparisonIDEA67348() throws Throwable {
+  public void testBooleanComparisonIDEA67348() {
     doXPathHighlighting();
   }
 
-  public void testDurationPlusDurationPlusDateIDEA69517() throws Throwable {
+  public void testDurationPlusDurationPlusDateIDEA69517() {
     doXPathHighlighting();
   }
 
-  public void testNumberPlusString() throws Throwable {
+  public void testNumberPlusString() {
     doXPathHighlighting();
   }
 
-  public void testUnaryExpressionType() throws Throwable {
+  public void testUnaryExpressionType() {
     doXPathHighlighting();
   }
 
-  public void testDatePlusDuration() throws Throwable {
+  public void testDatePlusDuration() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testDatePlusDate() throws Throwable {
+  public void testDatePlusDate() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testDateMinusDate() throws Throwable {
+  public void testDateMinusDate() {
     doXPathHighlighting();
   }
 
-  public void testTimeMinusTime() throws Throwable {
+  public void testTimeMinusTime() {
     doXPathHighlighting();
   }
 
-  public void testDateTimeMinusDateTime() throws Throwable {
+  public void testDateTimeMinusDateTime() {
     doXPathHighlighting();
   }
 
-  public void testTimeMinusDate() throws Throwable {
+  public void testTimeMinusDate() {
     doXPathHighlighting();
   }
 
-  public void testDateMinusDuration() throws Throwable {
+  public void testDateMinusDuration() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testDateMinusDuration2() throws Throwable {
+  public void testDateMinusDuration2() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testDurationMinusDate() throws Throwable {
+  public void testDurationMinusDate() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testNumericDivDuration() throws Throwable {
+  public void testNumericDivDuration() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testNumericIDivDuration() throws Throwable {
+  public void testNumericIDivDuration() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testDurationDivNumeric() throws Throwable {
+  public void testDurationDivNumeric() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testDurationIDivNumeric() throws Throwable {
+  public void testDurationIDivNumeric() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
 
-  public void testNumericMultString() throws Throwable {
+  public void testNumericMultString() {
     doXPathHighlighting();
   }
 
-  public void testQuantifiedExprCondition() throws Throwable {
+  public void testQuantifiedExprCondition() {
     doXPathHighlighting();
   }
 
-  public void testRedundantTypeConversion() throws Throwable {
+  public void testRedundantTypeConversion() {
     TestNamespaceContext.install(myFixture.getTestRootDisposable());
     doXPathHighlighting();
   }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathCompletionTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathCompletionTest.java
index f2606acae528..0064198e9aa4 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathCompletionTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathCompletionTest.java
@@ -17,31 +17,31 @@ package org.intellij.lang.xpath;
 
 public class XPathCompletionTest extends TestBase {
 
-  public void testAxis() throws Throwable {
+  public void testAxis() {
         doXPathCompletion("ancestor", "ancestor-or-self", "attribute");
     }
 
-    public void testAxisInsert() throws Throwable {
+    public void testAxisInsert() {
         doXPathCompletion();
     }
 
-    public void testPartialAxis() throws Throwable {
+    public void testPartialAxis() {
         doXPathCompletion("ancestor", "ancestor-or-self");
     }
 
-    public void testFunctions() throws Throwable {
+    public void testFunctions() {
         doXPathCompletion("text()", "translate(string, string, string)", "true()");
     }
 
-    public void testFunctionInsert1() throws Throwable {
+    public void testFunctionInsert1() {
         doXPathCompletion();
     }
 
-    public void testFunctionInsert2() throws Throwable {
+    public void testFunctionInsert2() {
         doXPathCompletion();
     }
 
-    private void doXPathCompletion() throws Throwable {
+    private void doXPathCompletion() {
         final String name = getTestFileName();
         myFixture.configureByFile(name + ".xpath");
         if (myFixture.completeBasic() != null) {
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathHighlightingTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathHighlightingTest.java
index e633ca52be3d..1f545562a52f 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathHighlightingTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/XPathHighlightingTest.java
@@ -33,73 +33,73 @@ public class XPathHighlightingTest extends TestBase {
       });
     }
 
-    public void testPathTypeMismatch() throws Throwable {
+    public void testPathTypeMismatch() {
         doXPathHighlighting();
     }
 
-    public void testUnknownFunction() throws Throwable {
+    public void testUnknownFunction() {
         doXPathHighlighting();
     }
 
-    public void testMissingArgument() throws Throwable {
+    public void testMissingArgument() {
         doXPathHighlighting();
     }
 
-    public void testInvalidArgument() throws Throwable {
+    public void testInvalidArgument() {
         doXPathHighlighting();
     }
 
-    public void testIndexZero() throws Throwable {
+    public void testIndexZero() {
         doXPathHighlighting();
     }
 
-    public void testSillyStep() throws Throwable {
+    public void testSillyStep() {
         doXPathHighlighting();
     }
 
-    public void testNonSillyStepIDEADEV33539() throws Throwable {
+    public void testNonSillyStepIDEADEV33539() {
         doXPathHighlighting();
     }
 
-    public void testHardwiredPrefix() throws Throwable {
+    public void testHardwiredPrefix() {
         doXPathHighlighting();
     }
 
-    public void testNumberFollowedByToken() throws Throwable {
+    public void testNumberFollowedByToken() {
       doXPathHighlighting();
     }
 
-    public void testScientificNotationNumber() throws Throwable {
+    public void testScientificNotationNumber() {
       doXPathHighlighting();
     }
 
-    public void testMalformedStringLiteral() throws Throwable {
+    public void testMalformedStringLiteral() {
       doXPathHighlighting();
     }
 
-    public void testMalformedStringLiteral2() throws Throwable {
+    public void testMalformedStringLiteral2() {
       doXPathHighlighting();
     }
 
-    public void testMalformedEmptyStringLiteral() throws Throwable {
+    public void testMalformedEmptyStringLiteral() {
       doXPathHighlighting();
     }
 
-    public void testQuotedStringLiteral() throws Throwable {
+    public void testQuotedStringLiteral() {
       doXPathHighlighting();
     }
 
     // IDEA-67413
-    public void testUnionSubExpression() throws Throwable {
+    public void testUnionSubExpression() {
       doXPathHighlighting();
     }
 
     // IDEA-102422
-    public void testPrefixedNameAnd() throws Throwable {
+    public void testPrefixedNameAnd() {
       doXPathHighlighting();
     }
 
-    private void doXPathHighlighting(String... moreFiles) throws Throwable {
+    private void doXPathHighlighting(String... moreFiles) {
         final String name = getTestFileName();
         myFixture.testHighlighting(true, false, false, ArrayUtil.append(moreFiles, name + ".xpath"));
     }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2CompletionTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2CompletionTest.java
index 441f6fa9b694..796759f2188a 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2CompletionTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2CompletionTest.java
@@ -19,20 +19,20 @@ import org.intellij.lang.xpath.TestBase;
 
 public class Xslt2CompletionTest extends TestBase {
 
-    public void testCustomFunctions() throws Throwable {
+    public void testCustomFunctions() {
         doXsltCompletion();
     }
 
-    public void testTypeCompletion() throws Throwable {
+    public void testTypeCompletion() {
         doXsltCompletion();
     }
 
-    public void testSchemaTypeCompletion() throws Throwable {
+    public void testSchemaTypeCompletion() {
       final String name = getTestFileName();
       myFixture.testCompletionTyping(name + ".xsl", "\n", name + "_after.xsl");
     }
 
-    private void doXsltCompletion(String... moreFiles) throws Throwable {
+    private void doXsltCompletion(String... moreFiles) {
         final String name = getTestFileName();
         myFixture.testCompletion(name + ".xsl", name + "_after.xsl", moreFiles);
     }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2HighlightingTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2HighlightingTest.java
index 3cd07676fd13..dec5834973e5 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2HighlightingTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2HighlightingTest.java
@@ -32,43 +32,43 @@ public class Xslt2HighlightingTest extends TestBase {
     });
   }
 
-  public void testCurrentMode() throws Throwable {
+  public void testCurrentMode() {
     doXsltHighlighting();
   }
 
-  public void testXslt2Example() throws Throwable {
+  public void testXslt2Example() {
     doXsltHighlighting();
   }
 
-  public void testNonDuplicateVariable() throws Throwable {
+  public void testNonDuplicateVariable() {
     doXsltHighlighting();
   }
 
-  public void testTypeResolving() throws Throwable {
+  public void testTypeResolving() {
     doXsltHighlighting();
   }
 
-  public void testEscapedXPathString() throws Throwable {
+  public void testEscapedXPathString() {
     doXsltHighlighting();
   }
 
-  public void testWildcardNamespace() throws Throwable {
+  public void testWildcardNamespace() {
     doXsltHighlighting();
   }
 
-  public void testUnknownSchemaType() throws Throwable {
+  public void testUnknownSchemaType() {
     doXsltHighlighting();
   }
 
-  public void testAttributeValueTemplateWithComment() throws Throwable {
+  public void testAttributeValueTemplateWithComment() {
     doXsltHighlighting();
   }
 
-  public void testSchemaTypeWithDashes() throws Throwable {
+  public void testSchemaTypeWithDashes() {
     doXsltHighlighting("move-def.xsd");
   }
 
-  private void doXsltHighlighting(String... moreFiles) throws Throwable {
+  private void doXsltHighlighting(String... moreFiles) {
     final String name = getTestFileName();
     myFixture.testHighlighting(true, false, false, ArrayUtil.mergeArrays(new String[]{ name + ".xsl" }, moreFiles));
   }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java
index 3cba5f468ce1..4af0c89c0a30 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/Xslt2RefactoringTest.java
@@ -40,15 +40,15 @@ public class Xslt2RefactoringTest extends TestBase {
     settings.getIndentOptions(StdFileTypes.XML).INDENT_SIZE = 2;
   }
 
-  public void testExtractFunction() throws Throwable {
+  public void testExtractFunction() {
     doExtractFunction();
   }
 
-  public void testExtractFunction2() throws Throwable {
+  public void testExtractFunction2() {
     doExtractFunction();
   }
 
-  private void doExtractFunction() throws Throwable {
+  private void doExtractFunction() {
     myFixture.configureByFile(getTestFileName() + ".xsl");
     final Editor editor = myFixture.getEditor();
 
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltBasicTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltBasicTest.java
index 71f40e9ddbf1..a947881ad024 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltBasicTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltBasicTest.java
@@ -22,56 +22,56 @@ import org.intellij.lang.xpath.TestBase;
 import org.intellij.lang.xpath.xslt.impl.XsltChecker;
 
 public class XsltBasicTest extends TestBase {
-  public void testSupportedXslt10() throws Throwable {
+  public void testSupportedXslt10() {
     doTestXsltSupport();
   }
 
-  public void testSupportedXslt10_Loaded() throws Throwable {
+  public void testSupportedXslt10_Loaded() {
     doTestXsltSupport();
   }
 
-  public void testSupportedXslt11() throws Throwable {
+  public void testSupportedXslt11() {
     doTestXsltSupport();
   }
 
-  public void testSupportedSimplifiedXslt() throws Throwable {
+  public void testSupportedSimplifiedXslt() {
     doTestXsltSupport();
   }
 
-  public void testSupportedSimplifiedXslt_Loaded() throws Throwable {
+  public void testSupportedSimplifiedXslt_Loaded() {
     doTestXsltSupport();
   }
 
-  public void testSupportedXslt20() throws Throwable {
+  public void testSupportedXslt20() {
     doTestXsltSupport();
   }
 
-  public void testUnsupportedXsltNoVersion() throws Throwable {
+  public void testUnsupportedXsltNoVersion() {
     doTestXsltSupport();
   }
 
-  public void testUnsupportedXsltNoVersion_Loaded() throws Throwable {
+  public void testUnsupportedXsltNoVersion_Loaded() {
     doTestXsltSupport();
   }
 
-  public void testUnsupportedNoXslt() throws Throwable {
+  public void testUnsupportedNoXslt() {
     doTestXsltSupport();
   }
 
-  public void testUnsupportedNoXslt_Loaded() throws Throwable {
+  public void testUnsupportedNoXslt_Loaded() {
     doTestXsltSupport();
   }
 
-  public void testUnsupportedNoXslt2() throws Throwable {
+  public void testUnsupportedNoXslt2() {
     doTestXsltSupport();
   }
 
   // actually a PSI test: IDEADEV-35024
-  public void testUnsupportedNoXslt2_Loaded() throws Throwable {
+  public void testUnsupportedNoXslt2_Loaded() {
     doTestXsltSupport();
   }
 
-  private void doTestXsltSupport() throws Throwable {
+  private void doTestXsltSupport() {
     configure();
 
     final XsltChecker.LanguageLevel level = XsltSupport.getXsltLanguageLevel(myFixture.getFile());
@@ -84,7 +84,7 @@ public class XsltBasicTest extends TestBase {
     }
   }
 
-  private void configure() throws Throwable {
+  private void configure() {
     final String fileName = getTestFileName();
     String path = fileName.replaceAll("_.*$", "") + ".xsl";
     final VirtualFile file = myFixture.copyFileToProject(path);
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltCompletionTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltCompletionTest.java
index 93cd0b92e699..c536f28e76a9 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltCompletionTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltCompletionTest.java
@@ -19,43 +19,43 @@ import org.intellij.lang.xpath.TestBase;
 
 public class XsltCompletionTest extends TestBase {
 
-    public void testLocalVariable() throws Throwable {
+    public void testLocalVariable() {
         doXsltCompletion();
     }
 
-    public void testGlobalVariable() throws Throwable {
+    public void testGlobalVariable() {
         doXsltCompletion();
     }
 
-    public void testTemplates() throws Throwable {
+    public void testTemplates() {
         doXsltCompletion();
     }
 
-    public void testModes() throws Throwable {
+    public void testModes() {
         doXsltCompletion();
     }
 
-    public void testNamedTemplateParams() throws Throwable {
+    public void testNamedTemplateParams() {
         doXsltCompletion();
     }
 
-    public void testIncludedTemplateParam() throws Throwable {
+    public void testIncludedTemplateParam() {
         doXsltCompletion("included.xsl");
     }
 
-    public void testApplyTemplateParams() throws Throwable {
+    public void testApplyTemplateParams() {
         doXsltCompletion();
     }
 
-    public void testIncludedVariable() throws Throwable {
+    public void testIncludedVariable() {
         doXsltCompletion("included.xsl");
     }
 
-    public void testUsedNames() throws Throwable {
+    public void testUsedNames() {
         doXsltCompletion();
     }
 
-    private void doXsltCompletion(String... moreFiles) throws Throwable {
+    private void doXsltCompletion(String... moreFiles) {
         final String name = getTestFileName();
         myFixture.testCompletion(name + ".xsl", name + "_after.xsl", moreFiles);
     }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java
index 9c85b3197772..9d7e11217bce 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java
@@ -34,104 +34,104 @@ public class XsltHighlightingTest extends TestBase {
       ApplicationManager.getApplication().runWriteAction(() -> ExternalResourceManagerEx.getInstanceEx().addIgnoredResource("urn:my"));
     }
 
-    public void xtestBackwardIncludedVariable() throws Throwable {
+    public void xtestBackwardIncludedVariable() {
         doXsltHighlighting();
     }
 
-    public void testUnknownTemplate() throws Throwable {
+    public void testUnknownTemplate() {
         doXsltHighlighting();
     }
 
-    public void testDuplicateTemplate() throws Throwable {
+    public void testDuplicateTemplate() {
         doXsltHighlighting();
     }
 
-    public void testUnknownMode() throws Throwable {
+    public void testUnknownMode() {
         doXsltHighlighting();
     }
 
-    public void testUndeclaredParam() throws Throwable {
+    public void testUndeclaredParam() {
         doXsltHighlighting();
     }
 
-    public void testMissingParam() throws Throwable {
+    public void testMissingParam() {
         doXsltHighlighting();
     }
 
-    public void testUnusedVariable() throws Throwable {
+    public void testUnusedVariable() {
         doXsltHighlighting();
     }
 
-    public void testDuplicateVariable() throws Throwable {
+    public void testDuplicateVariable() {
         doXsltHighlighting();
     }
 
-    public void testNonDuplicateVariable() throws Throwable {
+    public void testNonDuplicateVariable() {
         doXsltHighlighting();
     }
 
-    public void testShadowedVariable() throws Throwable {
+    public void testShadowedVariable() {
         doXsltHighlighting();
     }
 
-    public void testShadowedVariable2() throws Throwable {
+    public void testShadowedVariable2() {
         doXsltHighlighting();
     }
 
-    public void testValidPatterns() throws Throwable {
+    public void testValidPatterns() {
         doXsltHighlighting();
     }
 
-    public void testInvalidPattern1() throws Throwable {
+    public void testInvalidPattern1() {
         doXsltHighlighting();
     }
 
-    public void testInvalidPattern2() throws Throwable {
+    public void testInvalidPattern2() {
         doXsltHighlighting();
     }
 
-    public void testInvalidPattern3() throws Throwable {
+    public void testInvalidPattern3() {
         doXsltHighlighting();
     }
 
-    public void testInvalidPattern4() throws Throwable {
+    public void testInvalidPattern4() {
         doXsltHighlighting();
     }
 
-    public void testInvalidPattern5() throws Throwable {
+    public void testInvalidPattern5() {
         doXsltHighlighting();
     }
 
-    public void testInvalidPattern6() throws Throwable {
+    public void testInvalidPattern6() {
         doXsltHighlighting();
     }
 
-    public void testEmptyExpression() throws Throwable {
+    public void testEmptyExpression() {
         doXsltHighlighting();
     }
 
-    public void testEmptyAVT() throws Throwable {
+    public void testEmptyAVT() {
         doXsltHighlighting();
     }
 
-    public void testInvalidSingleClosingBrace() throws Throwable {
+    public void testInvalidSingleClosingBrace() {
         doXsltHighlighting();
     }
 
-    public void testEscapedXPathString() throws Throwable {
+    public void testEscapedXPathString() {
         doXsltHighlighting();
     }
 
-    public void testXsltFreeze() throws Throwable {
+    public void testXsltFreeze() {
       doXsltHighlighting();
     }
 
-    public void testTemplateWithPrefix() throws Throwable {
+    public void testTemplateWithPrefix() {
         myFixture.enableInspections(XmlUnusedNamespaceInspection.class);
         doXsltHighlighting();
     }
 
-    public void xtestPerformance() throws Throwable {
+    public void xtestPerformance() {
         myFixture.configureByFile(getTestFileName() + ".xsl");
         final long l = runHighlighting();
         assertTrue("Highlighting took " + l + "ms", l < 6000);
@@ -148,7 +148,7 @@ public class XsltHighlightingTest extends TestBase {
         });
     }
 
-    private void doXsltHighlighting() throws Throwable {
+    private void doXsltHighlighting() {
         final String name = getTestFileName();
         myFixture.testHighlighting(true, false, false, name + ".xsl");
     }
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltRefactoringTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltRefactoringTest.java
index 6277139fb22c..fb8d830b40a7 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltRefactoringTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltRefactoringTest.java
@@ -15,8 +15,11 @@
  */
 package org.intellij.lang.xpath.xslt;
 
+import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.formatter.xml.XmlCodeStyleSettings;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.intellij.lang.xpath.TestBase;
@@ -24,10 +27,6 @@ import org.intellij.lang.xpath.psi.XPathVariable;
 import org.intellij.lang.xpath.psi.XPathVariableReference;
 import org.intellij.lang.xpath.xslt.refactoring.VariableInlineHandler;
 import org.intellij.lang.xpath.xslt.refactoring.extractTemplate.XsltExtractTemplateAction;
-
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import org.jetbrains.annotations.Nullable;
 
 public class XsltRefactoringTest extends TestBase {
@@ -40,39 +39,39 @@ public class XsltRefactoringTest extends TestBase {
     settings.getIndentOptions(StdFileTypes.XML).INDENT_SIZE = 2;
   }
 
-  public void testExtractTemplate() throws Throwable {
+  public void testExtractTemplate() {
     doExtractTemplate();
   }
 
-  public void testExtractTemplateWithComment() throws Throwable {
+  public void testExtractTemplateWithComment() {
     doExtractTemplate();
   }
 
-  public void testExtractTemplateOneVar() throws Throwable {
+  public void testExtractTemplateOneVar() {
     doExtractTemplate();
   }
 
-  public void testExtractTemplateOneVar2() throws Throwable {
+  public void testExtractTemplateOneVar2() {
     doExtractTemplate();
   }
 
-  public void testExtractTemplateTwoVars() throws Throwable {
+  public void testExtractTemplateTwoVars() {
     doExtractTemplate();
   }
 
-  public void testExtractTemplateTwoVars2() throws Throwable {
+  public void testExtractTemplateTwoVars2() {
     doExtractTemplate();
   }
 
-  public void testExtractTemplateUnresolvedVar() throws Throwable {
+  public void testExtractTemplateUnresolvedVar() {
     doExtractTemplate();
   }
 
-  public void testExtractTemplateUnresolvedVar2() throws Throwable {
+  public void testExtractTemplateUnresolvedVar2() {
     doExtractTemplate();
   }
 
-  private void doExtractTemplate() throws Throwable {
+  private void doExtractTemplate() {
     myFixture.configureByFile(getTestFileName() + ".xsl");
 
     final XsltExtractTemplateAction action = new XsltExtractTemplateAction();
@@ -81,15 +80,15 @@ public class XsltRefactoringTest extends TestBase {
     myFixture.checkResultByFile(getTestFileName() + "_after.xsl");
   }
 
-  public void testInlineVariable() throws Throwable {
+  public void testInlineVariable() {
     doInlineVariable();
   }
 
-  public void testInlineVariableOnDecl() throws Throwable {
+  public void testInlineVariableOnDecl() {
     doInlineVariable();
   }
 
-  private void doInlineVariable() throws Throwable {
+  private void doInlineVariable() {
     myFixture.configureByFile(getTestFileName() + ".xsl");
 
     final XPathVariable variable = findVariable();
diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltResolveTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltResolveTest.java
index 3d22b908064e..1c036a0d758f 100644
--- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltResolveTest.java
+++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltResolveTest.java
@@ -62,7 +62,7 @@ public class XsltResolveTest extends TestBase {
         assertNotNull(template.getName());
     }
 
-    public void testResolveIncludedTemplateParam() throws Throwable {
+    public void testResolveIncludedTemplateParam() {
         final String name = getTestFileName();
         final PsiReference reference = myFixture.getReferenceAtCaretPositionWithAssertion(name + ".xsl", "included.xsl");
 
@@ -90,7 +90,7 @@ public class XsltResolveTest extends TestBase {
         return null;
     }
 
-    private XsltVariable doVariableResolveTest(boolean global) throws Throwable {
+    private XsltVariable doVariableResolveTest(boolean global) {
         final PsiReference reference = findInjectedReferenceAtCaret();
 
         final PsiElement element = reference.resolve();
@@ -103,7 +103,7 @@ public class XsltResolveTest extends TestBase {
         return var;
     }
 
-    private XsltFunction doFunctionResolveTest(String... files) throws Throwable {
+    private XsltFunction doFunctionResolveTest(String... files) {
         final PsiReference reference = findInjectedReferenceAtCaret(files);
 
         final PsiElement element = reference.resolve();
@@ -117,7 +117,7 @@ public class XsltResolveTest extends TestBase {
     }
 
     @NotNull
-    private PsiReference findInjectedReferenceAtCaret(String... moreFiles) throws Throwable {
+    private PsiReference findInjectedReferenceAtCaret(String... moreFiles) {
         configure(moreFiles);
 
         final PsiElement e = myFixture.getFile().findElementAt(myFixture.getEditor().getCaretModel().getOffset());
@@ -128,7 +128,7 @@ public class XsltResolveTest extends TestBase {
         return reference;
     }
 
-    private void configure(String... moreFiles) throws Throwable {
+    private void configure(String... moreFiles) {
       myFixture.configureByFiles(ArrayUtil.mergeArrays(new String[]{getTestFileName() + ".xsl"}, moreFiles));
     }
 
diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java
index a0267bd03810..b719a779cbf9 100644
--- a/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java
+++ b/plugins/yaml/testSrc/org/jetbrains/yaml/lexer/YAMLLexerTest.java
@@ -149,23 +149,23 @@ public class YAMLLexerTest extends LexerTestCase {
     doTest();
   }
 
-  public void testRuby14864() throws Throwable {
+  public void testRuby14864() {
     doTest();
   }
 
-  public void testRuby15402() throws Throwable {
+  public void testRuby15402() {
     doTest();
   }
 
-  public void testRuby17389() throws Throwable {
+  public void testRuby17389() {
     doTest();
   }
 
-  public void testRuby19105() throws Throwable {
+  public void testRuby19105() {
     doTest();
   }
 
-  public void testEmptyMultiline() throws Throwable {
+  public void testEmptyMultiline() {
     doTest();
   }
 
diff --git a/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/WebSocketConnectionTest.java b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/WebSocketConnectionTest.java
index 186239aae30e..da7978ebef8e 100644
--- a/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/WebSocketConnectionTest.java
+++ b/python/ipnb/testSrc/org/jetbrains/plugins/ipnb/WebSocketConnectionTest.java
@@ -31,7 +31,7 @@ import static org.jetbrains.plugins.ipnb.run.IpnbCommandLineState.getHostPortFro
  */
 public class WebSocketConnectionTest extends TestCase {
   @Override
-  protected void setUp() throws Exception {
+  protected void setUp() {
     //WebSocketImpl.DEBUG = true;
     Assume.assumeTrue(pingHost(getTestServerURI()));
   }
diff --git a/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java b/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java
index 11cbedc50816..c69d5ea8f54b 100644
--- a/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java
+++ b/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java
@@ -103,7 +103,7 @@ public class PythonCodeInsightSanityTest extends PyEnvTestCase {
     final String subfolder = "sanity";
     runTest(new PyExecutionFixtureTestTask(subfolder) {
       @Override
-      public void runTestOn(String sdkHome) throws Exception {
+      public void runTestOn(String sdkHome) {
         ApplicationManager.getApplication().invokeAndWait(() -> {
           final Pair<String, CodeInsightTestFixture> pathAndFixture =
             Pair.create(new File(myFixture.getTestDataPath(), subfolder).getPath(), myFixture);
diff --git a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineArgsTest.java b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineArgsTest.java
index 073dbd831e50..631e6f980970 100644
--- a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineArgsTest.java
+++ b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineArgsTest.java
@@ -32,7 +32,7 @@ public final class CommandLineArgsTest extends PyTestCase {
   /**
    * Ensures argument is returned if exists
    */
-  public void testArgsRequired() throws Exception {
+  public void testArgsRequired() {
     CommandTestTools.initFileType();
     validateNextArgument("command", "positional_argument");
   }
@@ -40,7 +40,7 @@ public final class CommandLineArgsTest extends PyTestCase {
   /**
    * Ensures option argument is returned if exists
    */
-  public void testOptionArgsRequired() throws Exception {
+  public void testOptionArgsRequired() {
     CommandTestTools.initFileType();
     validateNextArgument("command positional_argument --available-option", "option argument");
   }
@@ -48,7 +48,7 @@ public final class CommandLineArgsTest extends PyTestCase {
   /**
    * Ensures argument is not returned if not required
    */
-  public void testNoMoreArgs() throws Exception {
+  public void testNoMoreArgs() {
     CommandTestTools.initFileType();
     final CommandLineFile file = CommandTestTools.createFileByText(myFixture, "command foo bar spam eggs");
     final ValidationResult validationResult = file.getValidationResult();
diff --git a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineInspectionTest.java b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineInspectionTest.java
index 30d46039b4b3..500034d39215 100644
--- a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineInspectionTest.java
+++ b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineInspectionTest.java
@@ -38,21 +38,21 @@ public final class CommandLineInspectionTest extends PyTestCase {
   /**
    * Everything should be ok
    */
-  public void testGoodCommandLine() throws Exception {
+  public void testGoodCommandLine() {
     doTest();
   }
 
   /**
    * No command provided in file
    */
-  public void testBadCommandLineNoCommand() throws Exception {
+  public void testBadCommandLineNoCommand() {
     doTest();
   }
 
   /**
    * Command provided, but args and opts have errors
    */
-  public void testBadCommandLineWithCommand() throws Exception {
+  public void testBadCommandLineWithCommand() {
     doTest();
   }
 
diff --git a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineParserTest.java b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineParserTest.java
index 9f8996f3c07c..43a1789cd648 100644
--- a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineParserTest.java
+++ b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineParserTest.java
@@ -37,7 +37,7 @@ public final class CommandLineParserTest extends ParsingTestCase {
     return CommandTestTools.TEST_PATH;
   }
 
-  public void testSpaces() throws Exception {
+  public void testSpaces() {
     doTest(true);
     final CommandLineFile commandLineFile = (CommandLineFile)myFile;
     Assert.assertEquals("Bad argument value", "spam and eggs", commandLineFile.getArguments().iterator().next().getValueNoQuotes());
@@ -49,21 +49,21 @@ public final class CommandLineParserTest extends ParsingTestCase {
   /**
    * Should be ok
    */
-  public void testCommandLine() throws Exception {
+  public void testCommandLine() {
     doTest(true);
   }
 
   /**
    * Should have a lot of errors
    */
-  public void testJunk() throws Exception {
+  public void testJunk() {
     doTest(true);
   }
 
   /**
    * Should have error because option ends with "="
    */
-  public void testOptionNoValueJunk() throws Exception {
+  public void testOptionNoValueJunk() {
     doTest(true);
   }
 }
diff --git a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineSuggestionTest.java b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineSuggestionTest.java
index 17a9285266b1..6f80c2ae43c8 100644
--- a/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineSuggestionTest.java
+++ b/python/testSrc/com/jetbrains/commandInterface/commandLine/CommandLineSuggestionTest.java
@@ -34,7 +34,7 @@ public final class CommandLineSuggestionTest extends PyTestCase {
   /**
    * Ensures suggestions are correct
    */
-  public void testSuggestions() throws Exception {
+  public void testSuggestions() {
     CommandTestTools.initFileType();
     CommandTestTools.createFileByText(myFixture, "command positional_ar --a");
 
diff --git a/python/testSrc/com/jetbrains/env/CommandBasedProcessRunner.java b/python/testSrc/com/jetbrains/env/CommandBasedProcessRunner.java
index 215db57f267c..f4c3c5943635 100644
--- a/python/testSrc/com/jetbrains/env/CommandBasedProcessRunner.java
+++ b/python/testSrc/com/jetbrains/env/CommandBasedProcessRunner.java
@@ -15,7 +15,6 @@
  */
 package com.jetbrains.env;
 
-import com.intellij.execution.ExecutionException;
 import com.intellij.execution.process.ProcessListener;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
@@ -58,8 +57,7 @@ public class CommandBasedProcessRunner extends ProcessWithConsoleRunner {
   void runProcess(@NotNull final String sdkPath,
                   @NotNull final Project project,
                   @NotNull final ProcessListener processListener,
-                  @NotNull final String tempWorkingPath)
-    throws ExecutionException {
+                  @NotNull final String tempWorkingPath) {
     myConsole = new SimpleProcessRunnerConsole(project, processListener);
     myCommand.execute(myCommand.getName(), myModule, myParameters, myConsole);
   }
diff --git a/python/testSrc/com/jetbrains/env/PyCaseSensitiveResolveTest.java b/python/testSrc/com/jetbrains/env/PyCaseSensitiveResolveTest.java
index badd3bfa39f8..31ff1e77fa50 100644
--- a/python/testSrc/com/jetbrains/env/PyCaseSensitiveResolveTest.java
+++ b/python/testSrc/com/jetbrains/env/PyCaseSensitiveResolveTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
  */
 public final class PyCaseSensitiveResolveTest extends PyEnvTestCase {
   @Test
-  public void testCaseSensitive() throws Exception {
+  public void testCaseSensitive() {
     runTest(new PyExecutionFixtureTestTask(null) {
       @NotNull
       @Override
diff --git a/python/testSrc/com/jetbrains/env/PyEnvTestCase.java b/python/testSrc/com/jetbrains/env/PyEnvTestCase.java
index fec19ea237af..ece7608f13a3 100644
--- a/python/testSrc/com/jetbrains/env/PyEnvTestCase.java
+++ b/python/testSrc/com/jetbrains/env/PyEnvTestCase.java
@@ -136,7 +136,7 @@ public abstract class PyEnvTestCase {
   }
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     if (myRequiredTags != null) { // Ensure all tags exist between available interpreters
       Assume.assumeThat(
         "Can't find some tags between all available interpreter, test (all methods) will be skipped",
@@ -159,7 +159,7 @@ public abstract class PyEnvTestCase {
     return allAvailableTags;
   }
 
-  protected void invokeTestRunnable(@NotNull final Runnable runnable) throws Exception {
+  protected void invokeTestRunnable(@NotNull final Runnable runnable) {
     if (runInWriteAction()) {
       UIUtil.invokeAndWaitIfNeeded((Runnable)() -> ApplicationManager.getApplication().runWriteAction(runnable));
     }
@@ -351,7 +351,7 @@ public abstract class PyEnvTestCase {
    * Always call parrent when overwrite
    */
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     // We can stop message capturing even if it was not started as cleanup process.
     stopMessageCapture();
   }
diff --git a/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java b/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java
index 92fdfdbbe785..a45691f061bc 100644
--- a/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java
+++ b/python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java
@@ -32,7 +32,6 @@ import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -181,14 +180,14 @@ public abstract class PyExecutionFixtureTestTask extends PyTestTask {
     return null;
   }
 
-  protected void disposeProcess(ProcessHandler h) throws InterruptedException {
+  protected void disposeProcess(ProcessHandler h) {
     h.destroyProcess();
     if (!waitFor(h)) {
       new Throwable("Can't stop process").printStackTrace();
     }
   }
 
-  protected boolean waitFor(ProcessHandler p) throws InterruptedException {
+  protected boolean waitFor(ProcessHandler p) {
     return p.waitFor(myTimeout);
   }
 
@@ -240,7 +239,7 @@ public abstract class PyExecutionFixtureTestTask extends PyTestTask {
    */
   @NotNull
   protected Sdk createTempSdk(@NotNull final String sdkHome, @NotNull final SdkCreationType sdkCreationType)
-    throws InvalidSdkException, IOException {
+    throws InvalidSdkException {
     final VirtualFile sdkHomeFile = LocalFileSystem.getInstance().findFileByPath(sdkHome);
     Assert.assertNotNull("Interpreter file not found: " + sdkHome, sdkHomeFile);
     final Sdk sdk = PyTestSdkTools.createTempSdk(sdkHomeFile, sdkCreationType, myFixture.getModule());
diff --git a/python/testSrc/com/jetbrains/env/PyProcessWithConsoleTestTask.java b/python/testSrc/com/jetbrains/env/PyProcessWithConsoleTestTask.java
index f07ae829a62a..f2669f4aa5fa 100644
--- a/python/testSrc/com/jetbrains/env/PyProcessWithConsoleTestTask.java
+++ b/python/testSrc/com/jetbrains/env/PyProcessWithConsoleTestTask.java
@@ -29,7 +29,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
@@ -98,7 +97,7 @@ public abstract class PyProcessWithConsoleTestTask<T extends ProcessWithConsoleR
     Disposer.dispose(runner);
   }
 
-  private void executeRunner(final String sdkHome, final T runner) throws InterruptedException, InvocationTargetException {
+  private void executeRunner(final String sdkHome, final T runner) throws InterruptedException {
     // Semaphore to wait end of process
     final Semaphore processStartedSemaphore = new Semaphore(1);
     processStartedSemaphore.acquire();
diff --git a/python/testSrc/com/jetbrains/env/PyToxTest.java b/python/testSrc/com/jetbrains/env/PyToxTest.java
index 89499f9be7c4..3f805361d8e3 100644
--- a/python/testSrc/com/jetbrains/env/PyToxTest.java
+++ b/python/testSrc/com/jetbrains/env/PyToxTest.java
@@ -119,7 +119,7 @@ public final class PyToxTest extends PyEnvTestCase {
    * Checks empty envs for all but 2.7
    */
   @Test
-  public void textToxOneInterpreter() throws Exception {
+  public void textToxOneInterpreter() {
     runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxOneInterpreter/", 0,
                                                      () -> new MyTestProcessRunner(),
                                                      Arrays.asList(
@@ -137,7 +137,7 @@ public final class PyToxTest extends PyEnvTestCase {
    * Ensures test is not launched 2 times because folder added 2 times
    */
   @Test
-  public void testDoubleRun() throws Exception {
+  public void testDoubleRun() {
     runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxDoubleRun/", 1,
                                                      () -> new MyTestProcessRunner(),
                                                      Collections.singletonList(
@@ -169,7 +169,7 @@ public final class PyToxTest extends PyEnvTestCase {
    * Ensures rerun works for tox
    */
   @Test
-  public void testEnvRerun() throws Exception {
+  public void testEnvRerun() {
     runPythonTest(new MyPyProcessWithConsoleTestTask("/toxtest/toxConcreteEnv/", 0,
                                                      () -> new MyTestProcessRunner(1),
                                                      Arrays.asList(
@@ -187,13 +187,13 @@ public final class PyToxTest extends PyEnvTestCase {
    * Provide certain env and check it is launched
    */
   @Test
-  public void testConcreteEnv() throws Exception {
+  public void testConcreteEnv() {
     final String[] envsToRun = {"py27", "py34"};
     runPythonTest(
       new PyProcessWithConsoleTestTask<PyAbstractTestProcessRunner<PyToxConfiguration>>("/toxtest/toxSuccess/", SdkCreationType.EMPTY_SDK) {
         @NotNull
         @Override
-        protected PyAbstractTestProcessRunner<PyToxConfiguration> createProcessRunner() throws Exception {
+        protected PyAbstractTestProcessRunner<PyToxConfiguration> createProcessRunner() {
           return new PyAbstractTestProcessRunner<PyToxConfiguration>(PyToxConfigurationFactory.INSTANCE, PyToxConfiguration.class, 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull final PyToxConfiguration configuration) throws IOException {
@@ -376,7 +376,7 @@ public final class PyToxTest extends PyEnvTestCase {
 
     @NotNull
     @Override
-    protected MyTestProcessRunner createProcessRunner() throws Exception {
+    protected MyTestProcessRunner createProcessRunner() {
       return myRunnerSupplier.get();
     }
   }
diff --git a/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java b/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java
index 0d2c91ef6e1a..73ee1c39e058 100644
--- a/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java
+++ b/python/testSrc/com/jetbrains/env/python/IPythonConsoleTest.java
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class IPythonConsoleTest extends PyEnvTestCase {
   @Test
-  public void testQuestion() throws Exception {
+  public void testQuestion() {
     runPythonTest(new IPythonTask() {
       @Override
       public void testing() throws Exception {
@@ -39,7 +39,7 @@ public class IPythonConsoleTest extends PyEnvTestCase {
 
   @Test
   @Staging
-  public void testParsing() throws Exception {
+  public void testParsing() {
     runPythonTest(new IPythonTask() {
       @Override
       public void testing() throws Exception {
@@ -65,7 +65,7 @@ public class IPythonConsoleTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testParsingNoIPython() throws Exception {
+  public void testParsingNoIPython() {
     runPythonTest(new IPythonTask() {
       @Override
       public void testing() throws Exception {
diff --git a/python/testSrc/com/jetbrains/env/python/PyDynamicTypesTest.java b/python/testSrc/com/jetbrains/env/python/PyDynamicTypesTest.java
index 37dc7e78bd8c..e309ce18e7a0 100644
--- a/python/testSrc/com/jetbrains/env/python/PyDynamicTypesTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PyDynamicTypesTest.java
@@ -41,7 +41,7 @@ public class PyDynamicTypesTest extends PyEnvTestCase {
   
   @Staging
   @Test
-  public void test1() throws Exception {
+  public void test1() {
     doTest(getTestName(true) + ".py");
   }
 
@@ -49,7 +49,7 @@ public class PyDynamicTypesTest extends PyEnvTestCase {
     runPythonTest(new PyDebuggerTask("/" + "dynamicTypes", scriptName) {
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         PyDebuggerOptionsProvider.getInstance(myFixture.getProject()).setSaveCallSignatures(true);
       }
 
diff --git a/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java b/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java
index 86fbcb21b716..96538e48f13b 100644
--- a/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class PythonConsoleTest extends PyEnvTestCase {
   @Test
-  public void testConsolePrint() throws Exception {
+  public void testConsolePrint() {
     runPythonTest(new PyConsoleTask() {
       @Override
       public void testing() throws Exception {
@@ -34,7 +34,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testExecuteMultiline() throws Exception {   //PY-4329
+  public void testExecuteMultiline() {   //PY-4329
     runPythonTest(new PyConsoleTask() {
       @Override
       public void testing() throws Exception {
@@ -56,7 +56,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
 
   @Test
   @Staging
-  public void testInterruptAsync() throws Exception {
+  public void testInterruptAsync() {
     runPythonTest(new PyConsoleTask() {
       @Override
       public void testing() throws Exception {
@@ -80,7 +80,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testLineByLineInput() throws Exception {
+  public void testLineByLineInput() {
     runPythonTest(new PyConsoleTask() {
       @Override
       public void testing() throws Exception {
@@ -95,7 +95,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
 
 
   @Test
-  public void testVariablesView() throws Exception {
+  public void testVariablesView() {
     runPythonTest(new PyConsoleTask() {
       @Override
       public void testing() throws Exception {
@@ -110,7 +110,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testCompoundVariable() throws Exception {
+  public void testCompoundVariable() {
     runPythonTest(new PyConsoleTask() {
       @Override
       public void testing() throws Exception {
@@ -126,7 +126,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testChangeVariable() throws Exception {
+  public void testChangeVariable() {
     runPythonTest(new PyConsoleTask() {
       @Override
       public void testing() throws Exception {
diff --git a/python/testSrc/com/jetbrains/env/python/PythonDataViewerTest.java b/python/testSrc/com/jetbrains/env/python/PythonDataViewerTest.java
index 81ffcd89ccad..cf9bb8185a6c 100644
--- a/python/testSrc/com/jetbrains/env/python/PythonDataViewerTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PythonDataViewerTest.java
@@ -29,7 +29,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Set;
 
@@ -39,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 public class PythonDataViewerTest extends PyEnvTestCase {
 
   @Test
-  public void testDataFrameChunkRetrieval() throws Exception {
+  public void testDataFrameChunkRetrieval() {
     runPythonTest(new PyDataFrameDebuggerTask(getRelativeTestDataPath(), "test_dataframe.py", ImmutableSet.of(7, 15, 22)) {
       @Override
       public void testing() throws Exception {
@@ -62,7 +61,7 @@ public class PythonDataViewerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testMultiIndexDataFrame() throws Exception {
+  public void testMultiIndexDataFrame() {
     runPythonTest(new PyDataFrameDebuggerTask(getRelativeTestDataPath(), "test_dataframe_multiindex.py", ImmutableSet.of(5, 10)) {
       @Override
       public void testing() throws Exception {
@@ -78,7 +77,7 @@ public class PythonDataViewerTest extends PyEnvTestCase {
 
   @Test
   @Staging
-  public void testSeries() throws Exception {
+  public void testSeries() {
     runPythonTest(new PyDataFrameDebuggerTask(getRelativeTestDataPath(), "test_series.py", ImmutableSet.of(7)) {
       @Override
       public void testing() throws Exception {
@@ -105,7 +104,7 @@ public class PythonDataViewerTest extends PyEnvTestCase {
     }
 
     protected void doTest(String name, int expectedRows, int expectedColumns, @Nullable Consumer<ArrayChunk> test)
-      throws InvocationTargetException, InterruptedException, PyDebuggerException {
+      throws InterruptedException, PyDebuggerException {
       waitForPause();
       ArrayChunk arrayChunk = getDefaultChunk(name, mySession);
       testShape(arrayChunk, expectedRows, expectedColumns);
@@ -116,7 +115,7 @@ public class PythonDataViewerTest extends PyEnvTestCase {
     }
 
     @Override
-    public void before() throws Exception {
+    public void before() {
       for (Integer line : myLines) {
         toggleBreakpoint(getScriptName(), line);
       }
diff --git a/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
index 1f2ef72a2115..b773c2e9ba7b 100644
--- a/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
@@ -49,7 +49,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
     }
 
     @Override
-    public void before() throws Exception {
+    public void before() {
       toggleBreakpoint(getFilePath(getScriptName()), 3);
       setWaitForTermination(false);
     }
@@ -75,7 +75,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testBreakpointStopAndEval() throws Exception {
+  public void testBreakpointStopAndEval() {
     runPythonTest(new BreakpointStopAndEvalTask("test1.py"));
   }
 
@@ -110,7 +110,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         return new PyUnitTestProcessRunner(script, 0);
       }
 
@@ -145,10 +145,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testConditionalBreakpoint() throws Exception {
+  public void testConditionalBreakpoint() {
     runPythonTest(new PyDebuggerTask("/debug", "test1.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 3);
         XDebuggerTestUtil.setBreakpointCondition(getProject(), 3, "i == 1 or i == 11 or i == 111");
         setWaitForTermination(false);
@@ -176,10 +176,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testDebugConsole() throws Exception {
+  public void testDebugConsole() {
     runPythonTest(new PyDebuggerTask("/debug", "test1.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 3);
         setWaitForTermination(false);
       }
@@ -225,10 +225,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testDebugCompletion() throws Exception {
+  public void testDebugCompletion() {
     runPythonTest(new PyDebuggerTask("/debug", "test4.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 3);
       }
 
@@ -243,10 +243,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testBreakpointLogExpression() throws Exception {
+  public void testBreakpointLogExpression() {
     runPythonTest(new PyDebuggerTask("/debug", "test1.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 3);
         XDebuggerTestUtil.setBreakpointLogExpression(getProject(), 3, "'i = %d'%i");
         setWaitForTermination(false);
@@ -262,10 +262,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testStepOver() throws Exception {
+  public void testStepOver() {
     runPythonTest(new PyDebuggerTask("/debug", "test2.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 5);
       }
 
@@ -282,10 +282,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testStepInto() throws Exception {
+  public void testStepInto() {
     runPythonTest(new PyDebuggerTask("/debug", "test2.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 5);
       }
 
@@ -306,11 +306,11 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testStepIntoMyCode() throws Exception {
+  public void testStepIntoMyCode() {
     runPythonTest(new PyDebuggerTask("/debug", "test_my_code.py") {
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 5);
         toggleBreakpoint(getFilePath(getScriptName()), 7);
       }
@@ -332,10 +332,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testSmartStepInto() throws Exception {
+  public void testSmartStepInto() {
     runPythonTest(new PyDebuggerTask("/debug", "test3.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 14);
       }
 
@@ -352,10 +352,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testSmartStepInto2() throws Exception {
+  public void testSmartStepInto2() {
     runPythonTest(new PyDebuggerTask("/debug", "test3.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 18);
         toggleBreakpoint(getFilePath(getScriptName()), 25);
       }
@@ -372,10 +372,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testInput() throws Exception {
+  public void testInput() {
     runPythonTest(new PyDebuggerTask("/debug", "test_input.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         setWaitForTermination(false);
       }
 
@@ -395,10 +395,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testRunToLine() throws Exception {
+  public void testRunToLine() {
     runPythonTest(new PyDebuggerTask("/debug", "test_runtoline.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 7);
         toggleBreakpoint(getFilePath(getScriptName()), 14);
         setWaitForTermination(false);
@@ -425,10 +425,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testExceptionBreakpointOnTerminate() throws Exception {
+  public void testExceptionBreakpointOnTerminate() {
     runPythonTest(new PyDebuggerTask("/debug", "test_exceptbreak.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         createExceptionBreakZeroDivisionError(myFixture, true, false, false);
       }
 
@@ -468,10 +468,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testExceptionBreakpointOnFirstRaise() throws Exception {
+  public void testExceptionBreakpointOnFirstRaise() {
     runPythonTest(new PyDebuggerTask("/debug", "test_exceptbreak.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         createExceptionBreak(myFixture, false, true, true);
       }
 
@@ -520,11 +520,11 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testExceptionBreakpointIgnoreLibrariesOnRaise() throws Exception {
+  public void testExceptionBreakpointIgnoreLibrariesOnRaise() {
     runPythonTest(new PyDebuggerTask("/debug", "test_ignore_lib.py") {
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         createExceptionBreak(myFixture, false, true, true);
       }
 
@@ -545,11 +545,11 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testExceptionBreakpointIgnoreLibrariesOnTerminate() throws Exception {
+  public void testExceptionBreakpointIgnoreLibrariesOnTerminate() {
     runPythonTest(new PyDebuggerTask("/debug", "test_ignore_lib.py") {
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         createExceptionBreak(myFixture, true, false, true);
       }
 
@@ -570,11 +570,11 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testExceptionBreakpointConditionOnRaise() throws Exception {
+  public void testExceptionBreakpointConditionOnRaise() {
     runPythonTest(new PyDebuggerTask("/debug", "test_exceptbreak.py") {
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         createExceptionBreak(myFixture, false, true, true, "__exception__[0] == ZeroDivisionError", null);
       }
 
@@ -596,11 +596,11 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
 
   @Test
-  public void testExceptionBreakpointConditionOnTerminate() throws Exception {
+  public void testExceptionBreakpointConditionOnTerminate() {
     runPythonTest(new PyDebuggerTask("/debug", "test_exceptbreak.py") {
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         createExceptionBreak(myFixture, true, false, false, "__exception__[0] == ZeroDivisionError", null);
       }
 
@@ -621,10 +621,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testMultithreading() throws Exception {
+  public void testMultithreading() {
     runPythonTest(new PyDebuggerTask("/debug", "test_multithread.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 10);
         toggleBreakpoint(getFilePath(getScriptName()), 16);
         setWaitForTermination(false);
@@ -650,10 +650,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
   @Test
   @StagingOn(os = TestEnv.WINDOWS)
-  public void testEggDebug() throws Exception {
+  public void testEggDebug() {
     runPythonTest(new PyDebuggerTask("/debug", "test_egg.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         String egg = getFilePath("Adder-0.1.egg");
         toggleBreakpointInEgg(egg, "adder/adder.py", 2);
         PythonSdkFlavor flavor = PythonSdkFlavor.getFlavor(getRunConfiguration().getSdkHome());
@@ -682,13 +682,13 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
 
   @Test
-  public void testWinEggDebug() throws Exception {
+  public void testWinEggDebug() {
     if (UsefulTestCase.IS_UNDER_TEAMCITY && !SystemInfo.isWindows) {
       return; // Only needs to run on windows
     }
     runPythonTest(new PyDebuggerTask("/debug", "test_winegg.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         String egg = getFilePath("wintestegg-0.1.egg");
         toggleBreakpointInEgg(egg, "eggxample/lower_case.py", 2);
         toggleBreakpointInEgg(egg, "eggxample/MIXED_case.py", 2);
@@ -722,13 +722,13 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testWinLongName() throws Exception {
+  public void testWinLongName() {
     if (!SystemInfo.isWindows) {
       return; // Only needs to run on windows
     }
     runPythonTest(new PyDebuggerTask("/debug", "long_n~1.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         String longName = "long_name_win_test.py";
         toggleBreakpoint(longName, 2);
       }
@@ -750,10 +750,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
 
   @Test
-  public void testStepOverConditionalBreakpoint() throws Exception {
+  public void testStepOverConditionalBreakpoint() {
     runPythonTest(new PyDebuggerTask("/debug", "test_stepOverCondition.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 1);
         toggleBreakpoint(getScriptName(), 2);
         XDebuggerTestUtil.setBreakpointCondition(getProject(), 2, "y == 3");
@@ -770,7 +770,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testMultiprocess() throws Exception {
+  public void testMultiprocess() {
     runPythonTest(new PyDebuggerTask("/debug", "test_multiprocess.py") {
       @Override
       protected void init() {
@@ -778,7 +778,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 9);
       }
 
@@ -802,7 +802,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testMultiprocessingSubprocess() throws Exception {
+  public void testMultiprocessingSubprocess() {
     runPythonTest(new PyDebuggerTask("/debug", "test_multiprocess_args.py") {
       @Override
       protected void init() {
@@ -810,7 +810,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath("test_remote.py"), 2);
         setWaitForTermination(false);
       }
@@ -833,7 +833,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testPyQtQThreadInheritor() throws Exception {
+  public void testPyQtQThreadInheritor() {
     if (UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows) {
       return; //Don't run under Windows
     }
@@ -845,7 +845,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 8);
       }
 
@@ -874,7 +874,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testPyQtMoveToThread() throws Exception {
+  public void testPyQtMoveToThread() {
     if (UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows) {
       return; //Don't run under Windows
     }
@@ -886,7 +886,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 10);
       }
 
@@ -916,7 +916,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
 
   @Test
-  public void testPyQtQRunnableInheritor() throws Exception {
+  public void testPyQtQRunnableInheritor() {
     if (UsefulTestCase.IS_UNDER_TEAMCITY && SystemInfo.isWindows) {
       return; //Don't run under Windows
     }
@@ -928,7 +928,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 9);
       }
 
@@ -958,7 +958,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
 
   @Test
-  public void testStepOverYieldFrom() throws Exception {
+  public void testStepOverYieldFrom() {
     runPythonTest(new PyDebuggerTask("/debug", "test_step_over_yield.py") {
       @Override
       protected void init() {
@@ -966,7 +966,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 6);
       }
 
@@ -1005,11 +1005,11 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testSteppingFilter() throws Exception {
+  public void testSteppingFilter() {
     runPythonTest(new PyDebuggerTask("/debug", "test_stepping_filter.py") {
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 4);
         List<PySteppingFilter> filters = new ArrayList<>();
         filters.add(new PySteppingFilter(true, "*/test_m?_code.py"));
@@ -1040,10 +1040,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testReturnValues() throws Exception {
+  public void testReturnValues() {
     runPythonTest(new PyDebuggerTask("/debug", "test_return_values.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 2);
         final PyDebuggerSettings debuggerSettings = PyDebuggerSettings.getInstance();
         debuggerSettings.setWatchReturnValues(true);
@@ -1079,7 +1079,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
   @Test
   @Staging
-  public void testSuspendAllThreadsPolicy() throws Exception {
+  public void testSuspendAllThreadsPolicy() {
     runPythonTest(new PyDebuggerTask("/debug", "test_two_threads.py") {
       @Override
       protected void init() {
@@ -1087,7 +1087,7 @@ public class PythonDebuggerTest extends PyEnvTestCase {
       }
 
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 17);
         setBreakpointSuspendPolicy(getProject(), 17, SuspendPolicy.ALL);
         setWaitForTermination(false);
@@ -1111,10 +1111,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
   @Test
   @Staging
-  public void testSuspendAllThreadsResume() throws Exception {
+  public void testSuspendAllThreadsResume() {
     runPythonTest(new PyDebuggerTask("/debug", "test_two_threads_resume.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 10);
         setBreakpointSuspendPolicy(getProject(), 10, SuspendPolicy.ALL);
         setWaitForTermination(false);
@@ -1139,10 +1139,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testSuspendOneThreadPolicy() throws Exception {
+  public void testSuspendOneThreadPolicy() {
     runPythonTest(new PyDebuggerTask("/debug", "test_two_threads.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 17);
         setBreakpointSuspendPolicy(getProject(), 17, SuspendPolicy.THREAD);
         setWaitForTermination(false);
@@ -1160,10 +1160,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
   @Test
   @Staging
-  public void testShowReferringObjects() throws Exception {
+  public void testShowReferringObjects() {
     runPythonTest(new PyDebuggerTask("/debug", "test_ref.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath(getScriptName()), 3);
       }
 
@@ -1183,10 +1183,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testResume() throws Exception {
+  public void testResume() {
     runPythonTest(new PyDebuggerTask("/debug", "test_resume.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 1);
       }
 
@@ -1203,12 +1203,12 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testResumeAfterStepping() throws Exception {
+  public void testResumeAfterStepping() {
     // This test case is important for frame evaluation debugging, because we reuse old tracing function for stepping and there were
     // some problems with switching between frame evaluation and tracing
     runPythonTest(new PyDebuggerTask("/debug", "test_resume_after_step.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 2);
         toggleBreakpoint(getScriptName(), 5);
         toggleBreakpoint(getScriptName(), 12);
@@ -1235,10 +1235,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testAddBreakWhileRunning() throws Exception {
+  public void testAddBreakWhileRunning() {
     runPythonTest(new PyDebuggerTask("/debug", "test_resume_after_step.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 2);
         toggleBreakpoint(getScriptName(), 3);
       }
@@ -1260,10 +1260,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testAddBreakAfterRemove() throws Exception {
+  public void testAddBreakAfterRemove() {
     runPythonTest(new PyDebuggerTask("/debug", "test1.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 2);
       }
 
@@ -1295,10 +1295,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
   @Staging
   @Test
-  public void testBreakOnContinuationLine() throws Exception {
+  public void testBreakOnContinuationLine() {
     runPythonTest(new PyDebuggerTask("/debug", "test_continuation.py") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getScriptName(), 11);
         setWaitForTermination(false);
       }
@@ -1327,10 +1327,10 @@ public class PythonDebuggerTest extends PyEnvTestCase {
 
   @Staging
   @Test
-  public void testModuleInterpreterOption() throws Exception {
+  public void testModuleInterpreterOption() {
     runPythonTest(new BreakpointStopAndEvalTask("test1") {
       @Override
-      public void before() throws Exception {
+      public void before() {
         toggleBreakpoint(getFilePath("test1.py"), 3);
         setScriptName("test1");
         setWaitForTermination(false);
diff --git a/python/testSrc/com/jetbrains/env/python/PythonGeneratorTest.java b/python/testSrc/com/jetbrains/env/python/PythonGeneratorTest.java
index d5a482a40254..3462c6c46ecd 100644
--- a/python/testSrc/com/jetbrains/env/python/PythonGeneratorTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PythonGeneratorTest.java
@@ -17,7 +17,7 @@ public class PythonGeneratorTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyUnitTestProcessRunner>("/helpers", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         return new PyUnitTestProcessRunner("test_generator.py", 0);
       }
 
diff --git a/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java b/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java
index e7a8d8c9fe43..72d4f07e5e83 100644
--- a/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java
+++ b/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java
@@ -92,7 +92,7 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
   }
 
   @Override
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         if (myConsoleView != null) {
@@ -107,7 +107,7 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
     });
   }
 
-  private void disposeConsole() throws InterruptedException {
+  private void disposeConsole() {
     if (myCommunication != null) {
       UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
         try {
@@ -129,7 +129,7 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
     if (myConsoleView != null) {
       new WriteAction() {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           Disposer.dispose(myConsoleView);
           myConsoleView = null;
         }
@@ -223,7 +223,7 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
     }
   }
 
-  private void disposeConsoleProcess() throws InterruptedException {
+  private void disposeConsoleProcess() {
     myProcessHandler.destroyProcess();
 
     waitFor(myProcessHandler);
diff --git a/python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java b/python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java
index e3295d543a11..458789d03cd6 100644
--- a/python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java
+++ b/python/testSrc/com/jetbrains/env/python/debug/PyBaseDebuggerTask.java
@@ -44,7 +44,6 @@ import org.jetbrains.annotations.TestOnly;
 import org.junit.Assert;
 
 import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 import java.util.concurrent.Semaphore;
 
@@ -66,20 +65,20 @@ public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask {
     super(relativeTestDataPath);
   }
 
-  protected void waitForPause() throws InterruptedException, InvocationTargetException {
+  protected void waitForPause() throws InterruptedException {
     Assert.assertTrue("Debugger didn't stopped within timeout\nOutput:" + output(), waitFor(myPausedSemaphore));
 
     XDebuggerTestUtil.waitForSwing();
   }
 
-  protected void waitForTerminate() throws InterruptedException, InvocationTargetException {
+  protected void waitForTerminate() throws InterruptedException {
     setProcessCanTerminate(true);
 
     Assert.assertTrue("Debugger didn't terminated within timeout\nOutput:" + output(), waitFor(myTerminateSemaphore));
     XDebuggerTestUtil.waitForSwing();
   }
 
-  protected void runToLine(int line) throws InvocationTargetException, InterruptedException {
+  protected void runToLine(int line) throws InterruptedException {
     XDebugSession currentSession = XDebuggerManager.getInstance(getProject()).getCurrentSession();
     XSourcePosition position = currentSession.getCurrentPosition();
 
@@ -222,7 +221,7 @@ public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask {
         if (lineBreakpoint.getLine() == line) {
           new WriteAction() {
             @Override
-            protected void run(@NotNull Result result) throws Throwable {
+            protected void run(@NotNull Result result) {
               lineBreakpoint.setSuspendPolicy(policy);
             }
           }.execute();
@@ -274,7 +273,7 @@ public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask {
     return new Variable(var);
   }
 
-  protected void setVal(String name, String value) throws InterruptedException, PyDebuggerException {
+  protected void setVal(String name, String value) throws PyDebuggerException {
     XValue var = XDebuggerTestUtil.evaluate(mySession, name).first;
     myDebugProcess.changeVariable((PyDebugValue)var, value);
   }
@@ -326,12 +325,12 @@ public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask {
     });
   }
 
-  protected void finishSession() throws InterruptedException {
+  protected void finishSession() {
     disposeDebugProcess();
 
     if (mySession != null) {
       new WriteAction() {
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           mySession.stop();
         }
       }.execute();
@@ -353,7 +352,7 @@ public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask {
     }
   }
 
-  protected abstract void disposeDebugProcess() throws InterruptedException;
+  protected abstract void disposeDebugProcess();
 
   protected void doTest(@Nullable OutputPrinter myOutputPrinter) throws InterruptedException {
     try {
@@ -402,7 +401,7 @@ public abstract class PyBaseDebuggerTask extends PyExecutionFixtureTestTask {
   protected static class Variable {
     private final XTestValueNode myValueNode;
 
-    public Variable(XValue value) throws InterruptedException {
+    public Variable(XValue value) {
       myValueNode = XDebuggerTestUtil.computePresentation(value);
     }
 
diff --git a/python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java b/python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java
index d63ff1484c19..0f8e449eaefc 100644
--- a/python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java
+++ b/python/testSrc/com/jetbrains/env/python/debug/PyDebuggerTask.java
@@ -41,7 +41,6 @@ import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.ServerSocket;
 import java.util.Set;
 import java.util.concurrent.Semaphore;
@@ -95,7 +94,7 @@ public class PyDebuggerTask extends PyBaseDebuggerTask {
 
     new WriteAction() {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         RunManager runManager = RunManager.getInstance(project);
         runManager.addConfiguration(settings, false);
         runManager.setSelectedConfiguration(settings);
@@ -219,7 +218,7 @@ public class PyDebuggerTask extends PyBaseDebuggerTask {
     myWaitForTermination = waitForTermination;
   }
 
-  protected void waitForAllThreadsPause() throws InterruptedException, InvocationTargetException {
+  protected void waitForAllThreadsPause() throws InterruptedException {
     waitForPause();
     Assert.assertTrue(String.format("All threads didn't stop within timeout\n" +
                                     "Output: %s", output()), waitForAllThreads());
@@ -235,7 +234,7 @@ public class PyDebuggerTask extends PyBaseDebuggerTask {
   }
 
   @Override
-  protected void disposeDebugProcess() throws InterruptedException {
+  protected void disposeDebugProcess() {
     if (myDebugProcess != null) {
       ProcessHandler processHandler = myDebugProcess.getProcessHandler();
 
diff --git a/python/testSrc/com/jetbrains/env/python/dotNet/PyIronPythonTest.java b/python/testSrc/com/jetbrains/env/python/dotNet/PyIronPythonTest.java
index cdae771a0ef9..c132a2867e93 100644
--- a/python/testSrc/com/jetbrains/env/python/dotNet/PyIronPythonTest.java
+++ b/python/testSrc/com/jetbrains/env/python/dotNet/PyIronPythonTest.java
@@ -30,7 +30,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Tests skeleton generation
    */
   @Test
-  public void testSkeletons() throws Exception {
+  public void testSkeletons() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.java.py",
       "com.just.like.java",
@@ -43,7 +43,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Tests skeleton generation with "from" statements
    */
   @Test
-  public void testClassFromModule() throws Exception {
+  public void testClassFromModule() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.java.py",
       "com.just.like.java",
@@ -56,7 +56,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Tests skeleton generation when imported as alias
    */
   @Test
-  public void testClassFromModuleAlias() throws Exception {
+  public void testClassFromModuleAlias() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.java.py",
       "com.just.like.java",
@@ -69,7 +69,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Tests skeleton generation when module is imported
    */
   @Test
-  public void testModuleFromPackage() throws Exception {
+  public void testModuleFromPackage() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.java.py",
       "com.just.like.java",
@@ -82,7 +82,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Tests skeleton generation when several classes are imported
    */
   @Test
-  public void testSeveralClasses() throws Exception {
+  public void testSeveralClasses() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.java.py",
       "com.just.like.java",
@@ -96,7 +96,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * but we are sure there should be class System.Web.AspNetHostingPermissionLevel which is part of public API
    */
   @Test
-  public void testImportBuiltInSystem() throws Exception {
+  public void testImportBuiltInSystem() {
     final SkeletonTestTask task = new SkeletonTestTask(
       null,
       "System.Web",
@@ -121,7 +121,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Test importing of inner classes
    */
   @Test
-  public void testImportInnerClass() throws Exception {
+  public void testImportInnerClass() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.Deep.py",
       "SingleNameSpace.Some.Deep",
@@ -134,7 +134,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Test importing of the whole namespace
    */
   @Test
-  public void testWholeNameSpace() throws Exception {
+  public void testWholeNameSpace() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.SingleNameSpace.py",
       "SingleNameSpace",
@@ -147,7 +147,7 @@ public final class PyIronPythonTest extends PyEnvTestCase {
    * Test importing of single class
    */
   @Test
-  public void testSingleClass() throws Exception {
+  public void testSingleClass() {
     runPythonTest(new SkeletonTestTask(
       "dotNet/expected.skeleton.SingleNameSpace.py",
       "SingleNameSpace",
diff --git a/python/testSrc/com/jetbrains/env/python/testing/CreateConfigurationTestTask.java b/python/testSrc/com/jetbrains/env/python/testing/CreateConfigurationTestTask.java
index a13ba02fb6fb..34b882b4f0cd 100644
--- a/python/testSrc/com/jetbrains/env/python/testing/CreateConfigurationTestTask.java
+++ b/python/testSrc/com/jetbrains/env/python/testing/CreateConfigurationTestTask.java
@@ -30,11 +30,7 @@ import com.jetbrains.python.run.PythonConfigurationFactoryBase;
 import com.jetbrains.python.run.PythonRunConfiguration;
 import com.jetbrains.python.sdk.InvalidSdkException;
 import com.jetbrains.python.sdkTools.SdkCreationType;
-import com.jetbrains.python.testing.AbstractPythonTestRunConfiguration;
-import com.jetbrains.python.testing.TestRunnerService;
-import com.jetbrains.python.testing.PyAbstractTestConfiguration;
-import com.jetbrains.python.testing.PyAbstractTestFactory;
-import com.jetbrains.python.testing.TestTargetType;
+import com.jetbrains.python.testing.*;
 import org.hamcrest.Matchers;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -168,7 +164,7 @@ public abstract class CreateConfigurationTestTask<T extends AbstractPythonTestRu
     }
 
     @Override
-    public void runTestOn(final String sdkHome) throws Exception {
+    public void runTestOn(final String sdkHome) {
       final T configuration =
         createFactory().createTemplateConfiguration(getProject());
       configuration.setModule(myFixture.getModule());
diff --git a/python/testSrc/com/jetbrains/env/python/testing/PythonDocTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonDocTestingTest.java
index 976f109e95fd..0ff010f5a519 100644
--- a/python/testSrc/com/jetbrains/env/python/testing/PythonDocTestingTest.java
+++ b/python/testSrc/com/jetbrains/env/python/testing/PythonDocTestingTest.java
@@ -22,7 +22,7 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
 
 
   @Test
-  public void testConfigurationProducer() throws Exception {
+  public void testConfigurationProducer() {
     runPythonTest(
       new CreateConfigurationByFileTask<>(null, PythonDocTestRunConfiguration.class, "doctest_test.py"));
   }
@@ -33,7 +33,7 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyDocTestProcessRunner>("/testRunner/env/doc", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyDocTestProcessRunner createProcessRunner() throws Exception {
+      protected PyDocTestProcessRunner createProcessRunner() {
         return new PyDocTestProcessRunner("subfolder", 0) {
           @Override
           protected void configurationCreatedAndWillLaunch(@NotNull PythonDocTestRunConfiguration configuration) throws IOException {
@@ -60,7 +60,7 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyDocTestProcessRunner>("/testRunner/env/doc", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyDocTestProcessRunner createProcessRunner() throws Exception {
+      protected PyDocTestProcessRunner createProcessRunner() {
         return new PyDocTestProcessRunner("test1.py", 0);
       }
 
@@ -81,7 +81,7 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyDocTestProcessRunner>("/testRunner/env/doc", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyDocTestProcessRunner createProcessRunner() throws Exception {
+      protected PyDocTestProcessRunner createProcessRunner() {
         return new PyDocTestProcessRunner("test1.py::FirstGoodTest", 0);
       }
 
@@ -97,11 +97,11 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testDiff() throws Exception {
+  public void testDiff() {
     runPythonTest(new PyProcessWithConsoleTestTask<PyDocTestProcessRunner>("/testRunner/env/doc", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyDocTestProcessRunner createProcessRunner() throws Exception {
+      protected PyDocTestProcessRunner createProcessRunner() {
         return new PyDocTestProcessRunner("test_Diff.py::test_dff", 0);
       }
 
@@ -122,7 +122,7 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyDocTestProcessRunner>("/testRunner/env/doc", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyDocTestProcessRunner createProcessRunner() throws Exception {
+      protected PyDocTestProcessRunner createProcessRunner() {
         return new PyDocTestProcessRunner("test1.py::SecondGoodTest::test_passes", 0);
       }
 
@@ -142,7 +142,7 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyDocTestProcessRunner>("/testRunner/env/doc", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyDocTestProcessRunner createProcessRunner() throws Exception {
+      protected PyDocTestProcessRunner createProcessRunner() {
         return new PyDocTestProcessRunner("test1.py::factorial", 0);
       }
 
@@ -162,7 +162,7 @@ public final class PythonDocTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyDocTestProcessRunner>("/testRunner/env/doc", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyDocTestProcessRunner createProcessRunner() throws Exception {
+      protected PyDocTestProcessRunner createProcessRunner() {
         return new PyDocTestProcessRunner("test2.py", 0);
       }
 
diff --git a/python/testSrc/com/jetbrains/env/python/testing/PythonNoseTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonNoseTestingTest.java
index 3199bb7591a1..78508af32d20 100644
--- a/python/testSrc/com/jetbrains/env/python/testing/PythonNoseTestingTest.java
+++ b/python/testSrc/com/jetbrains/env/python/testing/PythonNoseTestingTest.java
@@ -8,9 +8,9 @@ import com.jetbrains.env.python.testing.CreateConfigurationTestTask.PyConfigurat
 import com.jetbrains.env.ut.PyNoseTestProcessRunner;
 import com.jetbrains.python.PyNames;
 import com.jetbrains.python.sdkTools.SdkCreationType;
-import com.jetbrains.python.testing.PyTestFrameworkService;
 import com.jetbrains.python.testing.PyNoseTestConfiguration;
 import com.jetbrains.python.testing.PyNoseTestFactory;
+import com.jetbrains.python.testing.PyTestFrameworkService;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 import org.junit.Test;
@@ -33,7 +33,7 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyNoseTestProcessRunner>("/testRunner/env/nose/generators", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+      protected PyNoseTestProcessRunner createProcessRunner() {
         return new PyNoseTestProcessRunner(toFullPath("test_nose_generator.py"), 1);
       }
 
@@ -57,11 +57,11 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
 
   // Ensures setup/teardown does not break anything
   @Test
-  public void testSetupTearDown() throws Exception {
+  public void testSetupTearDown() {
     runPythonTest(new SetupTearDownTestTask<PyNoseTestProcessRunner>() {
       @NotNull
       @Override
-      protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+      protected PyNoseTestProcessRunner createProcessRunner() {
         return new PyNoseTestProcessRunner("test_test.py", 1);
       }
     });
@@ -71,22 +71,22 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
    * Ensures that python target pointing to module works correctly
    */
   @Test
-  public void testRunModuleAsFile() throws Exception {
+  public void testRunModuleAsFile() {
     runPythonTest(new RunModuleAsFileTask<PyNoseTestProcessRunner>(){
       @NotNull
       @Override
-      protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+      protected PyNoseTestProcessRunner createProcessRunner() {
         return new PyNoseTestProcessRunner(TARGET, 0);
       }
     });
   }
 
   @Test
-  public void testRerunSubfolder() throws Exception {
+  public void testRerunSubfolder() {
     runPythonTest(new RerunSubfolderTask<PyNoseTestProcessRunner>(2) {
       @NotNull
       @Override
-      protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+      protected PyNoseTestProcessRunner createProcessRunner() {
         return new PyNoseTestProcessRunner(".", 1);
       }
     });
@@ -94,20 +94,20 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
 
   // Ensure slow test is not run when --attr="!slow"  is provided
   @Test
-  public void testMarkerWithSlow() throws Exception {
+  public void testMarkerWithSlow() {
     runPythonTest(new SlowRunnerTask("--attr=\"!slow\" -vvv"));
   }
   @Test
-  public void testMarkerWithSlowSingleQuotes() throws Exception {
+  public void testMarkerWithSlowSingleQuotes() {
     runPythonTest(new SlowRunnerTask("--attr='!slow' -vvv"));
   }
   @Test
-  public void testMarkerWithSlowRegexp() throws Exception {
+  public void testMarkerWithSlowRegexp() {
     runPythonTest(new SlowRunnerTask("--attr='!slow' -vvv -m \"(?:^|[\\b_\\./-])[Tt]est\""));
   }
 
   @Test
-  public void testMultipleCases() throws Exception {
+  public void testMultipleCases() {
     runPythonTest(
       new CreateConfigurationMultipleCasesTask<>(PyTestFrameworkService.getSdkReadableNameByFramework(PyNames.NOSE_TEST),
                                                  PyNoseTestConfiguration.class));
@@ -117,13 +117,13 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
    * Checks tests are resolved when launched from subfolder
    */
   @Test
-  public void testTestsInSubFolderResolvable() throws Exception {
+  public void testTestsInSubFolderResolvable() {
     runPythonTest(
       new PyTestsInSubFolderRunner<PyNoseTestProcessRunner>("test_metheggs", "test_funeggs",
                                                             "test_first") {
         @NotNull
         @Override
-        protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+        protected PyNoseTestProcessRunner createProcessRunner() {
           return new PyNoseTestProcessRunner(toFullPath("tests"), 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyNoseTestConfiguration configuration) throws IOException {
@@ -139,12 +139,12 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
    * Ensures test output works
    */
   @Test
-  public void testOutput() throws Exception {
+  public void testOutput() {
     runPythonTest(
       new PyTestsOutputRunner<PyNoseTestProcessRunner>("test_metheggs", "test_funeggs", "test_first") {
         @NotNull
         @Override
-        protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+        protected PyNoseTestProcessRunner createProcessRunner() {
           return new PyNoseTestProcessRunner(toFullPath("tests"), 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyNoseTestConfiguration configuration) throws IOException {
@@ -158,7 +158,7 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
 
 
   @Test(expected = RuntimeConfigurationWarning.class)
-  public void testValidation() throws Exception {
+  public void testValidation() {
 
     final PyConfigurationCreationTask<PyNoseTestConfiguration> task =
       new PyConfigurationCreationTask<PyNoseTestConfiguration>() {
@@ -173,20 +173,20 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testConfigurationProducer() throws Exception {
+  public void testConfigurationProducer() {
     runPythonTest(
       new CreateConfigurationByFileTask<>(myFrameworkName, PyNoseTestConfiguration.class));
   }
 
   @Test
-  public void testConfigurationProducerOnDirectory() throws Exception {
+  public void testConfigurationProducerOnDirectory() {
     runPythonTest(
       new CreateConfigurationByFileTask.CreateConfigurationTestAndRenameFolderTask<>(myFrameworkName,
                                                                                      PyNoseTestConfiguration.class));
   }
 
   @Test
-  public void testRenameClass() throws Exception {
+  public void testRenameClass() {
     runPythonTest(
       new CreateConfigurationByFileTask.CreateConfigurationTestAndRenameClassTask<>(
         myFrameworkName,
@@ -200,7 +200,7 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
 
       @NotNull
       @Override
-      protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+      protected PyNoseTestProcessRunner createProcessRunner() {
         return new PyNoseTestProcessRunner("test1.py", 0);
       }
 
@@ -220,7 +220,7 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyNoseTestProcessRunner>("/testRunner/env/nose", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+      protected PyNoseTestProcessRunner createProcessRunner() {
         return new PyNoseTestProcessRunner("test2.py", 0);
       }
 
@@ -247,7 +247,7 @@ public final class PythonNoseTestingTest extends PyEnvTestCase {
 
     @NotNull
     @Override
-    protected PyNoseTestProcessRunner createProcessRunner() throws Exception {
+    protected PyNoseTestProcessRunner createProcessRunner() {
       return new PyNoseTestProcessRunner("test_with_slow.py", 0) {
         @Override
         protected void configurationCreatedAndWillLaunch(@NotNull PyNoseTestConfiguration configuration) throws IOException {
diff --git a/python/testSrc/com/jetbrains/env/python/testing/PythonPyTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonPyTestingTest.java
index c717600ade38..ddee76585a2f 100644
--- a/python/testSrc/com/jetbrains/env/python/testing/PythonPyTestingTest.java
+++ b/python/testSrc/com/jetbrains/env/python/testing/PythonPyTestingTest.java
@@ -16,7 +16,10 @@ import com.jetbrains.env.ut.PyTestTestProcessRunner;
 import com.jetbrains.python.PyNames;
 import com.jetbrains.python.psi.PyFunction;
 import com.jetbrains.python.sdkTools.SdkCreationType;
-import com.jetbrains.python.testing.*;
+import com.jetbrains.python.testing.PyTestConfiguration;
+import com.jetbrains.python.testing.PyTestFactory;
+import com.jetbrains.python.testing.PyTestFrameworkService;
+import com.jetbrains.python.testing.TestTargetType;
 import org.hamcrest.Matchers;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
@@ -41,11 +44,11 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
 
   // Ensures setup/teardown does not break anything
   @Test
-  public void testSetupTearDown() throws Exception {
+  public void testSetupTearDown() {
     runPythonTest(new SetupTearDownTestTask<PyTestTestProcessRunner>() {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner("test_test.py", 1);
       }
     });
@@ -55,11 +58,11 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * Ensures that python target pointing to module works correctly
    */
   @Test
-  public void testRunModuleAsFile() throws Exception {
+  public void testRunModuleAsFile() {
     runPythonTest(new RunModuleAsFileTask<PyTestTestProcessRunner>() {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner(TARGET, 0);
       }
     });
@@ -67,11 +70,11 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
 
 
   @Test
-  public void testRerunSubfolder() throws Exception {
+  public void testRerunSubfolder() {
     runPythonTest(new RerunSubfolderTask<PyTestTestProcessRunner>(2) {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner(".", 1);
       }
     });
@@ -79,13 +82,13 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
 
 
   @Test
-  public void testParametrized() throws Exception {
+  public void testParametrized() {
     runPythonTest(
       new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest/parametrized", SdkCreationType.EMPTY_SDK) {
 
         @NotNull
         @Override
-        protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+        protected PyTestTestProcessRunner createProcessRunner() {
           return new PyTestTestProcessRunner("test_pytest_parametrized.py", 1);
         }
 
@@ -111,13 +114,13 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * See https://github.com/JetBrains/teamcity-messages/issues/131
    */
   @Test
-  public void testTestNameBeforeTestStarted() throws Exception {
+  public void testTestNameBeforeTestStarted() {
     runPythonTest(
       new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest/testNameBeforeTestStarted", SdkCreationType.EMPTY_SDK) {
 
         @NotNull
         @Override
-        protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+        protected PyTestTestProcessRunner createProcessRunner() {
           return new PyTestTestProcessRunner("test_test.py", 0);
         }
 
@@ -147,13 +150,13 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
 
   // Ensure test survives patched strftime
   @Test
-  public void testMonkeyPatch() throws Exception {
+  public void testMonkeyPatch() {
     runPythonTest(
       new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest/monkeyPatch", SdkCreationType.EMPTY_SDK) {
 
         @NotNull
         @Override
-        protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+        protected PyTestTestProcessRunner createProcessRunner() {
           return new PyTestTestProcessRunner("test_test.py", 0);
         }
 
@@ -169,13 +172,13 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
 
   // Ensure slow test is not run when -m "not slow" is provided
   @Test
-  public void testMarkerWithSpaces() throws Exception {
+  public void testMarkerWithSpaces() {
     runPythonTest(
       new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest/test_with_markers", SdkCreationType.EMPTY_SDK) {
 
         @NotNull
         @Override
-        protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+        protected PyTestTestProcessRunner createProcessRunner() {
           return new PyTestTestProcessRunner("test_with_markers.py", 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyTestConfiguration configuration) throws IOException {
@@ -205,7 +208,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * New configuration should have closest src set as its working dir
    */
   @Test
-  public void testClosestSrcIsWorkDirOnNewConfig() throws Exception {
+  public void testClosestSrcIsWorkDirOnNewConfig() {
     runPythonTest(
       new CreateConfigurationTestTask<PyTestConfiguration>(myFrameworkName,
                                                            PyTestConfiguration.class) {
@@ -234,12 +237,12 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * In case when workdir is not set we should use closest src
    */
   @Test
-  public void testClosestSrcIsWorkDirDynamically() throws Exception {
+  public void testClosestSrcIsWorkDirDynamically() {
     runPythonTest(
       new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/createConfigurationTest/", SdkCreationType.EMPTY_SDK) {
         @NotNull
         @Override
-        protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+        protected PyTestTestProcessRunner createProcessRunner() {
           return new PyTestTestProcessRunner(TEST_TARGET_PREFIX + "test_test.test_test", 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyTestConfiguration configuration) throws IOException {
@@ -275,13 +278,13 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testConfigurationProducer() throws Exception {
+  public void testConfigurationProducer() {
     runPythonTest(
       new CreateConfigurationByFileTask<>(myFrameworkName, PyTestConfiguration.class));
   }
 
   @Test
-  public void testMultipleCases() throws Exception {
+  public void testMultipleCases() {
     runPythonTest(
       new CreateConfigurationMultipleCasesTask<>(myFrameworkName, PyTestConfiguration.class));
   }
@@ -290,13 +293,13 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * Checks tests are resolved when launched from subfolder
    */
   @Test
-  public void testTestsInSubFolderResolvable() throws Exception {
+  public void testTestsInSubFolderResolvable() {
     runPythonTest(
       new PyTestsInSubFolderRunner<PyTestTestProcessRunner>("test_metheggs", "test_funeggs",
                                                             "test_first") {
         @NotNull
         @Override
-        protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+        protected PyTestTestProcessRunner createProcessRunner() {
           return new PyTestTestProcessRunner(toFullPath("tests"), 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyTestConfiguration configuration) throws IOException {
@@ -312,12 +315,12 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * Ensures test output works
    */
   @Test
-  public void testOutput() throws Exception {
+  public void testOutput() {
     runPythonTest(
       new PyTestsOutputRunner<PyTestTestProcessRunner>("test_metheggs", "test_funeggs", "test_first") {
         @NotNull
         @Override
-        protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+        protected PyTestTestProcessRunner createProcessRunner() {
           return new PyTestTestProcessRunner(toFullPath("tests"), 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyTestConfiguration configuration) throws IOException {
@@ -330,7 +333,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
   }
 
   @Test(expected = RuntimeConfigurationWarning.class)
-  public void testValidation() throws Exception {
+  public void testValidation() {
 
     final CreateConfigurationTestTask.PyConfigurationCreationTask<PyTestConfiguration> task =
       new CreateConfigurationTestTask.PyConfigurationCreationTask<PyTestConfiguration>() {
@@ -345,14 +348,14 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testConfigurationProducerOnDirectory() throws Exception {
+  public void testConfigurationProducerOnDirectory() {
     runPythonTest(
       new CreateConfigurationByFileTask.CreateConfigurationTestAndRenameFolderTask<>(myFrameworkName,
                                                                                      PyTestConfiguration.class));
   }
 
   @Test
-  public void testProduceConfigurationOnFile() throws Exception {
+  public void testProduceConfigurationOnFile() {
     runPythonTest(
       new CreateConfigurationByFileTask<PyTestConfiguration>(myFrameworkName,
                                                              PyTestConfiguration.class, "spam.py") {
@@ -365,7 +368,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
   }
 
   @Test
-  public void testRenameClass() throws Exception {
+  public void testRenameClass() {
     runPythonTest(
       new CreateConfigurationByFileTask.CreateConfigurationTestAndRenameClassTask<>(
         myFrameworkName,
@@ -376,11 +379,11 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * Ensure dots in test names do not break anything (PY-13833)
    */
   @Test
-  public void testEscape() throws Exception {
+  public void testEscape() {
     runPythonTest(new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest/", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner("test_escape_me.py", 0);
       }
 
@@ -403,7 +406,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
 
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner(".", 0);
       }
 
@@ -422,11 +425,11 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
    * Ensure element dir is used as curdir even if not set explicitly
    */
   @Test
-  public void testCurrentDir() throws Exception {
+  public void testCurrentDir() {
     runPythonTest(new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest/", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner("", 0) {
           @Override
           protected void configurationCreatedAndWillLaunch(@NotNull final PyTestConfiguration configuration) throws IOException {
@@ -458,7 +461,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner("test1.py", 0);
       }
 
@@ -487,7 +490,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         if (getLevelForSdk().isPy3K()) {
           return new PyTestTestProcessRunner("folder_no_init_py/test_test.py", 2);
         }
@@ -525,7 +528,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/pytest", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner("test2.py", 1);
       }
 
@@ -572,7 +575,7 @@ public final class PythonPyTestingTest extends PyEnvTestCase {
     runPythonTest(new PyProcessWithConsoleTestTask<PyTestTestProcessRunner>("/testRunner/env/unit", SdkCreationType.EMPTY_SDK) {
       @NotNull
       @Override
-      protected PyTestTestProcessRunner createProcessRunner() throws Exception {
+      protected PyTestTestProcessRunner createProcessRunner() {
         return new PyTestTestProcessRunner(fileName, 0);
       }
 
diff --git a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java
index 3a0f42e7220f..74344b6d85c2 100644
--- a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java
+++ b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java
@@ -53,7 +53,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
   }
 
   @Test
-  public void testSetupPyRunner() throws Exception {
+  public void testSetupPyRunner() {
     // We need to make sure setup.py is called using different runner
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/failFast", "setup.py") {
 
@@ -68,7 +68,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
   }
 
   @Test
-  public void testRenameClass() throws Exception {
+  public void testRenameClass() {
     runPythonTest(
       new CreateConfigurationByFileTask.CreateConfigurationTestAndRenameClassTask<>(
         PythonTestConfigurationsModel.PYTHONS_UNITTEST_NAME,
@@ -76,7 +76,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
   }
 
   @Test(expected = RuntimeConfigurationWarning.class)
-  public void testValidation() throws Exception {
+  public void testValidation() {
 
     final CreateConfigurationTestTask.PyConfigurationCreationTask<PyUnitTestConfiguration> task =
       new CreateConfigurationTestTask.PyConfigurationCreationTask<PyUnitTestConfiguration>() {
@@ -98,13 +98,13 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * tests failfast as example of argument
    */
   @Test
-  public void testFailFast() throws Exception {
+  public void testFailFast() {
 
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/failFast", "test_test.py") {
 
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         return new PyUnitTestProcessRunner(toFullPath(getMyScriptName()), 1) {
           @Override
           protected void configurationCreatedAndWillLaunch(@NotNull final PyUnitTestConfiguration configuration) throws IOException {
@@ -134,7 +134,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * check non-ascii (127+) chars are supported in skip messaged
    */
   @Test
-  public void testNonAsciiMessage() throws Exception {
+  public void testNonAsciiMessage() {
 
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/nonAscii", "test_test.py") {
 
@@ -161,12 +161,12 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
   // Ensure failed and error subtests work
   @Test
   @EnvTestTagsRequired(tags = "python3")
-  public void testSubTestError() throws Exception {
+  public void testSubTestError() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/subtestError", "test_test.py") {
 
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         return new PyUnitTestProcessRunner(toFullPath(getMyScriptName()), 1);
       }
 
@@ -191,7 +191,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    */
   @EnvTestTagsRequired(tags = "python3")
   @Test
-  public void testDotsInSubtest() throws Exception {
+  public void testDotsInSubtest() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/subtestDots", "test_test.py") {
 
       @NotNull
@@ -226,12 +226,12 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
 
   @EnvTestTagsRequired(tags = "unittest2")
   @Test
-  public void testUnitTest2() throws Exception {
+  public void testUnitTest2() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/unittest2", "test_test.py") {
 
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         return new PyUnitTestProcessRunner(toFullPath(getMyScriptName()), 1);
       }
 
@@ -265,7 +265,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * Raising SkipTest on class setup should not lead to KeyError
    */
   @Test
-  public void testSkipInSetup() throws Exception {
+  public void testSkipInSetup() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/skipInSetup", "test_test.py") {
 
 
@@ -292,12 +292,12 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    */
   @Test
   @EnvTestTagsRequired(tags = "python3")
-  public void testScriptWithHyphen() throws Exception {
+  public void testScriptWithHyphen() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/withHyphen", "test-foobar.py") {
 
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         return new PyUnitTestProcessRunner(toFullPath(getMyScriptName()), 1);
       }
 
@@ -325,12 +325,12 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * Make sure test rerun works when pattern is enabled (PY-23416)
    */
   @Test
-  public void testPatternRerun() throws Exception {
+  public void testPatternRerun() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/patternRerun", ".") {
 
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         // Full pass is required because it is folder
         return new PyUnitTestProcessRunner(toFullPath(getMyScriptName()), 2) {
           @Override
@@ -358,11 +358,11 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
   }
 
   @Test
-  public void testRerunSubfolder() throws Exception {
+  public void testRerunSubfolder() {
     runPythonTest(new RerunSubfolderTask<PyUnitTestProcessRunner>(1) {
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         return new PyUnitTestProcessRunner(".", 1) {
           @Override
           protected void configurationCreatedAndWillLaunch(@NotNull PyUnitTestConfiguration configuration) throws IOException {
@@ -379,12 +379,12 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
   @EnvTestTagsRequired(tags = "python3") // Rerun for this scenario does not work for unitttest and py2
   //https://github.com/JetBrains/teamcity-messages/issues/129
   @Test
-  public void testPackageInsideFolder() throws Exception {
+  public void testPackageInsideFolder() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/package_in_folder", "tests") {
 
       @NotNull
       @Override
-      protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+      protected PyUnitTestProcessRunner createProcessRunner() {
         // Full pass is required because it is folder
         return new PyUnitTestProcessRunner(toFullPath(getMyScriptName()), 2) {
           @Override
@@ -412,7 +412,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
 
   @EnvTestTagsRequired(tags = "python3") // No subtest in py2
   @Test
-  public void testSubtest() throws Exception {
+  public void testSubtest() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/", "test_subtest.py", 1) {
       @Override
       protected void checkTestResults(@NotNull PyUnitTestProcessRunner runner,
@@ -441,7 +441,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
 
   @EnvTestTagsRequired(tags = "python3") // No subtest in py2
   @Test
-  public void testSubtestSkipped() throws Exception {
+  public void testSubtestSkipped() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("testRunner/env/unit/", "test_skipped_subtest.py", 1) {
       @Override
       protected void checkTestResults(@NotNull PyUnitTestProcessRunner runner,
@@ -456,7 +456,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
 
   // PY-24407
   @Test
-  public void testWorkingDirectoryDependsOnRelativeImport() throws Exception {
+  public void testWorkingDirectoryDependsOnRelativeImport() {
     runPythonTest(new CreateConfigurationTestTask<PyUnitTestConfiguration>(PythonTestConfigurationsModel.PYTHONS_UNITTEST_NAME,
                                                                            PyUnitTestConfiguration.class) {
       @NotNull
@@ -500,12 +500,12 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * Checks tests are resolved when launched from subfolder
    */
   @Test
-  public void testTestsInSubFolderResolvable() throws Exception {
+  public void testTestsInSubFolderResolvable() {
     runPythonTest(
       new PyTestsInSubFolderRunner<PyUnitTestProcessRunner>("test_metheggs", "test_first") {
         @NotNull
         @Override
-        protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+        protected PyUnitTestProcessRunner createProcessRunner() {
           return new PyUnitTestProcessRunner(toFullPath("tests"), 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyUnitTestConfiguration configuration) throws IOException {
@@ -521,12 +521,12 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * Ensures test output works
    */
   @Test
-  public void testOutput() throws Exception {
+  public void testOutput() {
     runPythonTest(
       new PyTestsOutputRunner<PyUnitTestProcessRunner>("test_metheggs", "test_first") {
         @NotNull
         @Override
-        protected PyUnitTestProcessRunner createProcessRunner() throws Exception {
+        protected PyUnitTestProcessRunner createProcessRunner() {
           return new PyUnitTestProcessRunner(toFullPath("tests"), 0) {
             @Override
             protected void configurationCreatedAndWillLaunch(@NotNull PyUnitTestConfiguration configuration) throws IOException {
@@ -543,7 +543,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * Checks <a href="https://docs.python.org/2/library/unittest.html#load-tests-protocol">Load test protocol</a>
    */
   @Test
-  public void testLoadProtocol() throws Exception {
+  public void testLoadProtocol() {
     runPythonTest(new PyUnitTestProcessWithConsoleTestTask("/testRunner/env/unit", "test_load_protocol.py") {
       @Override
       public boolean isLanguageLevelSupported(@NotNull final LanguageLevel level) {
@@ -617,7 +617,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
 
 
   @Test
-  public void testConfigurationProducerOnDirectory() throws Exception {
+  public void testConfigurationProducerOnDirectory() {
     runPythonTest(
       new CreateConfigurationByFileTask.CreateConfigurationTestAndRenameFolderTask<>(PythonTestConfigurationsModel.PYTHONS_UNITTEST_NAME,
                                                                                      PyUnitTestConfiguration.class));
@@ -625,7 +625,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
 
 
   @Test
-  public void testConfigurationProducer() throws Exception {
+  public void testConfigurationProducer() {
     runPythonTest(new CreateConfigurationByFileTask<>(PythonTestConfigurationsModel.PYTHONS_UNITTEST_NAME, PyUnitTestConfiguration.class));
   }
 
@@ -633,7 +633,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
    * Ensures newly created configuration inherits working dir from default if set
    */
   @Test
-  public void testConfigurationProducerObeysDefaultDir() throws Exception {
+  public void testConfigurationProducerObeysDefaultDir() {
     runPythonTest(
       new CreateConfigurationByFileTask<PyUnitTestConfiguration>(PythonTestConfigurationsModel.PYTHONS_UNITTEST_NAME,
                                                                  PyUnitTestConfiguration.class) {
@@ -660,7 +660,7 @@ public final class PythonUnitTestingTest extends PythonUnitTestingLikeTest<PyUni
   }
 
   @Test
-  public void testMultipleCases() throws Exception {
+  public void testMultipleCases() {
     runPythonTest(
       new CreateConfigurationMultipleCasesTask<PyUnitTestConfiguration>(PythonTestConfigurationsModel.PYTHONS_UNITTEST_NAME,
                                                                         PyUnitTestConfiguration.class) {
diff --git a/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java b/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java
index 5b0a17a13cd4..0757ab47c0ed 100644
--- a/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java
+++ b/python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java
@@ -135,7 +135,7 @@ public abstract class PyUnitTestTask extends PyExecutionFixtureTestTask {
   }
 
   @Override
-  public void tearDown() throws Exception {
+  public void tearDown() {
     UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
       try {
         if (mySetUp) {
@@ -195,7 +195,7 @@ public abstract class PyUnitTestTask extends PyExecutionFixtureTestTask {
 
     new WriteAction() {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         RunManager runManager = RunManager.getInstance(project);
         runManager.addConfiguration(settings, false);
         runManager.setSelectedConfiguration(settings);
diff --git a/python/testSrc/com/jetbrains/python/Py3CompletionTest.java b/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
index 68f87bf63e9d..d7debed61731 100644
--- a/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/Py3CompletionTest.java
@@ -86,7 +86,7 @@ public class Py3CompletionTest extends PyTestCase {
   }
 
   // PY-4073
-  public void testSpecialFunctionAttributesPy3() throws Exception {
+  public void testSpecialFunctionAttributesPy3() {
     setLanguageLevel(LanguageLevel.PYTHON32);
     try {
       List<String> suggested = doTestByText("def func(): pass; func.func_<caret>");
diff --git a/python/testSrc/com/jetbrains/python/PyAssignmentMappingTest.java b/python/testSrc/com/jetbrains/python/PyAssignmentMappingTest.java
index 6a951c938d33..548cd176335d 100644
--- a/python/testSrc/com/jetbrains/python/PyAssignmentMappingTest.java
+++ b/python/testSrc/com/jetbrains/python/PyAssignmentMappingTest.java
@@ -40,7 +40,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
   }
 
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(2, marks.size());
     PsiElement src = marks.get("<src>").getParent(); // const -> expr;
@@ -54,7 +54,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
     Assert.assertEquals(src, pair.getSecond());
   }
 
-  public void testSubscribedSource() throws Exception {
+  public void testSubscribedSource() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(2, marks.size());
     PsiElement src = marks.get("<src>").getParent().getParent(); // const -> ref foo -> subscr expr;
@@ -68,7 +68,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
     Assert.assertEquals(src, pair.getSecond());
   }
 
-  public void testSubscribedTarget() throws Exception {
+  public void testSubscribedTarget() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(2, marks.size());
     PsiElement src = marks.get("<src>").getParent(); // const -> expr;
@@ -83,7 +83,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
   }
 
 
-  public void testMultiple() throws Exception {
+  public void testMultiple() {
     Map<String, PsiElement> marks = loadTest();
     final int TARGET_NUM = 3;
     Assert.assertEquals(TARGET_NUM + 1, marks.size());
@@ -104,7 +104,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
     }
   }
 
-  public void testTupleMapped() throws Exception {
+  public void testTupleMapped() {
     Map<String, PsiElement> marks = loadTest();
     final int PAIR_NUM = 2;
     Assert.assertEquals(PAIR_NUM * 2, marks.size());
@@ -128,7 +128,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
     }
   }
 
-  public void testParenthesizedTuple() throws Exception { //PY-2648
+  public void testParenthesizedTuple() { //PY-2648
     Map<String, PsiElement> marks = loadTest();
     final int PAIR_NUM = 2;
     Assert.assertEquals(PAIR_NUM * 2, marks.size());
@@ -152,7 +152,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
     }
   }
 
-  public void testTuplePack() throws Exception {
+  public void testTuplePack() {
     Map<String, PsiElement> marks = loadTest();
     final int SRC_NUM = 2;
     Assert.assertEquals(SRC_NUM + 1, marks.size());
@@ -174,7 +174,7 @@ public class PyAssignmentMappingTest extends LightMarkedTestCase {
   }
 
 
-  public void testTupleUnpack() throws Exception {
+  public void testTupleUnpack() {
     Map<String, PsiElement> marks = loadTest();
     final int DST_NUM = 2;
     Assert.assertEquals(DST_NUM + 3, marks.size());
diff --git a/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java b/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java
index 828e746bb427..2b94a243f575 100644
--- a/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java
+++ b/python/testSrc/com/jetbrains/python/PyAutoUnindentTest.java
@@ -24,35 +24,35 @@ import com.jetbrains.python.fixtures.PyTestCase;
  */
 public class PyAutoUnindentTest extends PyTestCase {
 
-  public void testSingleElse() throws Exception{
+  public void testSingleElse() {
     doTypingTest();
   }
 
-  public void testNestedElse() throws Exception{
+  public void testNestedElse() {
     doTypingTest();
   }
 
-  public void testMisplacedElse() throws Exception{
+  public void testMisplacedElse() {
     doTypingTest();
   }
 
-  public void testSimpleElif() throws Exception{
+  public void testSimpleElif() {
     doTypingTest();
   }
 
-  public void testInnerElif() throws Exception{
+  public void testInnerElif() {
     doTypingTest();
   }
 
-  public void testSimpleExcept() throws Exception{
+  public void testSimpleExcept() {
     doTypingTest();
   }
 
-  public void testSimpleFinally() throws Exception{
+  public void testSimpleFinally() {
     doTypingTest();
   }
 
-  public void testNestedFinally() throws Exception{
+  public void testNestedFinally() {
     doTypingTest();
   }
 
@@ -64,7 +64,7 @@ public class PyAutoUnindentTest extends PyTestCase {
 
 
 
-  private void doTypingTest() throws Exception {
+  private void doTypingTest() {
     final String testName = "editing/" + getTestName(true);
     myFixture.configureByFile(testName + ".py");
     myFixture.type(':');
diff --git a/python/testSrc/com/jetbrains/python/PyClassicPropertyTest.java b/python/testSrc/com/jetbrains/python/PyClassicPropertyTest.java
index 7c4dd51ae6c1..f716283ee130 100644
--- a/python/testSrc/com/jetbrains/python/PyClassicPropertyTest.java
+++ b/python/testSrc/com/jetbrains/python/PyClassicPropertyTest.java
@@ -35,7 +35,7 @@ public class PyClassicPropertyTest extends PyTestCase {
     myClass = file.getTopLevelClasses().get(0);
   }
 
-  public void testV1() throws Exception {
+  public void testV1() {
     Property p;
     Maybe<PyCallable> accessor;
     p = myClass.findProperty("v1", true, null);
@@ -59,7 +59,7 @@ public class PyClassicPropertyTest extends PyTestCase {
     assertNull(accessor.value());
   }
 
-  public void testV2() throws Exception {
+  public void testV2() {
     Property p;
     Maybe<PyCallable> accessor;
     p = myClass.findProperty("v2", true, null);
@@ -84,7 +84,7 @@ public class PyClassicPropertyTest extends PyTestCase {
     assertEquals("deleter", accessor.value().getName());
   }
 
-  public void testV3() throws Exception {
+  public void testV3() {
     Maybe<PyCallable> accessor;
     Property p = myClass.findProperty("v3", true, null);
     assertNotNull(p);
diff --git a/python/testSrc/com/jetbrains/python/PyDecoratedPropertyTest.java b/python/testSrc/com/jetbrains/python/PyDecoratedPropertyTest.java
index fc38d939affd..6bca50bcec27 100644
--- a/python/testSrc/com/jetbrains/python/PyDecoratedPropertyTest.java
+++ b/python/testSrc/com/jetbrains/python/PyDecoratedPropertyTest.java
@@ -31,7 +31,7 @@ public class PyDecoratedPropertyTest extends PyTestCase {
     myClass = file.getTopLevelClasses().get(0);
   }
 
-  public void testW1() throws Exception {
+  public void testW1() {
     Property p;
     Maybe<PyCallable> accessor;
     final String name = "w1";
@@ -56,7 +56,7 @@ public class PyDecoratedPropertyTest extends PyTestCase {
     assertEquals(name, accessor.value().getName());
   }
 
-  public void testW2() throws Exception {
+  public void testW2() {
     Property p;
     Maybe<PyCallable> accessor;
     final String name = "w2";
diff --git a/python/testSrc/com/jetbrains/python/PyDecoratorTest.java b/python/testSrc/com/jetbrains/python/PyDecoratorTest.java
index 88b966a3da28..8f09a3dc0315 100644
--- a/python/testSrc/com/jetbrains/python/PyDecoratorTest.java
+++ b/python/testSrc/com/jetbrains/python/PyDecoratorTest.java
@@ -29,12 +29,12 @@ import com.jetbrains.python.psi.PyFunction;
  * Date: Dec 28, 2008 3:50:23 AM
  */
 public class PyDecoratorTest extends PyTestCase {
-  private PsiElement find() throws Exception {
+  private PsiElement find() {
     PsiReference ref = myFixture.getReferenceAtCaretPosition("/resolve/decorators/" + getTestName(false) + ".py");
     return ref.getElement();
   }
 
-  public void testDecoCall() throws Exception {
+  public void testDecoCall() {
     PsiElement targetElement = find().getParent();
     assertTrue(targetElement instanceof PyDecorator);
     PyDecorator deco = (PyDecorator)targetElement;
@@ -45,7 +45,7 @@ public class PyDecoratorTest extends PyTestCase {
     assertFalse(deco.hasArgumentList());
   }
 
-  public void testDecoParamCall() throws Exception {
+  public void testDecoParamCall() {
     PsiElement targetElement = find().getParent();
     assertTrue(targetElement instanceof PyDecorator);
     PyDecorator deco = (PyDecorator)targetElement;
diff --git a/python/testSrc/com/jetbrains/python/PyDocstringTest.java b/python/testSrc/com/jetbrains/python/PyDocstringTest.java
index a086fefc811e..f548e783046b 100644
--- a/python/testSrc/com/jetbrains/python/PyDocstringTest.java
+++ b/python/testSrc/com/jetbrains/python/PyDocstringTest.java
@@ -48,15 +48,15 @@ public class PyDocstringTest extends PyTestCase {
                 " ... #comm\n"+
                 " ...   pass", "Py:SPACE", "Py:IF_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:COLON", "Py:STATEMENT_BREAK", "Py:LINE_BREAK", "Py:END_OF_LINE_COMMENT", "Py:LINE_BREAK", "Py:INDENT", "Py:PASS_KEYWORD", "Py:STATEMENT_BREAK");
   }
-  public void testFunctionName() throws Throwable {
+  public void testFunctionName() {
     doCompletionTest();
   }
 
-  public void testClassName() throws Throwable {
+  public void testClassName() {
     doCompletionTest();
   }
 
-  public void doCompletionTest() throws Throwable {
+  public void doCompletionTest() {
     String inputDataFileName = getInputDataFileName(getTestName(true));
     String expectedResultFileName = getExpectedResultFileName(getTestName(true));
     myFixture.testCompletion(inputDataFileName, expectedResultFileName);
diff --git a/python/testSrc/com/jetbrains/python/PyEditingTest.java b/python/testSrc/com/jetbrains/python/PyEditingTest.java
index 38b590773f6f..d44c09050e0d 100644
--- a/python/testSrc/com/jetbrains/python/PyEditingTest.java
+++ b/python/testSrc/com/jetbrains/python/PyEditingTest.java
@@ -90,7 +90,7 @@ public class PyEditingTest extends PyTestCase {
   }
 
   // PY-18972
-  public void testFString() throws Exception {
+  public void testFString() {
     assertEquals("f''", doTestTyping("f", 1, '\''));
     assertEquals("rf''", doTestTyping("rf", 2, '\''));
     assertEquals("fr''", doTestTyping("fr", 2, '\''));
@@ -128,7 +128,7 @@ public class PyEditingTest extends PyTestCase {
     myFixture.checkResultByFile("/editing/" + fileName + ".after.py", true);
   }
 
-  public void testUncommentWithSpace() throws Exception {   // PY-980
+  public void testUncommentWithSpace() {   // PY-980
     myFixture.configureByFile("/editing/uncommentWithSpace.before.py");
     myFixture.getEditor().getCaretModel().moveToLogicalPosition(new LogicalPosition(0, 1));
     PlatformTestUtil.invokeNamedAction(IdeActions.ACTION_COMMENT_LINE);
diff --git a/python/testSrc/com/jetbrains/python/PyFormatterTest.java b/python/testSrc/com/jetbrains/python/PyFormatterTest.java
index 8ad3b04247fe..da4c9a612775 100644
--- a/python/testSrc/com/jetbrains/python/PyFormatterTest.java
+++ b/python/testSrc/com/jetbrains/python/PyFormatterTest.java
@@ -661,7 +661,7 @@ public class PyFormatterTest extends PyTestCase {
     doTest();
   }
 
-  public void testDoNotDestroyAlignment_OnPostponedFormatting() throws Exception {
+  public void testDoNotDestroyAlignment_OnPostponedFormatting() {
     getPythonCodeStyleSettings().DICT_ALIGNMENT = PyCodeStyleSettings.DICT_ALIGNMENT_ON_COLON;
     doTest();
   }
diff --git a/python/testSrc/com/jetbrains/python/PyInheritorsSearchTest.java b/python/testSrc/com/jetbrains/python/PyInheritorsSearchTest.java
index c0ebd0d929da..c7c4d31083d8 100644
--- a/python/testSrc/com/jetbrains/python/PyInheritorsSearchTest.java
+++ b/python/testSrc/com/jetbrains/python/PyInheritorsSearchTest.java
@@ -28,21 +28,21 @@ import java.util.Collection;
  * @author yole
  */
 public class PyInheritorsSearchTest extends PyTestCase {
-  public void testSimple() throws Exception {
+  public void testSimple() {
     setupProject();
     final PyClass pyClass = findClass("A");
     Collection<PyClass> inheritors = PyClassInheritorsSearch.search(pyClass, false).findAll();
     assertEquals(2, inheritors.size());
   }
 
-  public void testDeep() throws Exception {
+  public void testDeep() {
     setupProject();
     final PyClass pyClass = findClass("A");
     Collection<PyClass> inheritors = PyClassInheritorsSearch.search(pyClass, true).findAll();
     assertEquals(2, inheritors.size());
   }
 
-  public void testDotted() throws Exception {
+  public void testDotted() {
     setupProject();
     final PyClass pyClass = findClass("A");
     Collection<PyClass> inheritors = PyClassInheritorsSearch.search(pyClass, true).findAll();
@@ -50,14 +50,14 @@ public class PyInheritorsSearchTest extends PyTestCase {
   }
 
   // PY-19461
-  public void testInheritorsWhenSuperClassImportedWithAs() throws Exception {
+  public void testInheritorsWhenSuperClassImportedWithAs() {
     setupProject();
     final PyClass pyClass = findClass("C");
     final Collection<PyClass> inheritors = PyClassInheritorsSearch.search(pyClass, false).findAll();
     assertSameElements(inheritors, findClass("D"));
   }
 
-  private void setupProject() throws Exception {
+  private void setupProject() {
     String testName = getTestName(true);
     myFixture.copyDirectoryToProject(testName, "");
     PsiDocumentManager.getInstance(myFixture.getProject()).commitAllDocuments();
diff --git a/python/testSrc/com/jetbrains/python/PyOverrideTest.java b/python/testSrc/com/jetbrains/python/PyOverrideTest.java
index 46ceb7885fa6..ce4c9597ab02 100644
--- a/python/testSrc/com/jetbrains/python/PyOverrideTest.java
+++ b/python/testSrc/com/jetbrains/python/PyOverrideTest.java
@@ -52,7 +52,7 @@ public class PyOverrideTest extends PyTestCase {
   /**
    * Ensures loops in class hierarchy does not lead to SO
    */
-  public final void testCircle() throws Exception {
+  public final void testCircle() {
     doTest();
   }
 
diff --git a/python/testSrc/com/jetbrains/python/PySmartEnterTest.java b/python/testSrc/com/jetbrains/python/PySmartEnterTest.java
index 761db67c4d49..e97751ed9a14 100644
--- a/python/testSrc/com/jetbrains/python/PySmartEnterTest.java
+++ b/python/testSrc/com/jetbrains/python/PySmartEnterTest.java
@@ -44,7 +44,7 @@ public class PySmartEnterTest extends PyTestCase {
     final List<SmartEnterProcessor> processors = getSmartProcessors(PythonLanguage.getInstance());
     new WriteCommandAction(myFixture.getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Editor editor = myFixture.getEditor();
         for (SmartEnterProcessor processor : processors) {
           processor.process(myFixture.getProject(), editor, myFixture.getFile());
diff --git a/python/testSrc/com/jetbrains/python/PyStatementListTest.java b/python/testSrc/com/jetbrains/python/PyStatementListTest.java
index 0d01cde05dd4..5547b65be6c3 100644
--- a/python/testSrc/com/jetbrains/python/PyStatementListTest.java
+++ b/python/testSrc/com/jetbrains/python/PyStatementListTest.java
@@ -35,7 +35,7 @@ public class PyStatementListTest extends PyTestCase {
 
     new WriteCommandAction.Simple(myFixture.getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         list1.add(list2.getStatements()[0]);
       }
     }.execute();
diff --git a/python/testSrc/com/jetbrains/python/PyStatementPartsTest.java b/python/testSrc/com/jetbrains/python/PyStatementPartsTest.java
index 075a5350f378..2353e5a661a7 100644
--- a/python/testSrc/com/jetbrains/python/PyStatementPartsTest.java
+++ b/python/testSrc/com/jetbrains/python/PyStatementPartsTest.java
@@ -34,7 +34,7 @@ public class PyStatementPartsTest extends LightMarkedTestCase {
     return PythonTestUtil.getTestDataPath() + "/psi/parts/";
   }
 
-  public void testIf() throws Exception {
+  public void testIf() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(2, marks.size());
     PsiElement elt = marks.get("<the_if>").getParent().getParent(); // if_keyword -> if_part -> if_stmt
@@ -46,7 +46,7 @@ public class PyStatementPartsTest extends LightMarkedTestCase {
     Assert.assertEquals(marks.get("<the_cond>").getParent(), if_cond);
   }
 
-  public void testIfElse() throws Exception {
+  public void testIfElse() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(4, marks.size());
     PsiElement elt = marks.get("<the_if>").getParent().getParent(); // if_keyword -> if_part -> if_stmt
@@ -71,7 +71,7 @@ public class PyStatementPartsTest extends LightMarkedTestCase {
 
   }
 
-  public void testIfElifElse() throws Exception {
+  public void testIfElifElse() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(6, marks.size());
     PsiElement elt = marks.get("<the_if>").getParent().getParent(); // if_keyword -> if_part -> if_stmt
@@ -105,7 +105,7 @@ public class PyStatementPartsTest extends LightMarkedTestCase {
 
   }
 
-  public void testWhile()  throws Exception {
+  public void testWhile() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(3, marks.size());
 
@@ -123,7 +123,7 @@ public class PyStatementPartsTest extends LightMarkedTestCase {
     Assert.assertEquals(while_stmt.getElsePart(), elt);
   }
 
-  public void testFor()  throws Exception {
+  public void testFor() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(4, marks.size());
 
@@ -144,7 +144,7 @@ public class PyStatementPartsTest extends LightMarkedTestCase {
     Assert.assertEquals(stmt.getElsePart(), elt);
   }
 
-  public void testTry() throws Exception {
+  public void testTry() {
     Map<String, PsiElement> marks = loadTest();
     Assert.assertEquals(6, marks.size());
 
diff --git a/python/testSrc/com/jetbrains/python/PyStubsTest.java b/python/testSrc/com/jetbrains/python/PyStubsTest.java
index 698ed521044d..cefc923f0233 100644
--- a/python/testSrc/com/jetbrains/python/PyStubsTest.java
+++ b/python/testSrc/com/jetbrains/python/PyStubsTest.java
@@ -204,7 +204,7 @@ public class PyStubsTest extends PyTestCase {
 
     new WriteCommandAction(myFixture.getProject(), fileImpl) {
       @Override
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         pyClass.setName("RenamedClass");
         assertEquals("RenamedClass", pyClass.getName());
       }
@@ -215,7 +215,7 @@ public class PyStubsTest extends PyTestCase {
 
     new WriteCommandAction(myFixture.getProject(), fileImpl) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         ((SingleRootFileViewProvider)fileImpl.getViewProvider()).onContentReload();
       }
     }.execute();
diff --git a/python/testSrc/com/jetbrains/python/PySurroundWithTest.java b/python/testSrc/com/jetbrains/python/PySurroundWithTest.java
index 8c1d7fb68540..e0952b1d24eb 100644
--- a/python/testSrc/com/jetbrains/python/PySurroundWithTest.java
+++ b/python/testSrc/com/jetbrains/python/PySurroundWithTest.java
@@ -29,50 +29,50 @@ import com.jetbrains.python.refactoring.surround.surrounders.statements.PyWithWh
  * @author yole
  */
 public class PySurroundWithTest extends PyTestCase {
-  public void testSurroundWithIf() throws Exception {
+  public void testSurroundWithIf() {
     doTest(new PyWithIfSurrounder());
   }
 
-  public void testSurroundWithWhile() throws Exception {
+  public void testSurroundWithWhile() {
     doTest(new PyWithWhileSurrounder());
   }
 
-  public void testSurroundWithTryExcept() throws Exception {
+  public void testSurroundWithTryExcept() {
     doTest(new PyWithTryExceptSurrounder());
   }
 
   // PY-11357
-  public void testCustomFoldingRegionFirstMethod() throws Exception {
+  public void testCustomFoldingRegionFirstMethod() {
     doTestSurroundWithCustomFoldingRegion();
   }
 
   // PY-11357
-  public void testCustomFoldingRegionLastMethod() throws Exception {
+  public void testCustomFoldingRegionLastMethod() {
     doTestSurroundWithCustomFoldingRegion();
   }
 
   // PY-14261
-  public void testCustomFoldingRegionPreservesIndentation() throws Exception {
+  public void testCustomFoldingRegionPreservesIndentation() {
     doTestSurroundWithCustomFoldingRegion();
   }
 
-  public void testCustomFoldingRegionSingleCharacter() throws Exception {
+  public void testCustomFoldingRegionSingleCharacter() {
     doTestSurroundWithCustomFoldingRegion();
   }
 
-  public void testCustomFoldingRegionSingleStatementInFile() throws Exception {
+  public void testCustomFoldingRegionSingleStatementInFile() {
     doTestSurroundWithCustomFoldingRegion();
   }
 
-  public void testCustomFoldingRegionIllegalSelection() throws Exception {
+  public void testCustomFoldingRegionIllegalSelection() {
     doTestSurroundWithCustomFoldingRegion();
   }
 
-  public void testCustomFoldingRegionSeveralMethods() throws Exception {
+  public void testCustomFoldingRegionSeveralMethods() {
     doTestSurroundWithCustomFoldingRegion();
   }
 
-  private void doTestSurroundWithCustomFoldingRegion() throws Exception {
+  private void doTestSurroundWithCustomFoldingRegion() {
     final Surrounder surrounder = ContainerUtil.find(CustomFoldingSurroundDescriptor.SURROUNDERS, new Condition<Surrounder>() {
       @Override
       public boolean value(Surrounder surrounder) {
@@ -83,19 +83,19 @@ public class PySurroundWithTest extends PyTestCase {
     doTest(surrounder);
   }
 
-  public void testSurroundCommentAtStart() throws Exception {
+  public void testSurroundCommentAtStart() {
     doTest(new PyWithIfSurrounder());
   }
 
-  public void testSurroundCommentAtEnd() throws Exception {
+  public void testSurroundCommentAtEnd() {
     doTest(new PyWithIfSurrounder());
   }
 
-  public void testSurroundNewline() throws Exception {
+  public void testSurroundNewline() {
     doTest(new PyWithIfSurrounder());
   }
 
-  private void doTest(final Surrounder surrounder) throws Exception {
+  private void doTest(final Surrounder surrounder) {
     String baseName = "/surround/" + getTestName(false);
     myFixture.configureByFile(baseName + ".py");
     SurroundWithHandler.invoke(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile(), surrounder);
diff --git a/python/testSrc/com/jetbrains/python/PyTypeTest.java b/python/testSrc/com/jetbrains/python/PyTypeTest.java
index 2d807e1c6b75..74734d6cbf95 100644
--- a/python/testSrc/com/jetbrains/python/PyTypeTest.java
+++ b/python/testSrc/com/jetbrains/python/PyTypeTest.java
@@ -38,7 +38,7 @@ public class PyTypeTest extends PyTestCase {
   /**
    * Call of union returns union of all callable types in this union
    */
-  public void testCallableInUnion() throws Exception {
+  public void testCallableInUnion() {
     doTest("str",
            "import random\n" +
            "def spam():\n" +
diff --git a/python/testSrc/com/jetbrains/python/PythonAutoPopupTest.java b/python/testSrc/com/jetbrains/python/PythonAutoPopupTest.java
index 0df52f86f14d..f6107cfcc542 100644
--- a/python/testSrc/com/jetbrains/python/PythonAutoPopupTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonAutoPopupTest.java
@@ -40,7 +40,7 @@ public class PythonAutoPopupTest extends PyTestCase {
   }
 
   @Override
-  protected void invokeTestRunnable(@NotNull Runnable runnable) throws Exception {
+  protected void invokeTestRunnable(@NotNull Runnable runnable) {
     myTester.runWithAutoPopupEnabled(runnable);
   }
 
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index 18da51cbdcd8..2a42a8e6505e 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -22,15 +22,11 @@ import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
 import com.intellij.codeInsight.lookup.Lookup;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.QualifiedName;
 import com.intellij.testFramework.PsiTestUtil;
 import com.jetbrains.python.documentation.PyDocumentationSettings;
 import com.jetbrains.python.documentation.docstrings.DocStringFormat;
 import com.jetbrains.python.fixtures.PyTestCase;
 import com.jetbrains.python.psi.LanguageLevel;
-import com.jetbrains.python.psi.PyReferenceExpression;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -446,7 +442,7 @@ public class PythonCompletionTest extends PyTestCase {
   }
 
   // PY-16877
-  public void testTwoWordsSectionNameInGoogleDocstring() throws Exception {
+  public void testTwoWordsSectionNameInGoogleDocstring() {
     runWithDocStringFormat(DocStringFormat.GOOGLE, this::doTest);
   }
 
diff --git a/python/testSrc/com/jetbrains/python/PythonLexerTest.java b/python/testSrc/com/jetbrains/python/PythonLexerTest.java
index e557727259bc..d34673658e66 100644
--- a/python/testSrc/com/jetbrains/python/PythonLexerTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonLexerTest.java
@@ -155,7 +155,7 @@ public class PythonLexerTest extends PyLexerTestCase {
   }
 
 
-  public void _testWithKeyword() throws Exception {
+  public void _testWithKeyword() {
     // processing of 'from __future__ import' is now done on parser level, so a pure lexer test won't handle
     // this correctly
     doTest("from __future__ import with_statement\nwith x as y", new String[] { "Py:FROM_KEYWORD", "Py:SPACE", "Py:IDENTIFIER", "Py:SPACE", "Py:IMPORT_KEYWORD", "Py:SPACE", "Py:IDENTIFIER",
diff --git a/python/testSrc/com/jetbrains/python/PythonReparseTest.java b/python/testSrc/com/jetbrains/python/PythonReparseTest.java
index d05812827ef7..a9fdeda53516 100644
--- a/python/testSrc/com/jetbrains/python/PythonReparseTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonReparseTest.java
@@ -10,7 +10,7 @@ import com.jetbrains.python.fixtures.PyTestCase;
  * @author Mikhail Golubev
  */
 public class PythonReparseTest extends PyTestCase {
-  private void doTest(final String typedText) throws InterruptedException {
+  private void doTest(final String typedText) {
     final String testName = getTestName(false);
     myFixture.configureByFile("reparse/" + testName + ".py");
     myFixture.type(typedText);
@@ -22,7 +22,7 @@ public class PythonReparseTest extends PyTestCase {
   }
 
   // PY-15605
-  public void testSimilarDecorators() throws InterruptedException {
+  public void testSimilarDecorators() {
     doTest("f");
   }
 }
diff --git a/python/testSrc/com/jetbrains/python/codeInsight/PyLineMarkerProviderTest.java b/python/testSrc/com/jetbrains/python/codeInsight/PyLineMarkerProviderTest.java
index a555e268f994..8a41e723afbe 100644
--- a/python/testSrc/com/jetbrains/python/codeInsight/PyLineMarkerProviderTest.java
+++ b/python/testSrc/com/jetbrains/python/codeInsight/PyLineMarkerProviderTest.java
@@ -40,7 +40,7 @@ public final class PyLineMarkerProviderTest extends PyTestCase {
   /**
    * Checks method has "up" arrow when overrides, and this arrow works
    */
-  public void testOverriding() throws Exception {
+  public void testOverriding() {
     myFixture.copyDirectoryToProject("lineMarkerTest", "");
     myFixture.configureByFile("spam.py");
 
diff --git a/python/testSrc/com/jetbrains/python/codeInsight/testIntegration/PyTestCreatorTest.java b/python/testSrc/com/jetbrains/python/codeInsight/testIntegration/PyTestCreatorTest.java
index 4f012f00d114..01fce57e0cd9 100644
--- a/python/testSrc/com/jetbrains/python/codeInsight/testIntegration/PyTestCreatorTest.java
+++ b/python/testSrc/com/jetbrains/python/codeInsight/testIntegration/PyTestCreatorTest.java
@@ -33,7 +33,7 @@ import static org.easymock.EasyMock.expect;
  * @author Ilya.Kazakevich
  */
 public final class PyTestCreatorTest extends PyTestCase {
-  public void testCreateTest() throws Exception {
+  public void testCreateTest() {
 
     myFixture.configureByFile("/create_tests/create_tst.py");
 
diff --git a/python/testSrc/com/jetbrains/python/fixtures/LightMarkedTestCase.java b/python/testSrc/com/jetbrains/python/fixtures/LightMarkedTestCase.java
index cc9b4ab663b6..086040eda74a 100644
--- a/python/testSrc/com/jetbrains/python/fixtures/LightMarkedTestCase.java
+++ b/python/testSrc/com/jetbrains/python/fixtures/LightMarkedTestCase.java
@@ -114,7 +114,7 @@ public abstract class LightMarkedTestCase extends PyTestCase {
     return result;
   }
 
-  protected Map<String, PsiElement> loadTest() throws Exception {
+  protected Map<String, PsiElement> loadTest() {
     String fname = getTestName(false) + ".py";
     return configureByFile(fname);
   }
diff --git a/python/testSrc/com/jetbrains/python/fixtures/PyResolveTestCase.java b/python/testSrc/com/jetbrains/python/fixtures/PyResolveTestCase.java
index 92ac19b3815f..a6cb499cb5fd 100644
--- a/python/testSrc/com/jetbrains/python/fixtures/PyResolveTestCase.java
+++ b/python/testSrc/com/jetbrains/python/fixtures/PyResolveTestCase.java
@@ -61,7 +61,7 @@ public abstract class PyResolveTestCase extends PyTestCase {
     return reference;
   }
 
-  protected abstract PsiElement doResolve() throws Exception;
+  protected abstract PsiElement doResolve();
 
   protected <T extends PsiElement> T assertResolvesTo(final LanguageLevel langLevel, final Class<T> aClass, final String name) {
     PythonLanguageLevelPusher.setForcedLanguageLevel(myFixture.getProject(), langLevel);
diff --git a/python/testSrc/com/jetbrains/python/hierarchy/PyCallHierarchyTest.java b/python/testSrc/com/jetbrains/python/hierarchy/PyCallHierarchyTest.java
index 6f538f023e17..cd53f03a4863 100644
--- a/python/testSrc/com/jetbrains/python/hierarchy/PyCallHierarchyTest.java
+++ b/python/testSrc/com/jetbrains/python/hierarchy/PyCallHierarchyTest.java
@@ -94,7 +94,7 @@ public class PyCallHierarchyTest extends PyTestCase {
     return getVerificationFilePath(CALLEE_VERIFICATION_SUFFIX);
   }
 
-  private void checkHierarchyTreeStructure(PyFunction function) throws Exception {
+  private void checkHierarchyTreeStructure(PyFunction function) {
     final PyCallerFunctionTreeStructure callerStructure = new PyCallerFunctionTreeStructure(myFixture.getProject(), function,
                                                                                             HierarchyBrowserBaseEx.SCOPE_PROJECT);
     assertSameLinesWithFile(getVerificationCallerFilePath(), dump(callerStructure, null));
@@ -103,7 +103,7 @@ public class PyCallHierarchyTest extends PyTestCase {
     assertSameLinesWithFile(getVerificationCalleeFilePath(), dump(calleeStructure, null));
   }
 
-  private void doTestCallHierarchy(String ... fileNames) throws Exception {
+  private void doTestCallHierarchy(String ... fileNames) {
     configureByFiles(fileNames);
 
     final PsiElement targetElement = TargetElementUtil
@@ -116,43 +116,43 @@ public class PyCallHierarchyTest extends PyTestCase {
     checkHierarchyTreeStructure(function);
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doTestCallHierarchy("main.py");
   }
 
-  public void testArgumentList() throws Exception {
+  public void testArgumentList() {
     doTestCallHierarchy("main.py", "file_1.py");
   }
 
-  public void testDefaultValue() throws Exception {
+  public void testDefaultValue() {
     doTestCallHierarchy("main.py");
   }
 
-  public void testLambda() throws Exception {
+  public void testLambda() {
     doTestCallHierarchy("main.py", "file_1.py");
   }
 
-  public void testNestedCall() throws Exception {
+  public void testNestedCall() {
     doTestCallHierarchy("main.py", "file_1.py");
   }
 
-  public void testInheritance() throws Exception {
+  public void testInheritance() {
     doTestCallHierarchy("main.py");
   }
 
-  public void testOverriddenMethod() throws Exception {
+  public void testOverriddenMethod() {
     doTestCallHierarchy("main.py", "file_1.py");
   }
 
-  public void testInnerFunction() throws Exception {
+  public void testInnerFunction() {
     doTestCallHierarchy("main.py");
   }
 
-  public void testConstructor() throws Exception {
+  public void testConstructor() {
     doTestCallHierarchy("main.py");
   }
 
-  public void testParentheses() throws Exception {
+  public void testParentheses() {
     doTestCallHierarchy("main.py", "file_1.py");
   }
 }
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
index 9d96366f576a..5ef1251c57e3 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
@@ -469,7 +469,7 @@ public class PyUnresolvedReferencesInspectionTest extends PyInspectionTestCase {
   }
 
   // PY-14359, PY-14158
-  public void testInspectionSettingsSerializable() throws Exception {
+  public void testInspectionSettingsSerializable() {
     final PyUnresolvedReferencesInspection inspection = new PyUnresolvedReferencesInspection();
     inspection.ignoredIdentifiers.add("foo.Bar.*");
     final Element serialized = new Element("tmp");
diff --git a/python/testSrc/com/jetbrains/python/intentions/PyConvertMethodToPropertyIntentionTest.java b/python/testSrc/com/jetbrains/python/intentions/PyConvertMethodToPropertyIntentionTest.java
index 7aa1b5077f05..a3b9a646e6e8 100644
--- a/python/testSrc/com/jetbrains/python/intentions/PyConvertMethodToPropertyIntentionTest.java
+++ b/python/testSrc/com/jetbrains/python/intentions/PyConvertMethodToPropertyIntentionTest.java
@@ -22,27 +22,27 @@ import com.jetbrains.python.PyBundle;
  */
 public class PyConvertMethodToPropertyIntentionTest extends PyIntentionTestCase {
 
-  public void testParamList() throws Exception {
+  public void testParamList() {
     doNegativeTest(PyBundle.message("INTN.convert.method.to.property"));
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doIntentionTest(PyBundle.message("INTN.convert.method.to.property"));
   }
 
-  public void testProperty() throws Exception {
+  public void testProperty() {
     doNegativeTest(PyBundle.message("INTN.convert.method.to.property"));
   }
 
-  public void testEmptyReturn() throws Exception {
+  public void testEmptyReturn() {
     doNegativeTest(PyBundle.message("INTN.convert.method.to.property"));
   }
 
-  public void testYield() throws Exception {
+  public void testYield() {
     doIntentionTest(PyBundle.message("INTN.convert.method.to.property"));
   }
 
-  public void testNoReturn() throws Exception {
+  public void testNoReturn() {
     doNegativeTest(PyBundle.message("INTN.convert.method.to.property"));
   }
 
diff --git a/python/testSrc/com/jetbrains/python/packaging/PyPackageTest.java b/python/testSrc/com/jetbrains/python/packaging/PyPackageTest.java
index 976ae8bbef67..1a0fc0603c8b 100644
--- a/python/testSrc/com/jetbrains/python/packaging/PyPackageTest.java
+++ b/python/testSrc/com/jetbrains/python/packaging/PyPackageTest.java
@@ -11,7 +11,7 @@ import java.util.Collections;
 public class PyPackageTest extends TestCase {
 
   // http://legacy.python.org/dev/peps/pep-0386/
-  public void testIsAtLeastVersionNormal() throws Exception {
+  public void testIsAtLeastVersionNormal() {
     final PyPackage pyPackage = new PyPackage("somePackage", "1.2.3.4", null, Collections.emptyList());
     assertTrue("Failed to check normal version", pyPackage.matches(createRequirement("somePackage>=1.2")));
     assertTrue("Failed to check normal version", pyPackage.matches(createRequirement("somePackage>=1.2.3")));
@@ -27,7 +27,7 @@ public class PyPackageTest extends TestCase {
   }
 
 
-  public void testIsAtLeastVersionBeta() throws Exception {
+  public void testIsAtLeastVersionBeta() {
     final PyPackage pyPackage = new PyPackage("somePackage", "0.5a3", null, Collections.emptyList());
     assertTrue("Failed to check alpha version", pyPackage.matches(createRequirement("somePackage>=0.4")));
     assertTrue("Failed to check alpha version", pyPackage.matches(createRequirement("somePackage<=0.5")));
diff --git a/python/testSrc/com/jetbrains/python/psi/impl/PyArgumentListImplTest.java b/python/testSrc/com/jetbrains/python/psi/impl/PyArgumentListImplTest.java
index ddb37158eedf..6db11f6b1fd5 100644
--- a/python/testSrc/com/jetbrains/python/psi/impl/PyArgumentListImplTest.java
+++ b/python/testSrc/com/jetbrains/python/psi/impl/PyArgumentListImplTest.java
@@ -31,7 +31,7 @@ public class PyArgumentListImplTest extends PyClassRefactoringTest {
   /**
    * Ensures new keyword argument is set into appropriate place
    */
-  public void testAddKeyArgument() throws Exception {
+  public void testAddKeyArgument() {
     final PyKeywordArgument classKeyword = myGenerator.createKeywordArgument(myLanguagelevel, "metaclass", "ABCMeta");
     final PyKeywordArgument functionKeyword = myGenerator.createKeywordArgument(myLanguagelevel, "new_param", "spam");
 
@@ -42,7 +42,7 @@ public class PyArgumentListImplTest extends PyClassRefactoringTest {
   /**
    * Ensures new param (NOT keyword argument) is set into appropriate place
    */
-  public void testAddParam() throws Exception {
+  public void testAddParam() {
     final PyExpression classParameter = myGenerator.createParameter("SuperClass");
     final PyExpression functionParameter = myGenerator.createParameter("new_param");
 
diff --git a/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java b/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java
index f5b6f8843be9..3a8ea694fdef 100644
--- a/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java
+++ b/python/testSrc/com/jetbrains/python/quickFixes/PyAddImportQuickFixTest.java
@@ -27,11 +27,11 @@ import org.jetbrains.annotations.NotNull;
 public class PyAddImportQuickFixTest extends PyQuickFixTestCase {
 
   // PY-19773
-  public void testReexportedName() throws Exception {
+  public void testReexportedName() {
     doMultiFileAutoImportTest("Import 'flask.request'");
   }
 
-  public void testOsPathFunctions() throws Exception {
+  public void testOsPathFunctions() {
     doMultiFileAutoImportTest("Import 'os.path.join()'");
   }
 
diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java
index 6f3154b257c8..1fb404996917 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java
@@ -128,7 +128,7 @@ public class PyInlineLocalTest extends PyTestCase {
     }
   }
 
-  public void testOperatorPrecedence() throws Exception {
+  public void testOperatorPrecedence() {
     checkOperatorPrecedence("x = 10 ** 2", "power");
     checkOperatorPrecedence("x = 10 * 2", "multiplication");
     checkOperatorPrecedence("x = 10 / 2", "division");
@@ -146,11 +146,11 @@ public class PyInlineLocalTest extends PyTestCase {
   }
 
   // PY-15390
-  public void testMatMulPrecedence() throws Exception {
+  public void testMatMulPrecedence() {
     checkOperatorPrecedence("x = y @ z", "matrixMultiplication");
   }
 
-  private void checkOperatorPrecedence(@NotNull final String firstLine, @NotNull String resultPrefix) throws Exception {
+  private void checkOperatorPrecedence(@NotNull final String firstLine, @NotNull String resultPrefix) {
     myFixture.configureByFile("/refactoring/inlinelocal/operatorPrecedence/template.py");
     WriteCommandAction.runWriteCommandAction(myFixture.getProject(), () -> myFixture.getEditor().getDocument().insertString(0, firstLine + "\n"));
     PsiDocumentManager.getInstance(myFixture.getProject()).commitAllDocuments();
diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyUnwrapperTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyUnwrapperTest.java
index a00ed0fd0f2d..7c434606369f 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/PyUnwrapperTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyUnwrapperTest.java
@@ -30,43 +30,43 @@ import java.util.List;
  */
 public class PyUnwrapperTest extends PyTestCase {
 
-  public void testIfUnwrap()                          throws Throwable {doTest();}
-  public void testIfUnwrapEmpty()                     throws Throwable {doNegativeTest();}
-  public void testIfUnwrapMultipleStatements()        throws Throwable {doTest();}
-  public void testWhileUnwrap()                       throws Throwable {doTest();}
-  public void testWhileUnwrapEmpty()                  throws Throwable {doNegativeTest();}
-  public void testWhileUnwrapMultipleStatements()     throws Throwable {doTest();}
-  public void testWhileElseUnwrap()                   throws Throwable {doTest();}
+  public void testIfUnwrap() {doTest();}
+  public void testIfUnwrapEmpty() {doNegativeTest();}
+  public void testIfUnwrapMultipleStatements() {doTest();}
+  public void testWhileUnwrap() {doTest();}
+  public void testWhileUnwrapEmpty() {doNegativeTest();}
+  public void testWhileUnwrapMultipleStatements() {doTest();}
+  public void testWhileElseUnwrap() {doTest();}
 
-  public void testIfWithElseUnwrap()                  throws Throwable {doTest();}
-  public void testIfInWhileUnwrap()                   throws Throwable {doTest();}
-  public void testWhileInIfUnwrap()                   throws Throwable {doTest();}
-  public void testIfInIfUnwrap()                      throws Throwable {doTest();}
-  public void testWhileInWhileUnwrap()                throws Throwable {doTest();}
+  public void testIfWithElseUnwrap() {doTest();}
+  public void testIfInWhileUnwrap() {doTest();}
+  public void testWhileInIfUnwrap() {doTest();}
+  public void testIfInIfUnwrap() {doTest();}
+  public void testWhileInWhileUnwrap() {doTest();}
 
-  public void testElseInIfUnwrap()                    throws Throwable {doTest(1);}
-  public void testElseInIfDelete()                    throws Throwable {doTest();}
-  public void testInnerElseUnwrap()                   throws Throwable {doTest(1);}
+  public void testElseInIfUnwrap() {doTest(1);}
+  public void testElseInIfDelete() {doTest();}
+  public void testInnerElseUnwrap() {doTest(1);}
 
-  public void testElIfUnwrap()                        throws Throwable {doTest();}
-  public void testElIfDelete()                        throws Throwable {doTest(1);}
+  public void testElIfUnwrap() {doTest();}
+  public void testElIfDelete() {doTest(1);}
 
-  public void testTryUnwrap()                         throws Throwable {doTest();}
-  public void testTryFinallyUnwrap()                  throws Throwable {doTest();}
-  public void testTryElseFinallyUnwrap()              throws Throwable {doTest();}
+  public void testTryUnwrap() {doTest();}
+  public void testTryFinallyUnwrap() {doTest();}
+  public void testTryElseFinallyUnwrap() {doTest();}
 
-  public void testForUnwrap()                         throws Throwable {doTest();}
-  public void testForElseUnwrap()                     throws Throwable {doTest();}
+  public void testForUnwrap() {doTest();}
+  public void testForElseUnwrap() {doTest();}
 
-  public void testWithUnwrap()                        throws Throwable {doTest(LanguageLevel.PYTHON32);}
+  public void testWithUnwrap() {doTest(LanguageLevel.PYTHON32);}
 
-  public void testEndOfStatementUnwrap()              throws Throwable {doTest();}
-  public void testEndOfStatementNextLineUnwrap()      throws Throwable {doNegativeTest();}
+  public void testEndOfStatementUnwrap() {doTest();}
+  public void testEndOfStatementNextLineUnwrap() {doNegativeTest();}
 
-  public void testIfInElifBranchUnwrap()              throws Throwable {doNegativeTest(PyBundle.message("unwrap.if"));}
+  public void testIfInElifBranchUnwrap() {doNegativeTest(PyBundle.message("unwrap.if"));}
 
-  public void testWhitespaceAtCaretUnwrap()           throws Throwable {doTest();}
-  public void testEmptyLineAtCaretUnwrap()            throws Throwable {doTest();}
+  public void testWhitespaceAtCaretUnwrap() {doTest();}
+  public void testEmptyLineAtCaretUnwrap() {doTest();}
 
   private void doTest() {
     doTest(0);
diff --git a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
index 4ccc253be1bb..41beeac3c13a 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureTest.java
@@ -232,7 +232,7 @@ public class PyChangeSignatureTest extends PyTestCase {
   }
 
   // PY-14774
-  public void testAnnotationsForStarredParametersAreNotShownInDialog() throws Exception {
+  public void testAnnotationsForStarredParametersAreNotShownInDialog() {
     runWithLanguageLevel(LanguageLevel.PYTHON30, () -> {
       myFixture.configureByText(PythonFileType.INSTANCE, "def func(a, b:int, *args: tuple, c:list, d:str='foo', ** kwargs:dict):\n" +
                                                          "    pass");
@@ -244,28 +244,28 @@ public class PyChangeSignatureTest extends PyTestCase {
     });
   }
 
-  public void testDuplicateNamesOfStarredParameters() throws Exception {
+  public void testDuplicateNamesOfStarredParameters() {
     final PyParameterInfo firstParam = new PyParameterInfo(0, "*foo", null, false);
     firstParam.setName("*bar");
     doValidationTest(null, Arrays.asList(firstParam, new PyParameterInfo(1, "**bar", null, false)),
                      PyBundle.message("ANN.duplicate.param.name"));
   }
 
-  public void testMultipleSingleStarredParameters() throws Exception {
+  public void testMultipleSingleStarredParameters() {
     final PyParameterInfo firstParam = new PyParameterInfo(0, "foo", null, false);
     firstParam.setName("*foo");
     doValidationTest(null, Arrays.asList(firstParam, new PyParameterInfo(1, "*bar", null, false)),
                      PyBundle.message("refactoring.change.signature.dialog.validation.multiple.star"));
   }
 
-  public void testMultipleDoubleStarredParameters() throws Exception {
+  public void testMultipleDoubleStarredParameters() {
     final PyParameterInfo firstParam = new PyParameterInfo(0, "foo", null, false);
     firstParam.setName("**foo");
     doValidationTest(null, Arrays.asList(firstParam, new PyParameterInfo(1, "**bar", null, false)),
                      PyBundle.message("refactoring.change.signature.dialog.validation.multiple.double.star"));
   }
 
-  public void testParameterNameWithMoreThanTwoStars() throws Exception {
+  public void testParameterNameWithMoreThanTwoStars() {
     final PyParameterInfo firstParam = new PyParameterInfo(0, "**kwargs", null, false);
     firstParam.setName("***kwargs");
     doValidationTest(null, Arrays.asList(firstParam), PyBundle.message("refactoring.change.signature.dialog.validation.parameter.name"));
diff --git a/python/testSrc/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassTest.java b/python/testSrc/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassTest.java
index 0834114bab8f..54a7cbd8a702 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassTest.java
@@ -45,38 +45,38 @@ public class PyExtractSuperclassTest extends PyClassRefactoringTest {
   }
 
   // Checks if class explicitly extends object we shall move it even in Py3K (PY-19137)
-  public void testPy3ParentHasObject() throws Exception {
+  public void testPy3ParentHasObject() {
     setLanguageLevel(LanguageLevel.PYTHON30);
     doSimpleTest("Child", "Parent", null, true, false, ".spam");
   }
 
   // Ensures refactoring works even if memeberInfo has null element (no npe: PY-19136)
-  public void testFieldsNpe() throws Exception {
+  public void testFieldsNpe() {
     doSimpleTest("Basic", "Ancestor", null, true, false, ".__init__", "#a", "#b", ".func1");
   }
 
   // Checks that moving methods between files moves imports as well
-  public void testImportMultiFile() throws Throwable {
+  public void testImportMultiFile() {
     multiFileTestHelper(".do_useful_stuff", false);
   }
 
   // Checks that moving methods between files moves superclass expressions as well
-  public void testMoveExtends() throws Throwable {
+  public void testMoveExtends() {
     multiFileTestHelper("TheParentOfItAll", false);
   }
 
   // Checks that moving methods between files moves superclass expressions regardless import style (q.name or name)
-  public void testMoveExtendsCheckReference() throws Throwable {
+  public void testMoveExtendsCheckReference() {
     multiFileTestHelper("TheParentOfItAll", false);
   }
 
   // Extracts method as abstract
-  public void testMoveAndMakeAbstract() throws Throwable {
+  public void testMoveAndMakeAbstract() {
     multiFileTestHelper(".foo_method", true);
   }
 
   // Extracts method as abstract and ensures that newly created class imports ABC in Py3
-  public void testMoveAndMakeAbstractImportExistsPy3() throws Throwable {
+  public void testMoveAndMakeAbstractImportExistsPy3() {
     setLanguageLevel(LanguageLevel.PYTHON30);
     configureMultiFile("abc");
     multiFileTestHelper(".foo_method", true);
@@ -98,56 +98,56 @@ public class PyExtractSuperclassTest extends PyClassRefactoringTest {
     final String destUrl = myFixture.getFile().getVirtualFile().getParent().findChild("dest_module.py").getUrl();
     new WriteCommandAction.Simple(myFixture.getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         PyExtractSuperclassHelper.extractSuperclass(findClass(sourceClass), Collections.singleton(member), "NewParent", destUrl);
       }
     }.execute();
     checkMultiFile(modules);
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doSimpleTest("Foo", "Suppa", null, true, false, ".foo");
   }
 
-  public void testInstanceNotDeclaredInInit() throws Exception {
+  public void testInstanceNotDeclaredInInit() {
     doSimpleTest("Child", "Parent", null, true, false, "#eggs");
   }
 
-  public void testWithSuper() throws Exception {
+  public void testWithSuper() {
     doSimpleTest("Foo", "Suppa", null, true, false, ".foo");
   }
 
-  public void testWithImport() throws Exception {
+  public void testWithImport() {
     doSimpleTest("A", "Suppa", null, false, false, ".foo");
   }
 
   // PY-12175
-  public void testImportNotBroken() throws Exception {
+  public void testImportNotBroken() {
     myFixture.copyFileToProject("/refactoring/extractsuperclass/shared.py", "shared.py");
     doSimpleTest("Source", "DestClass", null, true, false, "SharedClass");
   }
 
   // PY-12175 but between several files
-  public void testImportNotBrokenManyFiles() throws Exception {
+  public void testImportNotBrokenManyFiles() {
     multiFileTestHelper("SharedClass", false);
   }
 
-  public void testMoveFields() throws Exception {
+  public void testMoveFields() {
     doSimpleTest("FromClass", "ToClass", null, true, false, "#instance_field", "#CLASS_FIELD");
   }
 
 
-  public void testProperties() throws Exception {
+  public void testProperties() {
     doSimpleTest("FromClass", "ToClass", null, true, false, "#C", "#a", "._get", ".foo");
   }
 
   // PY-16747
-  public void testAbstractMethodDocStringIndentationPreserved() throws Exception {
+  public void testAbstractMethodDocStringIndentationPreserved() {
     doSimpleTest("B", "A", null, true, true, ".m");
   }
 
   // PY-16770
-  public void testAbstractMethodDocStringPrefixPreserved() throws Exception {
+  public void testAbstractMethodDocStringPrefixPreserved() {
     doSimpleTest("B", "A", null, true, true, ".m");
   }
 
@@ -155,7 +155,7 @@ public class PyExtractSuperclassTest extends PyClassRefactoringTest {
                             final String superclassName,
                             final String expectedError,
                             final boolean sameFile,
-                            boolean asAbstract, final String... membersName) throws Exception {
+                            boolean asAbstract, final String... membersName) {
     try {
       String baseName = "/refactoring/extractsuperclass/" + getTestName(true);
       myFixture.configureByFile(baseName + ".before.py");
@@ -170,7 +170,7 @@ public class PyExtractSuperclassTest extends PyClassRefactoringTest {
 
       new WriteCommandAction.Simple(myFixture.getProject()) {
         @Override
-        protected void run() throws Throwable {
+        protected void run() {
           //noinspection ConstantConditions
           final String url = sameFile ? myFixture.getFile().getVirtualFile().getUrl() :
                              myFixture.getFile().getVirtualFile().getParent().getUrl();
@@ -199,7 +199,7 @@ public class PyExtractSuperclassTest extends PyClassRefactoringTest {
 
     new WriteCommandAction.Simple(myFixture.getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         //noinspection ConstantConditions
         final String path = base_dir.getPath() + "/a/b";
         PyExtractSuperclassHelper.extractSuperclass(clazz, members, superclassName, path);
@@ -242,7 +242,7 @@ public class PyExtractSuperclassTest extends PyClassRefactoringTest {
 
     new WriteCommandAction.Simple(myFixture.getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         //TODO: Test via presenter
         //noinspection ConstantConditions
         final String path = base_dir.getPath() + "/a/b";
diff --git a/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModelTest.java b/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModelTest.java
index 382f9e37fff9..7811aac80ed7 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModelTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpInfoModelTest.java
@@ -40,7 +40,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
   /**
    * Checks class field depends on class field
    */
-  public void testClassMemberDependencies() throws Exception {
+  public void testClassMemberDependencies() {
     checkMembers("CLASS_FIELD_DEPENDS_ON_CLASS_FIELD_FOO");
     Assert.assertThat("Class member dependencies failed", getErrorMemberNames(), Matchers.containsInAnyOrder("CLASS_FIELD_FOO"));
   }
@@ -48,7 +48,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
   /**
    * Checks instance field depends on class field
    */
-  public void testInstanceMemberDependencies() throws Exception {
+  public void testInstanceMemberDependencies() {
     checkMembers("self.depends_on_class_field_foo");
     Assert.assertThat("Instance member dependencies failed", getErrorMemberNames(), Matchers.containsInAnyOrder("CLASS_FIELD_FOO"));
   }
@@ -56,7 +56,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
   /**
    * Checks method depends on another class field
    */
-  public void testMethodMemberDependencies() throws Exception {
+  public void testMethodMemberDependencies() {
     checkMembers("method_depends_on_normal_method(self)");
     Assert.assertThat("Method dependencies failed", getErrorMemberNames(), Matchers.containsInAnyOrder("normal_method(self)"));
   }
@@ -64,7 +64,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
   /**
    * Checks method depends on method
    */
-  public void testMethodOnInstanceMemberDependencies() throws Exception {
+  public void testMethodOnInstanceMemberDependencies() {
     checkMembers("method_depends_on_instance_field_bar(self)");
     Assert.assertThat("Instance on member dependencies failed", getErrorMemberNames(), Matchers.containsInAnyOrder("self.instance_field_bar"));
   }
@@ -73,7 +73,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
    * Check dependnecies for properties, declared in old-style
    *
    */
-  public void testOldProperty() throws Exception {
+  public void testOldProperty() {
     checkMembers("method_depends_on_old_property(self)");
     Assert.assertThat("Method on old property dependency failed", getErrorMemberNames(), Matchers.containsInAnyOrder(
       "old_property",
@@ -85,7 +85,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
    *
    * Check dependnecies for properties, declared in new-style
    */
-  public void testNewProperty() throws Exception {
+  public void testNewProperty() {
     checkMembers("method_depends_on_new_property(self)");
     Assert.assertThat("Method on new property dependency failed", getErrorMemberNames(), Matchers.containsInAnyOrder("new_property", "new_property_2"));
   }
@@ -94,7 +94,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
   /**
    * All dependencies are met: new (destination) class has all of them
    */
-  public void testParentDependenciesOk() throws Exception {
+  public void testParentDependenciesOk() {
     checkMembers("CLASS_FIELD_DEPENDS_ON_PARENT_FIELD",
                  "method_depends_on_parent_method(self)",
                  "method_depends_on_parent_field(self)");
@@ -106,7 +106,7 @@ public class PyPullUpInfoModelTest extends PyTestCase {
    * New (destination) class has no members, required by member under refactoring.
    * Error should be displayed.
    */
-  public void testNoParentDependenciesOk() throws Exception {
+  public void testNoParentDependenciesOk() {
     mySut.setSuperClass(getClassByName("EmptyParent"));
     checkMembers("CLASS_FIELD_DEPENDS_ON_PARENT_FIELD",
                  "method_depends_on_parent_method(self)",
diff --git a/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpPresenterTest.java b/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpPresenterTest.java
index c7216b2c833f..b62c4377df96 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpPresenterTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/classes/pullUp/PyPullUpPresenterTest.java
@@ -35,7 +35,7 @@ public class PyPullUpPresenterTest extends PyRefactoringPresenterTestCase<PyPull
   /**
    * Checks that parents are returned in MRO order and no parents outside of source root are included
    */
-  public void testParentsOrder() throws Exception {
+  public void testParentsOrder() {
     final PyPullUpPresenter sut = configureByClass("Child");
     configureParent();
     myMocksControl.replay();
@@ -50,14 +50,14 @@ public class PyPullUpPresenterTest extends PyRefactoringPresenterTestCase<PyPull
   /**
    * Checks that refactoring does not work for classes with out of allowed parents
    */
-  public void testNoParents() throws Exception {
+  public void testNoParents() {
     ensureNoMembers("NoParentsAllowed");
   }
 
   /**
    * Ensures that presenter displays conflicts if destination class already has that members
    */
-  public void testConflicts() throws Exception {
+  public void testConflicts() {
     final PyPullUpPresenterImpl sut = configureByClass("ChildWithConflicts");
     configureParent();
     final Collection<PyMemberInfo<PyElement>> infos = getMemberInfos(sut);
@@ -87,21 +87,21 @@ public class PyPullUpPresenterTest extends PyRefactoringPresenterTestCase<PyPull
   /**
    * Checks that refactoring does not work for classes with out of members
    */
-  public void testNoMembers() throws Exception {
+  public void testNoMembers() {
     ensureNoMembers("NoMembers");
   }
 
   /**
    * Checks that refactoring does not work when C3 MRO can't be calculated
    */
-  public void testBadMro() throws Exception {
+  public void testBadMro() {
     ensureNoMembers("BadMro");
   }
 
   /**
    * Checks that parent can't be moved to itself
    */
-  public void testNoMoveParentToItSelf() throws Exception {
+  public void testNoMoveParentToItSelf() {
     final Collection<PyPresenterTestMemberEntry> memberNamesAndStatus = launchAndGetMembers("Foo", "Bar");
 
     compareMembers(memberNamesAndStatus, Matchers.containsInAnyOrder(new PyPresenterTestMemberEntry("__init__(self)", true, false, false),
@@ -112,14 +112,14 @@ public class PyPullUpPresenterTest extends PyRefactoringPresenterTestCase<PyPull
   /**
    * Checks that some members are not allowed (and may nto be abstract), while others are for Py2
    */
-  public void testMembersPy2() throws Exception {
+  public void testMembersPy2() {
     ensureCorrectMembersForHugeChild(false);
   }
 
   /**
    * Checks that some members are not allowed (and may nto be abstract), while others are for Py3
    */
-  public void testMembersPy3() throws Exception {
+  public void testMembersPy3() {
     setLanguageLevel(LanguageLevel.PYTHON30);
     ensureCorrectMembersForHugeChild(true);
   }
@@ -174,7 +174,7 @@ public class PyPullUpPresenterTest extends PyRefactoringPresenterTestCase<PyPull
   /**
    * Checks that refactoring does not work for classes with out of members
    */
-  private void ensureNoMembers(@NotNull final String className) throws Exception {
+  private void ensureNoMembers(@NotNull final String className) {
     try {
       final PyPullUpPresenter sut = configureByClass(className);
 
diff --git a/python/testSrc/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownTest.java b/python/testSrc/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownTest.java
index 2c876fe50999..c4631324f0c3 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/classes/pushDown/PyPushDownTest.java
@@ -46,33 +46,33 @@ public class PyPushDownTest extends PyClassRefactoringTest {
     checkMultiFile(modules);
   }
 
-  public void testSimple() throws Exception {
+  public void testSimple() {
     doProcessorTest("Foo", null, ".foo");
   }
 
-  public void testSuperclass() throws Exception {
+  public void testSuperclass() {
     doProcessorTest("Zope", null, "Foo");
   }
 
-  public void testFull() throws Exception {
+  public void testFull() {
     doProcessorTest("Parent", null, "#CLASS_VAR_1", "#inst_var", ".method_1", "Dummny");
   }
 
-  public void testMultiple() throws Exception {
+  public void testMultiple() {
     doProcessorTest("Foo", null, ".foo");
   }
 
-  public void testPy346() throws Exception {
+  public void testPy346() {
     doProcessorTest("A", null, ".meth_a1", ".meth_a2");
   }
 
-  public void testExistingmethod() throws Exception {
+  public void testExistingmethod() {
     doProcessorTest("Foo",
                     "method <b><code>foo</code></b> is already overridden in class <b><code>Boo</code></b>. Method will not be pushed down to that class.",
                     ".foo");
   }
 
-  private void doProcessorTest(final String className, final String expectedError, final String... memberNames) throws Exception {
+  private void doProcessorTest(final String className, final String expectedError, final String... memberNames) {
     try {
       String baseName = "/refactoring/pushdown/" + getTestName(true);
       myFixture.configureByFile(baseName + ".before.py");
diff --git a/python/testSrc/com/jetbrains/python/remote/PyRemotePathMapperTest.java b/python/testSrc/com/jetbrains/python/remote/PyRemotePathMapperTest.java
index 1c1ff45d2c0a..0847d6b69ff5 100644
--- a/python/testSrc/com/jetbrains/python/remote/PyRemotePathMapperTest.java
+++ b/python/testSrc/com/jetbrains/python/remote/PyRemotePathMapperTest.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
  */
 public class PyRemotePathMapperTest {
   @Test
-  public void testFromSettings() throws Exception {
+  public void testFromSettings() {
     PathMappingSettings settings = new PathMappingSettings();
     PyRemotePathMapper emptyMapper = PyRemotePathMapper.fromSettings(settings, PyPathMappingType.USER_DEFINED);
 
@@ -49,7 +49,7 @@ public class PyRemotePathMapperTest {
   }
 
   @Test
-  public void testReplicatedFolderInsideSysPath() throws Exception {
+  public void testReplicatedFolderInsideSysPath() {
     PyRemotePathMapper mapper = new PyRemotePathMapper();
     mapper.addMapping("C:\\Users\\J.S.\\.PyCharm\\system\\remote_sources\\-114", "/development/lib", PyPathMappingType.SYS_PATH);
     mapper.addMapping("C:\\Users\\J.S.\\.PyCharm\\system\\remote_sources\\-27315", "/development/src/project/module",
diff --git a/python/testSrc/com/jetbrains/python/run/PyTracebackParserTest.java b/python/testSrc/com/jetbrains/python/run/PyTracebackParserTest.java
index 6d565316c99f..a3fd10f55fd6 100644
--- a/python/testSrc/com/jetbrains/python/run/PyTracebackParserTest.java
+++ b/python/testSrc/com/jetbrains/python/run/PyTracebackParserTest.java
@@ -30,7 +30,7 @@ public class PyTracebackParserTest extends TestCase {
   /**
    * Ensures we find link in stack trace
    */
-  public void testLineWithLink() throws Exception {
+  public void testLineWithLink() {
     final LinkInTrace linkInTrace = new PyTracebackParser().findLinkInTrace("File \"foo/bar.py\", line 42 failed");
     Assert.assertNotNull("Failed to parse line", linkInTrace);
     Assert.assertEquals("Bad file name", "foo/bar.py", linkInTrace.getFileName());
@@ -42,7 +42,7 @@ public class PyTracebackParserTest extends TestCase {
   /**
    * lines with out of file references should not have links
    */
-  public void testLineNoLink() throws Exception {
+  public void testLineNoLink() {
     Assert.assertNull("File with no lines should not work", new PyTracebackParser().findLinkInTrace("File \"foo/bar.py\""));
     Assert.assertNull("No file name provided, but link found", new PyTracebackParser().findLinkInTrace("line 42 failed"));
   }
diff --git a/python/testSrc/com/jetbrains/python/sdk/PythonSdkTypeTest.java b/python/testSrc/com/jetbrains/python/sdk/PythonSdkTypeTest.java
index 532fed4e80c5..cdcdb136d1bf 100644
--- a/python/testSrc/com/jetbrains/python/sdk/PythonSdkTypeTest.java
+++ b/python/testSrc/com/jetbrains/python/sdk/PythonSdkTypeTest.java
@@ -32,24 +32,24 @@ public class PythonSdkTypeTest extends PlatformLiteFixture {
     registerExtension(CredentialsLanguageContribution.EP_NAME, credentialsLanguageContribution);
   }
 
-  public void testLocalSdk() throws Exception {
+  public void testLocalSdk() {
     when(sdk.getSdkAdditionalData()).thenReturn(sdkAdditionalData);
     Assert.assertFalse(PythonSdkType.hasInvalidRemoteCredentials(sdk));
   }
 
-  public void testAbsentRemoteSdkCredentials() throws Exception {
+  public void testAbsentRemoteSdkCredentials() {
     when(sdk.getSdkAdditionalData()).thenReturn(remoteSdkAdditionalData);
     Assert.assertFalse(PythonSdkType.hasInvalidRemoteCredentials(sdk));
   }
 
-  public void testValidRemoteSdkCredentials() throws Exception {
+  public void testValidRemoteSdkCredentials() {
     when(vagrantBasedCredentialsHolder.getVagrantFolder()).thenReturn("/home/vagrant/box");
     mockSwitchOnConnectionType(remoteSdkAdditionalData, vagrantBasedCredentialsHolder);
     when(sdk.getSdkAdditionalData()).thenReturn(remoteSdkAdditionalData);
     Assert.assertFalse(PythonSdkType.hasInvalidRemoteCredentials(sdk));
   }
 
-  public void testInvalidRemoteSdkCredentials() throws Exception {
+  public void testInvalidRemoteSdkCredentials() {
     when(vagrantBasedCredentialsHolder.getVagrantFolder()).thenReturn("");
     mockSwitchOnConnectionType(remoteSdkAdditionalData, vagrantBasedCredentialsHolder);
     when(sdk.getSdkAdditionalData()).thenReturn(remoteSdkAdditionalData);
diff --git a/python/testSrc/com/jetbrains/python/sdk/flavors/WinPythonSdkFlavorTest.java b/python/testSrc/com/jetbrains/python/sdk/flavors/WinPythonSdkFlavorTest.java
index 707d0e4ffe06..e757c4a1037c 100644
--- a/python/testSrc/com/jetbrains/python/sdk/flavors/WinPythonSdkFlavorTest.java
+++ b/python/testSrc/com/jetbrains/python/sdk/flavors/WinPythonSdkFlavorTest.java
@@ -40,7 +40,7 @@ public final class WinPythonSdkFlavorTest {
   private WinRegistryService myMock;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     myControl = EasyMock.createControl(MockType.NICE);
     myMock = myControl.createMock(WinRegistryService.class);
   }
diff --git a/python/testSrc/com/jetbrains/python/sdkTools/PyTestSdkTools.java b/python/testSrc/com/jetbrains/python/sdkTools/PyTestSdkTools.java
index 26230463d676..302ea372bbcc 100644
--- a/python/testSrc/com/jetbrains/python/sdkTools/PyTestSdkTools.java
+++ b/python/testSrc/com/jetbrains/python/sdkTools/PyTestSdkTools.java
@@ -66,7 +66,7 @@ public final class PyTestSdkTools {
                                   @NotNull final SdkCreationType sdkCreationType,
                                   @Nullable final Module module
   )
-    throws InvalidSdkException, IOException {
+    throws InvalidSdkException {
     final Ref<Sdk> ref = Ref.create();
     EdtTestUtil.runInEdtAndWait(() -> {
       final Sdk sdk = SdkConfigurationUtil.setupSdk(NO_SDK, sdkHome, PythonSdkType.getInstance(), true, null, null);
@@ -94,7 +94,7 @@ public final class PyTestSdkTools {
   public static void generateTempSkeletonsOrPackages(@NotNull final Sdk sdk,
                                                      final boolean addSkeletons,
                                                      @Nullable final Module module)
-    throws InvalidSdkException, IOException {
+    throws InvalidSdkException {
     Project project = null;
 
     if (module != null) {
diff --git a/python/testSrc/com/jetbrains/python/testing/pytest/PyTestTracebackParserTest.java b/python/testSrc/com/jetbrains/python/testing/pytest/PyTestTracebackParserTest.java
index 7f312a68cffa..c2a4269c9577 100644
--- a/python/testSrc/com/jetbrains/python/testing/pytest/PyTestTracebackParserTest.java
+++ b/python/testSrc/com/jetbrains/python/testing/pytest/PyTestTracebackParserTest.java
@@ -41,7 +41,7 @@ public final class PyTestTracebackParserTest {
   private String myBase64Junk;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     // Generate junk to text regexp speed
     final int junkSize = 50000;
     final byte[] junk = new byte[junkSize];
@@ -61,7 +61,7 @@ public final class PyTestTracebackParserTest {
    * Ensures we find link in stack trace
    */
   @Test
-  public void testLineWithLink() throws Exception {
+  public void testLineWithLink() {
     final LinkInTrace linkInTrace = new PyTestTracebackParser().findLinkInTrace("foo/bar.py:42 file ");
     Assert.assertNotNull("Failed to parse line", linkInTrace);
     Assert.assertEquals("Bad file name", "foo/bar.py", linkInTrace.getFileName());
@@ -74,7 +74,7 @@ public final class PyTestTracebackParserTest {
    * lines with out of file references should not have links
    */
   @Test
-  public void testLineNoLink() throws Exception {
+  public void testLineNoLink() {
     Assert.assertNull("File with no lines should not work", new PyTestTracebackParser().findLinkInTrace("foo/bar.py file "));
     Assert.assertNull("No file name provided, but link found", new PyTestTracebackParser().findLinkInTrace(":12 file "));
   }
@@ -116,7 +116,7 @@ public final class PyTestTracebackParserTest {
      * Regexp worst cases are limited to prevent freezing on very long lines
      */
     @Test(timeout = 5000)
-    public void testLongLines ()throws Exception {
+    public void testLongLines () {
       Assert
         .assertNull("No link should be found in numbers list", new PyTestTracebackParser().findLinkInTrace(myStringJunk));
       Assert.assertNull("No link should be found in base64 list", new PyTestTracebackParser().findLinkInTrace(myBase64Junk));
diff --git a/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java b/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java
index 2c2121e31ad2..8da5940087bd 100644
--- a/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java
+++ b/spellchecker/testSrc/com/intellij/spellchecker/ui/SpellCheckingEditorCustomizationTest.java
@@ -33,7 +33,7 @@ public class SpellCheckingEditorCustomizationTest extends LightPlatformCodeInsig
     doTest(false, "missspelling");
   }
 
-  public void testEnabledEvenIfDisabledInMainProfile() throws Exception {
+  public void testEnabledEvenIfDisabledInMainProfile() {
     //todo[batrak] ((CodeInsightTestFixtureImpl)myFixture).myDisabledInspections.add(SpellCheckingInspection.SPELL_CHECKING_INSPECTION_TOOL_NAME);
     testEnabled();
   }
diff --git a/updater/testSrc/com/intellij/updater/DigesterTest.java b/updater/testSrc/com/intellij/updater/DigesterTest.java
index 1b5f524bb8bd..87af92b00e3a 100644
--- a/updater/testSrc/com/intellij/updater/DigesterTest.java
+++ b/updater/testSrc/com/intellij/updater/DigesterTest.java
@@ -48,7 +48,7 @@ public class DigesterTest extends UpdaterTestCase {
   }
 
   @Test
-  public void testHelpers() throws Exception {
+  public void testHelpers() {
     assertTrue(Digester.isFile(CHECKSUMS.README_TXT));
     assertTrue(Digester.isFile(CHECKSUMS.ANNOTATIONS_JAR));
     assertFalse(Digester.isFile(Digester.INVALID));
diff --git a/updater/testSrc/com/intellij/updater/RunnerTest.java b/updater/testSrc/com/intellij/updater/RunnerTest.java
index fda451173e55..f428c13ca6c7 100644
--- a/updater/testSrc/com/intellij/updater/RunnerTest.java
+++ b/updater/testSrc/com/intellij/updater/RunnerTest.java
@@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class RunnerTest {
   @Test
-  public void testExtractingFiles() throws Exception {
+  public void testExtractingFiles() {
     String[] args = {"bar", "ignored=xxx;yyy;zzz/zzz", "critical=", "ignored=aaa", "baz", "critical=ccc"};
     assertThat(Runner.extractArguments(args, "ignored")).containsExactly("xxx", "yyy", "zzz/zzz", "aaa");
     assertThat(Runner.extractArguments(args, "critical")).containsExactly("ccc");
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomAnnotationsTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomAnnotationsTest.java
index 49110e2c0f4a..f2dc3c9821ba 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomAnnotationsTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomAnnotationsTest.java
@@ -45,7 +45,7 @@ public class DomAnnotationsTest extends DomTestCase {
     return element;
   }
 
-  public void testResolveProblemsAreReportedOnlyOnce() throws Throwable {
+  public void testResolveProblemsAreReportedOnlyOnce() {
     final MyElement myElement = createElement("<a><my-class>abc</my-class></a>", MyElement.class);
     
     new MockDomInspection(MyElement.class).checkFile(DomUtil.getFile(myElement), InspectionManager.getInstance(getProject()), true);
@@ -60,7 +60,7 @@ public class DomAnnotationsTest extends DomTestCase {
     assertEquals(1, holder.getProblems(myElement, true, true).size());
   }
 
-  public void testMinSeverity() throws Throwable {
+  public void testMinSeverity() {
     final MyElement element = createElement("<a/>", MyElement.class);
     final DomElementsProblemsHolderImpl holder = new DomElementsProblemsHolderImpl(DomUtil.getFileElement(element));
     final DomElementProblemDescriptorImpl error = new DomElementProblemDescriptorImpl(element, "abc", HighlightSeverity.ERROR);
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomBasicsTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomBasicsTest.java
index 0900b7234376..e11462ab14d0 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomBasicsTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomBasicsTest.java
@@ -39,16 +39,16 @@ import java.util.*;
  */
 public class DomBasicsTest extends DomTestCase {
   @Override
-  protected void invokeTestRunnable(@NotNull final Runnable runnable) throws Exception {
+  protected void invokeTestRunnable(@NotNull final Runnable runnable) {
     new WriteCommandAction.Simple(null) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         runnable.run();
       }
     }.execute().throwException();
   }
 
-  public void testFileElementCaching() throws Throwable {
+  public void testFileElementCaching() {
     final XmlFile file = createXmlFile("<a/>");
     final DomManagerImpl manager = getDomManager();
     final DomFileElementImpl<DomElement> fileElement = manager.getFileElement(file, DomElement.class, "a");
@@ -70,14 +70,14 @@ public class DomBasicsTest extends DomTestCase {
     assertFalse(rootElement.exists());
   }
 
-  public void testElementCaching() throws Throwable {
+  public void testElementCaching() {
     final MyElement element = createElement("<a><child/></a>");
     assertSame(element.getChild(), element.getChild());
     assertSame(element.getXmlTag().getSubTags()[0], element.getChild().getXmlTag());
     assertCached(element.getChild(), element.getChild().getXmlTag());
   }
 
-  public void testGetParentAndRoot() throws Throwable {
+  public void testGetParentAndRoot() {
     final XmlFile file = createXmlFile("<a><foo/><child-element/><child-element/></a>");
     final DomFileElementImpl<MyElement> fileElement = getDomManager().getFileElement(file, MyElement.class, "a");
     assertNull(fileElement.getParent());
@@ -96,7 +96,7 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals(parent, element.getParent());
   }
 
-  public void testEnsureTagExists() throws Throwable {
+  public void testEnsureTagExists() {
     final MyElement element = createElement("<a/>");
     myCallRegistry.clear();
     final MyElement child = element.getChild();
@@ -119,7 +119,7 @@ public class DomBasicsTest extends DomTestCase {
     assertSame(childElementTag, childElement.ensureTagExists());
   }
 
-  public void testEnsureRootTagExists() throws Throwable {
+  public void testEnsureRootTagExists() {
     final MyElement rootElement = createEmptyElement();
     myCallRegistry.clear();
     assertNull(rootElement.getXmlTag());
@@ -147,7 +147,7 @@ public class DomBasicsTest extends DomTestCase {
     return getDomManager().getFileElement(file, MyElement.class, "root").getRootElement();
   }
 
-  public void testFile() throws Throwable {
+  public void testFile() {
     final XmlFile file = createXmlFile("<a>foo</a>");
     DomFileElementImpl<MyElement> fileElement = getDomManager().getFileElement(file, MyElement.class, "a");
     final MyElement rootElement = fileElement.getRootElement();
@@ -155,7 +155,7 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals("foo", rootElement.getValue());
   }
 
-  public void testAcceptChildren() throws Throwable {
+  public void testAcceptChildren() {
     final MyElement element = createElement("<a><child-element/><child/><child-element/></a>");
     final Set<DomElement> visited = new HashSet<>();
     element.acceptChildren(new DomElementVisitor() {
@@ -223,7 +223,7 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals(MyElement.class.getMethod("getGenericValue").getGenericReturnType(), element.getGenericValue().getDomElementType());
   }
 
-  public void testAddChildrenByReflection() throws Throwable {
+  public void testAddChildrenByReflection() {
     final MyElement element =
       createElement("<a><child-element/></a>");
     final DomGenericInfo info = element.getGenericInfo();
@@ -241,7 +241,7 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals(newChildren, collectionChild.getValues(element));
   }
 
-  public void testGetPresentableName() throws Throwable {
+  public void testGetPresentableName() {
     assertCollectionPresentableName("Aaas", "aaa", DomNameStrategy.HYPHEN_STRATEGY);
     assertCollectionPresentableName("Aaa Bbbs", "aaa-bbb", DomNameStrategy.HYPHEN_STRATEGY);
 
@@ -261,7 +261,7 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals(expected, new FixedChildDescriptionImpl(new XmlName(tagName), DomElement.class, 0, new Collection[0]).getCommonPresentableName(strategy));
   }
 
-  public void testNameStrategy() throws Throwable {
+  public void testNameStrategy() {
     assertTrue(createElement("<a/>").getNameStrategy() instanceof HyphenNameStrategy);
 
     final AnotherElement anotherElement = createElement("<a/>", AnotherElement.class);
@@ -269,19 +269,19 @@ public class DomBasicsTest extends DomTestCase {
     assertTrue(anotherElement.getChild().getNameStrategy() instanceof JavaNameStrategy);
   }
 
-  public void testModificationCount() throws Throwable {
+  public void testModificationCount() {
     final MyElement element = createElement("<a/>");
     final long count = DomUtil.getFileElement(element).getModificationCount();
     element.addChildElement();
     assertTrue(DomUtil.getFileElement(element).getModificationCount() > count);
   }
 
-  public void testIsTagValueElement() throws Throwable {
+  public void testIsTagValueElement() {
     assertTrue(getDomManager().getGenericInfo(MyElement.class).isTagValueElement());
     assertFalse(getDomManager().getGenericInfo(AnotherElement.class).isTagValueElement());
   }
 
-  public void testAttributeChildrenGenerics() throws Throwable {
+  public void testAttributeChildrenGenerics() {
     final StaticGenericInfo genericInfo = DomApplicationComponent.getInstance().getStaticGenericInfo(MyElement.class);
     final List<? extends DomAttributeChildDescription> descriptions = genericInfo.getAttributeChildrenDescriptions();
     assertEquals(1, descriptions.size());
@@ -296,7 +296,7 @@ public class DomBasicsTest extends DomTestCase {
     return createElement(xml, MyElement.class);
   }
 
-  public void testSubPropertyAccessing() throws Throwable {
+  public void testSubPropertyAccessing() {
     final MyElement element = createElement("");
     final GenericAttributeValue<String> attr = element.getChild().getChild().getAttr();
     assertNotNull(attr);
@@ -307,7 +307,7 @@ public class DomBasicsTest extends DomTestCase {
     assertOrderedEquals(element.getChildChildrenAttr(), attr1, attr2);
   }
 
-  public void testInstanceImplementation() throws Throwable {
+  public void testInstanceImplementation() {
     MyElement element = createElement("");
     final Object o = new Object();
     element.setObject(o);
@@ -319,7 +319,7 @@ public class DomBasicsTest extends DomTestCase {
     assertSame(o, element.getObject());
   }
 
-  public void testSeveralInstanceImplementations() throws Throwable {
+  public void testSeveralInstanceImplementations() {
     InheritedElement element = createElement("", InheritedElement.class);
     final Object o = new Object();
     element.setObject(o);
@@ -329,7 +329,7 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals("foo", element.getString());
   }
 
-  public void testVisitor() throws Throwable {
+  public void testVisitor() {
     final Integer[] visits = new Integer[]{0, 0, 0};
     DomElementVisitor visitor = new MyVisitor() {
       @Override
@@ -370,14 +370,14 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals(Arrays.asList(1, 3, 1), visitsList);
   }
 
-  public void testRegisteringImplementation() throws Throwable {
+  public void testRegisteringImplementation() {
     DomApplicationComponent.getInstance().registerImplementation(AnotherElement.class, EmptyImpl.class, getTestRootDisposable());
     DomApplicationComponent.getInstance().registerImplementation(DomElement.class, BaseImpl.class, getTestRootDisposable());
     final AnotherElement element = createElement("", AnotherElement.class);
     assertTrue(element.getClass().getSuperclass().getName(), element instanceof EmptyImpl);
   }
 
-  public void testMockElements() throws Throwable {
+  public void testMockElements() {
     Module module = new MockModule(getTestRootDisposable());
     final MyElement element = getDomManager().createMockElement(MyElement.class, module, false);
     assertSame(module, element.getModule());
@@ -400,7 +400,7 @@ public class DomBasicsTest extends DomTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         element2.copyFrom(element);
       }
     }.execute();
@@ -415,7 +415,7 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals("def", childElements.get(0).getGenericValue().getStringValue());
   }
 
-  public void testCopyingFromEmptyToEmpty() throws Throwable {
+  public void testCopyingFromEmptyToEmpty() {
     Module module = new MockModule(getTestRootDisposable());
     MyElement element1 = getDomManager().createMockElement(MyElement.class, module, false);
     MyElement element2 = getDomManager().createMockElement(MyElement.class, module, false);
@@ -423,7 +423,7 @@ public class DomBasicsTest extends DomTestCase {
     assertNull(element2.getXmlTag());
   }
 
-  public void testCopyingFromNonEmptyToEmpty() throws Throwable {
+  public void testCopyingFromNonEmptyToEmpty() {
     Module module = new MockModule(getTestRootDisposable());
     final MyElement element1 = getDomManager().createMockElement(MyElement.class, module, false);
     final MyElement element2 = getDomManager().createMockElement(MyElement.class, module, false);
@@ -432,14 +432,14 @@ public class DomBasicsTest extends DomTestCase {
     element1.getChild().getChild().getGenericValue().setStringValue("abc");
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         element2.copyFrom(element1);
       }
     }.execute();
     assertEquals("abc", element2.getChild().getChild().getGenericValue().getStringValue());
   }
 
-  public void testStableValues() throws Throwable {
+  public void testStableValues() {
     final MyElement[] element = new MyElement[]{null};
     final MyElement stable = getDomManager().createStableValue(() -> {
       try {
@@ -468,7 +468,7 @@ public class DomBasicsTest extends DomTestCase {
     final MyElement oldElement1 = oldElement;
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         oldElement1.undefine();
       }
     }.execute();
@@ -493,7 +493,7 @@ public class DomBasicsTest extends DomTestCase {
     assertFalse(oldElement.equals(((StableElement)stable).getWrappedElement()));
   }
 
-  public void testStable_Revalidate() throws Throwable {
+  public void testStable_Revalidate() {
     final MyElement[] element = new MyElement[]{createElement("")};
     final MyElement stable = getDomManager().createStableValue(() -> element[0]);
     MyElement oldElement = element[0];
@@ -508,7 +508,7 @@ public class DomBasicsTest extends DomTestCase {
     assertSame(element[0], ((StableElement) stable).getWrappedElement());
   }
 
-  public void testStable_Invalidate() throws Throwable {
+  public void testStable_Invalidate() {
     final MyElement oldElement = createElement("");
     final MyElement[] element = new MyElement[]{oldElement};
     final MyElement stable = getDomManager().createStableValue(() -> element[0]);
@@ -518,14 +518,14 @@ public class DomBasicsTest extends DomTestCase {
     assertEquals(oldElement.toString(), stable.toString());
   }
 
-  public void testStableCopies() throws Throwable {
+  public void testStableCopies() {
     final MyElement element = createElement("<a><child-element/><child-element><child/></child-element></a>");
     final MyElement parent = element.getChildElements().get(1);
     final MyElement child = parent.getChild();
     final MyElement copy = (MyElement) child.createStableCopy();
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         parent.undefine();
         element.addChildElement().getChild().ensureXmlElementExists();
       }
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java
index 3df2499e4990..02316c83ce0b 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomChildrenTest.java
@@ -21,8 +21,6 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Consumer;
-import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xml.events.DomEvent;
@@ -42,7 +40,7 @@ public class DomChildrenTest extends DomTestCase {
     return createElement(xml, MyElement.class);
   }
 
-  public void testGetChild() throws Throwable {
+  public void testGetChild() {
     final MyElement element = createElement("<a>" + "<child>foo</child>" + "</a>");
     element.toString();
     assertEquals("foo", element.getMyChild().getValue());
@@ -51,19 +49,19 @@ public class DomChildrenTest extends DomTestCase {
     assertNull(element.getChild239().getXmlTag());
   }
 
-  public void testGetChild239() throws Throwable {
+  public void testGetChild239() {
     final MyElement element = createElement("<a><child/><child-239/></a>");
     assertNotNull(element.getChild239().getXmlTag());
   }
 
-  public void testGetChildren() throws Throwable {
+  public void testGetChildren() {
     final MyElement element = createElement("<a>" + "<child-element>foo</child-element>" + "<child-element>bar</child-element>" + "</a>");
     assertSubBars(element.getMyChildren());
     assertSubBars(element.getChildElements());
     assertSubBars(element.getMyChildren2());
   }
 
-  public void testGetChildrenMultipleTimes() throws Throwable {
+  public void testGetChildrenMultipleTimes() {
     final MyElement element = createElement("<a>" + "<child-element>" + " <child-element/>" + "</child-element>" + "</a>");
     for (int i = 0; i < 239; i++) {
       final List<MyElement> children = element.getChildElements();
@@ -80,7 +78,7 @@ public class DomChildrenTest extends DomTestCase {
     assertEquals("bar", subBars.get(1).getValue());
   }
 
-  public void testClassChoosers() throws Throwable {
+  public void testClassChoosers() {
     getTypeChooserManager().registerTypeChooser(MyAbstractElement.class, new MyTypeChooser());
     try {
       MyElement element = createElement("<a>" +
@@ -97,7 +95,7 @@ public class DomChildrenTest extends DomTestCase {
     }
   }
 
-  public void testAddConcreteElements() throws Throwable {
+  public void testAddConcreteElements() {
     getTypeChooserManager().registerTypeChooser(MyAbstractElement.class, new MyTypeChooser());
     try {
       MyElement element = createElement("<a/>");
@@ -120,13 +118,13 @@ public class DomChildrenTest extends DomTestCase {
     }
   }
 
-  public void testIndexedChild() throws Throwable {
+  public void testIndexedChild() {
     MyElement element = createElement("<a>" + "<child>foo</child>" + "<child>bar</child>" + "</a>");
     assertCached(element.getChild2(), element.getXmlTag().getSubTags()[1]);
     assertEquals(0, element.getChildElements().size());
   }
 
-  public void testDefiningIndexedChild() throws Throwable {
+  public void testDefiningIndexedChild() {
     final MyElement element = createElement("<a/>");
     final XmlTag tag = element.getChild2().ensureTagExists();
     final XmlTag[] subTags = element.getXmlTag().findSubTags("child");
@@ -149,7 +147,7 @@ public class DomChildrenTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testAddChild() throws Throwable {
+  public void testAddChild() {
     final MyElement element = createElement("<a><child-element/></a>");
     assertEquals(1, element.getChildElements().size());
     final MyElement firstChild = element.getChildElements().get(0);
@@ -195,7 +193,7 @@ public class DomChildrenTest extends DomTestCase {
     assertSame(lastChildTag, element.getXmlTag().findSubTags("child-element")[3]);
   }
 
-  public void testUndefineCollectionChild() throws Throwable {
+  public void testUndefineCollectionChild() {
     final MyElement element = createElement("<a><child-element/><child-element/><child-element/></a>");
     final MyElement child1 = element.getChildElements().get(0);
     final MyElement child2 = element.getChildElements().get(1);
@@ -223,10 +221,10 @@ public class DomChildrenTest extends DomTestCase {
     myCallRegistry.assertResultsAndClear();
   }
 
-  public void testUndefineFixedChild() throws Throwable {
+  public void testUndefineFixedChild() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final MyElement child = createElement("<a><child/></a>").getChild();
 
         incModCount();
@@ -247,7 +245,7 @@ public class DomChildrenTest extends DomTestCase {
     }.execute().throwException();
   }
 
-  public void testAttributes() throws Throwable {
+  public void testAttributes() {
     final MyElement element = createElement("<a/>");
     final GenericAttributeValue<String> attr = element.getAttr();
     assertSame(element.getXmlTag(), attr.getXmlTag());
@@ -270,10 +268,10 @@ public class DomChildrenTest extends DomTestCase {
     assertNull(attr.getXmlAttribute());
   }
 
-  public void testUndefineLastFixedChildWithNotEmptyCollection() throws Throwable {
+  public void testUndefineLastFixedChildWithNotEmptyCollection() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final MyElement element = createElement("<a>" + "<child>1</child>" + "<child attr=\"\">2</child>" + "<child/></a>");
         final MyElement child = element.getChild();
         final MyElement child2 = element.getChild2();
@@ -304,10 +302,10 @@ public class DomChildrenTest extends DomTestCase {
     }.execute().throwException();
   }
 
-  public void testUndefineNotLastFixedChild() throws Throwable {
+  public void testUndefineNotLastFixedChild() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final MyElement element = createElement("<a>" + "<child>1</child>" + "<child attr=\"\">2</child>" + "</a>");
         final MyElement child = element.getChild();
         final MyElement child2 = element.getChild2();
@@ -333,10 +331,10 @@ public class DomChildrenTest extends DomTestCase {
     }.execute().throwException();
   }
 
-  public void testUndefineLastFixedChild() throws Throwable {
+  public void testUndefineLastFixedChild() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final MyElement element =
           createElement("<a>" + "<child>1</child>" + "<child attr=\"\">2</child>" + "<child attr=\"\">2</child>" + "</a>");
         final MyElement child = element.getChild();
@@ -358,10 +356,10 @@ public class DomChildrenTest extends DomTestCase {
     }.execute().throwException();
   }
 
-  public void testUndefineFixedChildWithNoTag() throws Throwable {
+  public void testUndefineFixedChildWithNoTag() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final MyElement element = createElement("<a/>");
         final MyElement child = element.getChild();
         child.undefine();
@@ -375,16 +373,16 @@ public class DomChildrenTest extends DomTestCase {
     }.execute().throwException();
   }
 
-  public void testGenericValuesCollection() throws Throwable {
+  public void testGenericValuesCollection() {
     final MyElement element = createElement("<a><generic-child>239</generic-child></a>");
     assertEquals(239, (int)element.getGenericChildren().get(0).getValue());
   }
 
-  public void testIsBooleanGenericValueMethod() throws Throwable {
+  public void testIsBooleanGenericValueMethod() {
     assertNull(createElement("").isGenericValue().getValue());
   }
 
-  public void testGetParentOfType() throws Throwable {
+  public void testGetParentOfType() {
     getTypeChooserManager().registerTypeChooser(MyAbstractElement.class, new MyTypeChooser());
     try {
       final MyElement element = createElement("");
@@ -403,7 +401,7 @@ public class DomChildrenTest extends DomTestCase {
     }
   }
 
-  public void testChildrenValidAfterUndefine() throws Throwable {
+  public void testChildrenValidAfterUndefine() {
     final MyElement element = createElement("<a><child/></a>");
     final MyElement child = element.getChild();
     ApplicationManager.getApplication().runWriteAction(() -> element.undefine());
@@ -412,7 +410,7 @@ public class DomChildrenTest extends DomTestCase {
     assertFalse(child.isValid());
   }
 
-  public void testGetCompositeCollection() throws Throwable {
+  public void testGetCompositeCollection() {
     final MyElement element = createElement("");
     final MyFooConcreteElement foo = element.addFooChild();
     final MyElement child = element.addChildElement();
@@ -420,7 +418,7 @@ public class DomChildrenTest extends DomTestCase {
     assertEquals(Arrays.asList(foo, bar, child), element.getCompositeList());
   }
 
-  public void testAddToCompositeCollection() throws Throwable {
+  public void testAddToCompositeCollection() {
     final MyElement element = createElement("");
     final MyBarConcreteElement bar = element.addBarComposite();
     final MyElement child = element.addChildComposite();
@@ -430,21 +428,21 @@ public class DomChildrenTest extends DomTestCase {
     assertEquals(Arrays.asList(foo2, bar, child, foo1, child2), element.getCompositeList());
   }
 
-  public void testCreateElementWithRequiredChild() throws Throwable {
+  public void testCreateElementWithRequiredChild() {
     final MyElement element = createElement("").addChildElement();
     assertNotNull(element.getAttr().getXmlAttribute());
     assertNotNull(element.isGenericValue().getXmlTag());
     assertTrue(element.getMyChildren2().isEmpty());
   }
 
-  public void testSetRequiredChildValue() throws Throwable {
+  public void testSetRequiredChildValue() {
     final MyElement element = createElement("<a/>").getChild();
     element.isGenericValue().setStringValue("true");
     assertEquals(1, element.getXmlTag().findSubTags("generic-value").length);
     assertTrue(element.isGenericValue().getValue());
   }
 
-  public void testGetFixedPath() throws Throwable {
+  public void testGetFixedPath() {
     final MyElement element = createElement("");
     final MyElement child2 = element.getChild2();
     assertEquals(Arrays.asList("getChild2", "getChild2", "getChild239", "getAbstractChild", "getChild2"),
@@ -455,7 +453,7 @@ public class DomChildrenTest extends DomTestCase {
     assertNull(DomUtil.getFixedPath(element.addChildElement().getChild()));
   }
 
-  public void testGetDomElementCustomChild() throws Throwable {
+  public void testGetDomElementCustomChild() {
     final MyElement myElement = createElement("<a><abstract-child/><generic-value/><bar/></a>", MyElement.class);
     final XmlTag tag = myElement.getXmlTag();
     assertEquals(1, myElement.getCustomChildren().size());
@@ -464,13 +462,13 @@ public class DomChildrenTest extends DomTestCase {
     assertInstanceOf(getDomManager().getDomElement(tag.getSubTags()[2]), MyElement.class);
   }
 
-  public void testNoChildrenForMalformedTags() throws Throwable {
+  public void testNoChildrenForMalformedTags() {
     final MyElement myElement = createElement("<a><</a>", MyElement.class);
     final XmlTag tag = myElement.getXmlTag();
     assertEquals(0, myElement.getCustomChildren().size());
   }
 
-  public void testCustomNameChildren() throws Throwable {
+  public void testCustomNameChildren() {
     final MyElement myElement = createElement("<a><foo/><bar/><foo xmlns=\"z\"/></a>", MyElement.class);
     final XmlTag tag = myElement.getXmlTag();
     final List<MyElement> customChildren = myElement.getCustomChildren();
@@ -491,7 +489,7 @@ public class DomChildrenTest extends DomTestCase {
     return ContainerUtil.map2List(DomUtil.getFixedPath(element), s -> s.getName());
   }
 
-  public void testElementsWithoutXmlGetItLater() throws Throwable {
+  public void testElementsWithoutXmlGetItLater() {
     final MyElement element = createElement("<a/>");
     final MyElement child = element.getChild();
     final MyElement child2 = element.getChild2();
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomExtensionsTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomExtensionsTest.java
index 4a315b53536e..e68e16b0278f 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomExtensionsTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomExtensionsTest.java
@@ -34,7 +34,7 @@ import java.util.List;
 public class DomExtensionsTest extends DomTestCase {
   private static final Key<Boolean> BOOL_KEY = Key.create("aaa");
 
-  public void testExtendAttributes() throws Throwable {
+  public void testExtendAttributes() {
     registerDomExtender(AttrDomExtender.class);
     assertEmpty(getCustomChildren(createElement("<a foo=\"xxx\"/>", MyElement.class)));
 
@@ -56,13 +56,13 @@ public class DomExtensionsTest extends DomTestCase {
     assertNotNull(element.getGenericInfo().getAttributeChildDescription("foo"));
   }
 
-  public void testCustomAttributeChildClass() throws Throwable {
+  public void testCustomAttributeChildClass() {
     registerDomExtender(AttrDomExtender3.class);
     final MyElement element = createElement("<a attr=\"xxx\"/>", MyElement.class);
     assertEquals("xxx", assertInstanceOf(assertOneElement(getCustomChildren(element)), MyAttribute.class).getXmlElementName());
   }
 
-  public void testUserData() throws Throwable {
+  public void testUserData() {
     registerDomExtender(AttrDomExtender3.class);
     final MyElement element = createElement("<a attr=\"xxx\"/>", MyElement.class);
     final DomAttributeChildDescription description = element.getGenericInfo().getAttributeChildDescription("xxx");
@@ -70,7 +70,7 @@ public class DomExtensionsTest extends DomTestCase {
     assertSame(Boolean.TRUE, description.getUserData(BOOL_KEY));
   }
 
-  public void testUseCustomConverter() throws Throwable {
+  public void testUseCustomConverter() {
     registerDomExtender(AttrDomExtender2.class);
     final MyElement myElement = createElement("<a attr=\"xxx\" xxx=\"zzz\" yyy=\"zzz\"/>", MyElement.class);
     assertUnorderedCollection(getCustomChildren(myElement), element -> {
@@ -96,7 +96,7 @@ public class DomExtensionsTest extends DomTestCase {
     });
   }
 
-  public void testFixedChildren() throws Throwable {
+  public void testFixedChildren() {
     registerDomExtender(FixedDomExtender.class);
     final MyElement myElement = createElement("<a attr=\"xxx\"><xxx>zzz</xxx><yyy attr=\"foo\"/><yyy attr=\"bar\"/></a>", MyElement.class);
     assertUnorderedCollection(getCustomChildren(myElement), element -> {
@@ -124,7 +124,7 @@ public class DomExtensionsTest extends DomTestCase {
     assertEquals(2, description.getCount());
   }
 
-  public void testCollectionChildren() throws Throwable {
+  public void testCollectionChildren() {
     registerDomExtender(CollectionDomExtender.class);
     final MyElement myElement = createElement("<a attr=\"xxx\"><xxx>zzz</xxx><xxx attr=\"foo\"/></a>", MyElement.class);
     assertUnorderedCollection(getCustomChildren(myElement), element -> {
@@ -137,7 +137,7 @@ public class DomExtensionsTest extends DomTestCase {
     assertNotNull(myElement.getGenericInfo().getCollectionChildDescription("xxx"));
   }
 
-  public void testCollectionAdders() throws Throwable {
+  public void testCollectionAdders() {
     registerDomExtender(CollectionDomExtender.class);
     final MyElement myElement = createElement("<a attr=\"xxx\"></a>", MyElement.class);
     final DomCollectionChildDescription description = myElement.getGenericInfo().getCollectionChildDescription("xxx");
@@ -148,7 +148,7 @@ public class DomExtensionsTest extends DomTestCase {
     assertSameElements(getCustomChildren(myElement), element0, element1, element2, element3);
   }
 
-  public void testCustomChildrenAccessFromExtender() throws Throwable {
+  public void testCustomChildrenAccessFromExtender() {
     registerDomExtender(MyCustomChildrenElement.class, CustomDomExtender.class);
     final MyCustomChildrenElement myElement = createElement("<a><xx/><yy/><concrete-child/><some-concrete-child/></a>", MyCustomChildrenElement.class);
     final DomCollectionChildDescription description = myElement.getGenericInfo().getCollectionChildDescription("xx");
@@ -159,7 +159,7 @@ public class DomExtensionsTest extends DomTestCase {
     assertNotNull(assertInstanceOf(myElement.getSomeConcreteChild(), MyConcreteElement.class).getXmlTag());
   }
 
-  public void testFirstChildRedefinitionOnExtending() throws Exception {
+  public void testFirstChildRedefinitionOnExtending() {
     registerDomExtender(MyCustomChildrenElement.class, ModestDomExtender.class);
 
     final MyCustomChildrenElement myElement = createElement("<a><concrete-child/><concrete-child/></a>", MyCustomChildrenElement.class);
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java
index 93971d262cfd..07b3de6d7670 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomFileDescriptionTest.java
@@ -78,7 +78,7 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase {
     }
   }
 
-  public void testNoInitialDomnessInB() throws Throwable {
+  public void testNoInitialDomnessInB() {
     assertFalse(getDomManager().isDomFile(myBarElementFile));
     assertNull(getDomManager().getFileElement(myBarElementFile));
   }
@@ -99,7 +99,7 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         file.getDocument().getRootTag().getValue().setText("239");
       }
     }.execute();
@@ -112,7 +112,7 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         file.getDocument().getRootTag().getValue().setText("57121");
       }
     }.execute();
@@ -168,7 +168,7 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         ((XmlFile)file).getDocument().getRootTag().setAttribute("xmlns", "bar");
       }
     }.execute();
@@ -190,7 +190,7 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Document document = getDocument(file);
         document.insertString(0, "<!DOCTYPE xxx PUBLIC \"bar\" \"http://java.sun.com/dtd/ejb-jar_2_0.dtd\">\n");
         commitDocument(document);
@@ -211,7 +211,7 @@ public class DomFileDescriptionTest extends DomHardCoreTestCase {
     final MyElement boy = getDomManager().getFileElement(file, MyElement.class).getRootElement().getBoys().get(0);
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         file.getDocument().getRootTag().setAttribute("zzz", "bar");
       }
     }.execute();
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomHighlightingLiteTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomHighlightingLiteTest.java
index e191cc3d6e1f..d3253e7b810e 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomHighlightingLiteTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomHighlightingLiteTest.java
@@ -124,7 +124,7 @@ public class DomHighlightingLiteTest extends DomTestCase {
     super.tearDown();
   }
 
-  public void testEmptyProblemDescriptorInTheBeginning() throws Throwable {
+  public void testEmptyProblemDescriptorInTheBeginning() {
     assertEmptyHolder(myAnnotationsManager.getProblemHolder(myElement));
   }
 
@@ -133,7 +133,7 @@ public class DomHighlightingLiteTest extends DomTestCase {
     assertEmpty(holder.getAllProblems());
   }
 
-  public void testProblemDescriptorIsCreated() throws Throwable {
+  public void testProblemDescriptorIsCreated() {
     myAnnotationsManager.appendProblems(myElement, createHolder(), MyDomElementsInspection.class);
     final DomElementsProblemsHolderImpl holder = assertNotEmptyHolder(myAnnotationsManager.getProblemHolder(myElement));
     assertEmpty(holder.getAllProblems());
@@ -148,14 +148,14 @@ public class DomHighlightingLiteTest extends DomTestCase {
     return assertInstanceOf(holder1, DomElementsProblemsHolderImpl.class);
   }
 
-  public void testInspectionMarkedAsPassedAfterAppend() throws Throwable {
+  public void testInspectionMarkedAsPassedAfterAppend() {
     myAnnotationsManager.appendProblems(myElement, createHolder(), MyDomElementsInspection.class);
     final DomElementsProblemsHolderImpl holder = (DomElementsProblemsHolderImpl)myAnnotationsManager.getProblemHolder(myElement);
     assertTrue(holder.isInspectionCompleted(MyDomElementsInspection.class));
     assertFalse(holder.isInspectionCompleted(DomElementsInspection.class));
   }
 
-  public void testHolderRecreationAfterChange() throws Throwable {
+  public void testHolderRecreationAfterChange() {
     myAnnotationsManager.appendProblems(myElement, createHolder(), MyDomElementsInspection.class);
     assertTrue(DomElementAnnotationsManagerImpl.isHolderUpToDate(myElement));
     final DomElementsProblemsHolder holder = myAnnotationsManager.getProblemHolder(myElement);
@@ -168,23 +168,23 @@ public class DomHighlightingLiteTest extends DomTestCase {
     assertNotSame(holder, assertNotEmptyHolder(myAnnotationsManager.getProblemHolder(myElement)));
   }
 
-  public void testMockDomInspection() throws Throwable {
+  public void testMockDomInspection() {
     myElement.setFileDescription(new MyNonHighlightingDomFileDescription());
     assertInstanceOf(myAnnotationsManager.getMockInspection(myElement), MockDomInspection.class);
   }
 
-  public void testMockAnnotatingDomInspection() throws Throwable {
+  public void testMockAnnotatingDomInspection() {
     myElement.setFileDescription(new DomFileDescription<>(DomElement.class, "a"));
     assertInstanceOf(myAnnotationsManager.getMockInspection(myElement), MockAnnotatingDomInspection.class);
   }
 
-  public void testNoMockInspection() throws Throwable {
+  public void testNoMockInspection() {
     myElement.setFileDescription(new MyNonHighlightingDomFileDescription());
     myInspectionProfile.setInspectionTools(new LocalInspectionToolWrapper(new MyDomElementsInspection()));
     assertNull(myAnnotationsManager.getMockInspection(myElement));
   }
 
-  public void testDefaultAnnotator() throws Throwable {
+  public void testDefaultAnnotator() {
     final DefaultDomAnnotator annotator = new DefaultDomAnnotator() {
       @Override
       protected DomElementAnnotationsManagerImpl getAnnotationsManager(final DomElement element) {
@@ -211,21 +211,21 @@ public class DomHighlightingLiteTest extends DomTestCase {
     assertEmpty(toFill);
   }
 
-  public void testHighlightStatus_MockDomInspection() throws Throwable {
+  public void testHighlightStatus_MockDomInspection() {
     myElement.setFileDescription(new MyNonHighlightingDomFileDescription());
     assertEquals(DomHighlightStatus.NONE, myAnnotationsManager.getHighlightStatus(myElement));
 
     myAnnotationsManager.appendProblems(myElement, createHolder(), MockDomInspection.class);
     assertEquals(DomHighlightStatus.INSPECTIONS_FINISHED, myAnnotationsManager.getHighlightStatus(myElement));
   }
-  public void testHighlightStatus_MockAnnotatingDomInspection() throws Throwable {
+  public void testHighlightStatus_MockAnnotatingDomInspection() {
     myElement.setFileDescription(new DomFileDescription<>(DomElement.class, "a"));
 
     myAnnotationsManager.appendProblems(myElement, createHolder(), MockAnnotatingDomInspection.class);
     assertEquals(DomHighlightStatus.INSPECTIONS_FINISHED, myAnnotationsManager.getHighlightStatus(myElement));
   }
 
-  public void testHighlightStatus_OtherInspections() throws Throwable {
+  public void testHighlightStatus_OtherInspections() {
     myElement.setFileDescription(new DomFileDescription<>(DomElement.class, "a"));
     final MyDomElementsInspection inspection = new MyDomElementsInspection() {
 
@@ -258,7 +258,7 @@ public class DomHighlightingLiteTest extends DomTestCase {
     }
   }
 
-  public void testHighlightStatus_OtherInspections2() throws Throwable {
+  public void testHighlightStatus_OtherInspections2() {
     myElement.setFileDescription(new DomFileDescription<>(DomElement.class, "a"));
     final MyDomElementsInspection inspection = new MyDomElementsInspection() {
 
@@ -282,7 +282,7 @@ public class DomHighlightingLiteTest extends DomTestCase {
     assertEquals(DomHighlightStatus.INSPECTIONS_FINISHED, myAnnotationsManager.getHighlightStatus(myElement));
   }
 
-  public void testRequiredAttributeWithoutAttributeValue() throws Throwable {
+  public void testRequiredAttributeWithoutAttributeValue() {
     final MyElement element = createElement("<a id />", MyElement.class);
     new MyBasicDomElementsInspection().checkDomElement(element.getId(), createHolder(), DomHighlightingHelperImpl.INSTANCE);
   }
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomModelMergingTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomModelMergingTest.java
index 19624b5b2bd6..1eebec7cac8f 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomModelMergingTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomModelMergingTest.java
@@ -36,7 +36,7 @@ public class DomModelMergingTest extends DomTestCase {
     myMerger = new ModelMergerImpl();
   }
 
-  public void testVisitor() throws Throwable {
+  public void testVisitor() {
     final MyElement element1 = createElement("", MyElement.class);
     final MyElement foo1 = element1.getFoo();
     final MyElement bar1 = element1.addBar();
@@ -74,10 +74,10 @@ public class DomModelMergingTest extends DomTestCase {
     assertEquals(4, count[0]);
   }
 
-  public void testValidity() throws Throwable {
+  public void testValidity() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final MyElement element = createElement("", MyElement.class);
         final MyElement bar1 = element.addBar();
         final MyElement bar2 = element.addBar();
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomNamespacesTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomNamespacesTest.java
index 85ea81601e37..e69af72be139 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomNamespacesTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomNamespacesTest.java
@@ -31,7 +31,7 @@ import java.util.List;
  */
 public class DomNamespacesTest extends DomTestCase {
 
-  public void testUseExistingNamespace() throws Throwable {
+  public void testUseExistingNamespace() {
     final MyElement element = createElement("<a xmlns=\"foo\" xmlns:bar=\"bar\"/>", MyElement.class);
     registerNamespacePolicies(element);
 
@@ -46,7 +46,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertEquals("bar", barChildTag.getNamespacePrefix());
   }
 
-  public void testDefineNewNamespace() throws Throwable {
+  public void testDefineNewNamespace() {
     final MyElement element = createElement("<a/>", MyElement.class);
     registerNamespacePolicies(element);
 
@@ -63,7 +63,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertEquals("bar", barChildTag.getAttributeValue("xmlns"));
   }
 
-  public void testCollectionChildNamespace() throws Throwable {
+  public void testCollectionChildNamespace() {
     final MyElement element = createElement("<a xmlns:foo=\"foo\"/>", MyElement.class);
     registerNamespacePolicies(element);
 
@@ -74,7 +74,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertNull(fooChildTag.getAttributeValue("xmlns"));
   }
 
-  public void testNoNamespaceForFixedChild() throws Throwable {
+  public void testNoNamespaceForFixedChild() {
     final MyElement element = createElement("<a xmlns:foo=\"foo\"/>", MyElement.class);
     registerNamespacePolicies(element);
 
@@ -85,7 +85,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertNull(childTag.getAttributeValue("xmlns"));
   }
 
-  public void testNoNamespaceForCollectionChild() throws Throwable {
+  public void testNoNamespaceForCollectionChild() {
     final MyElement element = createElement("<a xmlns:foo=\"foo\"/>", MyElement.class);
     registerNamespacePolicies(element);
 
@@ -96,7 +96,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertNull(childTag.getAttributeValue("xmlns"));
   }
 
-  public void testNamespaceEqualToParent() throws Throwable {
+  public void testNamespaceEqualToParent() {
     final MyElement element = createElement("<a xmlns=\"foo\"/>", MyElement.class);
     registerNamespacePolicies(element);
 
@@ -107,7 +107,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertNull(childTag.getAttributeValue("xmlns"));
   }
 
-  public void testNamespaceEqualToParent2() throws Throwable {
+  public void testNamespaceEqualToParent2() {
     final MyElement root = createElement("<a xmlns=\"foo\"/>", MyElement.class);
     registerNamespacePolicies(root);
     final MyFooElement element = root.addFooElement();
@@ -123,13 +123,13 @@ public class DomNamespacesTest extends DomTestCase {
     assertNull(child.getXmlElementNamespaceKey());
   }
 
-  public void testHardcodedNamespacePrefix() throws Throwable {
+  public void testHardcodedNamespacePrefix() {
     final XmlFile xmlFile = createXmlFile("<a xmlns:sys=\"\"/>");
     final MyElement element = getDomManager().getFileElement(xmlFile, MyElement.class, "a").getRootElement();
     final MyElement hardcodedElement = element.getHardcodedElement();
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         hardcodedElement.ensureTagExists();
       }
     }.execute();
@@ -141,7 +141,7 @@ public class DomNamespacesTest extends DomTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         hardcodedElement.getHardcodedElement().getHardcodedElement().ensureTagExists();
       }
     }.execute();
@@ -154,7 +154,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertEquals(1, element.getXmlTag().getSubTags().length);
   }
 
-  public void testAutoChooseNamespaceIfPresent() throws Throwable {
+  public void testAutoChooseNamespaceIfPresent() {
     final MyElement root = createElement("<a xmlns=\"foo\"/>", MyElement.class);
     getDomManager().getDomFileDescription(root.getXmlElement()).registerNamespacePolicy("foo", "bar", "foo");
 
@@ -165,7 +165,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertEquals(0, fooChildTag.getAttributes().length);
   }
 
-  public void testNonemptyRootTagPrefix() throws Throwable {
+  public void testNonemptyRootTagPrefix() {
     getDomManager().registerFileDescription(new DomFileDescription<MyFooElement>(MyFooElement.class, "a", "foons") {
 
       @Override
@@ -184,7 +184,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertSame(psiFile.getDocument().getRootTag(), root.getXmlElement());
   }
 
-  public void testSpringAopLike() throws Throwable {
+  public void testSpringAopLike() {
     getDomManager().registerFileDescription(new DomFileDescription<MyBeans>(MyBeans.class, "beans", "beans", "aop") {
 
       @Override
@@ -208,7 +208,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertEquals(assertOneElement(aopConfig.getPointcuts()), pointcut);
   }
 
-  public void testSpringUtilLike() throws Throwable {
+  public void testSpringUtilLike() {
     getDomManager().registerFileDescription(new DomFileDescription<MyBeans>(MyBeans.class, "beans", "beans", "util") {
 
       @Override
@@ -246,7 +246,7 @@ public class DomNamespacesTest extends DomTestCase {
     description.registerNamespacePolicy("bar", bar);
   }
 
-  public void testFindChildDescriptionWithoutNamespace() throws Throwable {
+  public void testFindChildDescriptionWithoutNamespace() {
     final DomGenericInfo info = getDomManager().getGenericInfo(MyListOrSet.class);
     assertNotNull(info.getAttributeChildDescription("attr"));
     assertNotNull(info.getAttributeChildDescription("attr").getType());
@@ -256,7 +256,7 @@ public class DomNamespacesTest extends DomTestCase {
     assertNotNull(info.getFixedChildDescription("ref").getType());
   }
 
-  public void testCopyFromHonorsNamespaces() throws Throwable {
+  public void testCopyFromHonorsNamespaces() {
     final MyElement element = createElement("<a xmlns=\"foo\" xmlns:bar=\"bar\"/>", MyElement.class);
     registerNamespacePolicies(element);
 
@@ -272,7 +272,7 @@ public class DomNamespacesTest extends DomTestCase {
     registerNamespacePolicies(element2, "foo1", "bar1");
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         element.copyFrom(element2);
       }
     }.execute();
@@ -289,7 +289,7 @@ public class DomNamespacesTest extends DomTestCase {
                  element.getXmlTag().getText());
   }
 
-  public void testAttributeWithAnotherNamespace() throws Throwable {
+  public void testAttributeWithAnotherNamespace() {
     final MyElement element = createElement("<a xmlns=\"foo\" xmlns:bar=\"bar\"><foo-child bar:my-attribute=\"xxx\"/></a>", MyElement.class);
     registerNamespacePolicies(element);
     final MyFooElement fooElement = element.getFooChild();
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomPerformanceTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomPerformanceTest.java
index 696803b0bad6..8075b24c4281 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomPerformanceTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomPerformanceTest.java
@@ -38,7 +38,7 @@ import java.util.List;
  */
 public class DomPerformanceTest extends DomHardCoreTestCase{
 
-  public void testVisitorPerformance() throws Throwable {
+  public void testVisitorPerformance() {
     final MyElement element = createElement("<root xmlns=\"adsf\" targetNamespace=\"adsf\"/>", MyElement.class);
 
     MetaRegistry.bindDataToElement(DomUtil.getFile(element).getDocument(), new XmlNSDescriptorImpl());
@@ -64,7 +64,7 @@ public class DomPerformanceTest extends DomHardCoreTestCase{
 
     PlatformTestUtil.startPerformanceTest(getTestName(false), 300, new ThrowableRunnable() {
       @Override
-      public void run() throws Exception {
+      public void run() {
         newElement.acceptChildren(new DomElementVisitor() {
           @Override
           public void visitDomElement(DomElement element) {
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomReferenceInjectorTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomReferenceInjectorTest.java
index b8f0ce1671a1..5a8288a69a0f 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomReferenceInjectorTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomReferenceInjectorTest.java
@@ -15,30 +15,30 @@
  */
 package com.intellij.util.xml;
 
-import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.Key;
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.Language;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
+import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.lang.Language;
-import com.intellij.lang.ASTNode;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
 
 public class DomReferenceInjectorTest extends DomHardCoreTestCase {
-  public void testBasic() throws Exception {
+  public void testBasic() {
     MyElement element = createElement("<a><value>abc${prop}def</value></a>", MyElement.class);
     assertEquals("abc${prop}def", element.getValue().getStringValue());
     assertEquals("abc${prop}def", element.getValue().getValue());
   }
 
-  public void testWithInjector() throws Exception {
+  public void testWithInjector() {
     MyElement element = createElement("<a><value>abc${prop}def</value></a>", MyElement.class);
 
     registerInjectorFor(element, null);
@@ -47,7 +47,7 @@ public class DomReferenceInjectorTest extends DomHardCoreTestCase {
     assertEquals("abcFOOdef", element.getValue().getValue());
   }
 
-  public void testCorrectlyCalculateOffsetWithInjector() throws Exception {
+  public void testCorrectlyCalculateOffsetWithInjector() {
     MyElement element = createElement("<a><value>   abc${prop}def   </value></a>", MyElement.class);
 
     registerInjectorFor(element, null);
@@ -56,7 +56,7 @@ public class DomReferenceInjectorTest extends DomHardCoreTestCase {
     assertEquals("abcFOOdef", element.getValue().getValue());
   }
 
-  public void testWithInjectorAndConverter() throws Exception {
+  public void testWithInjectorAndConverter() {
     MyElement element = createElement("<a><converted-value>abc${prop}def</converted-value></a>", MyElement.class);
 
     registerInjectorFor(element, null);
@@ -65,7 +65,7 @@ public class DomReferenceInjectorTest extends DomHardCoreTestCase {
     assertEquals("abcBARdef", element.getConvertedValue().getValue());
   }
 
-  public void testReference() throws Exception {
+  public void testReference() {
     String text = "<a><value>abc${prop}def</value></a>";
     MyElement element = createElement(text, MyElement.class);
 
@@ -78,7 +78,7 @@ public class DomReferenceInjectorTest extends DomHardCoreTestCase {
     assertReference(element.getValue(), targetElement, text.indexOf("${prop}") + 1);
   }
 
-  public void testAttribute() throws Exception {
+  public void testAttribute() {
     String text = "<a attr=\"abc${prop}def\"/>";
     MyElement element = createElement(text, MyElement.class);
 
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomReferencesTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomReferencesTest.java
index 31b000467fad..cd2ed1c5bbe8 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomReferencesTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomReferencesTest.java
@@ -31,7 +31,7 @@ import java.util.*;
  */
 public class DomReferencesTest extends DomHardCoreTestCase {
 
-  public void testMetaData() throws Throwable {
+  public void testMetaData() {
     final MyElement element = createElement("");
     element.getName().setValue("A");
     final XmlTag tag = element.getXmlTag();
@@ -45,7 +45,7 @@ public class DomReferencesTest extends DomHardCoreTestCase {
     assertEquals("B", element.getName().getValue());
   }
 
-  public void testNameReference() throws Throwable {
+  public void testNameReference() {
     final MyElement element = createElement("<a><name>abc</name></a>");
     final DomTarget target = DomTarget.getTarget(element);
     assertNotNull(target);
@@ -53,7 +53,7 @@ public class DomReferencesTest extends DomHardCoreTestCase {
     assertNull(tag.getContainingFile().findReferenceAt(tag.getValue().getTextRange().getStartOffset()));
   }
 
-  public void testProcessingInstruction() throws Throwable {
+  public void testProcessingInstruction() {
     createElement("<a><?xml version=\"1.0\"?></a>").getXmlTag().accept(new PsiRecursiveElementVisitor() {
       @Override public void visitElement(PsiElement element) {
         super.visitElement(element);
@@ -64,12 +64,12 @@ public class DomReferencesTest extends DomHardCoreTestCase {
     });
   }
 
-  public void testBooleanReference() throws Throwable {
+  public void testBooleanReference() {
     final MyElement element = createElement("<a><boolean>true</boolean></a>");
     assertVariants(assertReference(element.getBoolean()), "false", "true");
   }
 
-  public void testBooleanAttributeReference() throws Throwable {
+  public void testBooleanAttributeReference() {
     final MyElement element = createElement("<a boolean-attribute=\"true\"/>");
     final PsiReference reference = getReference(element.getBooleanAttribute());
     assertVariants(reference, "false", "true");
@@ -81,34 +81,34 @@ public class DomReferencesTest extends DomHardCoreTestCase {
     assertEquals(new TextRange(0, "true".length()).shiftRight(1), reference.getRangeInElement());
   }
 
-  public void testEnumReference() throws Throwable {
+  public void testEnumReference() {
     assertVariants(assertReference(createElement("<a><enum>239</enum></a>").getEnum(), null), "A", "B", "C");
     assertVariants(assertReference(createElement("<a><enum>A</enum></a>").getEnum()), "A", "B", "C");
   }
 
-  public void testPsiClass() throws Throwable {
+  public void testPsiClass() {
     final MyElement element = createElement("<a><psi-class>java.lang.String</psi-class></a>");
     assertReference(element.getPsiClass(), PsiType.getJavaLangString(getPsiManager(), GlobalSearchScope.allScope(getProject())).resolve(),
                     element.getPsiClass().getXmlTag().getValue().getTextRange().getEndOffset() - 1);
   }
 
-  public void testPsiType() throws Throwable {
+  public void testPsiType() {
     final MyElement element = createElement("<a><psi-type>java.lang.String</psi-type></a>");
     assertReference(element.getPsiType(), PsiType.getJavaLangString(getPsiManager(), GlobalSearchScope.allScope(getProject())).resolve());
   }
 
-  public void testIndentedPsiType() throws Throwable {
+  public void testIndentedPsiType() {
     final MyElement element = createElement("<a><psi-type>  java.lang.Strin   </psi-type></a>");
     final PsiReference psiReference = assertReference(element.getPsiType(), null);
     assertEquals(new TextRange(22, 22 + "Strin".length()), psiReference.getRangeInElement());
   }
 
-  public void testPsiPrimitiveType() throws Throwable {
+  public void testPsiPrimitiveType() {
     final MyElement element = createElement("<a><psi-type>int</psi-type></a>");
     assertReference(element.getPsiType());
   }
   
-  public void testPsiPrimitiveTypeArray() throws Throwable {
+  public void testPsiPrimitiveTypeArray() {
     final MyElement element = createElement("<a><psi-type>int[]</psi-type></a>");
     final GenericDomValue value = element.getPsiType();
     final XmlTagValue tagValue = value.getXmlTag().getValue();
@@ -116,12 +116,12 @@ public class DomReferencesTest extends DomHardCoreTestCase {
     assertReference(value, value.getXmlTag(), tagValue.getTextRange().getStartOffset() + i + "int".length());
   }
 
-  public void testPsiUnknownType() throws Throwable {
+  public void testPsiUnknownType() {
     final MyElement element = createElement("<a><psi-type>#$^%*$</psi-type></a>");
     assertReference(element.getPsiType(), null);
   }
 
-  public void testPsiArrayType() throws Throwable {
+  public void testPsiArrayType() {
     final MyElement element = createElement("<a><psi-type>java.lang.String[]</psi-type></a>");
     final XmlTag tag = element.getPsiType().getXmlTag();
     final TextRange valueRange = tag.getValue().getTextRange();
@@ -132,7 +132,7 @@ public class DomReferencesTest extends DomHardCoreTestCase {
     assertEquals("String".length(), reference.getRangeInElement().getLength());
   }
 
-  public void testJvmArrayType() throws Throwable {
+  public void testJvmArrayType() {
     final MyElement element = createElement("<a><jvm-psi-type>[Ljava.lang.String;</jvm-psi-type></a>");
     final XmlTag tag = element.getJvmPsiType().getXmlTag();
     final TextRange valueRange = tag.getValue().getTextRange();
@@ -143,12 +143,12 @@ public class DomReferencesTest extends DomHardCoreTestCase {
     assertEquals("String".length(), reference.getRangeInElement().getLength());
   }
 
-  public void testCustomResolving() throws Throwable {
+  public void testCustomResolving() {
     final MyElement element = createElement("<a><string-buffer>239</string-buffer></a>");
     assertVariants(assertReference(element.getStringBuffer()), "239", "42", "foo", "zzz");
   }
 
-  public void testAdditionalValues() throws Throwable {
+  public void testAdditionalValues() {
     final MyElement element = createElement("<a><string-buffer>zzz</string-buffer></a>");
     final XmlTag tag = element.getStringBuffer().getXmlTag();
     assertTrue(tag.getContainingFile().findReferenceAt(tag.getValue().getTextRange().getStartOffset()).isSoft());
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java
index 1d54400b1cd4..dcbbbde0a8de 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomSaxParserTest.java
@@ -27,51 +27,51 @@ import org.jetbrains.annotations.Nullable;
  */
 public class DomSaxParserTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testGetRootTagNameWithoutNamespace() throws Throwable {
+  public void testGetRootTagNameWithoutNamespace() {
     assertData("<root>", "root", null, null, null);
   }
 
-  public void testGetRootTagNameWithNamespaceWithEmptyPrefix() throws Throwable {
+  public void testGetRootTagNameWithNamespaceWithEmptyPrefix() {
     assertData("<root xmlns=\"foo\">", "root", "foo", null, null);
   }
 
-  public void testGetRootTagNameWithUnfinishedAttribute() throws Throwable {
+  public void testGetRootTagNameWithUnfinishedAttribute() {
     XmlFile file = createXmlFile("<root xmlns=\"foo\" aaa>");
     ensureParsed(file);
     final XmlFileHeader header = DomService.getInstance().getXmlFileHeader(file);
     assertEquals(new XmlFileHeader("root", "foo", null, null), header);
   }
 
-  public void testGetRootTagNameWithNamespaceWithNonEmptyPrefix() throws Throwable {
+  public void testGetRootTagNameWithNamespaceWithNonEmptyPrefix() {
     assertData("<bar:root xmlns=\"foo\" xmlns:bar=\"b\">", "root", "b", null, null);
   }
 
-  public void testGetRootTagNameWithDtdNamespace() throws Throwable {
+  public void testGetRootTagNameWithDtdNamespace() {
     assertData("<!DOCTYPE ejb-jar PUBLIC\n" +
                "\"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\"\n" +
                "\"http://java.sun.com/dtd/ejb-jar_2_0.dtd\"><root>", "root", null, "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN", "http://java.sun.com/dtd/ejb-jar_2_0.dtd");
   }
 
-  public void testGetRootTagNameWithDtdNamespace2() throws Throwable {
+  public void testGetRootTagNameWithDtdNamespace2() {
     assertData("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                "<!DOCTYPE ejb-jar PUBLIC\n" +
                "\"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\"\n" +
                "\"http://java.sun.com/dtd/ejb-jar_2_0.dtd\"><root>", "root", null, "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN", "http://java.sun.com/dtd/ejb-jar_2_0.dtd");
   }
 
-  public void testNoTag() throws Throwable {
+  public void testNoTag() {
     assertData("aaaaaaaaaaaaaaaaaaaaa", null, null, null, null);
   }
 
-  public void testEmptyFile() throws Throwable {
+  public void testEmptyFile() {
     assertData("", null, null, null, null);
   }
 
-  public void testInvalidContent() throws Throwable {
+  public void testInvalidContent() {
     assertData("<?xmlmas8v6708986><OKHD POH:&*$%*&*I8yo9", null, null, null, null);
   }
 
-  public void testInvalidContent2() throws Throwable {
+  public void testInvalidContent2() {
     assertData("?xmlmas8v6708986><OKHD POH:&*$%*&*I8yo9", null, null, null, null);
   }
 
@@ -80,15 +80,15 @@ public class DomSaxParserTest extends LightPlatformCodeInsightFixtureTestCase {
     file.getNode().getFirstChildNode();
   }
 
-  public void testInvalidContent3() throws Throwable {
+  public void testInvalidContent3() {
     assertData("<?xmlmas8v67089", null, null, null, null);
   }
 
-  public void testSubtag() throws Throwable {
+  public void testSubtag() {
     assertData("<root><foo/>", "root", null, null, null);
   }
 
-  public void testSpring() throws Throwable {
+  public void testSpring() {
     assertData("<?xml version=\"1.0\" encoding=\"gbk\"?>\n" + "\n" + "\n" +
                "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
                "       xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -100,7 +100,7 @@ public class DomSaxParserTest extends LightPlatformCodeInsightFixtureTestCase {
                "</beans>", "beans", "http://www.springframework.org/schema/beans", null, null);
   }
 
-  public void testInternalDtd() throws Throwable {
+  public void testInternalDtd() {
     assertData("<?xml version=\"1.0\"?>\n" +
                "<!DOCTYPE \n" + 
                "        hibernate-mapping SYSTEM\n" +
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomSimpleValuesTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomSimpleValuesTest.java
index 2cbcb854f8ab..3c2d5b5e8318 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomSimpleValuesTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomSimpleValuesTest.java
@@ -42,13 +42,13 @@ public class DomSimpleValuesTest extends DomTestCase {
     return createElement(xml, MyElement.class);
   }
 
-  public void testGetValue() throws Throwable {
+  public void testGetValue() {
     final String text = "<a>foo</a>";
     assertEquals("foo", createElement(text).getTagValue());
     assertEquals("foo", createElement(text).getValue());
   }
 
-  public void testSetValue() throws Throwable {
+  public void testSetValue() {
     final MyElement element = createElement("<a/>");
     assertEquals("", element.getValue());
     element.setValue(239);
@@ -59,7 +59,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     myCallRegistry.assertResultsAndClear();
   }
 
-  public void testDefineAndSet() throws Throwable {
+  public void testDefineAndSet() {
     final MyElement element = getDomManager().getFileElement(createXmlFile(""), MyElement.class, "root").getRootElement();
     myCallRegistry.clear();
     assertNull(element.getXmlTag());
@@ -79,7 +79,7 @@ public class DomSimpleValuesTest extends DomTestCase {
   }
 
 
-  public void testSimpleConverters() throws Throwable {
+  public void testSimpleConverters() {
     assertEquals(239, createElement("<a>239</a>").getInt());
     assertEquals(true, createElement("<a>true</a>").getBoolean());
     assertEquals("true", createElement("<a>true</a>").getBuffer().toString());
@@ -107,7 +107,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     }
   }
 
-  public void testComment() throws Throwable {
+  public void testComment() {
     assertEquals(239, createElement("<a>" +
                                     "  <!-- some comment-->" +
                                     "  239" +
@@ -115,7 +115,7 @@ public class DomSimpleValuesTest extends DomTestCase {
                                     "</a>").getInt());
   }
 
-  public void testPsiClassConverter() throws Throwable {
+  public void testPsiClassConverter() {
     final String className = Object.class.getName();
     final PsiClass objectClass = getJavaFacade().findClass(className, GlobalSearchScope.allScope(getProject()));
     assertEquals(objectClass, createElement("<a>" + className + "</a>").getPsiClass());
@@ -123,7 +123,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertNull(createElement("<a>abcdef</a>").getPsiClass());
   }
 
-  public void testEnums() throws Throwable {
+  public void testEnums() {
     final MyElement element = createElement("<a/>", MyElement.class);
     assertNull(element.getEnum());
 
@@ -139,7 +139,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertNull(element.getEnum());
   }
 
-  public void testAttributeValues() throws Throwable {
+  public void testAttributeValues() {
     final MyElement element = createElement("<a attra=\"foo\"/>");
     final GenericAttributeValue<String> attributeValue = element.getAttributeValue();
     assertEquals("attra", attributeValue.getXmlElementName());
@@ -171,7 +171,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertNull(createElement("<a attra\"/>").getAttributeValue().getStringValue());
   }
 
-  public void testGenericValue() throws Throwable {
+  public void testGenericValue() {
     final MyElement element = createElement("<a><generic-child>239</generic-child></a>");
     final GenericDomValue<Integer> integerChild = element.getGenericChild();
     assertEquals(239, (int)integerChild.getValue());
@@ -181,14 +181,14 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertEquals("42", integerChild.getStringValue());
   }
 
-  public void testAnnotatedGenericValue() throws Throwable {
+  public void testAnnotatedGenericValue() {
     final MyElement element = createElement("<a><buffer>239</buffer></a>");
     element.getGenericChild().getValue();
     final GenericDomValue<StringBuffer> genericChild2 = element.getGenericChild2();
     assertEquals("239", genericChild2.getValue().toString());
   }
 
-  public void testSpecialCharacters() throws Throwable {
+  public void testSpecialCharacters() {
     final MyElement element = createElement("");
     element.setValue("<");
     assertEquals("<", element.getValue());
@@ -199,7 +199,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertEquals("\"&lt;\"", element.getXmlTag().getAttribute("attra", null).getValueElement().getText());
   }
 
-  public void testIndicators() throws Throwable {
+  public void testIndicators() {
     final MyElement element = createElement("<a><indicator/></a>");
     final GenericDomValue<Boolean> indicator = element.getIndicator();
     assertTrue(indicator.getValue());
@@ -223,7 +223,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     final XmlTag tag = element.getXmlTag();
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         tag.add(createTag("<indicator/>"));
         tag.add(createTag("<indicator/>"));
       }
@@ -254,13 +254,13 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertEquals("def", DomUIFactory.GET_VALUE_METHOD.invoke(generic));
   }
 
-  public void testNameValueInPresentation() throws Throwable {
+  public void testNameValueInPresentation() {
     final MyElement element = createElement("");
     element.getAttr().setValue(23942);
     assertEquals("23942", element.getPresentation().getElementName());
   }
 
-  public void testResolveToDomElement() throws Throwable {
+  public void testResolveToDomElement() {
     final RootInterface element = createElement("", RootInterface.class);
     final MyElement child1 = element.addChild();
     child1.getAttr().setValue(555);
@@ -283,7 +283,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertEquals(child2, resolve2.getValue());
   }
 
-  public void testPlainPsiTypeConverter() throws Throwable {
+  public void testPlainPsiTypeConverter() {
     assertNull(createElement("").getPsiType());
     assertSame(PsiType.INT, createElement("<a>int</a>").getPsiType());
     final PsiType psiType = createElement("<a>java.lang.String</a>").getPsiType();
@@ -294,7 +294,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertSame(PsiType.INT, ((PsiArrayType) arrayType).getComponentType());
   }
 
-  public void testJvmPsiTypeConverter() throws Throwable {
+  public void testJvmPsiTypeConverter() {
     assertNull(createElement("").getJvmPsiType());
     assertNotNull(createElement("<a>int</a>").getJvmPsiType());
     final PsiClassType string = PsiType.getJavaLangString(getPsiManager(), GlobalSearchScope.allScope(getProject()));
@@ -311,7 +311,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertJvmPsiTypeToString(string, "java.lang.String");
   }
 
-  public void testValueCaching() throws Throwable {
+  public void testValueCaching() {
     final GenericDomValue<String> element = createElement("<a><cached-value/></a>", MyElement.class).getCachedValue();
     assertEquals(0, ((MyConverter) element.getConverter()).fromStringCalls);
     assertEquals("", element.getValue());
@@ -336,19 +336,19 @@ public class DomSimpleValuesTest extends DomTestCase {
     assertEquals(element.getJavaStyledAttribute().getXmlElementName(), "javaStyledAttribute");
   }
 
-  public void testGenericValueListConverter() throws Throwable {
+  public void testGenericValueListConverter() {
     final MyElement element = createElement("<a><string-buffer>abc</string-buffer></a>");
     assertEquals("abc", element.getStringBuffers().get(0).getValue().toString());
   }
 
-  public void testConvertAnnotationOnType() throws Throwable {
+  public void testConvertAnnotationOnType() {
     final MyElement element =
       createElement("<a>" + "<my-generic-value>abc</my-generic-value>" + "<my-foo-generic-value>abc</my-foo-generic-value>" + "");
     assertEquals("bar", element.getMyGenericValue().getValue());
     assertEquals("foo", element.getMyFooGenericValue().getValue());
   }
   
-  public void testEntities() throws Throwable {
+  public void testEntities() {
     final MyElement element = createElement("<!DOCTYPE a SYSTEM \"aaa\"\n" +
                                             "[<!ENTITY idgenerator    \"identity\">]>\n" +
                                             "<a attra=\"a&lt;b\" some-attribute=\"&idgenerator;\">&xxx;+&idgenerator;+&amp;</a>");
@@ -471,7 +471,7 @@ public class DomSimpleValuesTest extends DomTestCase {
     void setValue(String s);
   }
 
-  public void testFuhrer() throws Throwable {
+  public void testFuhrer() {
     final FieldGroup group = createElement("<field-group>\n" +
                                            "<group-name>myGroup</load-group-name>\n" +
                                            "<field-name>myField1</field-name>\n" +
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/DomVirtualFileEventsTest.java b/xml/dom-tests/tests/com/intellij/util/xml/DomVirtualFileEventsTest.java
index de5e504d014a..81719ce772cc 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/DomVirtualFileEventsTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/DomVirtualFileEventsTest.java
@@ -41,7 +41,7 @@ public class DomVirtualFileEventsTest extends DomHardCoreTestCase{
     }, getTestRootDisposable());
   }
 
-  public void testCreateFile() throws Throwable {
+  public void testCreateFile() {
     new WriteCommandAction.Simple(myProject) {
       @Override
       protected void run() throws Throwable {
@@ -60,7 +60,7 @@ public class DomVirtualFileEventsTest extends DomHardCoreTestCase{
     }.execute().throwException();
   }
 
-  public void testDeleteFile() throws Throwable {
+  public void testDeleteFile() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
       protected void run() throws Throwable {
@@ -81,7 +81,7 @@ public class DomVirtualFileEventsTest extends DomHardCoreTestCase{
     }.execute().throwException();
   }
 
-  public void testRenameFile() throws Throwable {
+  public void testRenameFile() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
       protected void run() throws Throwable {
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/NameStrategyTest.java b/xml/dom-tests/tests/com/intellij/util/xml/NameStrategyTest.java
index a6c80f1b5218..e5572d2cd73a 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/NameStrategyTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/NameStrategyTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
  */
 public class NameStrategyTest extends TestCase {
 
-  public void testHyphenStrategy() throws Throwable {
+  public void testHyphenStrategy() {
     assertEquals("aaa-bbb-ccc", DomNameStrategy.HYPHEN_STRATEGY.convertName("aaaBbbCcc"));
     assertEquals("aaa-bbb-ccc", DomNameStrategy.HYPHEN_STRATEGY.convertName("AaaBbbCcc"));
     assertEquals("aaa", DomNameStrategy.HYPHEN_STRATEGY.convertName("Aaa"));
@@ -31,7 +31,7 @@ public class NameStrategyTest extends TestCase {
     assertEquals("aaa-BBB", DomNameStrategy.HYPHEN_STRATEGY.convertName("AaaBBB"));
   }
 
-  public void testHyphenStrategySplit() throws Throwable {
+  public void testHyphenStrategySplit() {
     assertEquals("aaa bbb ccc", DomNameStrategy.HYPHEN_STRATEGY.splitIntoWords("aaa-bbb-ccc"));
     assertEquals("Aaa", DomNameStrategy.HYPHEN_STRATEGY.splitIntoWords("Aaa"));
     assertEquals("aaa", DomNameStrategy.HYPHEN_STRATEGY.splitIntoWords("aaa"));
@@ -39,7 +39,7 @@ public class NameStrategyTest extends TestCase {
     assertEquals("aaa BBB", DomNameStrategy.HYPHEN_STRATEGY.splitIntoWords("aaa-BBB"));
   }
 
-  public void testJavaStrategy() throws Throwable {
+  public void testJavaStrategy() {
     assertEquals("aaaBbbCcc", DomNameStrategy.JAVA_STRATEGY.convertName("aaaBbbCcc"));
     assertEquals("aaaBbbCcc", DomNameStrategy.JAVA_STRATEGY.convertName("AaaBbbCcc"));
     assertEquals("aaa", DomNameStrategy.JAVA_STRATEGY.convertName("Aaa"));
@@ -48,7 +48,7 @@ public class NameStrategyTest extends TestCase {
     assertEquals("aaaBBB", DomNameStrategy.JAVA_STRATEGY.convertName("AaaBBB"));
   }
 
-  public void testJavaStrategySplit() throws Throwable {
+  public void testJavaStrategySplit() {
     assertEquals("aaa bbb ccc", DomNameStrategy.JAVA_STRATEGY.splitIntoWords("aaaBbbCcc"));
     assertEquals("aaa", DomNameStrategy.JAVA_STRATEGY.splitIntoWords("Aaa"));
     assertEquals("aaa", DomNameStrategy.JAVA_STRATEGY.splitIntoWords("aaa"));
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/ProxyTest.java b/xml/dom-tests/tests/com/intellij/util/xml/ProxyTest.java
index 516643d0f67a..27c60217f078 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/ProxyTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/ProxyTest.java
@@ -111,7 +111,7 @@ public class ProxyTest extends TestCase {
     public abstract String foo();
   }
 
-  public void testAddInterfaces() throws Throwable {
+  public void testAddInterfaces() {
     final BaseImpl proxy = AdvancedProxy.createProxy(BaseImpl.class, BaseIEx.class);
     assertEquals(proxy.sayA(), "a");
     assertEquals(((BaseI)proxy).sayA(), "a");
@@ -141,12 +141,11 @@ public class ProxyTest extends TestCase {
     public abstract static class AbstractBaseImpl extends AbstractBase {}
   }
 
-  public void testCovariantFromInterface() throws Throwable {
+  public void testCovariantFromInterface() {
     final AbstractBase.AbstractBaseImpl proxy = AdvancedProxy.createProxy(AbstractBase.AbstractBaseImpl.class, ArrayUtil.EMPTY_CLASS_ARRAY,
                                                                           new InvocationHandler() {
                                                                             @Override
-                                                                            public Object invoke(Object proxy, Method method, Object[] args)
-                                                                              throws Throwable {
+                                                                            public Object invoke(Object proxy, Method method, Object[] args) {
                                                                               return "a";
                                                                             }
                                                                           }, false, new Object[0]);
@@ -172,11 +171,11 @@ public class ProxyTest extends TestCase {
     }
   }
 
-  public void testCovariantFromBaseClass() throws Throwable {
+  public void testCovariantFromBaseClass() {
     final CovariantFromBaseClassTest.Impl proxy = AdvancedProxy.createProxy(CovariantFromBaseClassTest.Impl.class,
                                                                             ArrayUtil.EMPTY_CLASS_ARRAY, new InvocationHandler() {
         @Override
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        public Object invoke(Object proxy, Method method, Object[] args) {
           return "a";
         }
       }, false, new Object[0]);
@@ -188,7 +187,7 @@ public class ProxyTest extends TestCase {
   public void testGenericMethodInvocationJava8() throws Throwable {
     ConcreteInterface proxy = AdvancedProxy.createProxy(new InvocationHandler() {
       @Override
-      public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+      public Object invoke(Object proxy, Method method, Object[] args) {
         return 42;
       }
     }, null, ConcreteInterface.class);
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/SimpleValuesIncrementalUpdateTest.java b/xml/dom-tests/tests/com/intellij/util/xml/SimpleValuesIncrementalUpdateTest.java
index 2a2bf1a4e2f3..e6843df48d1b 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/SimpleValuesIncrementalUpdateTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/SimpleValuesIncrementalUpdateTest.java
@@ -24,7 +24,7 @@ import com.intellij.util.xml.impl.DomTestCase;
  */
 public class SimpleValuesIncrementalUpdateTest extends DomTestCase {
 
-  public void testAttributeChange() throws Throwable {
+  public void testAttributeChange() {
     final MyElement element = createElement("<a/>");
     element.getXmlTag().setAttribute("attr", "foo");
     putExpected(new DomEvent(element, false));
@@ -44,7 +44,7 @@ public class SimpleValuesIncrementalUpdateTest extends DomTestCase {
     assertTrue(element.getAttr().isValid());
   }
 
-  public void testAttributeValueChangeAsXmlElementChange() throws Throwable {
+  public void testAttributeValueChangeAsXmlElementChange() {
     final MyElement element = createElement("<a attr=\"foo\"/>");
     final GenericAttributeValue<String> attr = element.getAttr();
     attr.getXmlAttributeValue().getFirstChild().replace(createTag("<a attr=\"bar\"/>").getAttribute("attr", null).getValueElement().getFirstChild());
@@ -53,7 +53,7 @@ public class SimpleValuesIncrementalUpdateTest extends DomTestCase {
     assertTrue(attr.isValid());
   }
 
-  public void testTagValueChange() throws Throwable {
+  public void testTagValueChange() {
     final MyElement element = createElement("<a><child> </child></a>").getChild();
     element.getXmlTag().getValue().setText("abc");
     putExpected(new DomEvent(element, false));
@@ -64,7 +64,7 @@ public class SimpleValuesIncrementalUpdateTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testAttrXmlEmptyUri() throws Throwable {
+  public void testAttrXmlEmptyUri() {
     final MyElement element = createElement("<a xmlns=\"foo\"><ns-child attr=\"239\"/></a>" , MyElement.class);
     getDomManager().getDomFileDescription(element.getXmlElement()).registerNamespacePolicy("foo", "foo");
 
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java b/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java
index 0b41f4410f6c..8b93274bbfc4 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/impl/TreeIncrementalUpdateTest.java
@@ -38,7 +38,7 @@ import java.util.List;
  */
 public class TreeIncrementalUpdateTest extends DomTestCase {
 
-  public void testRenameCollectionTag() throws Throwable {
+  public void testRenameCollectionTag() {
     final MyElement rootElement = createPhysicalElement(
         "<?xml version='1.0' encoding='UTF-8'?>\n" + "<a>\n" + " <boy>\n" + " </boy>\n" + " <girl/>\n" + "</a>");
     myCallRegistry.clear();
@@ -51,7 +51,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     final int endoffset = offset+tag.getTextLength();
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         rootElement.getGirls().get(0).undefine();
         final Document document = getDocument(DomUtil.getFile(rootElement));
         PsiDocumentManager.getInstance(getProject()).doPostponedOperationsAndUnblockDocument(document);
@@ -64,7 +64,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertEquals(1, rootElement.getGirls().size());
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Document document = getDocument(DomUtil.getFile(rootElement));
         document.replaceString(endoffset - "boy".length(), endoffset, "girl");
         commitDocument(document);
@@ -81,7 +81,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     return rootElement;
   }
 
-  public void testRenameFixedTag() throws Throwable {
+  public void testRenameFixedTag() {
     final XmlFile file = (XmlFile)createFile("file.xml", "<?xml version='1.0' encoding='UTF-8'?>\n" +
                                                          "<a>\n" +
                                                          " <aboy>\n" +
@@ -100,7 +100,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     final int endoffset = offset+tag.getTextLength();
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         rootElement.getAgirl().undefine();
         final Document document = getDocument(file);
         PsiDocumentManager.getInstance(getProject()).doPostponedOperationsAndUnblockDocument(document);
@@ -113,7 +113,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertNotNull(rootElement.getAgirl().getXmlElement());
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Document document = getDocument(file);
         document.replaceString(endoffset - "aboy".length(), endoffset, "agirl");
         commitDocument(document);
@@ -123,7 +123,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertNotNull(rootElement.getAgirl().getXmlElement());
   }
 
-  public void testDocumentChange() throws Throwable {
+  public void testDocumentChange() {
     final XmlFile file = (XmlFile)createFile("file.xml", "<?xml version='1.0' encoding='UTF-8'?>\n" +
                                                          "<a>\n" +
                                                          " <child>\n" +
@@ -139,7 +139,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Document document = getDocument(file);
         document.replaceString(0, document.getText().length(), "<a/>");
         commitDocument(document);
@@ -160,7 +160,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertNull(rootElement.getChild().getChild().getXmlTag());
   }
 
-  public void testDocumentChange2() throws Throwable {
+  public void testDocumentChange2() {
     final XmlFile file = (XmlFile)createFile("file.xml", "<?xml version='1.0' encoding='UTF-8'?>\n" +
                                                          "<!DOCTYPE ejb-jar PUBLIC \"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\" \"http://java.sun.com/dtd/ejb-jar_2_0.dtd\">\n" +
                                                          "<a>\n" +
@@ -177,7 +177,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         file.getDocument().getProlog().delete();
         final XmlTag tag = file.getDocument().getRootTag();
         tag.setAttribute("xmlns", "something");
@@ -200,7 +200,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertTrue(rootElement.getChild().getChild().getXmlTag().isValid());
   }
 
-  public void testMoveUp() throws Throwable {
+  public void testMoveUp() {
     final XmlFile file = (XmlFile)createFile("file.xml", "<?xml version='1.0' encoding='UTF-8'?>\n" +
                                                          "<a>\n" +
                                                          " <child>\n" +
@@ -218,7 +218,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     final int len = "<agirl/>".length();
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final int agirl = document.getText().indexOf("<agirl/>");
         final int boy = document.getText().indexOf("<aboy />");
         document.replaceString(agirl, agirl + len, "<aboy />");
@@ -233,7 +233,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertEquals(getDomManager().getDomElement(tag1.findFirstSubTag("aboy")), rootElement.getChild().getAboy());
   }
 
-  public void testRemoveAttributeParent() throws Throwable {
+  public void testRemoveAttributeParent() {
     final XmlFile file = (XmlFile)createFile("file.xml", "<?xml version='1.0' encoding='UTF-8'?>\n" +
                                                          "<!DOCTYPE ejb-jar PUBLIC \"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN\" \"http://java.sun.com/dtd/ejb-jar_2_0.dtd\">\n" +
                                                          "<a>\n" +
@@ -249,7 +249,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         oldLeafTag.delete();
       }
     }.execute();
@@ -258,7 +258,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertFalse(xxx.isValid());
   }
 
-  public void testTypeBeforeRootTag() throws Throwable {
+  public void testTypeBeforeRootTag() {
     getDomManager().registerFileDescription(new DomFileDescription<>(MyElement.class, "a"), getTestRootDisposable());
 
     final XmlFile file = (XmlFile)createFile("file.xml", "<?xml version='1.0' encoding='UTF-8'?>\n" +
@@ -273,7 +273,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Document document = getDocument(file);
         final int i = document.getText().indexOf("<a");
         document.insertString(i, "a");
@@ -299,7 +299,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     return createElement(xml, MyElement.class);
   }
 
-  public void testAddCollectionElement() throws Throwable {
+  public void testAddCollectionElement() {
     final MyElement element = createElement("<a><child/><child/><child-element/></a>");
     final MyElement child = element.getChild();
     final MyElement child2 = element.getChild2();
@@ -314,7 +314,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testAddFixedElement() throws Throwable {
+  public void testAddFixedElement() {
     final MyElement element = createPhysicalElement("<a>" +
                                             "<child/>" +
                                             "<child><child/></child>" +
@@ -325,7 +325,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
 
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         element.getXmlTag().addAfter(createTag("<child/>"), child.getXmlTag());
       }
     }.execute();
@@ -347,7 +347,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testAddFixedElementCanDefineIt() throws Throwable {
+  public void testAddFixedElementCanDefineIt() {
     final MyElement element = createElement("<a></a>");
     final MyElement child = element.getChild();
 
@@ -364,7 +364,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testActuallyRemoveCollectionElement() throws Throwable {
+  public void testActuallyRemoveCollectionElement() {
     final MyElement element = createElement("<a><child-element><child/></child-element><child-element/></a>");
     final MyElement child = element.getChild();
     final MyElement child2 = element.getChild2();
@@ -384,7 +384,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertCached(lastChild, tag.getSubTags()[0]);
   }
 
-  public void testCustomChildrenEvents() throws Throwable {
+  public void testCustomChildrenEvents() {
     final Sepulka element = createElement("<a><foo/><bar/></a>", Sepulka.class);
     final List<MyElement> list = element.getCustomChildren();
     final XmlTag tag = element.getXmlTag();
@@ -402,7 +402,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertEquals(1, element.getCustomChildren().size());
   }
 
-  public void testRemoveFixedElement() throws Throwable {
+  public void testRemoveFixedElement() {
     final MyElement element = createElement("<a>" +
                                             "<child/>" +
                                             "<child><child/></child>" +
@@ -433,7 +433,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testRootTagAppearsLater() throws Throwable {
+  public void testRootTagAppearsLater() {
     final XmlFile file = createXmlFile("");
     final DomFileElementImpl<MyElement> fileElement = getDomManager().getFileElement(file, MyElement.class, "root");
     myCallRegistry.clear();
@@ -447,7 +447,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testAnotherChildren() throws Throwable {
+  public void testAnotherChildren() {
     final MyElement element = createElement("<a><child/></a>");
     element.getXmlTag().add(createTag("<another-child/>"));
     assertEquals(1, element.getAnotherChildren().size());
@@ -456,11 +456,11 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertResultsAndClear();
   }
 
-  public void testInvalidateParent() throws Throwable {
+  public void testInvalidateParent() {
     final MyElement root = getDomManager().createMockElement(MyElement.class, null, true);
     new WriteCommandAction<MyElement>(getProject()) {
       @Override
-      protected void run(@NotNull Result<MyElement> result) throws Throwable {
+      protected void run(@NotNull Result<MyElement> result) {
         root.getChild().ensureTagExists();
         root.getChild2().ensureTagExists();
         final MyElement element = root.addChildElement().getChild();
@@ -477,7 +477,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     final MyElement genericValue = child.getChild();
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Document document = getDocument(DomUtil.getFile(element));
         final TextRange range = element.getXmlTag().getTextRange();
         document.replaceString(range.getStartOffset(), range.getEndOffset(), "");
@@ -489,11 +489,11 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertFalse(element.isValid());
   }
 
-  public void testCollectionChildValidAfterFormattingReparse() throws Throwable {
+  public void testCollectionChildValidAfterFormattingReparse() {
     final MyElement root = getDomManager().createMockElement(MyElement.class, null, true);
     final MyElement element = new WriteCommandAction<MyElement>(getProject()) {
       @Override
-      protected void run(@NotNull Result<MyElement> result) throws Throwable {
+      protected void run(@NotNull Result<MyElement> result) {
         result.setResult(root.addChildElement());
       }
     }.execute().getResultObject();
@@ -501,7 +501,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     assertNotNull(element.getXmlElement());
   }
 
-  public void testChangeImplementationClass() throws Throwable {
+  public void testChangeImplementationClass() {
     getTypeChooserManager().registerTypeChooser(MyElement.class, createClassChooser());
     try {
       final MyElement element = getDomManager().createMockElement(MyElement.class, getModule(), true);
@@ -509,7 +509,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
       
       new WriteCommandAction(getProject()) {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           element.addChildElement().addChildElement();
         }
       }.execute();
@@ -532,7 +532,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
 
       new WriteCommandAction(getProject()) {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           tag.add(XmlElementFactory.getInstance(getProject()).createTagFromText("<foo/>"));
         }
       }.execute();
@@ -555,14 +555,14 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
     }
   }
 
-  public void testChangeImplementationClass_InCollection() throws Throwable {
+  public void testChangeImplementationClass_InCollection() {
     getTypeChooserManager().registerTypeChooser(MyElement.class, createClassChooser());
     try {
       final MyElement element = getDomManager().createMockElement(MyElement.class, getModule(), true);
       final DomFileElement<MyElement> root = DomUtil.getFileElement(element);
       new WriteCommandAction<MyElement>(getProject()) {
         @Override
-        protected void run(@NotNull Result<MyElement> result) throws Throwable {
+        protected void run(@NotNull Result<MyElement> result) {
           element.addChildElement().addChildElement();
         }
       }.execute().getResultObject();
@@ -585,7 +585,7 @@ public class TreeIncrementalUpdateTest extends DomTestCase {
 
       new WriteCommandAction(getProject()) {
         @Override
-        protected void run(@NotNull Result result) throws Throwable {
+        protected void run(@NotNull Result result) {
           tag.add(XmlElementFactory.getInstance(getProject()).createTagFromText("<foo/>"));
         }
       }.execute();
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java
index 1e308a0d79f8..5bddc0fbe2d6 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubBuilderTest.java
@@ -41,11 +41,11 @@ import org.jetbrains.annotations.NotNull;
  */
 public class DomStubBuilderTest extends DomStubTest {
 
-  public void testDomLoading() throws Exception {
+  public void testDomLoading() {
     getRootStub("foo.xml");
   }
 
-  public void testFoo() throws Exception {
+  public void testFoo() {
     doBuilderTest("foo.xml", "File:foo\n" +
                              "  Element:foo\n" +
                              "    Element:id:foo\n" +
@@ -70,14 +70,14 @@ public class DomStubBuilderTest extends DomStubTest {
     assertEquals("foo", idElementStub.getValue());
   }
 
-  public void testIncompleteAttribute() throws Exception {
+  public void testIncompleteAttribute() {
     doBuilderTest("incompleteAttribute.xml", "File:foo\n" +
                                              "  Element:foo\n" +
                                              "    Element:bar\n" +
                                              "      Attribute:string:\n");
   }
 
-  public void testDomExtension() throws Exception {
+  public void testDomExtension() {
     DomExtenderEP ep = new DomExtenderEP();
     ep.domClassName = Bar.class.getName();
     ep.extenderClassName = TestExtender.class.getName();
@@ -90,7 +90,7 @@ public class DomStubBuilderTest extends DomStubTest {
                                   "    Element:bar\n");
   }
 
-  public void testNullTag() throws Exception {
+  public void testNullTag() {
     VirtualFile virtualFile = myFixture.copyFileToProject("nullTag.xml");
     assertNotNull(virtualFile);
     PsiFile psiFile = ((PsiManagerEx)getPsiManager()).getFileManager().findFile(virtualFile);
@@ -102,7 +102,7 @@ public class DomStubBuilderTest extends DomStubTest {
     assertNull(stubTree); // no stubs for invalid XML
   }
 
-  public void testInclusion() throws Exception {
+  public void testInclusion() {
     myFixture.copyFileToProject("include.xml");
     doBuilderTest("inclusion.xml", "File:foo\n" +
                                    "  Element:foo\n" +
diff --git a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubUsingTest.java b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubUsingTest.java
index 6993ea1d6e5e..597b60f5984f 100644
--- a/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubUsingTest.java
+++ b/xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubUsingTest.java
@@ -150,7 +150,7 @@ public class DomStubUsingTest extends DomStubTest {
 
     new WriteCommandAction.Simple(null) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         domElement.undefine();
       }
     }.execute().throwException();
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/AttributeCompletionTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/AttributeCompletionTest.java
index 1741601759f6..e6857f6cb4a9 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/AttributeCompletionTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/AttributeCompletionTest.java
@@ -25,31 +25,31 @@ public class AttributeCompletionTest extends HighlightingTestBase {
     return "completion";
   }
 
-  public void testAttributeCompletion1() throws Throwable {
+  public void testAttributeCompletion1() {
     doTestCompletion("attribute-completion-1.xml", new String[]{ "foo" });
   }
 
-  public void testAttributeCompletion2() throws Throwable {
+  public void testAttributeCompletion2() {
     doTestCompletion("attribute-completion-2.xml", new String[]{ "1.0" });
   }
 
-  public void testAttributeCompletion3() throws Throwable {
+  public void testAttributeCompletion3() {
     doTestCompletion("attribute-completion-3.xml", "1.0", "2.0");
   }
 
-  public void testAttributeCompletion4() throws Throwable {
+  public void testAttributeCompletion4() {
     doTestCompletion("attribute-completion-4.xml", "1.0", "2.0");
   }
 
-  public void testAttributeCompletion5() throws Throwable {
+  public void testAttributeCompletion5() {
     doTestCompletion("attribute-completion-5.xml", "foo", "bar");
   }
 
-  public void testAttributeCompletion6() throws Throwable {
+  public void testAttributeCompletion6() {
     doTestCompletion("attribute-completion-6.xml", "p:foo", "p:bar");
   }
 
-  public void testAttrCombine() throws Throwable {
+  public void testAttrCombine() {
     doTestCompletion("attr-combine.xml", "foo", "bar");
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/ElementCompletionTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/ElementCompletionTest.java
index 5a959ce8e1ae..15fedd7a3742 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/ElementCompletionTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/ElementCompletionTest.java
@@ -26,19 +26,19 @@ public class ElementCompletionTest extends HighlightingTestBase {
     return "completion";
   }
 
-  public void testElementCompletionRoot() throws Throwable {
+  public void testElementCompletionRoot() {
     doTestCompletion("element-completion-root.xml", "bar", "baz", "completion-1", "completion-2", "completion-3", "foo", "x");
   }
 
-  public void testElementCompletion1() throws Throwable {
+  public void testElementCompletion1() {
     doTestCompletion("element-completion-1.xml", new String[]{ "foo" });
   }
 
-  public void testElementCompletion2() throws Throwable {
+  public void testElementCompletion2() {
     doTestCompletion("element-completion-2.xml", "foo", "bar", "baz");
   }
 
-  public void testElementCompletion3() throws Throwable {
+  public void testElementCompletion3() {
     final WebEditorOptions options = WebEditorOptions.getInstance();
     final boolean oldValue = options.isAutomaticallyInsertRequiredAttributes();
     try {
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/ExternalRncParsingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/ExternalRncParsingTest.java
index 76520a3caacb..102125ad7338 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/ExternalRncParsingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/ExternalRncParsingTest.java
@@ -22,35 +22,35 @@ public class ExternalRncParsingTest extends HighlightingTestBase {
     return "parsing";
   }
 
-  public void testParseSimple() throws Throwable {
+  public void testParseSimple() {
     doTestHighlighting("simple.rnc");
   }
 
-  public void testParseEscaped() throws Throwable {
+  public void testParseEscaped() {
     doTestHighlighting("escaped.rnc");
   }
 
-  public void testParseEscapedBroken1() throws Throwable {
+  public void testParseEscapedBroken1() {
     doTestHighlighting("escaped-broken-1.rnc");
   }
 
-  public void testParseEscapedBroken2() throws Throwable {
+  public void testParseEscapedBroken2() {
     doTestHighlighting("escaped-broken-2.rnc");
   }
 
-  public void testParseEscapedBroken3() throws Throwable {
+  public void testParseEscapedBroken3() {
     doTestHighlighting("escaped-broken-3.rnc");
   }
 
-  public void testParseEscapedBroken4() throws Throwable {
+  public void testParseEscapedBroken4() {
     doTestHighlighting("escaped-broken-4.rnc");
   }
 
-  public void testParseEscapedBroken5() throws Throwable {
+  public void testParseEscapedBroken5() {
     doTestHighlighting("escaped-broken-5.rnc");
   }
 
-  private void doTestHighlighting(String s) throws Throwable {
+  private void doTestHighlighting(String s) {
     doExternalToolHighlighting(s);
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java
index 711734e16145..8c10d3321521 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java
@@ -132,12 +132,12 @@ public abstract class HighlightingTestBase extends UsefulTestCase implements Ide
     }
   }
 
-  protected void doHighlightingTest(String s) throws Throwable {
+  protected void doHighlightingTest(String s) {
     doCustomHighlighting(s, true, false);
 //    myTestFixture.testHighlighting(true, false, true, s);
   }
 
-  protected void doExternalToolHighlighting(String name) throws Throwable {
+  protected void doExternalToolHighlighting(String name) {
     doCustomHighlighting(name, true, true);
   }
 
@@ -183,7 +183,7 @@ public abstract class HighlightingTestBase extends UsefulTestCase implements Ide
     myTestFixture.testCompletionVariants(before, variants);
   }
 
-  protected void doTestCompletion(String before) throws Throwable {
+  protected void doTestCompletion(String before) {
     doTestCompletion(before, "xml");
   }
 
@@ -209,7 +209,7 @@ public abstract class HighlightingTestBase extends UsefulTestCase implements Ide
                                                                                                                true);
     new WriteCommandAction.Simple(project, myTestFixture.getFile()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         fixes[0].applyFix(project, problemDescriptor);
       }
     }.execute();
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncAnnotationParsingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncAnnotationParsingTest.java
index 4efa2bac847d..fd55e5f3cb0d 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncAnnotationParsingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncAnnotationParsingTest.java
@@ -21,27 +21,27 @@ public class RncAnnotationParsingTest extends AbstractParsingTest {
     super("annotations");
   }
 
-  public void testSimple1() throws Throwable {
+  public void testSimple1() {
    doTest(true);
   }
 
-  public void testSimple2() throws Throwable {
+  public void testSimple2() {
    doTest(true);
   }
 
-  public void testNested() throws Throwable {
+  public void testNested() {
    doTest(true);
   }
 
-  public void testGrammarLevel() throws Throwable {
+  public void testGrammarLevel() {
    doTest(true);
   }
 
-  public void testFollowing() throws Throwable {
+  public void testFollowing() {
    doTest(true);
   }
 
-  public void testFollowingIncomplete() throws Throwable {
+  public void testFollowingIncomplete() {
    doTest(true);
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncCompletionTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncCompletionTest.java
index 9f50a9895226..35ac99c4242a 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncCompletionTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncCompletionTest.java
@@ -31,28 +31,28 @@ public class RncCompletionTest extends HighlightingTestBase {
     return "completion/rnc";
   }
 
-  public void testCompleteKeyword1() throws Throwable {
+  public void testCompleteKeyword1() {
     doTestCompletion("complete-keyword-1", "rnc");
   }
 
-  public void testCompleteKeyword2() throws Throwable {
+  public void testCompleteKeyword2() {
     doTestCompletion("complete-keyword-2", "rnc");
   }
 
-  public void testCompleteRef1() throws Throwable {
+  public void testCompleteRef1() {
     doTestCompletion("complete-ref-1", "rnc");
   }
 
-  public void testCompleteRef2() throws Throwable {
+  public void testCompleteRef2() {
     doTestCompletion("complete-ref-2", "rnc");
   }
 
   @CopyFile("included.rnc")
-  public void testCompleteRef3() throws Throwable {
+  public void testCompleteRef3() {
     doTestCompletion("complete-ref-3", "rnc");
   }
 
-  public void testCompleteRef4() throws Throwable {
+  public void testCompleteRef4() {
     doTestCompletion("complete-ref-4", "rnc");
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncExternalHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncExternalHighlightingTest.java
index 2d61fc68feec..fc22da2274a4 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncExternalHighlightingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncExternalHighlightingTest.java
@@ -31,24 +31,24 @@ public class RncExternalHighlightingTest extends HighlightingTestBase {
 //    ExternalResourceManager.getInstance().addResource("http://relaxng.org/ns/structure/1.0", new File("highlighting/relaxng.rng").getAbsolutePath());
   }
 
-  public void testAddressBook() throws Throwable {
+  public void testAddressBook() {
     doExternalToolHighlighting("addressbook.rnc");
   }
 
-  public void testMissingContent() throws Throwable {
+  public void testMissingContent() {
     doExternalToolHighlighting("missing-content.rnc");
   }
 
   @CopyFile("included.rnc")
-  public void testMissingStart() throws Throwable {
+  public void testMissingStart() {
     doExternalToolHighlighting("missing-start.rnc");
   }
 
-  public void testUndefinedRef() throws Throwable {
+  public void testUndefinedRef() {
     doExternalToolHighlighting("undefined-ref-ok.rnc");
   }
 
-  public void testRngSchema() throws Throwable {
+  public void testRngSchema() {
     doExternalToolHighlighting("rng-schema.rnc");
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncHighlightingTest.java
index adc18888d3bf..77120a2f7a87 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncHighlightingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncHighlightingTest.java
@@ -25,101 +25,101 @@ public class RncHighlightingTest extends HighlightingTestBase {
     return "highlighting/rnc";
   }
 
-  public void testRef3() throws Throwable {
+  public void testRef3() {
     doHighlightingTest("ref-3.rnc");
   }
 
-  public void testUndefinedRef() throws Throwable {
+  public void testUndefinedRef() {
     doHighlightingTest("undefined-ref.rnc");
   }
 
-  public void testCreateDefintion1() throws Throwable {
+  public void testCreateDefintion1() {
     doTestQuickFix("create-definition-1", "rnc");
   }
 
-  public void testCreateDefintion2() throws Throwable {
+  public void testCreateDefintion2() {
     doTestQuickFix("create-definition-2", "rnc");
   }
 
-  public void testNsPrefix() throws Throwable {
+  public void testNsPrefix() {
     doHighlightingTest("ns-prefix.rnc");
   }
 
-  public void testNsPrefixKeyword() throws Throwable {
+  public void testNsPrefixKeyword() {
     doHighlightingTest("ns-prefix-keyword.rnc");
   }
 
-  public void testUnresolvedNsPrefix1() throws Throwable {
+  public void testUnresolvedNsPrefix1() {
     doHighlightingTest("unresolved-ns-prefix-1.rnc");
   }
 
-  public void testUnresolvedNsPrefix2() throws Throwable {
+  public void testUnresolvedNsPrefix2() {
     doHighlightingTest("unresolved-ns-prefix-2.rnc");
   }
 
-  public void testUnresolvedNsPrefix3() throws Throwable {
+  public void testUnresolvedNsPrefix3() {
     doHighlightingTest("unresolved-ns-prefix-3.rnc");
   }
 
-  public void testCreateNsPrefix() throws Throwable {
+  public void testCreateNsPrefix() {
     doTestQuickFix("create-ns-prefix-1", "rnc");
   }
 
-  public void testDatatypePrefix() throws Throwable {
+  public void testDatatypePrefix() {
     doHighlightingTest("datatype-prefix.rnc");
   }
 
-  public void testUnresolvedDatatypePrefix1() throws Throwable {
+  public void testUnresolvedDatatypePrefix1() {
     doHighlightingTest("unresolved-datatype-prefix-1.rnc");
   }
 
-  public void testUnresolvedDatatypePrefix2() throws Throwable {
+  public void testUnresolvedDatatypePrefix2() {
     doHighlightingTest("unresolved-datatype-prefix-2.rnc");
   }
 
-  public void testCreateDatatypesPrefix() throws Throwable {
+  public void testCreateDatatypesPrefix() {
     doTestQuickFix("create-datatypes-prefix-1", "rnc");
   }
 
-  public void testUnresolvedInclude() throws Throwable {
+  public void testUnresolvedInclude() {
     doHighlightingTest("unresolved-include.rnc");
   }
 
-  public void testUnresolvedExternal() throws Throwable {
+  public void testUnresolvedExternal() {
     doHighlightingTest("unresolved-external.rnc");
   }
 
-  public void testParentRef() throws Throwable {
+  public void testParentRef() {
     doHighlightingTest("parent-ref.rnc");
   }
 
-  public void testBadParentRef1() throws Throwable {
+  public void testBadParentRef1() {
     doHighlightingTest("bad-parent-ref-1.rnc");
   }
 
-  public void testAnnotation() throws Throwable {
+  public void testAnnotation() {
     doHighlightingTest("annotation.rnc");
   }
 
   @CopyFile("fo/*.rnc")
-  public void testFoMain() throws Throwable {
+  public void testFoMain() {
     doHighlightingTest("fo/main.rnc");
   }
 
   @CopyFile("fo/*.rnc")
-  public void testFoElements() throws Throwable {
+  public void testFoElements() {
     doHighlightingTest("fo/elements.rnc");
   }
 
-  public void testFoDatatype() throws Throwable {
+  public void testFoDatatype() {
     doHighlightingTest("fo/datatype.rnc");
   }
 
-  public void testRngSchema() throws Throwable {
+  public void testRngSchema() {
     doHighlightingTest("rng-schema.rnc");
   }
 
-  public void testDocbook() throws Throwable {
+  public void testDocbook() {
     doHighlightingTest("docbook.rnc");
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncIndexHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncIndexHighlightingTest.java
index 6b1ef67552c5..4e5e521f29c2 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncIndexHighlightingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncIndexHighlightingTest.java
@@ -26,23 +26,23 @@ public class RncIndexHighlightingTest extends AbstractIndexTest {
     return "highlighting/rnc";
   }
 
-  public void testBackwardIncludeRef() throws Throwable {
+  public void testBackwardIncludeRef() {
     doHighlightingTest("backward-include-ref.rnc");
   }
 
-  public void testInspectionUnusedDefine() throws Throwable {
+  public void testInspectionUnusedDefine() {
     doHighlightingTest("unused-define.rnc");
   }
 
-  public void testInspectionSuppressedUnusedDefine() throws Throwable {
+  public void testInspectionSuppressedUnusedDefine() {
     doHighlightingTest("suppressed-unused-define.rnc");
   }
 
-  public void testInspectionUsedDefine() throws Throwable {
+  public void testInspectionUsedDefine() {
     doHighlightingTest("used-define.rnc");
   }
 
-  public void testInclude1() throws Throwable {
+  public void testInclude1() {
     myTestFixture.configureByFiles("include1.rnc", "include1_1.rnc", "include1_2.rnc");
     doCustomHighlighting(true, false);
   }
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java
index 6b3ad242b51c..d7dbd6112ca2 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncParsingTest.java
@@ -21,31 +21,31 @@ public class RncParsingTest extends AbstractParsingTest {
     super("complex");
   }
 
-  public void testExternal() throws Throwable {
+  public void testExternal() {
     doTest(true);
   }
 
-  public void testMain() throws Throwable {
+  public void testMain() {
    doTest(true);
   }
 
-  public void testElements() throws Throwable {
+  public void testElements() {
    doTest(true);
   }
 
-  public void testProperties() throws Throwable {
+  public void testProperties() {
    doTest(true);
   }
 
-  public void testDatatype() throws Throwable {
+  public void testDatatype() {
    doTest(true);
   }
 
-  public void testRelaxNG() throws Throwable {
+  public void testRelaxNG() {
    doTest(true);
   }
 
-  public void testDocbook() throws Throwable {
+  public void testDocbook() {
     doTest(true);
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java
index 2bef5bc88282..feee1f1169dc 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RncRenameTest.java
@@ -45,27 +45,27 @@ public class RncRenameTest extends HighlightingTestBase {
     return "rename/rnc";
   }
 
-  public void testRenameDefinition1() throws Throwable {
+  public void testRenameDefinition1() {
     doTestRename("rename-definition-1", "bar");
   }
 
-  public void testRenameDefinition2() throws Throwable {
+  public void testRenameDefinition2() {
     doTestRename("rename-definition-2", "element");
   }
 
-  public void testRenameDefinition3() throws Throwable {
+  public void testRenameDefinition3() {
     doTestRename("rename-definition-3", "bar");
   }
 
-  public void testRenameNsPrefix1() throws Throwable {
+  public void testRenameNsPrefix1() {
     doTestRename("rename-ns-prefix-1", "bar");
   }
 
-  public void testRenameDatatypePrefix1() throws Throwable {
+  public void testRenameDatatypePrefix1() {
     doTestRename("rename-datatype-prefix-1", "bar");
   }
 
-  public void testRenameIncludedFile() throws Throwable {
+  public void testRenameIncludedFile() {
     myTestFixture.copyFileToProject("rename-in-include-ref.rnc");
     
     final Project project = myTestFixture.getProject();
@@ -90,7 +90,7 @@ public class RncRenameTest extends HighlightingTestBase {
     assertEquals("rename-after.rnc", file.getName());
   }
 
-  private void doTestRename(String name, String newName) throws Throwable {
+  private void doTestRename(String name, String newName) {
     doTestRename(name, "rnc", newName);
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngCompletionTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngCompletionTest.java
index a2dd6d3f55b8..19d0cb6002c6 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngCompletionTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngCompletionTest.java
@@ -25,20 +25,20 @@ public class RngCompletionTest extends HighlightingTestBase {
     return "completion/rng";
   }
 
-  public void testCompleteRef1() throws Throwable {
+  public void testCompleteRef1() {
     doTestCompletion("complete-ref-1.rng", new String[]{ "start.element" });
   }
 
-  public void testCompleteRef2() throws Throwable {
+  public void testCompleteRef2() {
     doTestCompletion("complete-ref-2.rng", new String[]{"start.element" });
   }
 
   @CopyFile("included.rng")
-  public void testCompleteRef3() throws Throwable {
+  public void testCompleteRef3() {
     doTestCompletion("complete-ref-3.rng", new String[]{ "included.start.element" });
   }
 
-  public void testCompleteRef4() throws Throwable {
+  public void testCompleteRef4() {
     CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
     doTestCompletion("complete-ref-4", "rng");
   }
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHighlightingTest.java
index 745adf546986..46df7cfb8467 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHighlightingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHighlightingTest.java
@@ -29,92 +29,92 @@ public class RngHighlightingTest extends HighlightingTestBase {
     return "highlighting/rng";
   }
 
-  public void testSimpleSchema() throws Throwable {
+  public void testSimpleSchema() {
     doHighlightingTest("simple.rng");
   }
 
-  public void testRef1() throws Throwable {
+  public void testRef1() {
     doHighlightingTest("ref-1.rng");
   }
 
-  public void testRef2() throws Throwable {
+  public void testRef2() {
     doHighlightingTest("ref-2.rng");
   }
 
-  public void testRef3() throws Throwable {
+  public void testRef3() {
     doHighlightingTest("ref-3.rng");
   }
 
-  public void testBadRef() throws Throwable {
+  public void testBadRef() {
     doHighlightingTest("bad-ref.rng");
   }
 
-  public void testBadRef2() throws Throwable {
+  public void testBadRef2() {
     doHighlightingTest("bad-ref-2.rng");
   }
 
-  public void testBadRef3() throws Throwable {
+  public void testBadRef3() {
     doHighlightingTest("bad-ref-3.rng");
   }
 
-  public void testBadRef4() throws Throwable {
+  public void testBadRef4() {
     doHighlightingTest("bad-ref-4.rng");
   }
 
-  public void testCreateDefinition1() throws Throwable {
+  public void testCreateDefinition1() {
     doTestQuickFix("create-definition-1", "rng");
   }
 
-  public void testParentRef1() throws Throwable {
+  public void testParentRef1() {
     doHighlightingTest("parent-ref-1.rng");
   }
 
-  public void testParentRef2() throws Throwable {
+  public void testParentRef2() {
     myTestFixture.copyFileToProject("include.rng");
     doHighlightingTest("parent-ref-2.rng");
   }
 
-  public void testBadParentRef1() throws Throwable {
+  public void testBadParentRef1() {
     doHighlightingTest("bad-parent-ref-1.rng");
   }
 
-  public void testBadParentRef2() throws Throwable {
+  public void testBadParentRef2() {
     myTestFixture.copyFileToProject("bad-parent-ref-1.rng");
     doHighlightingTest("bad-parent-ref-2.rng");
   }
 
-  public void testCreateDefinition2() throws Throwable {
+  public void testCreateDefinition2() {
     doTestQuickFix("create-definition-2", "rng");
   }
 
-  public void testMissingStartElement() throws Throwable {
+  public void testMissingStartElement() {
     doCustomHighlighting("missing-start-element.rng", false, true);
   }
 
-  public void testMissingStartElementAndInclude() throws Throwable {
+  public void testMissingStartElementAndInclude() {
     myTestFixture.copyFileToProject("included-grammar.rng");
     doCustomHighlighting("missing-start-element-and-include.rng", false, true);
   }
 
-  public void testBadNsPrefix() throws Throwable {
+  public void testBadNsPrefix() {
     doHighlightingTest("bad-ns-prefix.rng");
   }
 
-  public void testBadElement() throws Throwable {
+  public void testBadElement() {
     doExternalToolHighlighting("bad-element.rng");
   }
 
-  public void testInclude() throws Throwable {
+  public void testInclude() {
     myTestFixture.copyFileToProject("include.rng");
     doHighlightingTest("good-include.rng");
   }
 
-  public void testIncludedRef1() throws Throwable {
+  public void testIncludedRef1() {
     myTestFixture.copyFileToProject("include.rng");
     doHighlightingTest("good-include-ref-1.rng");
   }
 
-  public void testResolveIncludedRef1() throws Throwable {
+  public void testResolveIncludedRef1() {
     myTestFixture.copyFileToProject("include.rng");
 
     final PsiReference ref = myTestFixture.getReferenceAtCaretPositionWithAssertion("resolve-include-ref-1.rng");
@@ -124,7 +124,7 @@ public class RngHighlightingTest extends HighlightingTestBase {
     assertEquals(0, ((XmlTag)element).getSubTags().length);
   }
 
-  public void testResolveIncludedRef2() throws Throwable {
+  public void testResolveIncludedRef2() {
     myTestFixture.copyFileToProject("include.rng");
 
     final PsiReference ref = myTestFixture.getReferenceAtCaretPositionWithAssertion("resolve-include-ref-2.rng");
@@ -149,7 +149,7 @@ public class RngHighlightingTest extends HighlightingTestBase {
     }
   }
 
-  public void testBadInclude() throws Throwable {
+  public void testBadInclude() {
     doHighlightingTest("bad-include.rng");
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java
index fce0d34c1709..1ec5e8ef69c4 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngHtml5CompletionTest.java
@@ -26,75 +26,75 @@ public class RngHtml5CompletionTest extends HighlightingTestBase {
     return "completion";
   }
 
-  public void testHtml5_1() throws Throwable {
+  public void testHtml5_1() {
     myTestFixture.testCompletionTyping("html5_1.xml", "\n", "html5_1_after.xml");
   }
 
-  public void testHtml5_2() throws Throwable {
+  public void testHtml5_2() {
     doTestCompletion("html5_2");
   }
 
-  public void testHtml5_3() throws Throwable {
+  public void testHtml5_3() {
     doTestCompletion("html5_3");
   }
 
-  public void testHtml5_4() throws Throwable {
+  public void testHtml5_4() {
     doTestCompletion("html5_4");
   }
 
-  public void testHtml5_5() throws Throwable {
+  public void testHtml5_5() {
     doTestCompletion("html5_5");
   }
 
-  public void testHtml5_6() throws Throwable {
+  public void testHtml5_6() {
     doTestCompletion("html5_6");
   }
 
-  public void testHtml5_7() throws Throwable {
+  public void testHtml5_7() {
     doTestCompletion("html5_7");
   }
 
-  public void testHtml5_8() throws Throwable {
+  public void testHtml5_8() {
     doTestCompletion("html5_8");
   }
 
-  public void testHtml5_9() throws Throwable {
+  public void testHtml5_9() {
     doTestCompletion("html5_9");
   }
 
-  public void testHtml5_10() throws Throwable {
+  public void testHtml5_10() {
     doTestCompletion("html5_10");
   }
 
-  public void testHtml5_11() throws Throwable {
+  public void testHtml5_11() {
     myTestFixture.testCompletionTyping("/html5_11.xml", "\n", "/html5_11_after.xml");
   }
 
-  public void testHtml5_12() throws Throwable {
+  public void testHtml5_12() {
     doTestCompletion("html5_12");
   }
 
-  public void testHtml5_13() throws Throwable {
+  public void testHtml5_13() {
     myTestFixture.testCompletionTyping("/html5_13.xml", "\n", "/html5_13_after.xml");
   }
 
-  public void testHtml5_14() throws Throwable {
+  public void testHtml5_14() {
     doTestCompletion("html5_14");
   }
 
-  public void testHtml5_15() throws Throwable {
+  public void testHtml5_15() {
     myTestFixture.testCompletionTyping("/html5_15.xml", "\n", "/html5_15_after.xml");
   }
 
-  public void testHtml5_16() throws Throwable {
+  public void testHtml5_16() {
     myTestFixture.testCompletionTyping("html5_16.xml", "\n", "html5_16_after.xml");
   }
 
-  public void testHtml5_17() throws Throwable {
+  public void testHtml5_17() {
     doTestCompletion("html5_17");
   }
   
-  public void testHtml5_overwritten_attributes() throws Throwable {
+  public void testHtml5_overwritten_attributes() {
     myTestFixture.testCompletionTyping("html5_overwritten_attributes.xml", "a\n", "html5_overwritten_attributes_after.xml");
   }
 }
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngIndexHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngIndexHighlightingTest.java
index 8be10217b840..43cec3085a61 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngIndexHighlightingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngIndexHighlightingTest.java
@@ -26,37 +26,37 @@ public class RngIndexHighlightingTest extends AbstractIndexTest {
     return "highlighting/rng";
   }
 
-  public void testInspectionUnusedDefine1() throws Throwable {
+  public void testInspectionUnusedDefine1() {
     doHighlightingTest("unused-define-1.rng");
   }
 
-  public void testInspectionUnusedDefine2() throws Throwable {
+  public void testInspectionUnusedDefine2() {
     doHighlightingTest("unused-define-2.rng");
   }
 
-  public void testInspectionDefine1() throws Throwable {
+  public void testInspectionDefine1() {
     doHighlightingTest("used-define-1.rng");
   }
 
-  public void testInspectionDefine2() throws Throwable {
+  public void testInspectionDefine2() {
     doHighlightingTest("used-define-2.rng");
   }
 
-  public void testInspectionDefine3() throws Throwable {
+  public void testInspectionDefine3() {
     doHighlightingTest("used-define-3-include.rng");
   }
 
-  public void testIncludedGrammarWithoutStart() throws Throwable {
+  public void testIncludedGrammarWithoutStart() {
     // adding a <weak_warning> tag doesn't work because it seems to prevent the index to recognize the file
     // because the replacement is done *after* building the index :(
     doCustomHighlighting("included-grammar.rng", false, false);
   }
 
-  public void testBackwardIncludeRef() throws Throwable {
+  public void testBackwardIncludeRef() {
     doHighlightingTest("backward-include-ref.rng");
   }
 
-  public void testUnrelatedBackwardIncludeRef() throws Throwable {
+  public void testUnrelatedBackwardIncludeRef() {
     doHighlightingTest("backward-with-include.rng");
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngRenameTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngRenameTest.java
index b0e42ddd3c72..829100f1d80f 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngRenameTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngRenameTest.java
@@ -31,11 +31,11 @@ public class RngRenameTest extends HighlightingTestBase {
     return "rename/rng";
   }
 
-  public void testRenameRef1() throws Throwable {
+  public void testRenameRef1() {
     doTestRename("rename-ref-1", "start");
   }
 
-  private void doTestRename(String name, String newName) throws Throwable {
+  private void doTestRename(String name, String newName) {
     doTestRename(name, "rng", newName);
   }
 }
\ No newline at end of file
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java
index 0e893ca1a482..4d5f310cf7b4 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java
@@ -63,118 +63,118 @@ public class RngXmlHighlightingTest extends HighlightingTestBase {
     });
   }
 
-  public void testSimpleElement() throws Throwable {
+  public void testSimpleElement() {
     doHighlightingTest("simple-element_1.xml");
   }
 
-  public void testOptionalElement() throws Throwable {
+  public void testOptionalElement() {
     doHighlightingTest("optional-element_1.xml");
   }
 
-  public void testSimpleAttribute() throws Throwable {
+  public void testSimpleAttribute() {
     doHighlightingTest("simple-attribute_1.xml");
   }
 
-  public void testSimpleAttributeMissing() throws Throwable {
+  public void testSimpleAttributeMissing() {
     doHighlightingTest("simple-attribute_2.xml");
   }
 
-  public void testOptionalAttribute() throws Throwable {
+  public void testOptionalAttribute() {
     doHighlightingTest("optional-attribute_1.xml");
     doHighlightingTest("optional-attribute_2.xml");
   }
 
-  public void testFixedAttribute() throws Throwable {
+  public void testFixedAttribute() {
     doHighlightingTest("fixed-attribute_1.xml");
   }
 
-  public void testFixedAttributeIllegal() throws Throwable {
+  public void testFixedAttributeIllegal() {
     doHighlightingTest("fixed-attribute_2.xml");
   }
 
-  public void testValueChoice1() throws Throwable {
+  public void testValueChoice1() {
     doHighlightingTest("value-choice-1.xml");
   }
 
-  public void testValueChoice2() throws Throwable {
+  public void testValueChoice2() {
     doHighlightingTest("value-choice-2.xml");
   }
 
-  public void testTokenDatatype() throws Throwable {
+  public void testTokenDatatype() {
     doHighlightingTest("token-datatype.xml");
   }
 
-  public void testAttributeChoice1() throws Throwable {
+  public void testAttributeChoice1() {
     doHighlightingTest("attribute-choice-1.xml");
   }
 
-  public void testAttributeChoice2() throws Throwable {
+  public void testAttributeChoice2() {
     doHighlightingTest("attribute-choice-2.xml");
   }
 
-  public void testAttributeChoice3() throws Throwable {
+  public void testAttributeChoice3() {
     doHighlightingTest("attribute-choice-3.xml");
   }
 
-  public void testNestedFragment() throws Throwable {
+  public void testNestedFragment() {
     doHighlightingTest("nested-fragment.xml");
   }
 
-  public void testNestedFragment2() throws Throwable {
+  public void testNestedFragment2() {
     myTestFixture.copyFileToProject("jpdl-3.1.xsd");
     doHighlightingTest("nested-fragment-2.xml");
   }
 
-  public void testDocbookExample() throws Throwable {
+  public void testDocbookExample() {
     doHighlightingTest("mybook.xml");
   }
 
-  public void testMissingAttributeRnc() throws Throwable {
+  public void testMissingAttributeRnc() {
     doHighlightingTest("rnc/missing-attribute.xml");
   }
 
-  public void testValidRnc() throws Throwable {
+  public void testValidRnc() {
     doHighlightingTest("rnc/valid-rnc.xml");
   }
 
   @CopyFile({"rnc/include.rnc", "rnc/included.rnc"})
-  public void testValidIncludeRnc() throws Throwable {
+  public void testValidIncludeRnc() {
     doHighlightingTest("rnc/valid-rnc-include.xml");
   }
 
-  public void testBadElementRnc() throws Throwable {
+  public void testBadElementRnc() {
     doHighlightingTest("rnc/bad-element.xml");
   }
 
-  public void testRngSchema() throws Throwable {
+  public void testRngSchema() {
     doHighlightingTest("relaxng.rng");
   }
 
-  public void testNestedComposite() throws Throwable {
+  public void testNestedComposite() {
     doHighlightingTest("nested-composite.rng");
   }
 
-  public void testXsltSchema() throws Throwable {
+  public void testXsltSchema() {
     doHighlightingTest("xslt.rng");
   }
 
-  public void testXslFoRncSchema() throws Throwable {
+  public void testXslFoRncSchema() {
     doHighlightingTest("rnc/fo/fo-test.xml");
   }
 
-  public void testFoFromDocbook() throws Throwable {
+  public void testFoFromDocbook() {
     doHighlightingTest("rnc/fo/mybook.fo");
   }
 
-  public void testDocBookSchema() throws Throwable {
+  public void testDocBookSchema() {
     doHighlightingTest("docbook.rng");
   }
 
-  public void testHtml5() throws Throwable {
+  public void testHtml5() {
     doHighlightingTest("Html5.xml");
   }
 
-  public void testHtml5_2() throws Throwable {
+  public void testHtml5_2() {
     doHighlightingTest("Html5_2.xml");
   }
 }
diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlValidationTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlValidationTest.java
index 3b937abb2815..54b3d7e78cb6 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlValidationTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlValidationTest.java
@@ -22,59 +22,59 @@ import org.intellij.plugins.testUtil.CopyFile;
 
 public class RngXmlValidationTest extends HighlightingTestBase {
 
-  public void testValidDocument() throws Throwable {
+  public void testValidDocument() {
     doTest("xslt.rng");
   }
 
   @CopyFile("broken.rng")
-  public void testPartiallyBrokenRng() throws Throwable {
+  public void testPartiallyBrokenRng() {
     myTestFixture.testHighlighting("broken-rng.xml");
   }
 
   @CopyFile("broken.rnc")
-  public void testPartiallyBrokenRnc() throws Throwable {
+  public void testPartiallyBrokenRnc() {
     myTestFixture.testHighlighting("broken-rnc.xml");
   }
 
   @CopyFile("entity-included.xml")
-  public void testEntityRef1() throws Throwable {
+  public void testEntityRef1() {
     doTest("entity-test-1.xml");
   }
 
   @CopyFile("entity-included.xml")
-  public void testEntityRef2() throws Throwable {
+  public void testEntityRef2() {
     doTest("entity-test-2.xml");
   }
 
-  public void testEntityRef3() throws Throwable {
+  public void testEntityRef3() {
     doTest("entity-test-3.xml");
   }
 
-  public void testTextContent() throws Throwable {
+  public void testTextContent() {
     doTest("text-content.xml");
   }
 
-  public void testCDATA() throws Throwable {
+  public void testCDATA() {
     doTest("cdata-test.xml");
   }
 
-  public void testMissingElement() throws Throwable {
+  public void testMissingElement() {
     doTest("missing-element.xml");
   }
 
-  public void testInvalidElement() throws Throwable {
+  public void testInvalidElement() {
     doTest("invalid-element.xml");
   }
 
-  public void testInvalidElementRnc() throws Throwable {
+  public void testInvalidElementRnc() {
     doTest("invalid-element-rnc.xml");
   }
 
-  public void testMissingElementRnc() throws Throwable {
+  public void testMissingElementRnc() {
     doTest("missing-element-rnc.xml");
   }
 
-  private void doTest(String name) throws Throwable {
+  private void doTest(String name) {
     doExternalToolHighlighting(name);
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java b/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java
index 9166f5923fcd..22d3ce48d7ac 100644
--- a/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/SoftWrapTest.java
@@ -25,7 +25,7 @@ import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCa
  */
 public class SoftWrapTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testSoftWrapInInjection() throws Exception {
+  public void testSoftWrapInInjection() {
 
     myFixture.configureByFile("softWrap.html");
     EditorTestUtil.configureSoftWraps(((EditorWindow)myFixture.getEditor()).getDelegate(), 83);
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java b/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java
index 70b0263d35ad..a156690c1ead 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java
@@ -91,12 +91,12 @@ public class XmlBuilderTest extends LightCodeInsightTestCase {
     }
   }
   
-  public void testEmptyXml() throws Exception {
+  public void testEmptyXml() {
     doTest("<root/>", "TAG: name='root' namespace=''\n" +
                       "ENDTAG: name='root' namespace=''\n", XmlBuilder.ProcessingOrder.TAGS_AND_ATTRIBUTES);
   }
 
-  public void testRealJspx() throws Exception {
+  public void testRealJspx() {
     doTest(
       /* Test: */
       "<jsp:root xmlns:jsp=\"http://java.sun.com/JSP/Page\" xmlns=\"http://www.w3.org/1999/xhtml\" version=\"2.0\"\n" +
@@ -136,7 +136,7 @@ public class XmlBuilderTest extends LightCodeInsightTestCase {
       XmlBuilder.ProcessingOrder.TAGS_AND_ATTRIBUTES);
   }
 
-  public void testRealJspxNoAttributes() throws Exception {
+  public void testRealJspxNoAttributes() {
     doTest(
       /* Test: */
       "<jsp:root xmlns:jsp=\"http://java.sun.com/JSP/Page\" xmlns=\"http://www.w3.org/1999/xhtml\" version=\"2.0\"\n" +
@@ -167,7 +167,7 @@ public class XmlBuilderTest extends LightCodeInsightTestCase {
   }
 
 
-  public void testNamespaceOverride() throws Exception {
+  public void testNamespaceOverride() {
     doTest(
       "<c:x xmlns:c=\"ns1\">\n" +
       "  <c:y/>\n" +
@@ -192,7 +192,7 @@ public class XmlBuilderTest extends LightCodeInsightTestCase {
       XmlBuilder.ProcessingOrder.TAGS_AND_ATTRIBUTES);
   }
 
-  public void testSimpleEntityResolution() throws Exception {
+  public void testSimpleEntityResolution() {
     doTest(
       "<root>&lt;</root>",
       "TAG: name='root' namespace=''\n" +
@@ -201,7 +201,7 @@ public class XmlBuilderTest extends LightCodeInsightTestCase {
       XmlBuilder.ProcessingOrder.TAGS_AND_TEXTS);
   }
 
-  public void testCDATA() throws Exception {
+  public void testCDATA() {
     doTest(
       "<root><![CDATA[<asis/>]]></root>",
       "TAG: name='root' namespace=''\n" +
@@ -211,7 +211,7 @@ public class XmlBuilderTest extends LightCodeInsightTestCase {
     );
   }
 
-  public void testErrors() throws Exception {
+  public void testErrors() {
     doTest(
       "<root>" +
       "<foo>" +
@@ -233,7 +233,7 @@ public class XmlBuilderTest extends LightCodeInsightTestCase {
     );
   }
 
-  public void testComments() throws Exception {
+  public void testComments() {
     doTest(
       "<root>" +
       "<foo>" +
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java b/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java
index c6eca35d47e1..09ce9d011195 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlDocumentationTest.java
@@ -36,7 +36,7 @@ import java.io.File;
 @SuppressWarnings("ConstantConditions")
 public class XmlDocumentationTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testXmlDoc() throws Exception {
+  public void testXmlDoc() {
     doOneTest("1.xml", "display-name", false, "web-app_2_3.dtd");
     doOneTest("2.xml", null, false, "web-app_2_4.xsd");
     doOneTest("3.xml", null, false, "web-app_2_4.xsd", "j2ee_1_4.xsd");
@@ -69,12 +69,12 @@ public class XmlDocumentationTest extends LightPlatformCodeInsightFixtureTestCas
     doQuickDocGenerationTestWithCheckExpectedResult(testName + ".xml", testName + ".xsd");
   }
 
-  public void testSchemaPrefix() throws Exception {
+  public void testSchemaPrefix() {
     DocumentationTestContext context = new DocumentationTestContext("SchemaPrefix.xml");
     assertEquals("XML Namespace Prefix \"xs\" (http://www.w3.org/2001/XMLSchema)", context.getQuickNavigateInfo());
   }
 
-  public void testEntityValue() throws Exception {
+  public void testEntityValue() {
     DocumentationTestContext context = new DocumentationTestContext("9.xml");
     assertEquals("\"&#171;\"", context.getQuickNavigateInfo());
   }
@@ -116,12 +116,12 @@ public class XmlDocumentationTest extends LightPlatformCodeInsightFixtureTestCas
     return text.substring(text.indexOf('\n'));
   }
 
-  public void testDtdDoc() throws Exception {
+  public void testDtdDoc() {
     doOneTest("dtd.dtd", "foo", false, true, "web-app_2_4.xsd");
     doOneTest("dtd.xml", "foo", false, true, "web-app_2_4.xsd");
   }
 
-  private void doOneTest(String fileName, String lookupObject, boolean testExternal, String... additional) throws Exception {
+  private void doOneTest(String fileName, String lookupObject, boolean testExternal, String... additional) {
     copyAdditionalFiles(additional);
     doOneTest(fileName, lookupObject, testExternal, true, "web-app_2_4.xsd");
   }
@@ -170,7 +170,7 @@ public class XmlDocumentationTest extends LightPlatformCodeInsightFixtureTestCas
     }
   }
 
-  private void doOneTest(String fileName, String lookupObject, boolean testExternal, boolean testForElementUnderCaret, String... additional) throws Exception {
+  private void doOneTest(String fileName, String lookupObject, boolean testExternal, boolean testForElementUnderCaret, String... additional) {
     copyAdditionalFiles(additional);
     final DocumentationTestContext context = new DocumentationTestContext(fileName);
 
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java b/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java
index 72b67dbcb5d1..a0cb0e559cc2 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java
@@ -31,7 +31,7 @@ import com.intellij.xml.impl.dtd.XmlNSDescriptorImpl;
  * @author Mike
  */
 public class XmlDtdTest extends LightPlatformTestCase {
-  public void testDocumentDescriptor1() throws Exception {
+  public void testDocumentDescriptor1() {
     XmlNSDescriptor NSDescriptor = createDescriptor("<!ELEMENT principals (#PCDATA)><!ELEMENT data-sources (#PCDATA)>");
 
     XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag("principals"));
@@ -44,7 +44,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertNull(elementDescriptor);
   }
 
-  public void testElementDescriptor1() throws Exception {
+  public void testElementDescriptor1() {
     XmlNSDescriptor NSDescriptor = createDescriptor("<!ELEMENT principals (#PCDATA)><!ELEMENT data-sources (#PCDATA)>");
 
     XmlElementDescriptor elementDescriptor = NSDescriptor.getElementDescriptor(tag("principals"));
@@ -54,7 +54,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("data-sources", elementDescriptor.getName());
   }
 
-  public void testElementDescriptor2() throws Exception {
+  public void testElementDescriptor2() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT principals (#PCDATA)><!ELEMENT data-sources ANY>" +
         "<!ELEMENT read-access (namespace-resource)><!ELEMENT group EMPTY>");
@@ -72,7 +72,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals(elementDescriptor.getContentType(), XmlElementDescriptor.CONTENT_TYPE_EMPTY);
   }
 
-  public void testElementDescriptor3() throws Exception {
+  public void testElementDescriptor3() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT principals ANY><!ATTLIST principals path CDATA #IMPLIED smtp-host CDATA #REQUIRED>" +
         "<!ATTLIST principals address CDATA #IMPLIED>");
@@ -99,7 +99,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals(3, descriptors.length);
   }
 
-  public void testElementDescriptor4() throws Exception {
+  public void testElementDescriptor4() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT orion-application (ejb-module*, persistence?, namespace-access)>" +
         "<!ELEMENT ejb-module ANY>" +
@@ -124,7 +124,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("namespace-access", elements[3].getName());
   }
 
-  public void testAttributeDescriptor1() throws Exception {
+  public void testAttributeDescriptor1() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT principals ANY><!ATTLIST principals path CDATA #IMPLIED>");
 
@@ -139,7 +139,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertNull(attributeDescriptor.getDefaultValue());
   }
 
-  public void testAttributeDescriptor2() throws Exception {
+  public void testAttributeDescriptor2() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT principals ANY><!ATTLIST principals path CDATA #IMPLIED>");
 
@@ -153,7 +153,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertNull(attributeDescriptor.getDefaultValue());
   }
 
-  public void testAttributeDescriptor3() throws Exception {
+  public void testAttributeDescriptor3() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT toc ANY> <!ATTLIST toc version CDATA #FIXED \"1.0\">");
 
@@ -167,7 +167,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("1.0", attributeDescriptor.getDefaultValue());
   }
 
-  public void testAttributeDescriptor4() throws Exception {
+  public void testAttributeDescriptor4() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT toc ANY> <!ATTLIST toc remote (true|false) \"false\">");
 
@@ -186,7 +186,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("false", values[1]);
   }
 
-  public void testAttributeDescriptor5() throws Exception {
+  public void testAttributeDescriptor5() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ELEMENT toc ANY> <!ATTLIST toc remote (0|1|2) #REQUIRED>");
 
@@ -206,7 +206,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("2", values[2]);
   }
 
-  public void testEntityDeclElement1() throws Exception {
+  public void testEntityDeclElement1() {
     final XmlNSDescriptor NSDescriptor = createDescriptor(
       "<!ENTITY % types \"fileset | patternset \"> <!ELEMENT project (target | taskdef | %types; | property )*> " +
       "<!ELEMENT target><!ELEMENT taskdef><!ELEMENT fileset><!ELEMENT patternset><!ELEMENT property>");
@@ -219,7 +219,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals(5, elements.length);
   }
 
-  public void testEntityDecl1() throws Exception {
+  public void testEntityDecl1() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ENTITY % boolean \"(true|false|on|off|yes|no)\"> <!ELEMENT toc ANY> <!ATTLIST toc remote %boolean; \"false\"");
 
@@ -242,7 +242,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("no", values[5]);
   }
 
-  public void testEntityDecl2() throws Exception {
+  public void testEntityDecl2() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ENTITY % coreattrs \"id D #IMPLIED\"> <!ELEMENT a ANY> <!ATTLIST a %coreattrs; version CDATA #FIXED \"1.0\"");
 
@@ -255,7 +255,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("version", attributes[1].getName());
   }
 
-  public void testEntityDecl3() throws Exception {
+  public void testEntityDecl3() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ENTITY % att1 \"id1 D #IMPLIED\"> <!ENTITY % att2 \"id2 D #IMPLIED\"> <!ELEMENT a ANY> <!ATTLIST a %att1; %att2; ");
 
@@ -268,7 +268,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("id2", attributes[1].getName());
   }
 
-  public void testEntityDecl4() throws Exception {
+  public void testEntityDecl4() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ENTITY % boolean \'(true|false|on|off|yes|no)\'> <!ENTITY % bool \"%boolean;\">  <!ELEMENT toc ANY> <!ATTLIST toc remote %bool; \"false\"");
 
@@ -291,7 +291,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("no", values[5]);
   }
 
-  public void testEntityDecl5() throws Exception {
+  public void testEntityDecl5() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<!ENTITY % boolean \"true | false\" > <!ELEMENT foo EMPTY> <!ATTLIST foo someBoolean (%boolean;) \"true\" someString CDATA #IMPLIED >");
 
@@ -309,7 +309,7 @@ public class XmlDtdTest extends LightPlatformTestCase {
     assertEquals("false", attributes[0].getEnumeratedValues()[1]);
   }
 
-  public void testEmbeddedDtd1() throws Exception {
+  public void testEmbeddedDtd1() {
     XmlFile xmlFile = (XmlFile)createFile("test.xml",
       "<!DOCTYPE tv [ <!ELEMENT tv (date)*> <!ELEMENT date (#PCDATA)> ]> <tv></tv>");
 
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java b/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java
index 6e292f8e57f1..9b276996f6ca 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java
@@ -36,7 +36,7 @@ import com.intellij.util.DocumentUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class XmlEventsTest extends LightCodeInsightTestCase {
-  public void test1() throws Exception{
+  public void test1() {
     final Listener listener = addPomListener();
     final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>");
     WriteCommandAction.runWriteCommandAction(null, () -> {
@@ -53,7 +53,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     return listener;
   }
 
-  public void test2() throws Exception{
+  public void test2() {
     final Listener listener = addPomListener();
     final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>aaa</a>");
     final XmlTag otherTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>");
@@ -65,7 +65,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(text changed to 'aa' was: 'aaa'), (child added to a child: XmlText), (child added to a child: XmlTag:a)\n", listener.getEventString());
   }
 
-  public void test3() throws Exception{
+  public void test3() {
     final Listener listener = addPomListener();
     final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>aaa</a>");
     final XmlText xmlText = tagFromText.getValue().getTextElements()[0];
@@ -74,7 +74,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(text changed to 'aabba' was: 'aaa')\n", listener.getEventString());
   }
 
-  public void testTagDelete() throws Exception{
+  public void testTagDelete() {
     final Listener listener = addPomListener();
     configureFromFileText("x.xml", "<a>aaa\n<x>xxx</x>\n<y>yyy</y></a>");
     final XmlTag x = ((XmlFile)getFile()).getRootTag().findSubTags("x")[0];
@@ -87,7 +87,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(child removed from a child: XmlTag:x), (child removed from a child: XmlText)\n", listener.getEventString());
   }
 
-  public void testTagInsert() throws Exception{
+  public void testTagInsert() {
     final Listener listener = addPomListener();
     configureFromFileText("x.xml", "<a>aaa\n<x>xxx</x>\n<y>yyy</y></a>");
     final XmlTag x = ((XmlFile)getFile()).getRootTag().findSubTags("x")[0];
@@ -100,7 +100,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(child added to a child: XmlText), (child added to a child: XmlTag:z)\n", listener.getEventString());
   }
 
-  public void test4() throws Exception{
+  public void test4() {
     final Listener listener = addPomListener();
     final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>a </a>");
     WriteCommandAction.runWriteCommandAction(null, () -> {
@@ -110,7 +110,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(text changed to 'a a ' was: 'a ')\n", listener.getEventString());
   }
 
-  public void test5() throws Exception{
+  public void test5() {
     final Listener listener = addPomListener();
     final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>aaa</a>");
     WriteCommandAction.runWriteCommandAction(null, () -> tagFromText.delete());
@@ -118,12 +118,12 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(Xml document changed)\n", listener.getEventString());
   }
 
-  public void testBulkUpdate() throws Exception{
+  public void testBulkUpdate() {
     final Listener listener = addPomListener();
     final PsiFile file = createFile("a.xml", "<a/>");
     new WriteCommandAction(getProject()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         final Document document = PsiDocumentManager.getInstance(getProject()).getDocument(file);
         DocumentUtil.executeInBulk(document, true, ()-> {
           document.insertString(0, " ");
@@ -134,7 +134,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(Xml document changed)", listener.getEventString().trim());
   }
 
-  public void testDocumentChange1() throws Exception{
+  public void testDocumentChange1() {
     final String rootTagText = "<a/>";
     final String stringToInsert = "b=\"c\"";
     final int positionToInsert = 2;
@@ -142,7 +142,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     checkEventsByDocumentChange(rootTagText, positionToInsert, stringToInsert, "(Xml document changed)\n");
   }
 
-  public void testDocumentChange2() throws Exception{
+  public void testDocumentChange2() {
     final String rootTagText = "<a />";
     final String stringToInsert = "b=\"c\"";
     final int positionToInsert = 3;
@@ -151,7 +151,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
   }
 
 
-  public void testDocumentChange3() throws Exception{
+  public void testDocumentChange3() {
     final String rootTagText = "<b><a /></b>";
     final String stringToInsert = "b=\"c\"";
     final int positionToInsert = 6;
@@ -159,7 +159,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     checkEventsByDocumentChange(rootTagText, positionToInsert, stringToInsert, "(child changed in b child: XmlTag:a)\n");
   }
 
-  public void testAttributeValueReplace() throws Exception {
+  public void testAttributeValueReplace() {
     final String text = "<target name=\"old\"/>";
     final Listener listener = addPomListener();
 
@@ -173,8 +173,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     assertEquals("(Attribute \"name\" for tag \"target\" set to \"\"new\"\")\n", listener.getEventString());
   }
 
-  private void checkEventsByDocumentChange(final String rootTagText, final int positionToInsert, final String stringToInsert, String events)
-    throws Exception {
+  private void checkEventsByDocumentChange(final String rootTagText, final int positionToInsert, final String stringToInsert, String events) {
     final Listener listener = addPomListener();
     final XmlTag tagFromText = ((XmlFile)createFile("file.xml", rootTagText)).getDocument().getRootTag();
     final PsiFileImpl containingFile = (PsiFileImpl)tagFromText.getContainingFile();
@@ -214,7 +213,7 @@ public class XmlEventsTest extends LightCodeInsightTestCase {
     }
   }
 
-  public void testDocumentChange() throws Exception {
+  public void testDocumentChange() {
     final String xml = "" +
                        "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
                        "<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n" +
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java b/xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java
index 675a424a4c3f..bce18c8168e1 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java
@@ -26,7 +26,7 @@ import com.intellij.xml.XmlNSDescriptor;
  * @author Mike
  */
 public class XmlInsightTest extends LightPlatformTestCase {
-  public void testDocumentDescriptor1() throws Exception {
+  public void testDocumentDescriptor1() {
     XmlFile file = createFile("<root><a></a><b></b><a></a></root>");
     XmlNSDescriptor descriptor = createDescriptor(file);
 
@@ -47,7 +47,7 @@ public class XmlInsightTest extends LightPlatformTestCase {
     assertEquals("a", element.getName());
   }
 
-  public void testElementDescriptor1() throws Exception {
+  public void testElementDescriptor1() {
     XmlFile file = createFile("<root><a></a><b></b><a></a></root>");
     XmlNSDescriptor descriptor = createDescriptor(file);
 
@@ -61,7 +61,7 @@ public class XmlInsightTest extends LightPlatformTestCase {
     assertEquals("b", elements[1].getName());
   }
 
-  public void testElementDescriptor2() throws Exception {
+  public void testElementDescriptor2() {
     XmlFile file = createFile("<root><a><b/></a><a><c/></a></root>");
     XmlNSDescriptor descriptor = createDescriptor(file);
 
@@ -76,7 +76,7 @@ public class XmlInsightTest extends LightPlatformTestCase {
     assertEquals("c", elements[1].getName());
   }
 
-  public void testElementDescriptor3() throws Exception {
+  public void testElementDescriptor3() {
     XmlFile file = createFile("<root><a><b/><c></c></a><a><c/></a></root>");
     XmlNSDescriptor descriptor = createDescriptor(file);
 
@@ -94,7 +94,7 @@ public class XmlInsightTest extends LightPlatformTestCase {
     //assertTrue(elements[1].getContentType() == XmlElementDescriptor.CONTENT_TYPE_CHILDREN);
   }
 
-  public void testElementDescriptor4() throws Exception {
+  public void testElementDescriptor4() {
     XmlFile file = createFile("<root><a attr2=''></a><a attr1=''></a></root>");
     XmlNSDescriptor descriptor = createDescriptor(file);
 
@@ -109,7 +109,7 @@ public class XmlInsightTest extends LightPlatformTestCase {
     assertEquals("attr2", attributes[1].getName());
   }
 
-  public void testAttributeDescriptor1() throws Exception {
+  public void testAttributeDescriptor1() {
     XmlFile file = createFile("<root><a attr1=''></a><a attr2='' attr1=''></a></root>");
     XmlNSDescriptor descriptor = createDescriptor(file);
 
@@ -126,7 +126,7 @@ public class XmlInsightTest extends LightPlatformTestCase {
     assertTrue(!attributes[1].isRequired());
   }
 
-  public void testAttributeDescriptor2() throws Exception {
+  public void testAttributeDescriptor2() {
     XmlFile file = createFile("<root><a c='' a=''></a></root>");
     XmlNSDescriptor descriptor = createDescriptor(file);
 
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java b/xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
index 97bf84b252d0..4ea5836ddccf 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
@@ -41,7 +41,6 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.xml.*;
 import com.intellij.testFramework.ParsingTestCase;
 import com.intellij.testFramework.PlatformTestUtil;
-import com.intellij.util.ThrowableRunnable;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -258,7 +257,7 @@ public class XmlParsingTest extends ParsingTestCase {
 
     new WriteCommandAction(getProject(), file) {
       @Override
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         PlatformTestUtil.startPerformanceTest("XML reparse using PsiBuilder", 2500, () -> {
           for (int i = 0; i < 10; i++) {
             final long tm = System.currentTimeMillis();
@@ -556,7 +555,7 @@ public class XmlParsingTest extends ParsingTestCase {
     doTestXml("<a><b><b/></c></a>");
   }
 
-  public void testDtdUrl1() throws Exception {
+  public void testDtdUrl1() {
     XmlFile file = (XmlFile)createFile("test.xml", "<!DOCTYPE greeting SYSTEM \"hello.dtd\">");
 
     XmlDocument document = file.getDocument();
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java b/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
index 0ba236c14d7c..18d96da79e29 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
@@ -50,11 +50,11 @@ public class XmlPerformanceTest extends LightQuickFixTestCase {
     Class clazz = IdeaTestUtil.class;
   }
 
-  public void testIndentUnindent() throws Exception {
+  public void testIndentUnindent() {
     doIndentTest(2000);
   }
 
-  public void testIndentUnindent2() throws Exception {
+  public void testIndentUnindent2() {
     doIndentTest(2001);
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java b/xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java
index 3a149247c6d4..045203ce126c 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java
@@ -39,7 +39,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     setFileType(StdFileTypes.XML);
   }
 
-  public void test1() throws Exception{
+  public void test1() {
     String s1 = "<a>";
     String s2 = "</a>";
 
@@ -49,7 +49,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     assertEquals("Tree changed after empty reparse", beforeReparse, DebugUtil.treeToString(((XmlFileImpl)myDummyFile).getTreeElement(), true));
   }
 
-  public void testTagData1() throws Exception {
+  public void testTagData1() {
     String s1 = "<a>";
     String s2 = "</a>";
 
@@ -61,7 +61,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     insert("xxxxx");
   }
 
-  public void testTagData2() throws Exception {
+  public void testTagData2() {
     String s1 = "<a><b>\nSomeDataHere";
     String s2 = "\n</b></a>";
 
@@ -78,7 +78,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     assertSame(element1, ((XmlFile)myDummyFile).getDocument().getRootTag());
   }
 
-  public void testTagInTag1() throws Exception {
+  public void testTagInTag1() {
     String s1 = "<a><b>";
     String s2 = "</b></a>";
 
@@ -90,7 +90,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     insert(">");
   }
 
-  public void testTagInTag2() throws Exception {
+  public void testTagInTag2() {
     String s1 = "<a><b>";
     String s2 = "</b></a>";
 
@@ -106,7 +106,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     insert(">");
   }
 
-  public void testTagInTag3() throws Exception {
+  public void testTagInTag3() {
     String s1 = "<a><b>";
     String s2 = "</b></a>";
 
@@ -118,7 +118,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     insert(">");
   }
 
-  public void testSCR5925() throws Exception {
+  public void testSCR5925() {
     String s1 = "<one>     <two ";
     String s2 = ",b\"/></one>";
 
@@ -171,7 +171,7 @@ public class XmlReparseTest extends AbstractReparseTestCase {
     return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/";
   }
 
-  public void testXml() throws Exception{
+  public void testXml() {
     setFileType(StdFileTypes.XML);
     String text2 = "</root>";
     final String text1 = "<root>/n";
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java b/xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java
index 9100b11c206e..08a4fb2d9fce 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java
@@ -42,7 +42,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     UNKNOWN_TAG = XmlTestUtil.tag("xxx", getProject());
   }
 
-  public void testDocumentDescriptor1() throws Exception {
+  public void testDocumentDescriptor1() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -55,7 +55,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(NSDescriptor.getElementDescriptor(UNKNOWN_TAG));
   }
 
-  public void testElementDescriptor1() throws Exception {
+  public void testElementDescriptor1() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -69,7 +69,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("comment", elementDescriptor.getName());
   }
 
-  public void testElementDescriptor2() throws Exception {
+  public void testElementDescriptor2() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"comment\" type=\"xsd:string\"/>" +
@@ -87,7 +87,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals(elementDescriptor.getContentType(), XmlElementDescriptor.CONTENT_TYPE_MIXED);
   }
 
-  public void testElementDescriptor3() throws Exception {
+  public void testElementDescriptor3() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -113,7 +113,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(elementDescriptor.getElementDescriptor(UNKNOWN_TAG, null));
   }
 
-  public void testElementDescriptor4() throws Exception {
+  public void testElementDescriptor4() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -137,7 +137,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(elementDescriptor.getAttributeDescriptor("xxx", tag));
   }
 
-  public void testElementDescriptor5() throws Exception {
+  public void testElementDescriptor5() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -179,7 +179,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("country", attributes[0].getName());
   }
 
-  public void testElementDescriptor6() throws Exception {
+  public void testElementDescriptor6() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -220,7 +220,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("country", attributes[0].getName());
   }
 
-  public void testElementDescriptor7() throws Exception {
+  public void testElementDescriptor7() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\">" +
@@ -253,7 +253,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("shipTo", elements[0].getName());
   }
 
-  public void testElementDescriptor8() throws Exception {
+  public void testElementDescriptor8() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -276,7 +276,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(elementDescriptor.getElementDescriptor(UNKNOWN_TAG, null));
   }
 
-  public void testElementDescriptor9() throws Exception {
+  public void testElementDescriptor9() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -305,7 +305,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(elementDescriptor.getElementDescriptor(UNKNOWN_TAG, null));
   }
 
-  public void testElementDescriptor10() throws Exception {
+  public void testElementDescriptor10() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -332,7 +332,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(elementDescriptor.getAttributeDescriptor("xxx", tag));
   }
 
-  public void testElementDescriptor11() throws Exception {
+  public void testElementDescriptor11() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -365,7 +365,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("items", elements[3].getName());
   }
 
-  public void testElementDescriptor15() throws Exception {
+  public void testElementDescriptor15() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -397,7 +397,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("shipTo2", elements[3].getName());
   }
 
-  public void testElementDescriptor12() throws Exception {
+  public void testElementDescriptor12() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -428,7 +428,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("name", attributes[2].getName());
   }
 
-  public void testElementDescriptor13() throws Exception {
+  public void testElementDescriptor13() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\">" +
@@ -448,7 +448,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals(0, elements.length);
   }
 
-  public void testElementDescriptor14() throws Exception {
+  public void testElementDescriptor14() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema targetNamespace=\"http://www.deansoft.com/AddressBook\" xmlns:ab=\"http://www.deansoft.com/AddressBook\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\">" +
@@ -481,7 +481,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("items", element0Descriptors[0].getName());
   }
 
-  public void testAttributeDescriptor1() throws Exception {
+  public void testAttributeDescriptor1() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -500,7 +500,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(attribute.getDefaultValue());
   }
 
-  public void testAttributeDescriptorProhibited() throws Exception {
+  public void testAttributeDescriptorProhibited() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -515,7 +515,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals(0, attributes.length);
   }
 
-  public void testAttributeDescriptorProhibited2() throws Exception {
+  public void testAttributeDescriptorProhibited2() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -543,7 +543,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("name", attributes[0].getName());
   }
 
-  public void testAttributeDescriptor2() throws Exception {
+  public void testAttributeDescriptor2() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -562,7 +562,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals(" 2002 ", attribute.getDefaultValue());
   }
 
-  public void testAttributeDescriptor3() throws Exception {
+  public void testAttributeDescriptor3() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -581,7 +581,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("1 01 2001", attribute.getDefaultValue());
   }
 
-  public void testAttributeDescriptor4() throws Exception {
+  public void testAttributeDescriptor4() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -602,7 +602,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertEquals("1 01 2001", attribute.getDefaultValue());
   }
 
-  public void testNamespace1() throws Exception {
+  public void testNamespace1() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xs:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -615,7 +615,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(NSDescriptor.getElementDescriptor(UNKNOWN_TAG));
   }
 
-  public void testNamespace2() throws Exception {
+  public void testNamespace2() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema targetNamespace=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
         "<xsd:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -638,7 +638,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNull(elementDescriptor.getElementDescriptor("xxx"));
   }
 
-  public void testNamespace3() throws Exception {
+  public void testNamespace3() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xs:schema xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
         "<xs:element name=\"purchaseOrder\" type=\"PurchaseOrderType\"/>" +
@@ -679,7 +679,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
   //  assertNotNull(aDescriptor);
   //}
 
-  public void testAny2() throws Exception {
+  public void testAny2() {
     PsiFile dtdFile = createFile("test.xml", "<xsd:schema targetNamespace=\"http://foo\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
                                              "  <xsd:element name=\"root\">" +
                                              "    <xsd:complexType>" +
@@ -707,7 +707,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     //assertNull(aDescriptor);
   }
 
-  public void testAny3() throws Exception {
+  public void testAny3() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema targetNamespace=\"http://foo\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
         "  <xsd:element name=\"root\">" +
@@ -733,7 +733,7 @@ public class XmlSchemaTest extends LightCodeInsightTestCase {
     assertNotNull(aDescriptor);
   }
 
-  public void testAny4() throws Exception {
+  public void testAny4() {
     XmlNSDescriptor NSDescriptor = createDescriptor(
         "<xsd:schema targetNamespace=\"http://foo\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >" +
         "  <xsd:element name=\"root\">" +
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java
index 74bbf2d6e16a..c9f7de4970bd 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlTagTest.java
@@ -39,7 +39,6 @@ import com.intellij.xml.util.XmlTagUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Arrays;
 
@@ -52,11 +51,11 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     return XmlElementFactory.getInstance(getProject()).createTagFromText("<foo>" + value + "</foo>");
   }
 
-  public void testGetTextValue() throws Throwable {
+  public void testGetTextValue() {
     assertEquals("bar", createTag("bar").getValue().getText());
   }
 
-  public void testCharRefs() throws Throwable {
+  public void testCharRefs() {
     String[] names = XmlTagUtil.getCharacterEntityNames();
     for (String name : names) {
       XmlTag tag = createTag("foo&" + name + ";bar");
@@ -64,7 +63,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     }
   }
 
-  public void testLocalNSDeclarations() throws Throwable {
+  public void testLocalNSDeclarations() {
     final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<foo xmlns='aaa' xmlns:a='bbbb'/>");
     final Object[] nsPrefixes = ArrayUtil.toObjectArray(tag.getLocalNamespaceDeclarations().keySet());
     Arrays.sort(nsPrefixes);
@@ -73,17 +72,17 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("",nsPrefixes[0]);
   }
 
-  public void testCDATA() throws Throwable {
+  public void testCDATA() {
     XmlTag tag = createTag("foo<![CDATA[<>&'\"]]>bar");
     assertEquals("foo<>&'\"bar", tag.getValue().getTrimmedText());
   }
 
-  public void testWhitespacesInAttributes() throws Throwable {
+  public void testWhitespacesInAttributes() {
     XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a c=d>b</a>");
     assertEquals("b", tag.getValue().getText());
   }
 
-  public void testCreateChildTag() throws Throwable {
+  public void testCreateChildTag() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a xmlns=\"aNamespace\"/>");
     final XmlTag childTag = rootTag.createChildTag("b", "bNamespace", null, true);
     assertEquals("bNamespace", childTag.getNamespace());
@@ -94,7 +93,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     });
   }
 
-  public void testDeleteTag() throws Throwable {
+  public void testDeleteTag() {
     XmlTag aTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a><b/> </a>");
     final XmlTag bTag = aTag.findFirstSubTag("b");
     WriteCommandAction.runWriteCommandAction(null, () -> bTag.delete());
@@ -102,7 +101,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals(0, aTag.getSubTags().length);
   }
 
-  public void testReplaceTag() throws Throwable {
+  public void testReplaceTag() {
     final XmlTag aTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<a><b/></a>");
     final XmlTag bTag = aTag.findFirstSubTag("b");
     WriteCommandAction.runWriteCommandAction(null, () -> {
@@ -112,7 +111,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     });
   }
 
-  public void testAddText() throws Exception{
+  public void testAddText() {
     final XmlElementFactory elementFactory = XmlElementFactory.getInstance(getProject());
     final XmlTag aTag = elementFactory.createTagFromText("<a>1</a>");
     final XmlText displayText = elementFactory.createDisplayText("2");
@@ -123,11 +122,11 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     });
   }
 
-  public void testWhitespaceInsideTag() throws Exception {
+  public void testWhitespaceInsideTag() {
     WriteCommandAction.runWriteCommandAction(null, () -> XmlElementFactory.getInstance(getProject()).createTagFromText("<p/>").getValue().setText("\n"));
   }
 
-  public void testSetAttribute_ForXhtml() throws Exception {
+  public void testSetAttribute_ForXhtml() {
     XmlFile xhtmlFile = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("dummy.xhtml", "<html/>");
     final XmlTag rootTag = xhtmlFile.getDocument().getRootTag();
 
@@ -140,7 +139,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("foo", rootTag.getAttributes()[0].getName());
   }
 
-  public void testSetAttribute() throws Exception {
+  public void testSetAttribute() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html/>");
     WriteCommandAction.runWriteCommandAction(null, () -> {
       rootTag.setAttribute("foo", "bar");
@@ -152,7 +151,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html foo=\"bar\"/>", rootTag.getText());
   }
 
-  public void testSetAttributeWithQuotes() throws Exception {
+  public void testSetAttributeWithQuotes() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html/>");
     final String value = "a \"b\" c";
     WriteCommandAction.runWriteCommandAction(null, () -> {
@@ -165,7 +164,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html foo='" + value + "'/>", rootTag.getText());
   }
 
-  public void testSetAttributeWithQuotes2() throws Exception {
+  public void testSetAttributeWithQuotes2() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html/>");
     final String value = "'a \"b\" c'";
     WriteCommandAction.runWriteCommandAction(null, () -> {
@@ -180,7 +179,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html foo=\"" + expected + "\"/>", rootTag.getText());
   }
 
-  public void testSetAttributeUpdateText() throws Exception {
+  public void testSetAttributeUpdateText() {
     final String value = "a \"b\" c";
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html foo='" + value + "'/>");
 
@@ -195,7 +194,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html foo='" + value + "'/>", rootTag.getText());
   }
 
-  public void testSetAttributeWithNamespaces() throws Exception {
+  public void testSetAttributeWithNamespaces() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<ns:tag xmlns:ns=\"xxx\"/>");
     WriteCommandAction.runWriteCommandAction(null, () -> {
       rootTag.setAttribute("foo", "", "bar");
@@ -207,7 +206,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<ns:tag xmlns:ns=\"xxx\" foo=\"bar\"/>", rootTag.getText());
   }
 
-  public void testTextEdit1() throws Exception {
+  public void testTextEdit1() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>aaa</html>");
     final XmlText xmlText = rootTag.getValue().getTextElements()[0];
     WriteCommandAction.runWriteCommandAction(null, () -> xmlText.removeText(0, 3));
@@ -215,14 +214,14 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html></html>", rootTag.getText());
   }
 
-  public void testTextEdit2() throws Exception {
+  public void testTextEdit2() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>a&lt;a</html>");
     WriteCommandAction.runWriteCommandAction(null, () -> rootTag.getValue().getTextElements()[0].removeText(0, 3));
 
     assertEquals("<html></html>", rootTag.getText());
   }
 
-  public void testTextEdit3() throws Exception {
+  public void testTextEdit3() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>a&lt;a</html>");
     final XmlText xmlText = rootTag.getValue().getTextElements()[0];
     WriteCommandAction.runWriteCommandAction(null, () -> xmlText.removeText(1, 2));
@@ -231,7 +230,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html>aa</html>", rootTag.getText());
   }
 
-  public void testTextEdit4() throws Exception {
+  public void testTextEdit4() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>aaa</html>");
     final XmlText xmlText = rootTag.getValue().getTextElements()[0];
     WriteCommandAction.runWriteCommandAction(null, () -> xmlText.removeText(1, 2));
@@ -240,7 +239,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html>aa</html>", rootTag.getText());
   }
 
-  public void testTextEdit5() throws Exception {
+  public void testTextEdit5() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html><x>xxx</x>\n<y>yyy</y></html>");
     final XmlTag y = rootTag.findFirstSubTag("y");
 
@@ -252,7 +251,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
 
     new WriteCommandAction(getProject(), file) {
       @Override
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         CodeStyleManager.getInstance(getProject()).adjustLineIndent(file, y.getTextOffset());
       }
     }.execute();
@@ -263,7 +262,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals(text, textRange.substring(file.getText()));
   }
 
-  public void testTextEdit6() throws Exception {
+  public void testTextEdit6() {
     final XmlTag rootTag = XmlElementFactory.getInstance(getProject()).createTagFromText("<html>a<b>1</b>c</html>");
     final XmlTag xmlTag = rootTag.findFirstSubTag("b");
     WriteCommandAction.runWriteCommandAction(null, () -> xmlTag.delete());
@@ -271,14 +270,14 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<html>ac</html>", rootTag.getText());
   }
 
-  public void testBrace() throws Exception {
+  public void testBrace() {
    final XmlTag tagFromText = XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>");
     WriteCommandAction.runWriteCommandAction(null, () -> tagFromText.getValue().setText("<"));
 
     assertEquals("<", tagFromText.getValue().getTextElements()[0].getValue());
   }
 
-  public void testEmptyTextRange() throws Exception {
+  public void testEmptyTextRange() {
     final String text = "<a></a>";
     final String name = "test.xhtml";
     XmlTag rootTag = createTag(name, text);
@@ -287,12 +286,12 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals(3, textRange.getEndOffset());
   }
 
-  public void testDeleteTagBetweenText() throws Exception {
+  public void testDeleteTagBetweenText() {
     final XmlTag tag = createTag("foo.xhtml", "<p>a<div/>b</p>");
     final XmlTag div = tag.getSubTags()[0];
     new WriteCommandAction(getProject(), tag.getContainingFile()) {
       @Override
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         div.delete();
       }
     }.execute();
@@ -306,7 +305,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
   }
 
   // tests whether rangemarker gets changed when texts are merged, passes
-  public void testRangeMarker1() throws IOException, IncorrectOperationException {
+  public void testRangeMarker1() throws IncorrectOperationException {
     final XmlFile file = (XmlFile)createFile("file.xhtml", "<a>1234<b></b>567</a>");
     final XmlTag root = file.getDocument().getRootTag();
     final XmlTag tag = root.findFirstSubTag("b");
@@ -325,7 +324,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
   }
 
   // this one fails, the difference is that we do some manipulations before: move "234" before the tag
-  public void testRangeMarker2() throws IOException, IncorrectOperationException {
+  public void testRangeMarker2() throws IncorrectOperationException {
     final XmlTag root = createTag("file.xhtml", "<a>1<b>234</b>567</a>");
     final XmlTag tag = root.findFirstSubTag("b");
     ApplicationManager.getApplication().runWriteAction(() -> CommandProcessor.getInstance().executeCommand(getProject(), () -> {
@@ -350,7 +349,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
   }
 
   // the previous test relveals one problem with text merge, "234" in fact is not merged with "1"
-  public void test3() throws IOException, IncorrectOperationException {
+  public void test3() throws IncorrectOperationException {
     final XmlTag root = XmlElementFactory.getInstance(getProject()).createTagFromText("<a>1<b>234</b>456</a>");
     final XmlTag tag = root.findFirstSubTag("b");
 
@@ -367,7 +366,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("1234456", root.getValue().getChildren()[0].getText());
   }
 
-  public void test3XHTML() throws IOException, IncorrectOperationException {
+  public void test3XHTML() throws IncorrectOperationException {
     final XmlTag root = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>1<b>234</b>456</a>");
     final XmlTag tag = root.findFirstSubTag("b");
 
@@ -384,7 +383,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("1234456", root.getValue().getChildren()[0].getText());
   }
 
-  public void testDisplayText() throws Throwable {
+  public void testDisplayText() {
     final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("  <foo/>");
     WriteCommandAction.runWriteCommandAction(null, () -> {
       tag.add(XmlElementFactory.getInstance(getProject()).createDisplayText("aaa\nbbb"));
@@ -393,7 +392,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("aaa\nbbb", tag.getValue().getTextElements()[0].getValue());
   }
 
-  public void testXHTMLAddBefore1() throws Exception {
+  public void testXHTMLAddBefore1() {
     final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xhtml",
                                                                                                               "<a>a <b>123</b> c</a>");
     final XmlTag tagB = file.getDocument().getRootTag().findFirstSubTag("b");
@@ -407,10 +406,10 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     });
   }
 
-  public void testXHTMLSetAttribute1() throws Exception {
+  public void testXHTMLSetAttribute1() {
     new WriteCommandAction.Simple(getProject()) {
       @Override
-      protected void run() throws Throwable {
+      protected void run() {
         final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xhtml", "<a/>");
         final XmlTag tagB = file.getDocument().getRootTag();
 
@@ -429,14 +428,14 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     }.execute().throwException();
   }
 
-  public void testXHTMLNbsp1() throws Exception {
+  public void testXHTMLNbsp1() {
     final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xhtml", "<a>&nbsp;</a>");
     final XmlTag tagB = file.getDocument().getRootTag();
     assertEquals(tagB.getValue().getTextElements().length, 1);
     assertEquals(tagB.getValue().getTextElements()[0].getValue(), "\u00a0");
   }
 
-  public void testDeleteTagWithMultilineWhitespace1() throws Exception {
+  public void testDeleteTagWithMultilineWhitespace1() {
     final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("test.xml",
                                                                                                               "<a>\n  <a/>\n</a>");
     final XmlTag tagB = file.getDocument().getRootTag();
@@ -445,7 +444,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<a>\n  </a>", tagB.getText());
   }
 
-  public void testDeleteTagWithMultilineWhitespace2() throws Exception {
+  public void testDeleteTagWithMultilineWhitespace2() {
     final XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject())
       .createFileFromText("test.xml", "<a>\n    <a>\n <b>\n     hasgdgasjdgasdg    asgdjhasgd</b>\n </a>\n</a>");
     final XmlTag tagB = file.getDocument().getRootTag();
@@ -454,7 +453,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("<a>\n    <a>\n </a>\n</a>", tagB.getText());
   }
 
-  public void testXHTMLRangeMarkers2() throws Exception {
+  public void testXHTMLRangeMarkers2() {
     XmlTag tag = createTag("file.xhtml", "<a>xyz</a>");
     PsiFile psiFile = tag.getContainingFile();
     Document document = PsiDocumentManager.getInstance(psiFile.getProject()).getDocument(psiFile);
@@ -472,14 +471,14 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals(5, rangeMarker.getEndOffset());
   }
 
-  public void testXHTMLTextInsert() throws Exception {
+  public void testXHTMLTextInsert() {
     final XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>xyz</a>");
     ApplicationManager.getApplication().runWriteAction(() -> tag.getValue().getTextElements()[0].insertText("<", 1));
 
     assertEquals("<a>x&lt;yz</a>", tag.getText());
   }
 
-  public void testSimpleTextInsertion() throws Throwable {
+  public void testSimpleTextInsertion() {
     doTestSimpleInsertion("xyz", "a");
     doTestSimpleInsertion(" xyz", "a");
     doTestSimpleInsertion("x yz", "a");
@@ -489,11 +488,11 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     doTestSimpleInsertion(" x y z ", "a");
   }
 
-  public void testWhitespaceTextInsertion() throws Throwable {
+  public void testWhitespaceTextInsertion() {
     doTestSimpleInsertion("xyz", " ");
   }
 
-  public void testSimpleTextDeletion() throws Throwable {
+  public void testSimpleTextDeletion() {
     doTestSimpleDeletion("xyz");
     doTestSimpleDeletion(" xyz");
     doTestSimpleDeletion("x yz");
@@ -503,7 +502,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     doTestSimpleDeletion(" x y z ");
   }
 
-  public void testWhitespaceDeletion() throws Throwable {
+  public void testWhitespaceDeletion() {
     doTestSimpleDeletion(" xyz");
     doTestSimpleDeletion("x yz");
     doTestSimpleDeletion("xy z");
@@ -546,7 +545,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     });
   }
 
-  public void testEscapedInsertion() throws Throwable {
+  public void testEscapedInsertion() {
     doTestEscapedInsertion("xyz", "&");
     doTestEscapedInsertion("xyz", "&&");
     doTestEscapedInsertion("xyz", "&x&");
@@ -637,14 +636,14 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     });
   }
 
-  public void testWhitespacesInEmptyXHTMLTag() throws Exception{
+  public void testWhitespacesInEmptyXHTMLTag() {
     final XmlTag tag = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a> <b/> </a>");
     ApplicationManager.getApplication().runWriteAction(() -> tag.findFirstSubTag("b").delete());
 
     assertEquals("<a>  </a>", tag.getText());
   }
 
-  public void test2() throws Exception {
+  public void test2() {
     XmlFile file = (XmlFile)createFile("file.xml", "<a>x y</a>");
     XmlTag tag = file.getDocument().getRootTag();
     final XmlText xmlText = tag.getValue().getTextElements()[0];
@@ -682,7 +681,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     return text;
   }
 
-  public void testCoordinateMappingConsistent() throws Exception {
+  public void testCoordinateMappingConsistent() {
     doCoordinateMappingConsistentFromDisplayText("abc");
     doCoordinateMappingConsistentFromDisplayText(" abc");
     doCoordinateMappingConsistentFromDisplayText(" a bc");
@@ -720,7 +719,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     doCoordinateMappingConsistentFromEscapedText("xxx<![CDATA[x<a>s]]>&amp;xxx");
   }
 
-  public void testNBSP() throws Exception {
+  public void testNBSP() {
     final XmlTag tagA = XmlElementFactory.getInstance(getProject()).createXHTMLTagFromText("<a>1<b>&nbsp;</b></a>");
 
     final XmlTag tagB = tagA.findFirstSubTag("b");
@@ -757,7 +756,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals(text.length(), xmlText.physicalToDisplay(tagText.length()));
   }
 
-  public void testStrangeCharactesInText() throws Throwable {
+  public void testStrangeCharactesInText() {
     ApplicationManager.getApplication().runWriteAction(() -> XmlElementFactory.getInstance(getProject()).createTagFromText("<a/>").getValue().setText("@#$%@$%$${${''}"));
   }
 
@@ -787,14 +786,14 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     }, "", null, UndoConfirmationPolicy.DO_NOT_REQUEST_CONFIRMATION));
   }
 
-  public void testXmlFormattingException() throws Throwable {
+  public void testXmlFormattingException() {
     final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<foo>bar</foo>");
     ApplicationManager.getApplication().runWriteAction(() -> {
       tag.add(XmlElementFactory.getInstance(getProject()).createTagFromText("<bar/>"));
     });
   }
 
-  public void testSetNamespace() throws Exception {
+  public void testSetNamespace() {
     XmlFile xhtmlFile = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("dummy.xml",
                                                                                                              "<html><body/></html>");
 
@@ -809,7 +808,7 @@ public class XmlTagTest extends LightCodeInsightTestCase {
     assertEquals("http://www.ru", rootTag.getSubTags()[0].getNamespace());
   }
 
-   public void testInsert() throws Exception {
+   public void testInsert() {
      String html = "<html><head /><body><hr /></body>\n</html>";
      XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("xxx.xhtml", html);
      XmlTag body = file.getDocument().getRootTag().findFirstSubTag("body");
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java
index 8e2ec91c0017..abf258562a00 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java
@@ -57,7 +57,7 @@ public class XmlTagWriteTest extends LightCodeInsightTestCase{
     assertEquals("tag2", createdFromText.getSubTags()[0].getName());
   }
 
-  public void test3() throws Exception{
+  public void test3() {
     final XmlTag tag = XmlElementFactory.getInstance(getProject()).createTagFromText("<b>\n0123456</b>");
     final XmlText text = (XmlText) tag.getValue().getChildren()[0];
     String textS = text.getText();
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlTextTest.java b/xml/tests/src/com/intellij/codeInsight/XmlTextTest.java
index 6402faef0cc6..b22db1c475a2 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlTextTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlTextTest.java
@@ -33,11 +33,11 @@ import org.jetbrains.annotations.NotNull;
  * @author mike
  */
 public class XmlTextTest extends LightCodeInsightTestCase {
-  public void testInsertAtOffset() throws Exception {
+  public void testInsertAtOffset() {
     new WriteCommandAction(getProject()) {
 
       @Override
-      protected void run(@NotNull final Result result) throws Throwable {
+      protected void run(@NotNull final Result result) {
         String xml = "<root>0123456789</root>";
         XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject())
           .createFileFromText("foo.xml", StdFileTypes.XML, xml, (long)1, true, false);
@@ -57,7 +57,7 @@ public class XmlTextTest extends LightCodeInsightTestCase {
     }.execute();
   }
 
-  public void testPhysicalToDisplayIfHasGaps2() throws Exception {
+  public void testPhysicalToDisplayIfHasGaps2() {
     String xml = "<div>&amp;abc</div>";
     XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("foo.xml", xml);
     XmlTag root = file.getDocument().getRootTag();
@@ -71,7 +71,7 @@ public class XmlTextTest extends LightCodeInsightTestCase {
     assertEquals(4, text.physicalToDisplay(8));
   }
 
-  public void testDisplayToPhysical() throws Exception {
+  public void testDisplayToPhysical() {
     String xml = "<div>&amp;abc</div>";
     XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("foo.xml", xml);
     XmlTag root = file.getDocument().getRootTag();
@@ -85,7 +85,7 @@ public class XmlTextTest extends LightCodeInsightTestCase {
     assertEquals(8, text.displayToPhysical(4));
   }
 
-  public void testDisplayToPhysical2() throws Exception {
+  public void testDisplayToPhysical2() {
     String xml = "<div><![CDATA[ ]]></div>";
     XmlFile file = (XmlFile)PsiFileFactory.getInstance(getProject()).createFileFromText("foo.xml", xml);
     XmlTag root = file.getDocument().getRootTag();
diff --git a/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java b/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java
index 86f5936d9714..4807df08b295 100644
--- a/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java
@@ -10,7 +10,7 @@ import java.io.File;
  * @author spleaner
  */
 public class XmlWrongClosingTagNameInspectionTest extends LightQuickFixParameterizedTestCase {
-  public void test() throws Exception { doAllTests(); }
+  public void test() { doAllTests(); }
 
   @Override
   protected String getBasePath() {
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
index 0323a0de1ed6..b2e3ad219b01 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlAutopopupTest.java
@@ -20,15 +20,15 @@ import com.intellij.ide.highlighter.XHtmlFileType;
 import com.intellij.openapi.fileTypes.FileType;
 
 public class XmlAutopopupTest extends CompletionAutoPopupTestCase {
-  public void testDoNotShowPopupInText() throws Exception {
+  public void testDoNotShowPopupInText() {
     doTestNoPopup(HtmlFileType.INSTANCE, "<div><caret></div>", "p");
   }
 
-  public void testAfterTagOpen() throws Exception {
+  public void testAfterTagOpen() {
     doTestPopup(HtmlFileType.INSTANCE, "<div><caret></div>", "<");
   }
 
-  public void testDoNotShowPopupInTextXhtml() throws Exception {
+  public void testDoNotShowPopupInTextXhtml() {
     doTestNoPopup(XHtmlFileType.INSTANCE, "<div><caret></div>", "p");
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
index a9c8cde3c276..d11354349063 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
@@ -78,7 +78,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     ExternalResourceManagerExImpl.addTestResource(url, location, myFixture.getTestRootDisposable());
   }
 
-  public void testCompleteWithAnyInSchema() throws Exception {
+  public void testCompleteWithAnyInSchema() {
     String location = "29.xsd";
     addResource("aaa",location);
 
@@ -99,7 +99,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     myFixture.configureByFiles(files);
   }
 
-  public void testCompleteWithAnyInSchema2() throws Exception {
+  public void testCompleteWithAnyInSchema2() {
     configureByFiles("32.xml", "32.xsd", "32_2.xsd");
     complete();
     checkResultByFile("/32_after.xml");
@@ -109,7 +109,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("32_2_after.xml");
   }
 
-  public void testCompleteWithAnyInSchema3() throws Exception {
+  public void testCompleteWithAnyInSchema3() {
     addResource("http://www.springframework.org/schema/tx",
                 getTestDataPath() + "/spring-tx-2.0.xsd");
     addResource("http://www.springframework.org/schema/util",
@@ -129,7 +129,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("36_3_after.xml");
   }
 
-  public void testXmlNonQualifiedElementCompletion() throws Exception {
+  public void testXmlNonQualifiedElementCompletion() {
     String location = "25.xsd";
     String url = "http://www.dummy-temp-address";
     addResource(url,location);
@@ -140,7 +140,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("25_after.xml");
   }
 
-  public void testXmlCompletion() throws Exception {
+  public void testXmlCompletion() {
     String location = "xslt.xsd";
     String location2 = "xhtml1-strict.xsd";
 
@@ -162,19 +162,19 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("/11_after.xml");
   }
 
-  public void testXmlCompletionWhenTagsWithSemicolon() throws Exception {
+  public void testXmlCompletionWhenTagsWithSemicolon() {
     configureByFiles("XmlCompletionWhenTagsWithSemicolon.xml", "XmlCompletionWhenTagsWithSemicolon.dtd");
     complete();
     checkResultByFile("XmlCompletionWhenTagsWithSemicolon_after.xml");
   }
 
-  public void testCompleteTagWithXsiTypeInParent() throws Exception {
+  public void testCompleteTagWithXsiTypeInParent() {
     final String testName = getTestName(false);
     String url = "urn:test";
     doCompletionTest("xml", url, testName + ".xsd");
   }
 
-  public void testAttributesTemplateFinishWithSpace() throws Throwable {
+  public void testAttributesTemplateFinishWithSpace() {
     TemplateManagerImpl.setTemplateTesting(getProject(), myFixture.getTestRootDisposable());
 
     configureByFile(getTestName(false) + ".xml");
@@ -191,7 +191,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     myFixture.completeBasic();
   }
 
-  public void testNoAttributesTemplateFinishWithSpace() throws Throwable {
+  public void testNoAttributesTemplateFinishWithSpace() {
     TemplateManagerImpl.setTemplateTesting(getProject(), myFixture.getTestRootDisposable());
 
     configureByFile(getTestName(false) + ".xml");
@@ -215,13 +215,13 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile(testName + "_after." + ext);
   }
 
-  public void testSingleCompletionVariantAtRootTag() throws Exception {
+  public void testSingleCompletionVariantAtRootTag() {
     addResource("http://www.springframework.org/dtd/spring-beans.dtd", getTestDataPath() + "/spring-beans-2.0.dtd");
 
     basicDoTest("");
   }
 
-  public void testDtdCompletion() throws Exception {
+  public void testDtdCompletion() {
     final String baseTestFileName = getTestName(false);
     configureByFile(baseTestFileName + ".dtd");
     selectItem(myFixture.getLookupElements()[0], (char)0);
@@ -247,7 +247,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile(name + "_after.dtd");
   }
 
-  public void testSchemaEnumerationCompletion() throws Exception {
+  public void testSchemaEnumerationCompletion() {
     addResource("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd", getTestDataPath() + "/web-app_2_4.xsd");
     configureByFile("12.xml");
     complete();
@@ -262,29 +262,29 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("12_4_after.xml");
   }
 
-  public void testEntityRefCompletion() throws Exception {
+  public void testEntityRefCompletion() {
     configureByFile("13.xml");
     checkResultByFile("13_after.xml");
   }
 
-  public void testEntityRefCompletion_2() throws Exception {
+  public void testEntityRefCompletion_2() {
     configureByFile("13_2.xml");
     checkResultByFile("13_2_after.xml");
   }
 
-  public void testEntityRefCompletion2() throws Exception {
+  public void testEntityRefCompletion2() {
     configureByFiles("28.xml", "28.ent");
     complete();
     type('\n');
     checkResultByFile("28_after.xml");
   }
 
-  public void testEntityRefCompletion3() throws Exception {
+  public void testEntityRefCompletion3() {
     configureByFile("13_3.xml");
     checkResultByFile("13_3_after.xml");
   }
 
-  public void testElementRefCompletionInSchema() throws Exception {
+  public void testElementRefCompletionInSchema() {
     boolean old = CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION;
     CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION = false;
     try {
@@ -297,17 +297,17 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  public void testFilePathCompletionInSystem() throws Exception {
+  public void testFilePathCompletionInSystem() {
     configureByFile("14.xml");
     checkResultByFile("14_after.xml");
   }
 
-  public void testFilePathCompletionInSchema() throws Exception {
+  public void testFilePathCompletionInSchema() {
     configureByFile("15.xml");
     checkResultByFile("15_after.xml");
   }
 
-  public void testUrlCompletionInSchema() throws Exception {
+  public void testUrlCompletionInSchema() {
     String url = "http://www.w3.org/1999/xhtml";
     String location = "xhtml1-strict.xsd";
     addResource(url,location);
@@ -325,13 +325,13 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("31_after.xml");
   }
 
-  public void testInsertExtraRequiredAttribute() throws Exception {
+  public void testInsertExtraRequiredAttribute() {
     configureByFile("37.xml");
     selectItem(myFixture.getLookupElements()[0], '\t');
     checkResultByFile("37_after.xml");
   }
 
-  public void testInsertExtraRequiredAttributeSingleQuote() throws Exception {
+  public void testInsertExtraRequiredAttributeSingleQuote() {
     final CodeStyleSettings settings = getCurrentCodeStyleSettings();
     final CodeStyleSettings.QuoteStyle quote = settings.HTML_QUOTE_STYLE;
     try {
@@ -343,7 +343,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  public void testInsertExtraRequiredAttributeNoneQuote() throws Exception {
+  public void testInsertExtraRequiredAttributeNoneQuote() {
     final CodeStyleSettings settings = getCurrentCodeStyleSettings();
     final CodeStyleSettings.QuoteStyle quote = settings.HTML_QUOTE_STYLE;
     try {
@@ -355,13 +355,13 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  public void testBeforeAttributeValue() throws Throwable {
+  public void testBeforeAttributeValue() {
     configureByFile(getTestName(true) + ".xml");
     assertEmpty(myFixture.getLookupElements());
     checkResultByFile(getTestName(true) + ".xml");
   }
 
-  public void testAttributeNoQuotes() throws Throwable {
+  public void testAttributeNoQuotes() {
     boolean oldInsertQuotes = WebEditorOptions.getInstance().isInsertQuotesForAttributeValue();
     WebEditorOptions.getInstance().setInsertQuotesForAttributeValue(false);
     try {
@@ -373,19 +373,19 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  public void testBeforeAttributeNameWithPrefix() throws Exception {
+  public void testBeforeAttributeNameWithPrefix() {
     configureByFile(getTestName(true) + ".xml");
     selectItem(myFixture.getLookupElements()[0], '\t');
     checkResultByFile(getTestName(true) + "_after.xml");
   }
 
-  public void testUrlCompletionInDtd() throws Exception {
+  public void testUrlCompletionInDtd() {
     configureByFile("20.xml");
     complete();
     checkResultByFile("20_after.xml");
   }
 
-  public void testElementFromSchemaIncludeCompletion() throws Exception {
+  public void testElementFromSchemaIncludeCompletion() {
     String location = "21.xsd";
     String location2 = "21_2.xsd";
 
@@ -398,27 +398,27 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("21_after.xml");
   }
 
-  public void testSchemaTypeReferenceCompletion() throws Exception {
+  public void testSchemaTypeReferenceCompletion() {
     configureByFile("22.xsd");
     checkResultByFile("22_after.xsd");
   }
 
-  public void testSchemaTypeReferenceCompletion2() throws Exception {
+  public void testSchemaTypeReferenceCompletion2() {
     configureByFile("23.xsd");
     checkResultByFile("23_after.xsd");
   }
 
-  public void testSchemaTypeReferenceCompletion3() throws Exception {
+  public void testSchemaTypeReferenceCompletion3() {
     configureByFile("34.xsd");
     checkResultByFile("34_after.xsd");
   }
 
-  public void testSchemaTypeReferenceCompletion4() throws Exception {
+  public void testSchemaTypeReferenceCompletion4() {
     configureByFile("35.xsd");
     checkResultByFile("35_after.xsd");
   }
 
-  public void testSchemaNonAllowedElementCompletion() throws Exception {
+  public void testSchemaNonAllowedElementCompletion() {
     configureByFiles("33.xml",
                      "33.xsd",
                      "33_2.xsd");
@@ -432,22 +432,22 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("33_2_after.xml");
   }
 
-  public void testSchemaBooleanCompletion() throws Exception {
+  public void testSchemaBooleanCompletion() {
     configureByFile("SchemaBooleanCompletion.xsd");
     checkResultByFile("SchemaBooleanCompletion_after.xsd");
   }
 
-  public void testXIncludeCompletion() throws Exception {
+  public void testXIncludeCompletion() {
     configureByFile("XIncludeCompletion.xsd");
     checkResultByFile("XIncludeCompletion_after.xsd");
   }
 
-  public void testCorrectPrefixInsertion() throws Exception {
+  public void testCorrectPrefixInsertion() {
     configureByFile("CorrectPrefixInsertion.xml");
     checkResultByFile("CorrectPrefixInsertion_after.xml");
   }
 
-  public void testDoNotSuggestAbstractElementsFromSchema() throws Exception {
+  public void testDoNotSuggestAbstractElementsFromSchema() {
     basicDoTest("");
   }
 
@@ -457,41 +457,41 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile(testName + "_after.xml");
   }
 
-  public void testDoNotSuggestTagsFromOtherNsInXslt() throws Exception {
+  public void testDoNotSuggestTagsFromOtherNsInXslt() {
     basicDoTest("");
   }
 
-  public void testDoNotSuggestTagsFromOtherNsInXslt_2() throws Exception {
+  public void testDoNotSuggestTagsFromOtherNsInXslt_2() {
     final String testName = getTestName(false);
     configureByFile(testName + ".xml");
     myFixture.type('\n');
     checkResultByFile(testName + "_after.xml");
   }
   
-  public void testDoNotSuggestTagsFromOtherNsInXslt_3() throws Exception {
+  public void testDoNotSuggestTagsFromOtherNsInXslt_3() {
     final String testName = getTestName(false);
     configureByFile(testName + ".xml");
     myFixture.type('\n');
     checkResultByFile(testName + "_after.xml");
   }
 
-  public void testDoNotSuggestTagsInXHtml() throws Exception {
+  public void testDoNotSuggestTagsInXHtml() {
     basicDoTest("");
   }
 
-  public void testSuggestTagsInXHtml() throws Exception {
+  public void testSuggestTagsInXHtml() {
     basicDoTest("");
     basicDoTest("_2");
   }
 
-  public void testCompleteWithSubstitutionGroup() throws Exception {
+  public void testCompleteWithSubstitutionGroup() {
     configureByFiles(getTestName(false) + ".xml", "mule.xsd", "mule-management.xsd");
     complete();
     myFixture.type('\n');
     checkResultByFile(getTestName(false) + "_after.xml");
   }
 
-  public void testCorrectSelectionInsertion() throws Exception {
+  public void testCorrectSelectionInsertion() {
     ((StatisticsManagerImpl)StatisticsManager.getInstance()).enableStatistics(myFixture.getTestRootDisposable());
     addResource("http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd",
                 getTestDataPath() + "/hibernate-mapping-3.0.dtd");
@@ -508,7 +508,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("CorrectSelectionInsertion2_after.xml");
   }
 
-  public void testCasePreference() throws Exception {
+  public void testCasePreference() {
     final int old = CodeInsightSettings.getInstance().COMPLETION_CASE_SENSITIVE;
     CodeInsightSettings.getInstance().COMPLETION_CASE_SENSITIVE = CodeInsightSettings.NONE;
 
@@ -527,12 +527,12 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  public void testCompleteXmlLang() throws Exception {
+  public void testCompleteXmlLang() {
     basicDoTest("");
     basicDoTest("_2");
   }
 
-  public void testCompleteWhenNoNsSchemaLocation() throws Exception {
+  public void testCompleteWhenNoNsSchemaLocation() {
     boolean old = CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION;
     CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION = false;
     try {
@@ -549,7 +549,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  public void testCompleteWhenUnqualifiedElements() throws Exception {
+  public void testCompleteWhenUnqualifiedElements() {
     final String testName = getTestName(false);
 
     configureByFiles(testName + ".xml",
@@ -571,7 +571,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile(testName + "_after.xml");
   }
 
-  public void testCompleteEnumeration() throws Exception {
+  public void testCompleteEnumeration() {
     final String testName = getTestName(false);
 
     configureByFiles(testName + ".xml",
@@ -581,18 +581,18 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile(testName + "_after.xml");
   }
 
-  public void testAttributeNameInAttributeValue() throws Throwable {
+  public void testAttributeNameInAttributeValue() {
     configureByFile(getTestName(false) + ".xml");
     complete();
     assertEmpty(myFixture.getLookupElements());
     checkResultByFile(getTestName(false) + "_after.xml");
   }
 
-  public void testNoFixedAttrComplete() throws Exception {
+  public void testNoFixedAttrComplete() {
     basicDoTest("");
   }
 
-  public void testCompleteWords() throws Exception {
+  public void testCompleteWords() {
     myFixture.addClass("public class ABxxZ {}");
 
     final String testName = getTestName(false);
@@ -604,7 +604,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile(testName + "_after.xml");
   }
 
-  public void testClassNamesOutrankWords() throws Exception {
+  public void testClassNamesOutrankWords() {
     myFixture.addClass("package foo; public class SomeClass {}");
 
     final String testName = getTestName(false);
@@ -614,7 +614,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile(testName + "_after.xml");
   }
 
-  public void testColonInTagName() throws Throwable {
+  public void testColonInTagName() {
     configureByFile(getTestName(false) + ".xml");
     type('f');
     type('o');
@@ -623,7 +623,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     assertNotNull(LookupManager.getActiveLookup(myFixture.getEditor()));
   }
 
-  public void testDoNotInsertClosingTagB4Text() throws Exception {
+  public void testDoNotInsertClosingTagB4Text() {
     configureByFile("doNotInsertClosingTagB4Text.xml");
     selectItem(myFixture.getLookupElements()[0], '>');
     checkResultByFile("doNotInsertClosingTagB4Text_after.xml");
@@ -635,7 +635,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     lookup.finishLookup(ch);
   }
 
-  public void testDoNotInsertClosingTagWithoutTagName() throws Exception {
+  public void testDoNotInsertClosingTagWithoutTagName() {
     configureByFile("doNotInsertClosingTagWithoutTagName.xml");
     type('>');
     //assertNotNull(myItems);
@@ -643,26 +643,26 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     checkResultByFile("doNotInsertClosingTagWithoutTagName_after.xml");
   }
 
-  public void testCompleteXmlTag() throws Exception {
+  public void testCompleteXmlTag() {
     addResource("http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd", getTestDataPath() + "archetype-descriptor-1.0.0.xsd");
     basicDoTest("");
   }
 
-  public void testCompleteXsl() throws Exception {
+  public void testCompleteXsl() {
     basicDoTest("");
   }
 
-  public void testAttributeWildcardFromAnotherNamespace() throws Exception {
+  public void testAttributeWildcardFromAnotherNamespace() {
     configureByFiles("foo.xsd", "bar.xsd");
     basicDoTest("");
   }
 
-  public void testCompleteQualifiedTopLevelTags() throws Exception {
+  public void testCompleteQualifiedTopLevelTags() {
     configureByFiles("foo.xsd", "bar.xsd");
     basicDoTest("");
   }
 
-  public void testDoNotSuggestExistingAttributes() throws Exception {
+  public void testDoNotSuggestExistingAttributes() {
     myFixture.configureByFile("DoNotSuggestExistingAttributes.xml");
     myFixture.completeBasic();
     List<String> strings = myFixture.getLookupElementStrings();
@@ -684,7 +684,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
                        "xsi:type");
   }
 
-  public void testRequiredAttributesOnTop() throws Exception {
+  public void testRequiredAttributesOnTop() {
     myFixture.configureByText("foo.html", "<img <caret>");
     myFixture.completeBasic();
     List<String> strings = myFixture.getLookupElementStrings();
@@ -694,7 +694,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     assertEquals("align", strings.get(2));
   }
 
-  public void testDoNotProcessAnyInRestrictions() throws Exception {
+  public void testDoNotProcessAnyInRestrictions() {
     myFixture.configureByText("foo.xsd", "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
                                          "    <<caret>\n" +
                                          "</xs:schema>");
@@ -712,22 +712,22 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
                                                             "xs:simpleType");
   }
 
-  public void testSubstitute() throws Exception {
+  public void testSubstitute() {
     myFixture.configureByFiles("Substitute/schema-a.xsd", "Substitute/schema-b.xsd");
     myFixture.testCompletionVariants("Substitute/test.xml", "b:instance", "instance");
   }
 
-  public void testAfterPrefix() throws Exception {
+  public void testAfterPrefix() {
     myFixture.testCompletion("Substitute/testAfterPrefix.xml", "Substitute/testAfterPrefix_after.xml", "Substitute/schema-a.xsd", "Substitute/schema-b.xsd");
   }
 
-  public void testEnumeratedTagValue() throws Exception {
+  public void testEnumeratedTagValue() {
     myFixture.configureByFile("tagValue/enumerated.xsd");
     myFixture.testCompletionVariants("tagValue/completeEnum.xml", "none", "standard");
     myFixture.testCompletionVariants("tagValue/completeBoolean.xml", "false", "true");
   }
 
-  public void testInheritedAttribute() throws Exception {
+  public void testInheritedAttribute() {
     myFixture.configureByFiles("InheritedAttr/test.xsd", "InheritedAttr/library.xsd");
     myFixture.testCompletionVariants("InheritedAttr/test.xml", "buz",
     "library:boo",
@@ -737,14 +737,14 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     "xml:space");
   }
 
-  public void testSchemaLocation() throws Exception {
+  public void testSchemaLocation() {
     myFixture.configureByFiles("spring-beans.xsd");
     myFixture.testCompletionVariants("SchemaLocation.xml", "http://www.springframework.org/schema/beans ",
                                      "http://www.w3.org/2001/XMLSchema ", "http://www.w3.org/2001/XMLSchema-instance ");
     myFixture.testCompletionVariants("SchemaLocation2.xml", "http://www.w3.org/2001/XMLSchema.xsd");
   }
 
-  public void testNamespaceCompletion() throws Exception {
+  public void testNamespaceCompletion() {
     myFixture.configureByText("foo.xml", "<schema xmlns=\"<caret>\"/>");
     LookupElement[] elements = myFixture.completeBasic();
     assertEquals("http://www.w3.org/2001/XMLSchema", elements[0].getLookupString());
@@ -754,7 +754,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     assertTrue(myFixture.getLookupElementStrings().size() > 3); // all standard schemas actually
   }
 
-  public void testRootTagCompletion() throws Exception {
+  public void testRootTagCompletion() {
     boolean old = CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION;
     CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION = false;
     try {
@@ -768,7 +768,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  public void testPi() throws Exception {
+  public void testPi() {
     myFixture.configureByText("foo.xml", "<<caret>");
     myFixture.completeBasic();
     myFixture.type('?');
@@ -776,7 +776,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     myFixture.checkResult("<?xml version=\"1.0\" encoding=\"<caret>\" ?>");
   }
 
-  public void testAttributeValueToken() throws Exception {
+  public void testAttributeValueToken() {
     myFixture.configureByText("foo.xml", "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\">\n" +
                                          "    <element name=\"a\" abstract=<caret>\"\"/>\n" +
                                          "</schema>");
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java
index 00a1d887b620..83982dcd2ec0 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlSmartCompletionTest.java
@@ -31,23 +31,23 @@ import java.util.List;
  */
 public class XmlSmartCompletionTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testCompletion() throws Exception {
+  public void testCompletion() {
     doTest(new String[]{"testCompletion.xml", "test.xsd"}, "b");
   }
 
-  public void testCompletionNext() throws Exception {
+  public void testCompletionNext() {
     doTest(new String[]{"testCompletionNext.xml", "test.xsd"}, "c");
   }
 
-  public void testCompletion3() throws Exception {
+  public void testCompletion3() {
     doTest(new String[]{"testCompletion3.xml", "test.xsd"}, "c", "d");
   }
 
-  public void testServlet() throws Exception {
+  public void testServlet() {
     doTest(new String[]{"Servlet.xml"}, "icon", "servlet-name");
   }
 
-  public void testServletName() throws Exception {
+  public void testServletName() {
 
     doForText("<!DOCTYPE web-app\n" +
               "        PUBLIC \"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN\"\n" +
@@ -70,7 +70,7 @@ public class XmlSmartCompletionTest extends LightPlatformCodeInsightFixtureTestC
               "</web-app>");
   }
 
-  public void testPrefix() throws Exception {
+  public void testPrefix() {
     doForText("<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
               "    <ann<caret>\n" +
               "</xs:schema>",
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java
index 30c2cf74feca..5d273d52e6dd 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java
@@ -125,7 +125,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     }
   }
 
-  public void testFooBar() throws Exception {
+  public void testFooBar() {
     doTest("<foo>\n" +
            "  <bar<caret></bar>\n" +
            "</foo>",
@@ -135,7 +135,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
            "</foo>");
   }
 
-  public void testWeb13982() throws Exception {
+  public void testWeb13982() {
     doTest(
       "<a foo=\"1\"\n" +
       "   bar=\"2\"><caret></a>",
@@ -149,7 +149,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     );
   }
 
-  public void testWeb392() throws Exception {
+  public void testWeb392() {
     doTest(
       "<h1>Title</h1>\n" +
       "<p>body text</p><caret>",
@@ -162,13 +162,13 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     );
   }
 
-  public void testPi() throws Exception {
+  public void testPi() {
     doTest("<<caret>", '?', "<?<caret> ?>");
     doTest("<caret>", '?', "?");
     doTest("<<caret> ?>", '?', "<?<caret> ?>");
   }
 
-  public void testAutoindentEndTag() throws Exception {
+  public void testAutoindentEndTag() {
     doTest(
       "<div>\n" +
       "    <p>\n" +
@@ -186,7 +186,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     );
   }
 
-  public void testSelectionBraces() throws Exception {
+  public void testSelectionBraces() {
     boolean surround = CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED;
     try {
       CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED = true;
@@ -198,7 +198,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     }
   }
 
-  public void testSelectionBracesInner() throws Exception {
+  public void testSelectionBracesInner() {
     boolean surround = CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED;
     try {
       CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED = true;
@@ -210,7 +210,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     }
   }
 
-  public void testSelectionBracesStart() throws Exception {
+  public void testSelectionBracesStart() {
     boolean surround = CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED;
     try {
       CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED = true;
@@ -222,7 +222,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     }
   }
 
-  public void testSelectionBracesEnd() throws Exception {
+  public void testSelectionBracesEnd() {
     boolean surround = CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED;
     try {
       CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED = true;
@@ -234,7 +234,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     }
   }
 
-  public void testSelectionBracesShort() throws Exception {
+  public void testSelectionBracesShort() {
     boolean surround = CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED;
     try {
       CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED = true;
@@ -247,7 +247,7 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
     }
   }
 
-  public void testSelectionBracesShortInner() throws Exception {
+  public void testSelectionBracesShortInner() {
     boolean surround = CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED;
     try {
       CodeInsightSettings.getInstance().SURROUND_SELECTION_ON_QUOTE_TYPED = true;
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
index 86e0ff63e1bf..72833f396297 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
@@ -139,7 +139,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
 
   public void testduplicateAttribute() throws Exception { doTest(); }
 
-  public void testduplicateAttribute2() throws Exception {
+  public void testduplicateAttribute2() {
     configureByFiles(null, BASE_PATH + getTestName(false) + ".xml", BASE_PATH + getTestName(false) + ".xsd");
 
     final String url = "http://www.foo.org/schema";
@@ -318,7 +318,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     }
   }
 
-  public void testComplexSchemaValidation11() throws Exception {
+  public void testComplexSchemaValidation11() {
     final String testName = getTestName(false);
     doTestWithLocations(
       new String[][] {
@@ -329,7 +329,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  private void doTestWithLocations(@Nullable String[][] resources, String ext) throws Exception {
+  private void doTestWithLocations(@Nullable String[][] resources, String ext) {
     try {
       doConfigureWithLocations(resources, ext);
       doDoTest(true,false);
@@ -342,7 +342,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     if (resources == null) return;
   }
 
-  private void doConfigureWithLocations(final String[][] resources, final String ext) throws Exception {
+  private void doConfigureWithLocations(final String[][] resources, final String ext) {
 
     String[] testNames = new String[(resources != null? resources.length:0) + 1];
     testNames[0] = BASE_PATH + getTestName(false) + "." + ext;
@@ -393,7 +393,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     }
   }
 
-  public void testXercesCachingProblem() throws Exception {
+  public void testXercesCachingProblem() {
     final String[][] resources = {{"http://www.test.com/test", getTestName(false) + ".dtd"}};
     doConfigureWithLocations(resources, "xml");
 
@@ -408,11 +408,11 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     }
   }
 
-  public void testComplexSchemaValidation13() throws Exception {
+  public void testComplexSchemaValidation13() {
     doTestWithLocations(new String[][] { {"urn:test", getTestName(false) + "_2.xsd"} }, "xsd");
   }
 
-  public void testComplexSchemaValidation14() throws Exception {
+  public void testComplexSchemaValidation14() {
     doTestWithLocations(new String[][]{{"parent", getTestName(false) + ".xsd"}}, "xml");
   }
 
@@ -420,7 +420,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(getFullRelativeTestName(".xsd"), true, false);
   }
 
-  public void testComplexSchemaValidation15() throws Exception {
+  public void testComplexSchemaValidation15() {
     doTestWithLocations(
       new String[][] {
         {"http://www.linkedin.com/lispring", getTestName(false) + ".xsd"},
@@ -431,7 +431,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
   }
 
   @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
-  public void testComplexSchemaValidation16() throws Exception {
+  public void testComplexSchemaValidation16() {
     doTestWithLocations(
       new String[][] {
         {"http://www.inversoft.com/schemas/savant-2.0/project", getTestName(false) + ".xsd"},
@@ -441,7 +441,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testComplexSchemaValidation17() throws Exception {
+  public void testComplexSchemaValidation17() {
     doTestWithLocations(
       new String[][]{
         {"urn:test", getTestName(false) + ".xsd"}
@@ -595,7 +595,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(getFullRelativeTestName(".xml"), true, false);
   }
 
-  public void testXercesMessagesBinding4() throws Exception {
+  public void testXercesMessagesBinding4() {
     String url = "antlib:org.apache.maven.artifact.ant";
 
     enableInspectionTool(new AntResolveInspection());
@@ -1066,7 +1066,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doDoTest(true, false);
   }
 
-  public void testEditorHighlighting() throws Exception {
+  public void testEditorHighlighting() {
     //                       10
     //             0123456789012
     String text = "<html></html>";
@@ -1393,7 +1393,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doDoTest(true, false);
   }
 
-  public void testXHtmlEditorHighlighting() throws Exception {
+  public void testXHtmlEditorHighlighting() {
     //                       10
     //             0123456789012
     String text = "<html></html>";
@@ -1417,7 +1417,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
 
   }
 
-  public void testDTDEditorHighlighting() throws Exception {
+  public void testDTDEditorHighlighting() {
     //                       10        20
     //             012345678901234567890 123456 789
     String text = "<!ENTITY % Charsets \"CDATA\">";
@@ -1491,7 +1491,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(getFullRelativeTestName(".dtd"), true, false);
   }
 
-  public void testImportProblems() throws Exception {
+  public void testImportProblems() {
     final String testName = getTestName(false);
     configureByFiles(
       null,
@@ -1503,11 +1503,11 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
 
   public void testEncoding() throws Exception { doTest(true); }
 
-  public void testSchemaImportHighlightingAndResolve() throws Exception {
+  public void testSchemaImportHighlightingAndResolve() {
     doTestWithLocations(new String[][]{{"http://www.springframework.org/schema/beans", "ComplexSchemaValidation11.xsd"}}, "xsd");
   }
 
-  public void testDocBookV5() throws Exception {
+  public void testDocBookV5() {
     doTestWithLocations(
       new String[][] {
         {"http://docbook.org/ns/docbook", "DocBookV5.xsd"},
@@ -1526,7 +1526,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testDocBook5() throws Exception {
+  public void testDocBook5() {
     doTestWithLocations(
       new String[][] {
         {"http://docbook.org/ns/docbook", "DocBookV5.xsd"},
@@ -1537,7 +1537,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testDocBookRole() throws Exception {
+  public void testDocBookRole() {
     doTestWithLocations(
       new String[][] {
         {"http://docbook.org/ns/docbook", "DocBookV5.xsd"},
@@ -1575,12 +1575,12 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     return highlightInfos;
   }
 
-  public void testUsingSchemaDtd() throws Exception {
+  public void testUsingSchemaDtd() {
     doTestWithLocations(null, "xsd");
   }
 
   @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
-  public void testDtdElementRefs() throws Exception {
+  public void testDtdElementRefs() {
     doTestWithLocations(
       new String[] [] {
         {"http://example.com/persistence","XIncludeTestSchema.xsd"}
@@ -1589,25 +1589,25 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testDuplicates() throws Exception {
+  public void testDuplicates() {
     doTestWithLocations(null, "xsd");
     doTestWithLocations(null, "dtd");
     doTestWithLocations(null, "xml");
   }
 
-  public void testMinMaxOccursInSchema() throws Exception {
+  public void testMinMaxOccursInSchema() {
     doTestWithLocations(null, "xsd");
   }
 
-  public void testXslt2() throws Exception {
+  public void testXslt2() {
     doTestWithLocations(null, "xsl");
   }
 
-  public void testDefaultAndFixedInSchema() throws Exception {
+  public void testDefaultAndFixedInSchema() {
     doTestWithLocations(null, "xsd");
   }
 
-  public void testAnyAttributesInAttrGroup() throws Exception {
+  public void testAnyAttributesInAttrGroup() {
     doTestWithLocations(
       new String[] [] {
         {"http://www.foo.org/test",getTestName(false)+".xsd"},
@@ -1617,7 +1617,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testXInclude() throws Exception {
+  public void testXInclude() {
     final String testName = getTestName(false);
     configureByFiles(
       null,
@@ -1657,7 +1657,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doSchemaTestWithManyFilesFromSeparateDir(urls, null);
   }
 
-  public void testMuleConfigHighlighting() throws Exception {
+  public void testMuleConfigHighlighting() {
     final String[][] urls = {
       {"http://www.springframework.org/schema/beans/spring-beans-2.0.xsd", "spring-beans-2.0.xsd"},
       {"http://www.springframework.org/schema/tool", "spring-tool-2.5.xsd"},
@@ -1668,7 +1668,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTestWithLocations(urls, "xml");
   }
 
-  public void testMuleConfigHighlighting2() throws Exception {
+  public void testMuleConfigHighlighting2() {
     String path = getTestName(false) + File.separatorChar;
     final String[][] urls = {
       {"http://www.springframework.org/schema/beans/spring-beans-2.0.xsd", "spring-beans-2.0.xsd"},
@@ -1706,7 +1706,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(files, true, false);
   }
 
-  public void testComplexRedefine5() throws Exception {
+  public void testComplexRedefine5() {
     final String testName = getTestName(false);
     String[][] urls = {
       {"http://extended", testName + ".xsd"},
@@ -1715,7 +1715,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTestWithLocations(urls, "xml");
   }
 
-  public void testComplexRedefine6() throws Exception {
+  public void testComplexRedefine6() {
     final String testName = getTestName(false);
     String[][] urls = {
       {"urn:jboss:bean-deployer:2.0", testName + ".xsd"},
@@ -1798,7 +1798,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testComplexRedefineFromJar() throws Exception {
+  public void testComplexRedefineFromJar() {
     String[][] urls = null;
 
     configureByFiles(null,BASE_PATH + getTestName(false) + ".xml", BASE_PATH + "mylib.jar");
@@ -1823,7 +1823,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     checkResultByFile(BASE_PATH + testName + "_after.xml");
   }
 
-  public void testUnqualifiedAttributePsi() throws Exception {
+  public void testUnqualifiedAttributePsi() {
     doTestWithLocations(null, "xml");
     final List<XmlAttribute> attrs = new ArrayList<>(2);
 
@@ -1902,7 +1902,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testProblemWithImportedNsReference() throws Exception {
+  public void testProblemWithImportedNsReference() {
     doTestWithLocations(null, "xsd");
   }
 
@@ -1911,11 +1911,11 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doHighlighting();
   }
 
-  public void testProblemWithMemberTypes() throws Exception {
+  public void testProblemWithMemberTypes() {
     doTestWithLocations(null, "xsd");
   }
 
-  public void testDtdHighlighting() throws Exception {
+  public void testDtdHighlighting() {
     final String testName = getTestName(false);
 
     doTestWithLocations(
@@ -1958,7 +1958,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     );
   }
 
-  public void testMappedSchemaLocation() throws Exception {
+  public void testMappedSchemaLocation() {
     doTestWithLocations(new String[][]{
       {"schemas/Forms.xsd", "Forms.xsd"}
     }, "xml");
@@ -1983,7 +1983,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doTest(getFullRelativeTestName(".html"), true, true);
   }
 
-  public void testAnyAttribute() throws Exception {
+  public void testAnyAttribute() {
     configureByFiles(null, BASE_PATH + "anyAttribute.xml", BASE_PATH + "services-1.0.xsd");
     doDoTest(true, false);
   }
@@ -2054,27 +2054,27 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     doDoTest(true, false);
   }
 
-  public void testQualifiedAttributeReference() throws Exception {
+  public void testQualifiedAttributeReference() {
     configureByFiles(null, BASE_PATH + "qualified.xml", BASE_PATH + "qualified.xsd");
     doDoTest(true, false);
   }
 
-  public void testEnumeratedBoolean() throws Exception {
+  public void testEnumeratedBoolean() {
     configureByFiles(null, BASE_PATH + "EnumeratedBoolean.xml", BASE_PATH + "EnumeratedBoolean.xsd");
     doDoTest(true, false);
   }
 
-  public void testCustomBoolean() throws Exception {
+  public void testCustomBoolean() {
     configureByFiles(null, BASE_PATH + "CustomBoolean.xml", BASE_PATH + "CustomBoolean.xsd");
     doDoTest(true, false);
   }
 
-  public void testStackOverflowInSchema() throws Exception {
+  public void testStackOverflowInSchema() {
     configureByFiles(null, BASE_PATH + "XMLSchema_1_1.xsd");
     doHighlighting();
   }
 
-  public void testSchemaVersioning() throws Exception {
+  public void testSchemaVersioning() {
     configureByFiles(null, BASE_PATH + "Versioning.xsd");
     doDoTest(true, false);
   }
@@ -2104,12 +2104,12 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     assertEquals(9, count[0]);
   }
 
-  public void testBillionLaughsValidation() throws Exception {
+  public void testBillionLaughsValidation() {
     configureByFiles(null, BASE_PATH + "BillionLaughs.xml");
     doDoTest(true, false);
   }
 
-  public void testMaxOccurLimitValidation() throws Exception {
+  public void testMaxOccurLimitValidation() {
     configureByFiles(null, BASE_PATH + "MaxOccurLimit.xml", BASE_PATH + "MaxOccurLimit.xsd");
     assertTrue(doHighlighting().stream().anyMatch(info -> info.getSeverity() == HighlightSeverity.ERROR));
 
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java
index 2ab23f56cb3a..0b0e6d5b08fe 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/CollapseTagTest.java
@@ -25,17 +25,17 @@ import com.intellij.xml.util.CollapseTagIntention;
  */
 public class CollapseTagTest extends LightPlatformCodeInsightFixtureTestCase{
 
-  public void testAvailable() throws Exception {
+  public void testAvailable() {
     PsiFile file = myFixture.configureByText(XmlFileType.INSTANCE, "<a>    <caret>   </a>");
     assertTrue(new CollapseTagIntention().isAvailable(getProject(), myFixture.getEditor(), file));
   }
 
-  public void testNotAvailable() throws Exception {
+  public void testNotAvailable() {
     PsiFile file = myFixture.configureByText(XmlFileType.INSTANCE, "<a>    <caret>   <b/> </a>");
     assertFalse(new CollapseTagIntention().isAvailable(getProject(), myFixture.getEditor(), file));
   }
 
-  public void testAlreadyCollapsed() throws Exception {
+  public void testAlreadyCollapsed() {
     PsiFile file = myFixture.configureByText(XmlFileType.INSTANCE, "<a/>");
     assertFalse(new CollapseTagIntention().isAvailable(getProject(), myFixture.getEditor(), file));
   }
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ExtractExternalResourceLinksTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ExtractExternalResourceLinksTest.java
index 423bc9b5e503..15366aca5dd9 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ExtractExternalResourceLinksTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ExtractExternalResourceLinksTest.java
@@ -33,7 +33,7 @@ public class ExtractExternalResourceLinksTest extends LightCodeInsightTestCase {
     return "/quickFix/fetchExternalResources";
   }
 
-  public void testExtractionOfEmbeddedFiles() throws Exception {
+  public void testExtractionOfEmbeddedFiles() {
     doExtractionOfEmbeddedFiles(
       "1.dtd",
       "xhtml-lat1.ent", "xhtml-symbol.ent", "xhtml-special.ent");
@@ -69,27 +69,27 @@ public class ExtractExternalResourceLinksTest extends LightCodeInsightTestCase {
 
   }
 
-  public void testSeamImport() throws Exception {
+  public void testSeamImport() {
     doExtractionOfEmbeddedFiles(
       "6.xml",
       "http://jboss.com/products/seam/components-1.2.xsd");
 
   }
 
-  public void testBPMN() throws Exception {
+  public void testBPMN() {
     doExtractionOfEmbeddedFiles("BPMN20.xsd",
                                 "BPMNDI.xsd", "Semantic.xsd");
 
   }
 
-  public void testGeronimo() throws Exception {
+  public void testGeronimo() {
     doExtractionOfEmbeddedFiles("web-1.1",
                                 "http://geronimo.apache.org/xml/ns/geronimo-naming-1.1.xsd",
                                 "http://geronimo.apache.org/xml/ns/geronimo-security-1.1.xsd",
                                 "http://geronimo.apache.org/xml/ns/geronimo-module-1.1.xsd");
   }
 
-  private void doExtractionOfEmbeddedFiles(String shortFileName,String... expectedFileNames) throws Exception {
+  private void doExtractionOfEmbeddedFiles(String shortFileName,String... expectedFileNames) {
     doExtractionOfEmbeddedFiles(new String[] {shortFileName}, new String[][] {expectedFileNames} );
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java
index 4d7bffc7765b..56bb5d5bf259 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 
 public class FetchExternalResourcesFixTest extends LightQuickFixParameterizedTestCase {
-  public void test() throws Exception { doAllTests(); }
+  public void test() { doAllTests(); }
 
   @Override
   protected String getBasePath() {
@@ -32,7 +32,7 @@ public class FetchExternalResourcesFixTest extends LightQuickFixParameterizedTes
 
   // just check for action availability
   @Override
-  protected void doAction(@NotNull ActionHint actionHint, String testFullPath, String testName) throws Exception {
+  protected void doAction(@NotNull ActionHint actionHint, String testFullPath, String testName) {
     IntentionAction action = findActionAndCheck(actionHint, testFullPath);
     if (action != null && testName.equals("5.xml")) {
       final String uri = FetchExtResourceAction.findUri(myFile, myEditor.getCaretModel().getOffset());
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java
index bf35b1cb505f..6ad70c6de683 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 
 public class IgnoreExternalResourcesFixTest extends LightQuickFixParameterizedTestCase {
-  public void test() throws Exception { doAllTests(); }
+  public void test() { doAllTests(); }
 
   @Override
   protected String getBasePath() {
@@ -30,7 +30,7 @@ public class IgnoreExternalResourcesFixTest extends LightQuickFixParameterizedTe
 
   // just check for action availability
   @Override
-  protected void doAction(@NotNull ActionHint actionHint, String testFullPath, String testName) throws Exception {
+  protected void doAction(@NotNull ActionHint actionHint, String testFullPath, String testName) {
     findActionAndCheck(actionHint, testFullPath);
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java
index 17280af94540..ec38b3d9aab3 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import java.io.File;
 
 public class ManuallySetupExternalResourcesFixTest extends LightQuickFixParameterizedTestCase {
-  public void test() throws Exception { doAllTests(); }
+  public void test() { doAllTests(); }
 
   @Override
   protected String getBasePath() {
@@ -30,7 +30,7 @@ public class ManuallySetupExternalResourcesFixTest extends LightQuickFixParamete
 
   // just check for action availability
   @Override
-  protected void doAction(@NotNull ActionHint actionHint, String testFullPath, String testName) throws Exception {
+  protected void doAction(@NotNull ActionHint actionHint, String testFullPath, String testName) {
     findActionAndCheck(actionHint, testFullPath);
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java
index 205b2116c8c4..5ce7a54704c7 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/RealFetchTest.java
@@ -31,7 +31,7 @@ import java.util.List;
  */
 public class RealFetchTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testFetchDtd() throws Exception {
+  public void testFetchDtd() {
 
     final String url = "http://java.sun.com/dtd/preferences.dtd";
     assertEquals(url, ExternalResourceManager.getInstance().getResourceLocation(url, getProject()));
diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ReplaceTagEmptyBodyTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ReplaceTagEmptyBodyTest.java
index 8688ad33553d..15f603e02430 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ReplaceTagEmptyBodyTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ReplaceTagEmptyBodyTest.java
@@ -24,7 +24,7 @@ import java.io.File;
 
 public class ReplaceTagEmptyBodyTest extends LightQuickFixParameterizedTestCase {
 
-  public void test() throws Exception {
+  public void test() {
     doAllTests();
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/editorActions/moveLeftRight/XmlMoveLeftRightTest.java b/xml/tests/src/com/intellij/codeInsight/editorActions/moveLeftRight/XmlMoveLeftRightTest.java
index 7c6dad16ecc2..d06c6f8dc99f 100644
--- a/xml/tests/src/com/intellij/codeInsight/editorActions/moveLeftRight/XmlMoveLeftRightTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/editorActions/moveLeftRight/XmlMoveLeftRightTest.java
@@ -25,7 +25,7 @@ public class XmlMoveLeftRightTest extends AbstractMoveElementLeftRightTest {
   }
   
   @Override
-  protected void configureEditor(String contents) throws Exception {
+  protected void configureEditor(String contents) {
     init(contents, TestFileType.XML);
   }
 }
diff --git a/xml/tests/src/com/intellij/editor/XmlEditorTest.java b/xml/tests/src/com/intellij/editor/XmlEditorTest.java
index 155b3f7e0abb..a6d68ceb3419 100644
--- a/xml/tests/src/com/intellij/editor/XmlEditorTest.java
+++ b/xml/tests/src/com/intellij/editor/XmlEditorTest.java
@@ -32,7 +32,7 @@ public class XmlEditorTest extends LightCodeInsightTestCase {
     return "/xml/tests/testData/editor/" + getTestName(true) + (isOriginal ? ".xml" : "_after.xml") ;
   }
 
-  public void testEnterPerformance() throws Exception {
+  public void testEnterPerformance() {
     configureByFile(getTestFilePath(true));
     for (int i = 0; i < 3; i++) {
       EditorTestUtil.performTypingAction(myEditor, '\n');
@@ -45,7 +45,7 @@ public class XmlEditorTest extends LightCodeInsightTestCase {
     checkResultByFile(getTestFilePath(false));
   }
 
-  public void testHardWrap() throws Exception {
+  public void testHardWrap() {
     configureFromFileText("a.xml",
                           "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n" +
                           "<svg version=\"1.1\" id=\"Layer_1\" xmlns=\"http://www.w3.org/2000/svg\">\n" +
@@ -72,7 +72,7 @@ public class XmlEditorTest extends LightCodeInsightTestCase {
                       "</svg>");
   }
 
-  public void testHardWrapInComment() throws Exception {
+  public void testHardWrapInComment() {
     configureFromFileText("a.xml",
                           "<!-- Some very long and informative xml comment to trigger hard wrapping indeed. Too short? Dave, let me ask you something. Are hard wraps working? What do we live for? What ice-cream do you like? Who am I?????????????????????????????????????????????????????????????????????????????????????????????????<caret>-->");
 
diff --git a/xml/tests/src/com/intellij/html/HtmlDocumentationTest.java b/xml/tests/src/com/intellij/html/HtmlDocumentationTest.java
index 30d1955ca570..2de07944535b 100644
--- a/xml/tests/src/com/intellij/html/HtmlDocumentationTest.java
+++ b/xml/tests/src/com/intellij/html/HtmlDocumentationTest.java
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.testFramework.LightPlatformCodeInsightTestCase;
 
 public class HtmlDocumentationTest extends LightPlatformCodeInsightTestCase {
-  public void testQuickDocumentationHtml5Tag() throws Exception {
+  public void testQuickDocumentationHtml5Tag() {
     doTest("<!DOCTYPE html>\n" +
            "<html>\n" +
            "<bo<caret>dy onload=\"\">\n" +
@@ -29,7 +29,7 @@ public class HtmlDocumentationTest extends LightPlatformCodeInsightTestCase {
            "</html>");
   }
 
-  public void testQuickDocumentationHtml5TagDialog() throws Exception {
+  public void testQuickDocumentationHtml5TagDialog() {
     doTest("<!DOCTYPE html>\n" +
            "<html>\n" +
            "<body onload=\"\">\n" +
@@ -38,7 +38,7 @@ public class HtmlDocumentationTest extends LightPlatformCodeInsightTestCase {
            "</html>");
   }
 
-  public void testQuickDocumentationHtml5Attr() throws Exception {
+  public void testQuickDocumentationHtml5Attr() {
     doTest("<!DOCTYPE html>\n" +
            "<html>\n" +
            "<body on<caret>load=\"\">\n" +
@@ -46,7 +46,7 @@ public class HtmlDocumentationTest extends LightPlatformCodeInsightTestCase {
            "</html>");
   }
 
-  public void testQuickDocumentationHtml4Tag() throws Exception {
+  public void testQuickDocumentationHtml4Tag() {
     doTest("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n" +
            "   \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
            "<html>\n" +
@@ -55,7 +55,7 @@ public class HtmlDocumentationTest extends LightPlatformCodeInsightTestCase {
            "</html>");
   }
 
-  public void testQuickDocumentationHtml4Attr() throws Exception {
+  public void testQuickDocumentationHtml4Attr() {
     doTest("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n" +
            "   \"http://www.w3.org/TR/html4/loose.dtd\">\n" +
            "<html>\n" +
@@ -64,7 +64,7 @@ public class HtmlDocumentationTest extends LightPlatformCodeInsightTestCase {
            "</html>");
   }
 
-  private static void doTest(String text) throws Exception {
+  private static void doTest(String text) {
     configureFromFileText("test.html", text);
     PsiElement originalElement = getFile().findElementAt(myEditor.getCaretModel().getOffset());
     PsiElement element = DocumentationManager.getInstance(getProject()).findTargetElement(getEditor(), getFile());
diff --git a/xml/tests/src/com/intellij/html/MicrodataCompletionTest.java b/xml/tests/src/com/intellij/html/MicrodataCompletionTest.java
index 964f248a01d4..01e2c700ce2f 100644
--- a/xml/tests/src/com/intellij/html/MicrodataCompletionTest.java
+++ b/xml/tests/src/com/intellij/html/MicrodataCompletionTest.java
@@ -40,12 +40,12 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     return true;
   }
 
-  private void doTestInHtml(String text, String... items) throws Throwable {
+  private void doTestInHtml(String text, String... items) {
     configureAndComplete(text);
     assertContainsElements(myFixture.getLookupElementStrings(), Arrays.asList(items));
   }
 
-  private void doFailTestInHtml(String text, String... items) throws Throwable {
+  private void doFailTestInHtml(String text, String... items) {
     configureAndComplete(text);
     final List<String> lookups = myFixture.getLookupElementStrings();
     assertNotNull(lookups);
@@ -59,54 +59,54 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     myFixture.complete(CompletionType.BASIC);
   }
 
-  public void testScopeType() throws Throwable {
+  public void testScopeType() {
     doTestInHtml("<section <caret>></section>", "itemscope");
   }
 
-  public void testScopeInDivTag() throws Throwable {
+  public void testScopeInDivTag() {
     doTestInHtml("<div <caret>></div>", "itemscope");
   }
 
-  public void testScopeInSpanTag() throws Throwable {
+  public void testScopeInSpanTag() {
     doTestInHtml("<span <caret>></span>", "itemscope");
   }
 
-  public void testScopeInATag() throws Throwable {
+  public void testScopeInATag() {
     doTestInHtml("<a <caret>></a>", "itemscope");
   }
 
-  public void _testTypeInATag() throws Throwable {
+  public void _testTypeInATag() {
     doFailTestInHtml("<a <caret>></a>", "itemtype", "itemid");
   }
 
-  public void testTypeInScope() throws Throwable {
+  public void testTypeInScope() {
     doTestInHtml("<section itemscope <caret>><div></div></section>", "itemtype", "itemid");
   }
 
-  public void testPropInScope() throws Throwable {
+  public void testPropInScope() {
     doTestInHtml("<section itemscope><div <caret>></div></section>", "itemprop");
   }
 
-  public void _testTypeWithinScope() throws Throwable {
+  public void _testTypeWithinScope() {
     doFailTestInHtml("<section <caret>><div></div></section>", "itemtype", "itemid");
   }
 
-  public void _testPropWithinScope() throws Throwable {
+  public void _testPropWithinScope() {
     doFailTestInHtml("<section><div <caret>></div></section>", "itemprop");
   }
 
-  public void testPropWithinScopeWithRef() throws Throwable {
+  public void testPropWithinScopeWithRef() {
     doTestInHtml("<body>" +
                  "<section itemscope itemref=\"bar foo\"></section>" +
                  "<section id=\"foo\"><div <caret>></div></section>" +
                  "</body>", "itemprop");
   }
 
-  public void testRefInScope() throws Throwable {
+  public void testRefInScope() {
     doTestInHtml("<section itemscope itemref=\"b<caret>\"></section><p id=\"bar\"></p><p id=\"baz\"></p>", "bar", "baz");
   }
 
-  public void testPropValue() throws Throwable {
+  public void testPropValue() {
     final VirtualFile virtualFile = myFixture.copyFileToProject("Person.html");
     ApplicationManager.getApplication().runWriteAction(() -> ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Person", virtualFile.getPath()));
     doTestInHtml("<section itemscope itemtype=\"http://data-vocabulary.org/Person\"><div itemprop=\"<caret>\"></div></section>",
@@ -114,7 +114,7 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     );
   }
 
-  public void testPropValueSchemaOrgFormat() throws Throwable {
+  public void testPropValueSchemaOrgFormat() {
     final VirtualFile virtualFile = myFixture.copyFileToProject("Product.html");
     ApplicationManager.getApplication().runWriteAction(() -> ExternalResourceManager.getInstance().addResource("http://schema.org/Product", virtualFile.getPath()));
     doTestInHtml("<section itemscope itemtype=\"http://schema.org/Product\"><div itemprop=\"<caret>\"></div></section>",
@@ -151,7 +151,7 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     );
   }
 
-  public void testPropValueSchemaOrgFormatWithLinks() throws Throwable {
+  public void testPropValueSchemaOrgFormatWithLinks() {
     final VirtualFile virtualFile = myFixture.copyFileToProject("Rating.html");
     ApplicationManager.getApplication().runWriteAction(() -> ExternalResourceManager.getInstance().addResource("http://schema.org/Rating", virtualFile.getPath()));
     doTestInHtml("<section itemscope itemtype=\"http://schema.org/Rating\"><div itemprop=\"<caret>\"></div></section>",
@@ -169,7 +169,7 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     );
   }
 
-  public void testPropValueFromTwoTypes() throws Throwable {
+  public void testPropValueFromTwoTypes() {
     final VirtualFile personFile = myFixture.copyFileToProject("Person.html");
     final VirtualFile addressFile = myFixture.copyFileToProject("Address.html");
     ApplicationManager.getApplication().runWriteAction(() -> {
@@ -183,7 +183,7 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     );
   }
 
-  public void testPropValueFromRef() throws Throwable {
+  public void testPropValueFromRef() {
     final VirtualFile virtualFile = myFixture.copyFileToProject("Person.html");
     ApplicationManager.getApplication().runWriteAction(() -> ExternalResourceManager.getInstance().addResource("http://data-vocabulary.org/Person", virtualFile.getPath()));
     doTestInHtml("<body>" +
@@ -194,7 +194,7 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     );
   }
 
-  public void testPropValueNestedScopes() throws Throwable {
+  public void testPropValueNestedScopes() {
     final VirtualFile personFile = myFixture.copyFileToProject("Person.html");
     final VirtualFile addressFile = myFixture.copyFileToProject("Address.html");
     ApplicationManager.getApplication().runWriteAction(() -> {
@@ -212,7 +212,7 @@ public class MicrodataCompletionTest extends CodeInsightFixtureTestCase {
     );
   }
 
-  public void testPropValueNestedScopesDifferentTrees() throws Throwable {
+  public void testPropValueNestedScopesDifferentTrees() {
     final VirtualFile personFile = myFixture.copyFileToProject("Person.html");
     final VirtualFile addressFile = myFixture.copyFileToProject("Address.html");
     ApplicationManager.getApplication().runWriteAction(() -> {
diff --git a/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java b/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java
index b882e08782a0..2fc799049691 100644
--- a/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java
+++ b/xml/tests/src/com/intellij/psi/formatter/HtmlFormatterTest.java
@@ -143,25 +143,25 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     doTest();
   }
 
-  public void test13() throws Exception {
+  public void test13() {
     getSettings().HTML_KEEP_LINE_BREAKS = false;
     doTextTest("<root>\n" + "    <aaa/>\n" + "    <aaa></aaa>\n" + "    <aaa/>\n" + "</root>",
                "<root>\n" + "    <aaa/>\n" + "    <aaa></aaa>\n" + "    <aaa/>\n" + "</root>");
   }
 
-  public void testSpaces() throws Exception {
+  public void testSpaces() {
     doTextTest("<div> text <div/> text <div> text </div> </div>",
                "<div> text\n" + "    <div/>\n" + "    text\n" + "    <div> text</div>\n" + "</div>");
   }
 
-  public void testClosingDivOnNextLine() throws Throwable {
+  public void testClosingDivOnNextLine() {
     //getSettings().HTML_PLACE_ON_NEW_LINE += ",div";
     doTextTest("<div>ReSharper</div>", "<div>ReSharper</div>");
     doTextTest("<div>Re\nSharper</div>", "<div>Re\n    Sharper\n</div>");
     doTextTest("<div>Re\nSharper </div>", "<div>Re\n    Sharper\n</div>");
   }
 
-  public void testLineFeedAfterWrappedTag() throws Exception {
+  public void testLineFeedAfterWrappedTag() {
     doTextTest("<html><body><table></table></body></html>", "<html>\n" + "<body>\n" + "<table></table>\n" + "</body>\n" + "</html>");
 
     doTextTest("<html><body><table></table><tag></tag></body></html>",
@@ -176,7 +176,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
 
   }
 
-  public void testSCR3654() throws Exception {
+  public void testSCR3654() {
     getSettings().setDefaultRightMargin(5);
     getSettings().HTML_TEXT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
 
@@ -207,7 +207,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     doTest();
   }
                                     
-  public void testHtmlReformatDoesntProduceAssertion() throws Exception {
+  public void testHtmlReformatDoesntProduceAssertion() {
     @NonNls String fileText =
       "<html>\n" +
       "  <head><title>Simple jsp page</title></head>\n" +
@@ -224,7 +224,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
       bodyTag.getTextRange().getEndOffset());
   }
 
-  public void testXhtmlReformatDoesntProduceAssertion() throws Exception {
+  public void testXhtmlReformatDoesntProduceAssertion() {
     @NonNls String fileText =
       "<html>\n" +
       "  <head><title>Simple jsp page</title></head>\n" +
@@ -262,7 +262,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     }
   }
 
-  public void testWeb456() throws Exception {
+  public void testWeb456() {
     doTextTest(
       "<html>\n" +
       "<body>\n" +
@@ -286,7 +286,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     );
   }
 
-  public void testWeb2405() throws Exception {
+  public void testWeb2405() {
     final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     int noIndentMinLines = settings.HTML_DO_NOT_ALIGN_CHILDREN_OF_MIN_LINES;
     settings.HTML_DO_NOT_ALIGN_CHILDREN_OF_MIN_LINES = 3;
@@ -318,7 +318,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     }
   }
 
-  public void testWeb12840() throws Exception {
+  public void testWeb12840() {
     doTextTest(
       "<div \n" +
       "id=\"some\"\n" +
@@ -332,7 +332,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     );
   }
 
-  public void testWeb16223() throws Exception {
+  public void testWeb16223() {
     doTextTest(
       "<img\n" +
       "id=\"image-id\"\n" +
@@ -350,7 +350,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     );
   }
 
-  public void testWeb12937() throws Exception  {
+  public void testWeb12937() {
     doTextTest(
       "<div id=\"top\"></div><!-- /#top -->\n" +
       "<div id=\"nav\">\n" +
@@ -369,7 +369,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     return "Performance".equals(getTestName(false));
   }
   
-  public void test10809() throws Exception {
+  public void test10809() {
     doTextTest(
       "<p>foobar</p>\n" +
       "<div>foobar</div>\n" +
@@ -467,7 +467,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
     );
   }
 
-  public void testSpaceInEmptyTag() throws Exception {
+  public void testSpaceInEmptyTag() {
     final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     settings.HTML_SPACE_INSIDE_EMPTY_TAG = true;
     doTextTest("<div class=\"emptyWithAttributes\"/>\n" +
@@ -478,7 +478,7 @@ public class HtmlFormatterTest extends XmlFormatterTestBase {
                "<div class=\"notEmpty\"></div>");
   }
 
-  public void testMultilineTags_NewlinesBeforeAndAfterAttributes() throws Exception {
+  public void testMultilineTags_NewlinesBeforeAndAfterAttributes() {
     final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     settings.HTML_NEWLINE_BEFORE_FIRST_ATTRIBUTE = CodeStyleSettings.HtmlTagNewLineStyle.WhenMultiline;
     settings.HTML_NEWLINE_AFTER_LAST_ATTRIBUTE = CodeStyleSettings.HtmlTagNewLineStyle.WhenMultiline;
diff --git a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java
index 4b5dd6a9e667..13574e8249cc 100644
--- a/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java
+++ b/xml/tests/src/com/intellij/psi/formatter/XmlFormatterTest.java
@@ -186,7 +186,7 @@ public class XmlFormatterTest extends XmlFormatterTestBase {
     doTest();
   }
 
-  public void testSCR1574() throws Exception {
+  public void testSCR1574() {
     XmlCodeStyleSettings xmlSettings = getSettings().getCustomSettings(XmlCodeStyleSettings.class);
     xmlSettings.XML_SPACE_INSIDE_EMPTY_TAG = true;
     doTextTest("<test/>", "<test />");
@@ -199,13 +199,13 @@ public class XmlFormatterTest extends XmlFormatterTestBase {
     doSanityTest(true);
   }
 
-  public void testSCR1798() throws Exception {
+  public void testSCR1798() {
     XmlCodeStyleSettings xmlSettings = getSettings().getCustomSettings(XmlCodeStyleSettings.class);
     xmlSettings.XML_SPACE_INSIDE_EMPTY_TAG = true;
     doTextTest("<a attr=\"value\"/>", "<a attr=\"value\" />");
   }
 
-  public void testIDEA55230() throws Exception {
+  public void testIDEA55230() {
     doTextTest("<a b=\"/>","<a b=\"/>");
   }
 
@@ -347,7 +347,7 @@ public class XmlFormatterTest extends XmlFormatterTestBase {
     doTest();
   }
   
-  public void testIdea52549() throws Exception {
+  public void testIdea52549() {
     doTextTest(
       "<para>\n" +
       "  My <link>link</link> within text.\n" +
@@ -359,7 +359,7 @@ public class XmlFormatterTest extends XmlFormatterTestBase {
     );
   }
 
-  public void testDontKeepLineBreaksInText() throws Throwable {
+  public void testDontKeepLineBreaksInText() {
     final CodeStyleSettings settings = getSettings();
     final XmlCodeStyleSettings xmlSettings = settings.getCustomSettings(XmlCodeStyleSettings.class);
     settings.setDefaultRightMargin(15);
diff --git a/xml/tests/src/com/intellij/psi/formatter/XmlPerformanceFormatterTest.java b/xml/tests/src/com/intellij/psi/formatter/XmlPerformanceFormatterTest.java
index 09baad7b4ac6..7c557104bc1d 100644
--- a/xml/tests/src/com/intellij/psi/formatter/XmlPerformanceFormatterTest.java
+++ b/xml/tests/src/com/intellij/psi/formatter/XmlPerformanceFormatterTest.java
@@ -57,12 +57,12 @@ public class XmlPerformanceFormatterTest extends XmlFormatterTestBase {
     SemService.getSemService(getProject()); // insanely expensive
   }
 
-  public void testReformatCodeFragment() throws Exception {
+  public void testReformatCodeFragment() {
     PlatformTestUtil.startPerformanceTest("reformat code fragment", 6300,
                                           () -> checkFormattingDoesNotProduceException("performance")).useLegacyScaling().assertTiming();
   }
 
-  public void testPerformance3() throws Exception {
+  public void testPerformance3() {
     final FileEditorManager editorManager = FileEditorManager.getInstance(getProject());
     try {
       PlatformTestUtil.startPerformanceTest("xml formatter", 6800, createTestRunnable()).useLegacyScaling().assertTiming();
@@ -99,7 +99,7 @@ public class XmlPerformanceFormatterTest extends XmlFormatterTestBase {
     CodeInsightTestFixtureImpl.instantiateAndRun(myFile, myEditor, new int[]{Pass.UPDATE_ALL, Pass.LOCAL_INSPECTIONS}, false);
   }
 
-  public void testPerformance4() throws Exception {
+  public void testPerformance4() {
     final FileEditorManager editorManager = FileEditorManager.getInstance(getProject());
     try {
       PlatformTestUtil.startPerformanceTest("xml formatter", 20000, createTestRunnable()).useLegacyScaling().assertTiming();
@@ -120,7 +120,7 @@ public class XmlPerformanceFormatterTest extends XmlFormatterTestBase {
   };
   }
 
-  public void testPerformance5() throws Exception {
+  public void testPerformance5() {
     final FileEditorManager editorManager = FileEditorManager.getInstance(getProject());
     try {
       PlatformTestUtil.startPerformanceTest("xml formatter", 10000, createTestRunnable()).useLegacyScaling().assertTiming();
@@ -133,7 +133,7 @@ public class XmlPerformanceFormatterTest extends XmlFormatterTestBase {
     }
   }
 
-  public void testPerformance6() throws Exception {
+  public void testPerformance6() {
     final FileEditorManager editorManager = FileEditorManager.getInstance(getProject());
     try {
       PlatformTestUtil.startPerformanceTest("xml formatter", 20000, createTestRunnable()).useLegacyScaling().assertTiming();
@@ -159,7 +159,7 @@ public class XmlPerformanceFormatterTest extends XmlFormatterTestBase {
       .assertTiming();
   }
   
-  private static ThrowableRunnable createAdjustLineIndentInRangeRunnable(final @NotNull PsiFile file) throws Exception {
+  private static ThrowableRunnable createAdjustLineIndentInRangeRunnable(final @NotNull PsiFile file) {
     return () -> {
       final Document document = PsiDocumentManager.getInstance(getProject()).getDocument(file);
       assertNotNull(document);
diff --git a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java
index 96a08dcc4211..3e56e83357c5 100644
--- a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java
+++ b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java
@@ -44,13 +44,13 @@ public class XMLCatalogManagerTest extends LightPlatformCodeInsightFixtureTestCa
     assertTrue(filePath, new File(new URI(filePath)).exists());
   }
 
-  public void testResolvePublic() throws Exception {
+  public void testResolvePublic() {
     String resolve = getManager().resolve("-//W3C//DTD XHTML 1.0 Strict//EN");
     assertNotNull(resolve);
     assertTrue(resolve, resolve.endsWith("/catalog/xhtml1-strict.dtd"));
   }
 
-  public void testResolveSystem() throws Exception {
+  public void testResolveSystem() {
     String resolve = getManager().resolve("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd");
     assertNotNull(resolve);
     assertTrue(resolve, resolve.endsWith("/catalog/xhtml1-strict.dtd"));
@@ -70,7 +70,7 @@ public class XMLCatalogManagerTest extends LightPlatformCodeInsightFixtureTestCa
     assertTrue(hasUrn);
   }
 
-  public void testFixedHighlighting() throws Exception {
+  public void testFixedHighlighting() {
     myFixture.configureByFile("policy.xml");
     try {
       ExternalResourceManagerEx.getInstanceEx().setCatalogPropertiesFile(getTestDataPath() + "catalog.properties");
@@ -81,7 +81,7 @@ public class XMLCatalogManagerTest extends LightPlatformCodeInsightFixtureTestCa
     }
   }
 
-  public void testConfigurable() throws Exception {
+  public void testConfigurable() {
     assertFalse(new XMLCatalogConfigurable().isModified());
   }
 
diff --git a/xml/tests/src/com/intellij/xml/XmlConstraintsTest.java b/xml/tests/src/com/intellij/xml/XmlConstraintsTest.java
index 1bc90cfd05ee..ce090365c2fd 100644
--- a/xml/tests/src/com/intellij/xml/XmlConstraintsTest.java
+++ b/xml/tests/src/com/intellij/xml/XmlConstraintsTest.java
@@ -50,7 +50,7 @@ import java.util.Vector;
 @SuppressWarnings({"UseOfObsoleteCollectionType"})
 public class XmlConstraintsTest extends LightCodeInsightFixtureTestCase {
 
-  public void testXercesGrammar() throws Exception {
+  public void testXercesGrammar() {
     XSModel xsModel = getXSModel("test.xml", "test.xsd");
     XSElementDeclaration elementDeclaration = xsModel.getElementDeclaration("a", "");
     XSComplexTypeDefinition typeDefinition = (XSComplexTypeDefinition)elementDeclaration.getTypeDefinition();
@@ -62,7 +62,7 @@ public class XmlConstraintsTest extends LightCodeInsightFixtureTestCase {
     assertEquals("b", o.getName());
   }
 
-  public void testXercesIncomplete() throws Exception {
+  public void testXercesIncomplete() {
     XSModel xsModel = getXSModel("testIncomplete.xml", "test.xsd");
     XSElementDeclaration elementDeclaration = xsModel.getElementDeclaration("a", "");
     XSComplexTypeDefinition typeDefinition = (XSComplexTypeDefinition)elementDeclaration.getTypeDefinition();
@@ -74,7 +74,7 @@ public class XmlConstraintsTest extends LightCodeInsightFixtureTestCase {
     assertEquals("b", o.getName());
   }
 
-  public void testXercesForCompletion() throws Exception {
+  public void testXercesForCompletion() {
     XSModel xsModel = getXSModel("testCompletion.xml", "test.xsd");
     PsiElement element = myFixture.getFile().findElementAt(getEditor().getCaretModel().getOffset());
     XmlTag tag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
@@ -111,13 +111,13 @@ public class XmlConstraintsTest extends LightCodeInsightFixtureTestCase {
     return grammar.toXSModel();
   }
 
-  public void testXsdConstraints() throws Exception {
+  public void testXsdConstraints() {
     Map<String, XmlElementDescriptor> map = configure("test.xml", "test.xsd");
     XmlElementDescriptor a = map.get("a");
     XmlElementsGroup topGroup = a.getTopGroup();
   }
 
-  public void testDtdConstraints() throws Exception {
+  public void testDtdConstraints() {
 
     Map<String, XmlElementDescriptor> map = configure("testDtd.xml");
     XmlElementDescriptor a = map.get("a");
diff --git a/xml/tests/src/com/intellij/xml/XmlFoldingTest.java b/xml/tests/src/com/intellij/xml/XmlFoldingTest.java
index 91cb38b6ae47..88c56a659239 100644
--- a/xml/tests/src/com/intellij/xml/XmlFoldingTest.java
+++ b/xml/tests/src/com/intellij/xml/XmlFoldingTest.java
@@ -22,18 +22,18 @@ import java.io.File;
 
 public class XmlFoldingTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testTagFolding() throws Throwable { doTest(); }
+  public void testTagFolding() { doTest(); }
 
-  public void testStyleAttributeFolding() throws Throwable { doTest(); }
-  public void testStyleAttributeFolding2() throws Throwable { doTest(".xml"); }
+  public void testStyleAttributeFolding() { doTest(); }
+  public void testStyleAttributeFolding2() { doTest(".xml"); }
 
-  public void testEntities() throws Throwable { doTest(); }
+  public void testEntities() { doTest(); }
 
-  public void testDataUri() throws Throwable { doTest(); }
+  public void testDataUri() { doTest(); }
 
-  public void testCustomRegions() throws Throwable { doTest(); }
+  public void testCustomRegions() { doTest(); }
 
-  private void doTest() throws Throwable {
+  private void doTest() {
     doTest(".html");
   }
 
diff --git a/xml/tests/src/com/intellij/xml/XmlNamespacesTest.java b/xml/tests/src/com/intellij/xml/XmlNamespacesTest.java
index af98e578401b..2ab38e1ea16d 100644
--- a/xml/tests/src/com/intellij/xml/XmlNamespacesTest.java
+++ b/xml/tests/src/com/intellij/xml/XmlNamespacesTest.java
@@ -30,13 +30,13 @@ import org.jetbrains.annotations.NotNull;
  * @author Dmitry Avdeev
  */
 public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
-  public void testUnusedNamespaces() throws Exception {
+  public void testUnusedNamespaces() {
     doUnusedDeclarationTest(
       "<all xmlns=\"http://www.w3.org/2001/XMLSchema\" <warning descr=\"Namespace declaration is never used\">xmlns:xsi=\"http://www.w3.org/2001/XMLSc<caret>hema-instance\"</warning>/>",
       "<all xmlns=\"http://www.w3.org/2001/XMLSchema\"/>", XmlBundle.message("xml.inspections.unused.schema.remove"));
   }
 
-  public void testUnusedDefaultNamespace() throws Exception {
+  public void testUnusedDefaultNamespace() {
     doUnusedDeclarationTest("<schema:schema \n" +
                             "            xmlns:schema=\"http://www.w3.org/2001/XMLSchema\"\n" +
                             "            <warning descr=\"Namespace declaration is never used\">xmlns=\"http://www.w3.org/2001/X<caret>Include\"</warning>\n" +
@@ -57,7 +57,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
                           "</schema:schema>");
   }
 
-  public void testDifferentPrefixes() throws Exception {
+  public void testDifferentPrefixes() {
     doUnusedDeclarationTest(
       "<x:all  <warning descr=\"Namespace declaration is never used\">xmlns=\"http://www.w3.org/2001/XMLS<caret>chema\"</warning>\n" +
       "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
@@ -73,7 +73,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
                           "/>");
   }
 
-  public void testUnusedLocation() throws Exception {
+  public void testUnusedLocation() {
     doUnusedDeclarationTest("<x:all\n" +
                             "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
                             "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -86,7 +86,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
                             XmlUnusedNamespaceInspection.RemoveNamespaceLocationFix.NAME);
   }
 
-  public void testUnusedLocationOnly() throws Exception {
+  public void testUnusedLocationOnly() {
     doUnusedDeclarationTest("<x:all\n" +
                             "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
                             "        <warning descr=\"Namespace declaration is never used\">xmlns:y=\"http://www.w3.org/2001/XInclude\"</warning>\n" +
@@ -100,7 +100,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
                             XmlBundle.message("xml.inspections.unused.schema.remove"));
   }
 
-  public void testUnusedDefaultLocation() throws Exception {
+  public void testUnusedDefaultLocation() {
     doUnusedDeclarationTest("<x:all\n" +
                             "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
                             "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -112,7 +112,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
                             XmlUnusedNamespaceInspection.RemoveNamespaceLocationFix.NAME);
   }
 
-  public void testKeepFormatting() throws Exception {
+  public void testKeepFormatting() {
     doUnusedDeclarationTest("<xs:schema attributeFormDefault=\"unqualified\"\n" +
                             "           <warning descr=\"Namespace declaration is never used\">xmlns:xsi=\"http://www.w3.org/20<caret>01/XMLSchema-instance\"</warning>\n" +
                             "           elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
@@ -135,7 +135,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
                             XmlBundle.message("xml.inspections.unused.schema.remove"));
   }
 
-  public void testImplicitPrefixUsage() throws Exception {
+  public void testImplicitPrefixUsage() {
     myFixture.configureByText("a.xml", "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"\n" +
                                        "           xmlns:x2=\"http://www.w3.org/2001/XMLSchema\"\n" +
                                        "           <warning descr=\"Namespace declaration is never used\">xmlns:x3=\"http://www.w3.org/2001/XMLSchema\"</warning> >\n" +
@@ -144,7 +144,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testUnusedLocationDetection() throws Exception {
+  public void testUnusedLocationDetection() {
     myFixture.configureByFile("web-app_2_5.xsd");
     myFixture.configureByText("a.xml", "<web-app xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
                                        "         xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -156,7 +156,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testWSDD() throws Exception {
+  public void testWSDD() {
     myFixture.configureByText("a.xml",
                               "<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" xmlns:java=\"http://xml.apache.org/axis/wsdd/providers/java\">\n" +
                               "<typeMapping deserializer=\"org.apache.axis.encoding.ser.BeanDeserializerFactory\" encodingStyle=\"\" qname=\"ns38:AxisAnalysis\" serializer=\"org.apache.axis.encoding.ser.BeanSerializerFactory\" languageSpecificType=\"java:com.pls.xactservice.axis.bindings.AxisAnalysis\"/>\n" +
@@ -164,7 +164,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testPrefixesInTagValues() throws Exception {
+  public void testPrefixesInTagValues() {
     myFixture.configureByText("a.xml",
                               "<<info descr=\"Namespace '' is not bound\">nodeTypes</info> xmlns:nt=\"<error descr=\"URI is not registered (Settings | Languages & Frameworks | Schemas and DTDs)\">http://www.jcp.org/jcr/nt/1.0</error>\" xmlns:customns=\"<error descr=\"URI is not registered (Settings | Languages & Frameworks | Schemas and DTDs)\">http://customurl</error>\">\n" +
                               "<nodeType name=\"customns:item\" isMixin=\"false\" hasOrderableChildNodes=\"false\">\n" +
@@ -176,7 +176,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testLocallyUsedNamespace() throws Exception {
+  public void testLocallyUsedNamespace() {
     myFixture.configureByText("a.xml", "<x:all\n" +
                                        "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
                                        "        xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -188,7 +188,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testLocallyUsedNamespaceWithPrefix() throws Exception {
+  public void testLocallyUsedNamespaceWithPrefix() {
     myFixture.configureByText("a.xml", "<s:foo xmlns:s=\"<error descr=\"URI is not registered (Settings | Languages & Frameworks | Schemas and DTDs)\">http://foo</error>\"\n" +
                                        "       <warning descr=\"Namespace declaration is never used\">xmlns:bar=\"<error descr=\"URI is not registered (Settings | Languages & Frameworks | Schemas and DTDs)\">http://bar</error>\"</warning>\n" +
                                        "       xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
@@ -200,11 +200,11 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  public void testSubDirectory() throws Exception {
+  public void testSubDirectory() {
     myFixture.testHighlighting("moved.xml", "trg/move-def.xsd");
   }
 
-  public void testSuppressedOptimize() throws Exception {
+  public void testSuppressedOptimize() {
     myFixture.configureByFile("web-app_2_5.xsd");
     String text = "<!--suppress XmlUnusedNamespaceDeclaration -->\n" +
                   "<web-app xmlns=\"http://java.sun.com/xml/ns/javaee\"\n" +
@@ -218,7 +218,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     doOptimizeImportsTest(text);
   }
 
-  public void testUsedInXmlns() throws Exception {
+  public void testUsedInXmlns() {
     myFixture.testHighlighting("spring.xml", "spring-beans-2.5.xsd", "spring-batch-2.1.xsd");
     IntentionAction action = myFixture.getAvailableIntention(XmlBundle.message("xml.inspections.unused.schema.remove"));
     assertNotNull(action);
@@ -226,18 +226,18 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.checkResultByFile("spring_after.xml");
   }
 
-  public void testXsiType() throws Exception {
+  public void testXsiType() {
     myFixture.testHighlighting("import.xml", "import.xsd");
   }
 
-  public void testDoNotOptimizeWhenInspectionDisabled() throws Exception {
+  public void testDoNotOptimizeWhenInspectionDisabled() {
     myFixture.disableInspections(new XmlUnusedNamespaceInspection());
     String text = "<all xmlns=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>";
     myFixture.configureByText(XmlFileType.INSTANCE, text);
     doOptimizeImportsTest(text);
   }
 
-  public void testFixAll() throws Exception {
+  public void testFixAll() {
     myFixture.configureByFiles("fixAll.xml", "spring-beans-2.5.xsd", "spring-batch-2.1.xsd");
     IntentionAction action = myFixture.findSingleIntention("Fix all");
     assertNotNull(action);
@@ -245,7 +245,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.checkResultByFile("fixAll_after.xml");
   }
 
-  public void testImplicitPrefixes() throws Exception {
+  public void testImplicitPrefixes() {
     myFixture.configureByText(XmlFileType.INSTANCE, "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" \n" +
                                                     "        xmlns:x=\"http://www.w3.org/2001/XMLSchema\"\n" +
                                                     "        <warning descr=\"Namespace declaration is never used\">xmlns:y=\"http://www.w3.org/2001/XMLSchema\"</warning>>\n" +
@@ -254,7 +254,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
   }
 
-  private void doUnusedDeclarationTest(String text, String after, String name) throws Exception {
+  private void doUnusedDeclarationTest(String text, String after, String name) {
     doUnusedDeclarationTest(text, after, name, true);
   }
 
@@ -276,7 +276,7 @@ public class XmlNamespacesTest extends LightCodeInsightFixtureTestCase {
     myFixture.testHighlighting();
     new WriteCommandAction(getProject(), getFile()) {
       @Override
-      protected void run(@NotNull Result result) throws Throwable {
+      protected void run(@NotNull Result result) {
         new OptimizeImportsProcessor(getProject(), getFile()).runWithoutProgress();
       }
     }.execute();
diff --git a/xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java b/xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java
index 029d4fdce16f..2b3f04b6aeb2 100644
--- a/xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java
+++ b/xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java
@@ -24,18 +24,18 @@ import com.intellij.xml.refactoring.SchemaPrefixRenameHandler;
  */
 public class XmlSchemaPrefixTest extends LightCodeInsightFixtureTestCase {
 
-  public void testPrefixUsages() throws Exception {
+  public void testPrefixUsages() {
     doFindUsages("usages.xml", 16);
     doFindUsages("usages1.xml", 16);
   }
 
-  public void testRename() throws Exception {doRename();}
-  public void testRename1() throws Exception {doRename();}
+  public void testRename() {doRename();}
+  public void testRename1() {doRename();}
 
-  public void testRename2() throws Exception {doRename();}
-  public void testRenameFromClosingTag() throws Exception {doRename();}
+  public void testRename2() {doRename();}
+  public void testRenameFromClosingTag() {doRename();}
 
-  private void doRename() throws Exception {
+  private void doRename() {
     doRename("xsd");
   }
 
diff --git a/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java b/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java
index 27466355fa6b..437e9516573a 100644
--- a/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java
+++ b/xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java
@@ -27,46 +27,46 @@ import java.io.File;
  */
 public class GenerateXmlTagTest extends LightPlatformCodeInsightFixtureTestCase {
 
-  public void testGenerate() throws Exception {
+  public void testGenerate() {
     myFixture.configureByFile("web-app_2_5.xsd");
     doTest("generate.xml", "security-constraint");
   }
 
-  public void testGenerateEmpty() throws Exception {
+  public void testGenerateEmpty() {
     myFixture.configureByFile("javaee_5.xsd");
     myFixture.configureByFile("web-app_2_5.xsd");
     doTest("generateEmpty.xml", "distributable");
   }
 
-  public void testGenerateDTD() throws Exception {
+  public void testGenerateDTD() {
     doTest("generateDTD.xml", "b");
   }
 
-  public void testGenerateDTDComplex() throws Exception {
+  public void testGenerateDTDComplex() {
     doTest("generateDTDComplex.xml", "b");
   }
 
-  public void testSpring() throws Exception {
+  public void testSpring() {
     myFixture.configureByFile("spring-beans_3.0.xsd");
     doTest("spring.xml", "bean");
   }
 
-  public void testSpringAtCaret() throws Exception {
+  public void testSpringAtCaret() {
     myFixture.configureByFile("spring-beans_3.0.xsd");
     doTest("springAtCaret.xml", "bean");
   }
 
-  public void testSpringAfterBean() throws Exception {
+  public void testSpringAfterBean() {
     myFixture.configureByFile("spring-beans_3.0.xsd");
     doTest("springAfterBean.xml", "bean");
   }
 
-  public void testSpringAlias() throws Exception {
+  public void testSpringAlias() {
     myFixture.configureByFile("spring-beans_3.0.xsd");
     doTest("springAlias.xml", "alias");
   }
 
-  public void testInitParam() throws Exception {
+  public void testInitParam() {
     doTest("initParam.xml", "context-param");
   }
 
diff --git a/xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java b/xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java
index f4fdf292c705..037078984230 100644
--- a/xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java
+++ b/xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
  * @author spleaner
  */
 public class SplitTagActionTest extends LightIntentionActionTestCase {
-  public void test() throws Exception { doAllTests(); }
+  public void test() { doAllTests(); }
 
   @Override
   protected boolean shouldBeAvailableAfterExecution() {
diff --git a/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java b/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java
index 6b1f20365839..c935e46d15ce 100644
--- a/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java
+++ b/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java
@@ -6,7 +6,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
-import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.io.DataExternalizer;
@@ -107,7 +106,7 @@ public class XmlSchemaIndexTest extends LightCodeInsightFixtureTestCase {
     assertNull(resource);
   }
 
-  public void testGuessDTD() throws Exception {
+  public void testGuessDTD() {
     myFixture.copyDirectoryToProject("", "");
     final List<IndexedRelevantResource<String, XsdNamespaceBuilder>> files =
       XmlNamespaceIndex.getResourcesByNamespace("foo.dtd",
@@ -120,7 +119,7 @@ public class XmlSchemaIndexTest extends LightCodeInsightFixtureTestCase {
     assertTrue(XmlNamespaceIndex.guessDtd("foo://bar/2/foo.dtd", file).getVirtualFile().getPath().endsWith("/2/foo.dtd"));
   }
 
-  public void testGuessByLocation() throws Exception {
+  public void testGuessByLocation() {
     myFixture.copyDirectoryToProject("", "");
     String namespace = "http://www.liquibase.org/xml/ns/dbchangelog";
     List<IndexedRelevantResource<String, XsdNamespaceBuilder>> resources =
diff --git a/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java b/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java
index 3d20badc6e58..32f032e17284 100644
--- a/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java
+++ b/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java
@@ -65,7 +65,7 @@ public class XmlSchemaTypeInheritanceTest extends CodeInsightFixtureTestCase {
     Assert.assertTrue(baseNode.contains(new SchemaTypeInfo("tFlowElement", true, ourNs)));
   }
 
-  public void testIndex() throws Exception {
+  public void testIndex() {
     myFixture.copyDirectoryToProject("", "");
 
     final Project project = getProject();