diff --git a/tests/bitcoinlib_cache_unittest1 b/tests/bitcoinlib_cache_unittest1
index b103c21d..a4ac3cc1 100644
Binary files a/tests/bitcoinlib_cache_unittest1 and b/tests/bitcoinlib_cache_unittest1 differ
diff --git a/tests/bitcoinlib_cache_unittest2 b/tests/bitcoinlib_cache_unittest2
index b103c21d..a4ac3cc1 100644
Binary files a/tests/bitcoinlib_cache_unittest2 and b/tests/bitcoinlib_cache_unittest2 differ
diff --git a/tests/test_services.py b/tests/test_services.py
index 99835e93..ec2d6571 100644
--- a/tests/test_services.py
+++ b/tests/test_services.py
@@ -820,9 +820,13 @@ def setUpClass(cls):
             try:
                 con = psycopg.connect(user='postgres', host='localhost', password='postgres', autocommit=True)
                 cur = con.cursor()
-                cur.execute(sql.SQL("CREATE DATABASE {}").format(
-                    sql.Identifier('bitcoinlibcache.unittest'))
-                )
+                try:
+                    cur.execute(sql.SQL("DROP DATABASE IF EXISTS {}").format(sql.Identifier(CACHE_DBNAME1)))
+                    cur.execute(sql.SQL("DROP DATABASE IF EXISTS {}").format(sql.Identifier(CACHE_DBNAME2)))
+                    cur.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(CACHE_DBNAME1)))
+                    cur.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(CACHE_DBNAME2)))
+                except:
+                    pass
                 cur.close()
                 con.close()
             except Exception: