diff --git a/python/testData/intentions/importAsToImportFromAll.py b/python/testData/intentions/removeQualifierFromAllUsages.py
similarity index 100%
rename from python/testData/intentions/importAsToImportFromAll.py
rename to python/testData/intentions/removeQualifierFromAllUsages.py
diff --git a/python/testData/intentions/importAsToImportFromAll_after.py b/python/testData/intentions/removeQualifierFromAllUsages_after.py
similarity index 100%
rename from python/testData/intentions/importAsToImportFromAll_after.py
rename to python/testData/intentions/removeQualifierFromAllUsages_after.py
diff --git a/python/testData/intentions/removeQualifierFromThisName.py b/python/testData/intentions/removeQualifierFromThisName.py
new file mode 100644
index 000000000000..10f747a2f4db
--- /dev/null
+++ b/python/testData/intentions/removeQualifierFromThisName.py
@@ -0,0 +1,10 @@
+import builtins as b
+
+quotient, rem = b.divmod(42, 3)
+b.divmod
+
+class MyClass(object):
+    @b.stati<caret>cmethod
+    @b.staticmethod
+    def method():
+        pass
\ No newline at end of file
diff --git a/python/testData/intentions/removeQualifierFromThisName_after.py b/python/testData/intentions/removeQualifierFromThisName_after.py
new file mode 100644
index 000000000000..bd8e42958cb8
--- /dev/null
+++ b/python/testData/intentions/removeQualifierFromThisName_after.py
@@ -0,0 +1,11 @@
+import builtins as b
+from builtins import staticmethod
+
+quotient, rem = b.divmod(42, 3)
+b.divmod
+
+class MyClass(object):
+    @staticmethod
+    @staticmethod
+    def method():
+        pass
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java
index 9dc32664bbe0..1e1b4571e8f7 100644
--- a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java
+++ b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java
@@ -6,6 +6,8 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.ui.TestDialogManager;
 import com.intellij.openapi.ui.TestInputDialog;
 import com.intellij.psi.PsiFile;
+import com.intellij.ui.ChooserInterceptor;
+import com.intellij.ui.UiInterceptors;
 import com.jetbrains.python.PyPsiBundle;
 import com.jetbrains.python.codeInsight.PyCodeInsightSettings;
 import com.jetbrains.python.documentation.PyDocumentationSettings;
@@ -464,10 +466,21 @@ public class PyIntentionTest extends PyTestCase {
   }
 
   // PY-45863
-  public void testImportAsToImportFromAll() {
+  public void testRemoveQualifierFromAllUsages() {
+    shouldSelectRemoveQualifierOption(0);
     doTest("Remove 'b' qualifier");
   }
 
+  public void testRemoveQualifierFromThisName() {
+    shouldSelectRemoveQualifierOption(1);
+    doTest("Remove 'b' qualifier");
+  }
+
+  private static void shouldSelectRemoveQualifierOption(int index) {
+    List<String> options = List.of("Remove qualifier from all usages", "Remove qualifier from this name");
+    UiInterceptors.register(new ChooserInterceptor(options, options.get(index)));
+  }
+
   // PY-45863
   public void testImportFQNToImportFromAll() {
     doMultiFileTest("Remove 'pkg.mod' qualifier");