diff --git a/tests/__init__.py b/tests/__init__.py
index 16fdeae..e211653 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -272,6 +272,13 @@ class SimplePagureTest(unittest.TestCase):
         for folder in ['repos', 'forks', 'releases', 'remotes', 'attachments']:
             os.mkdir(os.path.join(self.path, folder))
 
+        if hasattr(pagure, 'REDIS') and pagure.REDIS:
+            pagure.REDIS.connection_pool.disconnect()
+            pagure.REDIS = None
+        if hasattr(pagure.lib, 'REDIS') and pagure.lib.REDIS:
+            pagure.lib.REDIS.connection_pool.disconnect()
+            pagure.lib.REDIS = None
+
         if DB_PATH:
             self.dbpath = DB_PATH
             _create_db_entities(self.dbpath)
@@ -346,9 +353,6 @@ class Modeltests(SimplePagureTest):
         # Clean up test performance info
         super(Modeltests, self).setUp()
 
-        pagure.REDIS = None
-        pagure.lib.REDIS = None
-
         # Create a broker
         broker_url = os.path.join(self.path, 'broker')