diff --git a/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java b/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java
index a43bc1259908..e2e1bf030593 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/SuppressionUtil.java
@@ -58,7 +58,7 @@ public class SuppressionUtil {
 
     for (@NonNls String id : ids) {
       @NonNls String trim = id.trim();
-      if (trim.equalsIgnoreCase(ALL)) return true;
+      if (trim.equals(inspectionToolID) || trim.equalsIgnoreCase(ALL)) return true;
     }
     return false;
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
index ddfe49cb0d98..3899fd5a402c 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
@@ -255,7 +255,7 @@ public abstract class RefElementImpl extends RefEntityImpl implements RefElement
   public boolean isSuppressed(final String toolId) {
     if (mySuppressions != null) {
       for (@NonNls String suppression : mySuppressions) {
-        if (suppression.equalsIgnoreCase(SuppressionUtil.ALL)){
+        if (suppression.equals(toolId) || suppression.equalsIgnoreCase(SuppressionUtil.ALL)){
           return true;
         }
       }