diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b705552a..99d23e4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,21 @@
-# Official language image. Look for the different tagged releases at:
-# https://hub.docker.com/r/library/python/tags/
+stages:
+- "test"
 
-.job_template: &job_definition
-  # Change pip's cache directory to be inside the project directory since we can
-  # only cache local items.
-  variables:
-    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
-  
-  # Pip's cache doesn't store the python packages
-  # https://pip.pypa.io/en/stable/reference/pip_install/#caching
-  #
-  # If you want to also cache the installed packages, you have to install
-  # them in a virtualenv and cache it as well.
-  cache:
-    paths:
-      - .cache/pip
-      - venv/
-  
-  before_script:
-    - python -V                  # Print out python version for debugging
-    - pip install virtualenv tox
-    - virtualenv venv
-    - source venv/bin/activate
-    
-  coverage: '/TOTAL.+ ([0-9]{1,3}%)/'
+before_script:
+- python -V
+- pip install wheel tox
 
-py36-dj20:
-  <<: *job_definition
+test-3.5:
+  image: python:3.5-stretch
+  script:  
+  - tox -e py35
+
+test-3.6:
   image: python:3.6-stretch
-  script:
-  - export TOXENV=py36-dj20
-  - tox
+  script:  
+  - tox -e py36
+
+test-3.7:
+  image: python:3.7-stretch
+  script:  
+  - tox -e py37
diff --git a/tox.ini b/tox.ini
index 0963661e..3a22b1ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,18 @@
 [tox]
-skipsdist = True
-usedevelop = True
-envlist = py{34,35,36,37}-dj{20}
+skipsdist = true
+usedevelop = true
+envlist = py{35,36,37}-dj{2X}
 
 [testenv]
 setenv =
     DJANGO_SETTINGS_MODULE = settings
-basepython =
-    py34: python3.4
+basepython =    
     py35: python3.5
     py36: python3.6
     py37: python3.7
 deps=    
-    dj20: Django>=2.0,<3.0
+    coverage
+    dj2X: Django>=2.0,<3.0
     py37: https://github.com/yaml/pyyaml/zipball/master#egg=pyyaml
     py37: https://github.com/celery/kombu/zipball/master#egg=kombu
 install_command = pip install -e ".[testing]" -U {opts} {packages}