diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_super_qualifier/UnnecessarySuperQualifier.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_super_qualifier/UnnecessarySuperQualifier.java
index 8ebe5372a650..72ae07c865a7 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_super_qualifier/UnnecessarySuperQualifier.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_super_qualifier/UnnecessarySuperQualifier.java
@@ -20,8 +20,8 @@ public class UnnecessarySuperQualifier {
 
     private static class Up extends Base<String> {
         void foo() {
-            super.test("asfd");
-            System.out.println(super.field);
+            <warning descr="Qualifier 'super' is unnecessary in this context">super</warning>.test("asfd");
+            System.out.println(<warning descr="Qualifier 'super' is unnecessary in this context">super</warning>.field);
         }
     }
 
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_super_qualifier/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_super_qualifier/expected.xml
deleted file mode 100644
index a3f99717de6e..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_super_qualifier/expected.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<problems>
-  <problem>
-    <file>UnnecessarySuperQualifier.java</file>
-    <line>23</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary 'super' qualifier</problem_class>
-    <description>Qualifier &lt;code&gt;super&lt;/code&gt; is unnecessary in this context #loc</description>
-  </problem>
-
-  <problem>
-    <file>UnnecessarySuperQualifier.java</file>
-    <line>24</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary 'super' qualifier</problem_class>
-    <description>Qualifier &lt;code&gt;super&lt;/code&gt; is unnecessary in this context #loc</description>
-  </problem>
-</problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessarySuperQualifierInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessarySuperQualifierInspectionTest.java
index d4ee42d943c1..5403dbdca6e0 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessarySuperQualifierInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessarySuperQualifierInspectionTest.java
@@ -1,12 +1,36 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.siyeh.ig.style;
 
-import com.siyeh.ig.IGInspectionTestCase;
+import com.intellij.codeInspection.InspectionProfileEntry;
+import com.siyeh.ig.LightInspectionTestCase;
+import org.jetbrains.annotations.Nullable;
 
-public class UnnecessarySuperQualifierInspectionTest
-  extends IGInspectionTestCase {
+/**
+ * @author Bas Leijdekkers
+ */
+public class UnnecessarySuperQualifierInspectionTest extends LightInspectionTestCase {
 
-  public void test() throws Exception {
-    doTest("com/siyeh/igtest/style/unnecessary_super_qualifier",
-           new UnnecessarySuperQualifierInspection());
+  public void testUnnecessarySuperQualifier() {
+    doTest();
+  }
+
+  @Nullable
+  @Override
+  protected InspectionProfileEntry getInspection() {
+    return new UnnecessarySuperQualifierInspection();
   }
 }
\ No newline at end of file