diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5e0e720..0c7ac9a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* :support:`-` use separate test vhost for celery queues
 * :support:`-` switch licensing to AGPLv3+
 * :support:`-` add a Vagrant setup to ease development
 * :support:`-` add example provisioning defined as saltstack states
diff --git a/gnuviechadmin/gnuviechadmin/settings/test.py b/gnuviechadmin/gnuviechadmin/settings/test.py
index a079403..872b320 100644
--- a/gnuviechadmin/gnuviechadmin/settings/test.py
+++ b/gnuviechadmin/gnuviechadmin/settings/test.py
@@ -20,3 +20,5 @@ LOGGING['loggers'].update(dict(
             'gvawebcore', 'hostingpackages', 'ldaptasks', 'managemails',
             'mysqltasks', 'osusers', 'pgsqltasks', 'taskresults',
             'userdbs', 'websites']]))
+BROKER_URL = BROKER_URL + '_test'
+CELERY_RESULT_PERSISTENT = False