diff --git a/pytest_django/compat.py b/pytest_django/compat.py
index 9203a50e1..54bad5f40 100644
--- a/pytest_django/compat.py
+++ b/pytest_django/compat.py
@@ -13,3 +13,12 @@ def teardown_databases(db_cfg, verbosity):
         _DiscoverRunner(verbosity=verbosity, interactive=False).teardown_databases(
             db_cfg
         )
+
+
+# Import NullTimeKeeper from Django > 3.1 for setup_databases call -
+# fix for https://github.com/pytest-dev/pytest-django/issues/858
+try:
+    from django.test.utils import NullTimeKeeper
+    setup_databases_args = {"time_keeper": NullTimeKeeper()}
+except ImportError:
+    setup_databases_args = {}
diff --git a/pytest_django/fixtures.py b/pytest_django/fixtures.py
index b2cc82580..c6a0b16e2 100644
--- a/pytest_django/fixtures.py
+++ b/pytest_django/fixtures.py
@@ -91,9 +91,7 @@ def django_db_setup(
     django_db_modify_db_settings,
 ):
     """Top level fixture to ensure test databases are available"""
-    from .compat import setup_databases, teardown_databases
-
-    setup_databases_args = {}
+    from .compat import setup_databases, teardown_databases, setup_databases_args
 
     if not django_db_use_migrations:
         _disable_native_migrations()