diff --git a/tests/admin_views/test_templatetags.py b/tests/admin_views/test_templatetags.py
index f717b8e1b7..14c3fcead5 100644
--- a/tests/admin_views/test_templatetags.py
+++ b/tests/admin_views/test_templatetags.py
@@ -128,3 +128,45 @@ class DateHierarchyTests(TestCase):
                 ]
                 expected_choices = [('?' + choice) if choice else '' for choice in expected_choices]
                 self.assertEqual(choices, expected_choices)
+
+    def test_choice_links_datetime(self):
+        modeladmin = ModelAdmin(Question, site)
+        modeladmin.date_hierarchy = 'expires'
+        Question.objects.bulk_create([
+            Question(question='q1', expires=datetime.datetime(2017, 10, 1)),
+            Question(question='q2', expires=datetime.datetime(2017, 10, 1)),
+            Question(question='q3', expires=datetime.datetime(2017, 12, 15)),
+            Question(question='q4', expires=datetime.datetime(2017, 12, 15)),
+            Question(question='q5', expires=datetime.datetime(2017, 12, 31)),
+            Question(question='q6', expires=datetime.datetime(2018, 2, 1)),
+        ])
+        tests = [
+            ({}, [['year=2017'], ['year=2018']]),
+            ({'year': 2016}, []),
+            (
+                {'year': 2017}, [
+                    ['month=10', 'year=2017'],
+                    ['month=12', 'year=2017'],
+                ],
+            ),
+            ({'year': 2017, 'month': 9}, []),
+            (
+                {'year': 2017, 'month': 12}, [
+                    ['day=15', 'month=12', 'year=2017'],
+                    ['day=31', 'month=12', 'year=2017'],
+                ],
+            ),
+        ]
+        for query, expected_choices in tests:
+            with self.subTest(query=query):
+                query = {'expires__%s' % q: val for q, val in query.items()}
+                request = self.factory.get('/', query)
+                request.user = self.superuser
+                changelist = modeladmin.get_changelist_instance(request)
+                spec = date_hierarchy(changelist)
+                choices = [choice['link'] for choice in spec['choices']]
+                expected_choices = [
+                    '?' + '&'.join('expires__%s' % c for c in choice)
+                    for choice in expected_choices
+                ]
+                self.assertEqual(choices, expected_choices)