diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/return_from_finally_block/ReturnFromFinallyBlock.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/return_from_finally_block/ReturnFromFinallyBlock.java
index dd6f002e789c..d79fb2bcd4a3 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/return_from_finally_block/ReturnFromFinallyBlock.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/return_from_finally_block/ReturnFromFinallyBlock.java
@@ -12,7 +12,7 @@ public class ReturnFromFinallyBlock
         }
         finally
         {
-            return;
+            <warning descr="'return' inside 'finally' block">return</warning>;
         }
     }
 
@@ -24,7 +24,7 @@ public class ReturnFromFinallyBlock
         }
         finally
         {
-            return 3;
+            <warning descr="'return' inside 'finally' block">return</warning> 3;
         }
     }
 
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/return_from_finally_block/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/return_from_finally_block/expected.xml
deleted file mode 100644
index 4175d624a9b6..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/errorhandling/return_from_finally_block/expected.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<problems>
-  <problem>
-    <file>ReturnFromFinallyBlock.java</file>
-    <line>15</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'return' inside 'finally' block</problem_class>
-    <description>&lt;code&gt;return&lt;/code&gt; inside 'finally' block #loc</description>
-  </problem>
-
-  <problem>
-    <file>ReturnFromFinallyBlock.java</file>
-    <line>27</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'return' inside 'finally' block</problem_class>
-    <description>&lt;code&gt;return&lt;/code&gt; inside 'finally' block #loc</description>
-  </problem>
-</problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspectionTest.java
index 108a02df91a6..6b84d6a97479 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspectionTest.java
@@ -1,10 +1,18 @@
 package com.siyeh.ig.errorhandling;
 
-import com.siyeh.ig.IGInspectionTestCase;
+import com.intellij.codeInspection.InspectionProfileEntry;
+import com.siyeh.ig.LightInspectionTestCase;
+import org.jetbrains.annotations.Nullable;
 
-public class ReturnFromFinallyBlockInspectionTest extends IGInspectionTestCase {
+public class ReturnFromFinallyBlockInspectionTest extends LightInspectionTestCase {
 
-  public void test() throws Exception {
-    doTest("com/siyeh/igtest/errorhandling/return_from_finally_block", new ReturnFromFinallyBlockInspection());
+  public void testReturnFromFinallyBlock() throws Exception {
+    doTest();
+  }
+
+  @Nullable
+  @Override
+  protected InspectionProfileEntry getInspection() {
+    return new ReturnFromFinallyBlockInspection();
   }
 }