diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java
index 80ab3b9b7748..f77549172549 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java
@@ -43,7 +43,7 @@ public class ComparisonToNaNInspection extends BaseInspection {
   public String buildErrorString(Object... infos) {
     final PsiBinaryExpression comparison = (PsiBinaryExpression)infos[0];
     final IElementType tokenType = comparison.getOperationTokenType();
-    if (!tokenType.equals(JavaTokenType.NE)) {
+    if (tokenType.equals(JavaTokenType.NE)) {
       return InspectionGadgetsBundle.message("comparison.to.nan.problem.descriptor2");
     }
     else {
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_na_n/ComparisonToNaN.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_na_n/ComparisonToNaN.java
new file mode 100644
index 000000000000..d5e7191f8eea
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_na_n/ComparisonToNaN.java
@@ -0,0 +1,25 @@
+package com.siyeh.igtest.numeric.comparison_to_nan;
+
+import static java.lang.Double.*;
+
+public class ComparisonToNaN {
+    public void foo(double x)
+    {
+        if(x == <warning descr="Comparison to 'Float.NaN' is always false">Float.NaN</warning>)
+        {
+            return;
+        }
+        if (x == <warning descr="Comparison to 'NaN' is always false">NaN</warning>) {
+          return;
+        }
+        if (x > <warning descr="Comparison to 'NaN' is always false">NaN</warning>) {
+            return;
+        }
+        if (x <= <warning descr="Comparison to 'NaN' is always false">NaN</warning>) {
+            return;
+        }
+        if (<warning descr="Comparison to 'Float.NaN' is always true">Float.NaN</warning> != Float.NaN) {
+            return;
+        }
+    }
+}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_nan/ComparisonToNaN.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_nan/ComparisonToNaN.java
deleted file mode 100644
index 5d73fd2795dd..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_nan/ComparisonToNaN.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.siyeh.igtest.numeric.comparison_to_nan;
-
-import static java.lang.Double.*;
-
-public class ComparisonToNaN {
-    public void foo(double x)
-    {
-        if(x == Float.NaN)
-        {
-            return;
-        }
-        if (x == NaN) {
-          return;
-        }
-    }
-}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_nan/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_nan/expected.xml
deleted file mode 100644
index e0491b7c6804..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/comparison_to_nan/expected.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<problems>
-  <problem>
-    <file>ComparisonToNaN.java</file>
-    <line>8</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Comparison to Double.NaN or Float.NaN</problem_class>
-    <description>Comparison to &lt;code&gt;Float.NaN&lt;/code&gt; is always false #loc</description>
-  </problem>
-
-  <problem>
-    <file>ComparisonToNaN.java</file>
-    <line>12</line>
-    <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Comparison to Double.NaN or Float.NaN</problem_class>
-    <description>Comparison to &lt;code&gt;NaN&lt;/code&gt; is always false #loc</description>
-  </problem>
-</problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/numeric/ComparisonToNanInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/numeric/ComparisonToNanInspectionTest.java
index 50fdf1ad42b2..02c8ce9762e6 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/numeric/ComparisonToNanInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/numeric/ComparisonToNanInspectionTest.java
@@ -1,10 +1,18 @@
 package com.siyeh.ig.numeric;
 
-import com.siyeh.ig.IGInspectionTestCase;
+import com.intellij.codeInspection.InspectionProfileEntry;
+import com.siyeh.ig.LightInspectionTestCase;
+import org.jetbrains.annotations.Nullable;
 
-public class ComparisonToNanInspectionTest extends IGInspectionTestCase {
+public class ComparisonToNanInspectionTest extends LightInspectionTestCase {
 
-  public void test() {
-    doTest("com/siyeh/igtest/numeric/comparison_to_nan", new ComparisonToNaNInspection());
+  public void testComparisonToNaN() {
+    doTest();
+  }
+
+  @Nullable
+  @Override
+  protected InspectionProfileEntry getInspection() {
+    return new ComparisonToNaNInspection();
   }
 }
\ No newline at end of file