diff --git a/subdomains/tests/tests.py b/subdomains/tests/tests.py
index 95fb016..471e958 100644
--- a/subdomains/tests/tests.py
+++ b/subdomains/tests/tests.py
@@ -7,8 +7,16 @@
 from django.test import TestCase
 from django.template import Context, Template
 
-from subdomains.compat.requestfactory import RequestFactory
-from subdomains.compat.tests import override_settings
+try:
+    from django.test.client import RequestFactory
+except ImportError:
+    from subdomains.compat.requestfactory import RequestFactory
+
+try:
+    from django.test.utils import override_settings
+except ImportError:
+    from subdomains.compat.tests import override_settings
+
 from subdomains.middleware import (SubdomainMiddleware,
     SubdomainURLRoutingMiddleware)
 from subdomains.utils import reverse, urljoin