diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 907bf8f1c0f002522e76438bc1cd75bcec16cd11..525c6f34f209c9d0db33b4d31a9e10ac0ae73395 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,24 +32,31 @@ cache:
   make install-dev
 
 test:
-    image: docker.km3net.de/base/python:3.6
-    stage: test
-    script:
-        - *virtualenv_definition
-        - pip list
-        - make test
-
+  image: docker.km3net.de/base/python:$PYTHON_VERSION
+  stage: test
+  script:
+    - *virtualenv_definition
+    - pip list
+    - make test
+  parallel:
+    matrix:
+      - PYTHON_VERSION: "3.6"
+      - PYTHON_VERSION: "3.7"
 
 coverage:
-    image: docker.km3net.de/base/python:3.6
-    stage: coverage
-    script:
-        - *virtualenv_definition
-        - "make test-cov|grep TOTAL| awk '{printf \"COVERAGE: %.2f%%\", (1-$3/$2)*100 }'"
-    coverage: '/COVERAGE:\s*([0-9]*\.[0-9]*%)/'
-    artifacts:
-        paths:
-            - reports/coverage
+  image: docker.km3net.de/base/python:$PYTHON_VERSION
+  stage: coverage
+  script:
+    - *virtualenv_definition
+    - "make test-cov | grep TOTAL | awk '{printf \"COVERAGE: %.2f%%\", (1-$3/$2)*100 }'"
+  coverage: '/COVERAGE:\s*([0-9]*\.[0-9]*%)/'
+  parallel:
+    matrix:
+      - PYTHON_VERSION: "3.6"
+      - PYTHON_VERSION: "3.7"
+  artifacts:
+    paths:
+      - reports/coverage
 
 
 pages: