3 files changed, 5 insertions, 3 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 5395af2331..477f04a964 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -371,8 +371,8 @@ class QuerySet(object):
         defaults = kwargs.pop('defaults', {})
         lookup = kwargs.copy()
         for f in self.model._meta.fields:
-            if f.column in lookup:
-                lookup[f.name] = lookup.pop(f.column)
+            if f.attname in lookup:
+                lookup[f.name] = lookup.pop(f.attname)
         try:
             self._for_write = True
             return self.get(**lookup), False
diff --git a/tests/regressiontests/get_or_create_regress/models.py b/tests/regressiontests/get_or_create_regress/models.py
index 292d96c980..637bbf62af 100644
--- a/tests/regressiontests/get_or_create_regress/models.py
+++ b/tests/regressiontests/get_or_create_regress/models.py
@@ -10,4 +10,4 @@ class Author(models.Model):
 class Book(models.Model):
     name = models.CharField(max_length=100)
     authors = models.ManyToManyField(Author, related_name='books')
-    publisher = models.ForeignKey(Publisher, related_name='books')
+    publisher = models.ForeignKey(Publisher, related_name='books', db_column="publisher_id_column")
diff --git a/tests/regressiontests/get_or_create_regress/tests.py b/tests/regressiontests/get_or_create_regress/tests.py
index e825fccc4b..103e254d4c 100644
--- a/tests/regressiontests/get_or_create_regress/tests.py
+++ b/tests/regressiontests/get_or_create_regress/tests.py
@@ -55,8 +55,10 @@ class GetOrCreateTests(TestCase):
         # Use the publisher's primary key value instead of a model instance.
         _, created = ed.books.get_or_create(name='The Great Book of Ed', publisher_id=p.id)
         self.assertTrue(created)
+
         # Try get_or_create again, this time nothing should be created.
         _, created = ed.books.get_or_create(name='The Great Book of Ed', publisher_id=p.id)
         self.assertFalse(created)
+
         # The publisher should have three books.
         self.assertEqual(p.books.count(), 3)