diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java
index f6f2a43f7c36..a958cfe0672b 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2014 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2015 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,6 +78,14 @@ public class FloatingPointEqualityInspection extends BaseInspection {
         final float v = aFloat.floatValue();
         return Float.isInfinite(v) || v == 0.0f;
       }
+      else if (value instanceof Integer) {
+        final Integer integer = (Integer)value;
+        return integer.intValue() == 0;
+      }
+      else if (value instanceof Long) {
+        final Long aLong = (Long)value;
+        return aLong.longValue() == 0;
+      }
       return false;
     }
   }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/floating_point_equality/FloatingPointEquality.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/floating_point_equality/FloatingPointEquality.java
index 0d436471570d..7c3839439c83 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/floating_point_equality/FloatingPointEquality.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/floating_point_equality/FloatingPointEquality.java
@@ -31,7 +31,9 @@ public class FloatingPointEquality
 
         boolean infinity = m_bar == Double.POSITIVE_INFINITY;
         boolean zero = m_barf == 0.0f;
-       
+        boolean zero2 = m_barf == 0;
+        boolean zero3 = m_barf == 0L;
+
     }