diff --git a/python/testData/inspections/PyMethodMayBeStaticInspection/methodWithAttributes.py b/python/testData/inspections/PyMethodMayBeStaticInspection/methodWithAttributes.py
new file mode 100644
index 000000000000..ee01799a1141
--- /dev/null
+++ b/python/testData/inspections/PyMethodMayBeStaticInspection/methodWithAttributes.py
@@ -0,0 +1,5 @@
+class Spam:
+    def eggs(self, a):
+        print(a)
+
+    eggs.name = "monthy"
\ No newline at end of file
diff --git a/python/testData/inspections/PyMethodMayBeStaticInspection/testClasses.py b/python/testData/inspections/PyMethodMayBeStaticInspection/testClasses.py
new file mode 100644
index 000000000000..b189edab5e1e
--- /dev/null
+++ b/python/testData/inspections/PyMethodMayBeStaticInspection/testClasses.py
@@ -0,0 +1,3 @@
+class TestFoo:
+    def test_smt(self):
+        pass
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyMethodMayBeStaticInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyMethodMayBeStaticInspectionTest.java
index 885f0430ae73..95c301cd3354 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyMethodMayBeStaticInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyMethodMayBeStaticInspectionTest.java
@@ -87,6 +87,16 @@ public class PyMethodMayBeStaticInspectionTest extends PyTestCase {
     doMultiFileTest("abc.py");
   }
 
+  //PY-17671
+  public void testMethodWithAttributes() {
+    doTest();
+  }
+
+  //PY-17824
+  public void testTestClasses() {
+    doTest();
+  }
+
   private void doTest() {
     myFixture.configureByFile(getTestName(true) + ".py");
     myFixture.enableInspections(PyMethodMayBeStaticInspection.class);