diff --git a/Jenkinsfile b/Jenkinsfile
index 4d9038a3..1f7ab214 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,28 @@ pipeline {
 	}
 
 	stages {
-		stage("Test") {
+		stage("test: baseline (jdk8)") {
+			when {
+				anyOf {
+					branch 'master'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-v $HOME:/tmp/jenkins-home'
+				}
+			}
+			options { timeout(time: 30, unit: 'MINUTES') }
+			steps {
+				sh 'rm -rf ?'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw clean dependency:list test -Dsort -U -B'
+			}
+		}
+
+		stage("Test other configurations") {
 			when {
 				anyOf {
 					branch 'master'
@@ -20,10 +41,10 @@ pipeline {
 				}
 			}
 			parallel {
-				stage("test: baseline") {
+				stage("test: baseline (jdk11)") {
 					agent {
 						docker {
-							image 'adoptopenjdk/openjdk8:latest'
+							image 'adoptopenjdk/openjdk11:latest'
 							label 'data'
 							args '-v $HOME:/tmp/jenkins-home'
 						}
@@ -31,11 +52,27 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
 						sh 'rm -rf ?'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw clean dependency:list test -Dsort -U -B'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
+					}
+				}
+
+				stage("test: baseline (jdk13)") {
+					agent {
+						docker {
+							image 'adoptopenjdk/openjdk13:latest'
+							label 'data'
+							args '-v $HOME:/tmp/jenkins-home'
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'rm -rf ?'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -Pjava11 clean dependency:list test -Dsort -U -B'
 					}
 				}
 			}
 		}
+
 		stage('Release to artifactory') {
 			when {
 				anyOf {