diff --git a/docs/releases/1.8.5.txt b/docs/releases/1.8.5.txt
index 1141c2c798..5a19a50137 100644
--- a/docs/releases/1.8.5.txt
+++ b/docs/releases/1.8.5.txt
@@ -36,3 +36,6 @@ Bugfixes
 * Changed ``Count`` queries to execute ``COUNT(*)`` instead of ``COUNT('*')``
   as versions of Django before 1.8 did (:ticket:`25377`). This may fix a
   performance regression on some databases.
+
+* Fixed custom queryset chaining with ``values()`` and ``values_list()``
+  (:ticket:`20625`).
diff --git a/tests/custom_managers/tests.py b/tests/custom_managers/tests.py
index b8acfc906d..28198b4422 100644
--- a/tests/custom_managers/tests.py
+++ b/tests/custom_managers/tests.py
@@ -76,6 +76,10 @@ class CustomManagerTests(TestCase):
             self.assertEqual(list(queryset), [six.text_type("Bugs")])
             self.assertEqual(queryset._filter_CustomQuerySet, True)
 
+            self.assertIsInstance(queryset.values(), CustomQuerySet)
+            self.assertIsInstance(queryset.values().values(), CustomQuerySet)
+            self.assertIsInstance(queryset.values_list().values(), CustomQuerySet)
+
     def test_init_args(self):
         """
         The custom manager __init__() argument has been set.