diff --git a/Jenkinsfile b/Jenkinsfile
index 20f74f6b4..9882f1203 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
     agent any
     options { disableConcurrentBuilds() }
     stages {
-        stage('Unit Tests (Python 2)') {
+        stage('Unit Tests') {
             steps {
-                sh 'tox -r -e py2-pylint-coverage'
+                sh 'tox -rv'
             }
             post {
                 always {
@@ -16,15 +16,10 @@ pipeline {
                         utils.publish_coverage_native('index.html')
                         utils.publish_pylint('pylint.out')
                     }
-                    junit '*_results.xml'
+                    mergeJunitResults()
                 }
             }
         }
-        stage('Unit Tests (Python 3)') {
-            steps {
-                sh 'tox -r -e py3'
-            }
-        }
         stage('Packaging') {
             steps {
                 script {
diff --git a/tox.ini b/tox.ini
index 02e9a6a3f..7d15a4f85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv =
     LC_ALL=C
     LC_TIME=C
     LANG=C
-    coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov-report html --cov=wcs/ --cov-config .coveragerc -v
+    coverage: COVERAGE=--cov-report xml --cov-report html --cov=wcs/ --cov-config .coveragerc -v
 passenv =
     USER
 deps =
@@ -39,5 +39,5 @@ deps =
     pylint<1.8
     py3: Quixote>=3.0
 commands =
-    py.test -v {env:COVERAGE:} {posargs:tests/}
+    py.test -v {env:COVERAGE:} --junitxml=junit-{envname}.xml {posargs:tests/}
     pylint: ./pylint.sh wcs/