diff --git a/.zuul.yaml b/.zuul.yaml
index 1b8b972..36bf690 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,15 +1,10 @@
 - project:
     templates:
       - check-requirements
+      - horizon-non-primary-django-jobs        
       - horizon-nodejs10-jobs
       - openstack-lower-constraints-jobs-horizon
       - openstack-python-jobs-horizon
       - openstack-python3-train-jobs-horizon
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
-    check:
-      jobs:
-        - horizon-openstack-tox-python3-django111
-    gate:
-      jobs:
-        - horizon-openstack-tox-python3-django111
diff --git a/tox.ini b/tox.ini
index 5e69498..fe36d75 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py37,py27-local,py36-local,py3-dj111-local,eslint,karma-local,docs-local,releasenotes,lower-constraints-local
+envlist = pep8,py37,py27-local,py36-local,py3-{dj111,dj22},eslint,karma-local,docs-local,releasenotes,lower-constraints-local
 minversion = 2.3.2
 skipsdist = True
 
@@ -17,7 +17,10 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-commands = python manage.py test {posargs} --settings=zun_ui.test.settings
+commands =
+  dj111: pip install django>=1.11,<2
+  dj22: pip install django>=2.2,<2.3
+  python manage.py test {posargs} --settings=zun_ui.test.settings
 
 # For installation of horizon on local
 # NOTICE: this tox.ini requires horizon repository cloned in sibling directory.
@@ -59,19 +62,6 @@ commands =
   {[testenv:hz-local]commands}
   {[testenv]commands}
 
-[testenv:py3-dj111]
-basepython = python3
-commands =
-  pip install django>=1.11,<2
-  {[testenv]commands}
-
-[testenv:py3-dj111-local]
-basepython = python3
-commands =
-  {[testenv:hz-local]commands}
-  pip install django>=1.11,<2
-  {[testenv]commands}
-
 [testenv:eslint]
 basepython = python3
 whitelist_externals =