diff --git a/tests/regressiontests/queries/models.py b/tests/regressiontests/queries/models.py
index d441433..9c5cf65 100644
--- a/tests/regressiontests/queries/models.py
+++ b/tests/regressiontests/queries/models.py
@@ -317,3 +317,9 @@ class ObjectC(models.Model):
 
     def __unicode__(self):
        return self.name
+
+# For testing .update + auto_now behaviour for #15566
+class LogEntry(models.Model):
+    name = models.CharField(max_length=50)
+    modify_ts = models.DateTimeField(auto_now=True)
+    modify_date = models.DateField(auto_now=True)
\ No newline at end of file
diff --git a/tests/regressiontests/queries/tests.py b/tests/regressiontests/queries/tests.py
index 93e0845..52bc974 100644
--- a/tests/regressiontests/queries/tests.py
+++ b/tests/regressiontests/queries/tests.py
@@ -15,7 +15,7 @@ from models import (Annotation, Article, Author, Celebrity, Child, Cover, Detail
     DumbCategory, ExtraInfo, Fan, Item, LeafA, LoopX, LoopZ, ManagedModel,
     Member, NamedCategory, Note, Number, Plaything, PointerA, Ranking, Related,
     Report, ReservedName, Tag, TvChef, Valid, X, Food, Eaten, Node, ObjectA, ObjectB,
-    ObjectC)
+    ObjectC, LogEntry)
 
 
 class BaseQuerysetTest(TestCase):
@@ -978,6 +978,11 @@ class Queries4Tests(BaseQuerysetTest):
         Report.objects.create(name='r1', creator=a1)
         Report.objects.create(name='r2', creator=a3)
         Report.objects.create(name='r3')
+        
+        entry = LogEntry.objects.create(name='First entry',
+                                        modify_date=datetime.date(2000, 1, 1))
+        self.entry_datetime = entry.modify_ts
+        self.entry_date = entry.modify_date
 
     def test_ticket7095(self):
         # Updates that are filtered on the model being updated are somewhat
@@ -1032,6 +1037,14 @@ class Queries4Tests(BaseQuerysetTest):
             []
         )
 
+    def test_update_with_auto_now(self):
+        # Ticket #15566. Make sure .update queries affect DateTimeField-s and 
+        # DateField-s with auto_now = True
+        LogEntry.objects.update(name='First entry modified')
+        entry = LogEntry.objects.get()
+        self.assertEqual(entry.name, 'First entry modified')
+        self.assertNotEqual(entry.modify_ts, self.entry_datetime, 'DateTime field of LogEntry should have been updated')
+        self.assertNotEqual(entry.modify_date, self.entry_date, 'Date field of LogEntry should have been updated')
 
 class Queries5Tests(TestCase):
     def setUp(self):
