diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedWithAttrSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedWithAttrSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedWithAttrSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedWithAttrSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedWithDictSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedWithDictSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnAndInheritedWithDictSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnAndInheritedWithDictSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnSlotsAndEmptyParent.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnSlotsAndEmptyParent.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnSlotsAndEmptyParent.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnSlotsAndEmptyParent.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy2.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy2.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy2.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy2.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy3.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy3.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy3.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithAttrAndInheritedSlotsPy3.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithDictAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithDictAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithDictAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithDictAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlots.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlotsWithAttrPy2.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlotsWithAttrPy2.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlotsWithAttrPy2.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlotsWithAttrPy2.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlotsWithAttrPy3.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlotsWithAttrPy3.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlotsWithAttrPy3.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlotsWithAttrPy3.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlotsWithDict.py b/python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlotsWithDict.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/classAttrAssignmentAndSlotsWithDict.py
rename to python/testData/inspections/PyDunderSlotsInspection/classAttrAssignmentAndSlotsWithDict.py
diff --git a/python/testData/inspections/PyDunderSlotsInspection/classVarInBaseAndSlotsInDerived.py b/python/testData/inspections/PyDunderSlotsInspection/classVarInBaseAndSlotsInDerived.py
new file mode 100644
index 000000000000..0b217ec2f8c5
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/classVarInBaseAndSlotsInDerived.py
@@ -0,0 +1,5 @@
+class Base(object):
+    foo = 1
+
+class Derived(Base):
+    __slots__ = 'foo'
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy2.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy2.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy2.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy2.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy3.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy3.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy3.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrAndDictSlotsPy3.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy2.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy2.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy2.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy2.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy3.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy3.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy3.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithAttrSlotsPy3.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithDictSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithDictSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnAndInheritedWithDictSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnAndInheritedWithDictSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithAttrAndDictAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithAttrAndDictAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithAttrAndDictAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithAttrAndDictAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedWithDictSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedWithDictSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedWithDictSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithAttrAndInheritedWithDictSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedSlots.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedSlots.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy2.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy2.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy2.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy2.py
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy3.py b/python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy3.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy3.py
rename to python/testData/inspections/PyDunderSlotsInspection/inheritedClassAttrAssignmentAndOwnWithDictAndInheritedWithAttrSlotsPy3.py
diff --git a/python/testData/inspections/PyDunderSlotsInspection/slotAndClassVar.py b/python/testData/inspections/PyDunderSlotsInspection/slotAndClassVar.py
new file mode 100644
index 000000000000..961380996efd
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/slotAndClassVar.py
@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = <warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>
+    foo = 1
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/slotInListAndClassVar.py b/python/testData/inspections/PyDunderSlotsInspection/slotInListAndClassVar.py
new file mode 100644
index 000000000000..a26e564ce1fc
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/slotInListAndClassVar.py
@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>]
+    foo = 1
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/slotInTupleAndClassVar.py b/python/testData/inspections/PyDunderSlotsInspection/slotInTupleAndClassVar.py
new file mode 100644
index 000000000000..4c4309ddecef
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/slotInTupleAndClassVar.py
@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>)
+    foo = 1
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndClassVarInDerived.py b/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndClassVarInDerived.py
new file mode 100644
index 000000000000..a60d308feb2e
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndClassVarInDerived.py
@@ -0,0 +1,5 @@
+class Base(object):
+    __slots__ = 'foo'
+
+class Derived(Base):
+    foo = 1
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInBase.py b/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInBase.py
new file mode 100644
index 000000000000..b35ff783a843
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInBase.py
@@ -0,0 +1,6 @@
+class Base(object):
+    __slots__ = 'bar'
+    foo = 1
+
+class Derived(Base):
+    __slots__ = 'foo'
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInDerived.py b/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInDerived.py
new file mode 100644
index 000000000000..6c1c655ce038
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/slotsInBaseAndDerivedClassVarInDerived.py
@@ -0,0 +1,6 @@
+class Base(object):
+    __slots__ = 'foo'
+
+class Derived(Base):
+    __slots__ = 'bar'
+    foo = 1
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/test.py b/python/testData/inspections/PyDunderSlotsInspection/test.py
deleted file mode 100644
index 25e8864f649d..000000000000
--- a/python/testData/inspections/PyDunderSlotsInspection/test.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# PY-20280: one slot in list
-class Foo(object):
-    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>]
-    foo = 1
-
-
-# PY-20280: one slot in tuple
-class Foo(object):
-    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>)
-    foo = 1
-
-
-# PY-20280: one slot
-class Foo(object):
-    __slots__ = <warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>
-    foo = 1
-
-
-# PY-20280: two slots in list
-class Foo(object):
-    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar']
-    foo = 1
-
-
-# PY-20280: two slots in tuple
-class Foo(object):
-    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar')
-    foo = 1
-
-
-# PY-20280: slots in base and class variable in derived
-class Base(object):
-    __slots__ = 'foo'
-
-class Derived(Base):
-    foo = 1
-
-
-# PY-20280: class variable in base and slots in derived
-class Base(object):
-    foo = 1
-
-class Derived(Base):
-    __slots__ = 'foo'
-
-
-# PY-20280: slots in base and derived, class variable in derived
-class Base(object):
-    __slots__ = 'foo'
-
-class Derived(Base):
-    __slots__ = 'bar'
-    foo = 1
-
-
-# PY-20280: slots in base and derived, class variable in base
-class Base(object):
-    __slots__ = 'bar'
-    foo = 1
-
-class Derived(Base):
-    __slots__ = 'foo'
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/twoSlotsInListAndClassVar.py b/python/testData/inspections/PyDunderSlotsInspection/twoSlotsInListAndClassVar.py
new file mode 100644
index 000000000000..114a4a671cd6
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/twoSlotsInListAndClassVar.py
@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = [<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar']
+    foo = 1
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspection/twoSlotsInTupleAndClassVar.py b/python/testData/inspections/PyDunderSlotsInspection/twoSlotsInTupleAndClassVar.py
new file mode 100644
index 000000000000..c54dae525d08
--- /dev/null
+++ b/python/testData/inspections/PyDunderSlotsInspection/twoSlotsInTupleAndClassVar.py
@@ -0,0 +1,3 @@
+class Foo(object):
+    __slots__ = (<warning descr="'foo' in __slots__ conflicts with class variable">'foo'</warning>, 'bar')
+    foo = 1
\ No newline at end of file
diff --git a/python/testData/inspections/PyDunderSlotsInspectionTest/writeToAttrInSlots.py b/python/testData/inspections/PyDunderSlotsInspection/writeToAttrInSlots.py
similarity index 100%
rename from python/testData/inspections/PyDunderSlotsInspectionTest/writeToAttrInSlots.py
rename to python/testData/inspections/PyDunderSlotsInspection/writeToAttrInSlots.py
diff --git a/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java b/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java
index 5edefbc07b05..9c51e63c6079 100644
--- a/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonInspectionsTest.java
@@ -333,10 +333,6 @@ public class PythonInspectionsTest extends PyTestCase {
     doHighlightingTest(PyShadowingNamesInspection.class);
   }
 
-  public void testPyDunderSlotsInspection() {
-    runWithLanguageLevel(LanguageLevel.PYTHON30, () -> doHighlightingTest(PyDunderSlotsInspection.class));
-  }
-
   // PY-21645
   public void testInspectionsDisabledInFunctionTypeComments() {
     myFixture.enableInspections(PyIncorrectDocstringInspection.class); 
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyDunderSlotsInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyDunderSlotsInspectionTest.java
index e3926bf83a42..411de65a249d 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyDunderSlotsInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyDunderSlotsInspectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -189,6 +189,51 @@ public class PyDunderSlotsInspectionTest extends PyTestCase {
     doTestPy3();
   }
 
+  // PY-20280
+  public void testSlotInListAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotInTupleAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testTwoSlotsInListAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testTwoSlotsInTupleAndClassVar() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotsInBaseAndClassVarInDerived() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testClassVarInBaseAndSlotsInDerived() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotsInBaseAndDerivedClassVarInDerived() {
+    doTestPy3();
+  }
+
+  // PY-20280
+  public void testSlotsInBaseAndDerivedClassVarInBase() {
+    doTestPy3();
+  }
+
   private void doTestPy2() {
     runWithLanguageLevel(LanguageLevel.PYTHON26, this::doTestPy);
   }
@@ -198,7 +243,7 @@ public class PyDunderSlotsInspectionTest extends PyTestCase {
   }
 
   private void doTestPy() {
-    final String path = "inspections/PyDunderSlotsInspectionTest/" + getTestName(true) + ".py";
+    final String path = "inspections/PyDunderSlotsInspection/" + getTestName(true) + ".py";
 
     final VirtualFile file = myFixture.getTempDirFixture().getFile(path);
     if (file != null) {