diff --git a/tests/utilities.py b/tests/utilities.py
index c783565..d040a95 100644
--- a/tests/utilities.py
+++ b/tests/utilities.py
@@ -1,15 +1,18 @@
+import configparser
 import os
+import random
+import shutil
 import tempfile
 
+import psycopg2
 from django.conf import settings
-from django.utils.six.moves import configparser as ConfigParser
 from quixote import cleanup, get_publisher
 from webtest import TestApp
 
 import wcs
 import wcs.middleware
 import wcs.wsgi
-from wcs import compat, publisher
+from wcs import compat, publisher, sql
 from wcs.qommon.http_request import HTTPRequest
 from wcs.qommon.publisher import set_publisher_class
 
@@ -17,7 +20,7 @@ wcs.middleware.AfterJobsMiddleware.ASYNC = False
 
 
 def create_temporary_pub():
-    config = ConfigParser.ConfigParser()
+    config = configparser.ConfigParser()
     APP_DIR = tempfile.mkdtemp()
     compat.CompatWcsPublisher.APP_DIR = APP_DIR
     compat.CompatWcsPublisher.DATA_DIR = os.path.abspath(
@@ -30,15 +33,67 @@ def create_temporary_pub():
     compat.CompatWcsPublisher.configure(config)
     compat.CompatWcsPublisher.init_publisher_class()
     pub = compat.CompatWcsPublisher.create_publisher()
-    # allow saving the user
     pub.app_dir = os.path.join(APP_DIR, 'example.net')
     os.mkdir(pub.app_dir)
+
+    # set classes
+    pub.user_class = sql.SqlUser
+    pub.role_class = sql.Role
+    pub.token_class = sql.Token
+    pub.tracking_code_class = sql.TrackingCode
+    pub.session_class = sql.Session
+    pub.custom_view_class = sql.CustomView
+    pub.snapshot_class = sql.Snapshot
+    pub.loggederror_class = sql.LoggedError
+
+    conn = psycopg2.connect(user=os.environ['USER'], dbname='postgres')
+    conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
+    i = 0
+    while True:
+        dbname = 'wcstests%d' % random.randint(0, 100000)
+        try:
+            cur = conn.cursor()
+            cur.execute('CREATE DATABASE %s' % dbname)
+            break
+        except psycopg2.Error:
+            if i < 5:
+                i += 1
+                continue
+            raise
+        finally:
+            cur.close()
+
+    pub.cfg['postgresql'] = {'database': dbname, 'user': os.environ['USER']}
+    pub.write_cfg()
+
+    sql.do_user_table()
+    sql.do_role_table()
+    sql.do_tokens_table()
+    sql.do_tracking_code_table()
+    sql.do_session_table()
+    sql.do_transient_data_table()
+    sql.do_custom_views_table()
+    sql.do_snapshots_table()
+    sql.do_loggederrors_table()
+    sql.do_meta_table()
+    sql.init_global_table()
+    conn.close()
+
     return pub
 
 
 def clean_temporary_pub():
-    if get_publisher():
-        get_publisher().cleanup()
+    pub = get_publisher()
+    conn = psycopg2.connect(user=os.environ['USER'], dbname='postgres')
+    conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
+    try:
+        cur = conn.cursor()
+        cur.execute('DROP DATABASE %s' % pub.cfg['postgresql']['database'])
+        cur.close()
+    except psycopg2.Error as e:
+        print(e)
+    shutil.rmtree(pub.app_dir)
+    pub.cleanup()
 
 
 def get_app(pub, https=False):
diff --git a/tox.ini b/tox.ini
index 68f431b..cef1353 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,10 @@ deps =
     Quixote>=3.0,<3.2
     django>=2.2,<2.3
     unidecode
+    psycopg2-binary
     pre-commit
+passenv=
+    USER
 commands =
     ./get_wcs.sh
     py.test {posargs: {env:JUNIT:} {env:COVERAGE:} tests/}