diff --git a/python/src/com/jetbrains/python/validation/UnsupportedFeatures.java b/python/src/com/jetbrains/python/validation/UnsupportedFeatures.java
index 1aa62c2aa648..50a905b86bdc 100644
--- a/python/src/com/jetbrains/python/validation/UnsupportedFeatures.java
+++ b/python/src/com/jetbrains/python/validation/UnsupportedFeatures.java
@@ -49,8 +49,11 @@ public class UnsupportedFeatures extends PyAnnotator {
   @Override
   public void visitPyDictCompExpression(PyDictCompExpression node) {
     super.visitPyDictCompExpression(node);
-    if (isPy2(node)) {
-      getHolder().createWarningAnnotation(node, "Dictionary comprehension is not supported in Python 2").registerFix(new ConvertDictCompIntention());
+    LanguageLevel languageLevel = getLanguageLevel(node);
+    if (!languageLevel.supportsSetLiterals()) {
+      getHolder()
+        .createWarningAnnotation(node, "Python version " + languageLevel + " does not support dictionary comprehensions")
+        .registerFix(new ConvertDictCompIntention());
     }
   }
 
diff --git a/python/testData/highlighting/unsupportedFeaturesInPython2.py b/python/testData/highlighting/unsupportedFeaturesInPython2.py
index 41f60f9a36f5..daef8c115147 100644
--- a/python/testData/highlighting/unsupportedFeaturesInPython2.py
+++ b/python/testData/highlighting/unsupportedFeaturesInPython2.py
@@ -1,6 +1,6 @@
 from __future__ import with_statement
 
-<warning descr="Dictionary comprehension is not supported in Python 2">{k: v for k, v in stuff}</warning>
+<warning descr="Python version 2.5 does not support dictionary comprehensions">{k: v for k, v in stuff}</warning>
 
 try:
   pass