diff --git a/python/testData/completion/assignedNearby.after.py b/python/testData/completion/assignedNearby.after.py
new file mode 100644
index 000000000000..e108303e7a87
--- /dev/null
+++ b/python/testData/completion/assignedNearby.after.py
@@ -0,0 +1,7 @@
+class Foo:
+    pass
+
+def bar():
+    x = Foo()
+    x.shazam = 1
+    print x.shazam
diff --git a/python/testData/completion/assignedNearby.py b/python/testData/completion/assignedNearby.py
new file mode 100644
index 000000000000..c43aac4d5c56
--- /dev/null
+++ b/python/testData/completion/assignedNearby.py
@@ -0,0 +1,7 @@
+class Foo:
+    pass
+
+def bar():
+    x = Foo()
+    x.shazam = 1
+    print x.sh<caret>
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index 19595928f85b..7df1606a11c1 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -483,4 +483,8 @@ public class PythonCompletionTest extends PyTestCase {
   public void testImportKeyword() {
     doTest();
   }
+  
+  public void testAssignedNearby() {
+    doTest();
+  }
 }