diff --git a/python/testData/refactoring/rename/renameUpdatesImportReferences/after/a.py b/python/testData/refactoring/rename/renameUpdatesImportReferences/after/a.py
new file mode 100644
index 000000000000..933fe2dbace6
--- /dev/null
+++ b/python/testData/refactoring/rename/renameUpdatesImportReferences/after/a.py
@@ -0,0 +1 @@
+import baz
\ No newline at end of file
diff --git a/python/testData/refactoring/rename/renameUpdatesImportReferences/after/bar.py b/python/testData/refactoring/rename/renameUpdatesImportReferences/after/bar.py
new file mode 100644
index 000000000000..9430285992f5
--- /dev/null
+++ b/python/testData/refactoring/rename/renameUpdatesImportReferences/after/bar.py
@@ -0,0 +1,2 @@
+import baz
+from baz import f
diff --git a/python/testData/refactoring/rename/renameUpdatesImportReferences/after/baz.py b/python/testData/refactoring/rename/renameUpdatesImportReferences/after/baz.py
new file mode 100644
index 000000000000..4f28bc7a4992
--- /dev/null
+++ b/python/testData/refactoring/rename/renameUpdatesImportReferences/after/baz.py
@@ -0,0 +1,2 @@
+def f():
+    pass
diff --git a/python/testData/refactoring/rename/renameUpdatesImportReferences/before/a.py b/python/testData/refactoring/rename/renameUpdatesImportReferences/before/a.py
new file mode 100644
index 000000000000..990c241c88d8
--- /dev/null
+++ b/python/testData/refactoring/rename/renameUpdatesImportReferences/before/a.py
@@ -0,0 +1 @@
+import f<caret>oo
\ No newline at end of file
diff --git a/python/testData/refactoring/rename/renameUpdatesImportReferences/before/bar.py b/python/testData/refactoring/rename/renameUpdatesImportReferences/before/bar.py
new file mode 100644
index 000000000000..969b817c6eb4
--- /dev/null
+++ b/python/testData/refactoring/rename/renameUpdatesImportReferences/before/bar.py
@@ -0,0 +1,2 @@
+import foo
+from foo import f
diff --git a/python/testData/refactoring/rename/renameUpdatesImportReferences/before/foo.py b/python/testData/refactoring/rename/renameUpdatesImportReferences/before/foo.py
new file mode 100644
index 000000000000..4f28bc7a4992
--- /dev/null
+++ b/python/testData/refactoring/rename/renameUpdatesImportReferences/before/foo.py
@@ -0,0 +1,2 @@
+def f():
+    pass
diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java
index e0d58067cbb6..9b3c36db8340 100644
--- a/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyRenameTest.java
@@ -170,6 +170,11 @@ public class PyRenameTest extends PyTestCase {
     doTest("bar");
   }
 
+  // PY-4200
+  public void testRenameUpdatesImportReferences() {
+    doMultiFileTest("baz.py");
+  }
+
   private void doRenameConflictTest(String newName, String expectedConflict) {
     myFixture.configureByFile(RENAME_DATA_PATH + getTestName(true) + ".py");
     try {