diff --git a/tests/conftest.py b/tests/conftest.py
index c32b0872..4fdb93c7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,13 +1,6 @@
 import pytest
 
-
-class Object:
-    pass
-
-
-@pytest.fixture
-def object():
-    return Object()
+from .fixtures import *
 
 
 def pytest_addoption(parser):
diff --git a/tests/fixtures.py b/tests/fixtures.py
new file mode 100644
index 00000000..838fa784
--- /dev/null
+++ b/tests/fixtures.py
@@ -0,0 +1,17 @@
+import pytest
+
+
+class Object:
+    pass
+
+
+@pytest.fixture
+def object():
+    return Object()
+
+
+@pytest.fixture
+def client():
+    from testclient_extensions import Client
+
+    return Client()
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index 2f8e5e80..baceeda7 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -1,9 +1,4 @@
-from django.db.models import signals
-
-
-def disconnect_signals():
-    signals.pre_save.receivers = []
-    signals.post_save.receivers = []
+from ..utils import disconnect_signals
 
 
 def pytest_runtest_setup(item):
diff --git a/tests/utils.py b/tests/utils.py
new file mode 100644
index 00000000..e70b3249
--- /dev/null
+++ b/tests/utils.py
@@ -0,0 +1,6 @@
+from django.db.models import signals
+
+
+def disconnect_signals():
+    signals.pre_save.receivers = []
+    signals.post_save.receivers = []