diff --git a/.travis.yml b/.travis.yml
index 3d1444071..9200ace01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,5 @@
 language: java
 
-matrix:
-  include:
-    - jdk: openjdk8
-      env: JDK='Open JDK 8'
-    - jdk: openjdk9
-      env: JDK='Open JDK 9'
-    - jdk: openjdk10
-      env:
-      - JDK='Open JDK 10'
-      - NO_JACOCO='true'
-    - jdk: openjdk11
-      env:
-      - JDK='Open JDK 11'
-      - NO_JACOCO='true'
 cache:
   directories:
     - $HOME/.m2
@@ -27,5 +13,5 @@ install: true
 
 script:
   - "echo 'microsoft/mssql-server-linux:2017-CU6' > spring-data-jdbc/src/test/resources/container-license-acceptance.txt"
-  - "mvn -version"
-  - "mvn clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U"
+  - "./mvnw -version"
+  - "./mvnw -Pjava11 clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U"
diff --git a/Jenkinsfile b/Jenkinsfile
index aa218aa4e..027795373 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,30 @@ pipeline {
 	}
 
 	stages {
-		stage("Test") {
+		stage("test: baseline (jdk8)") {
+			when {
+				anyOf {
+					branch 'master'
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				docker {
+					image 'adoptopenjdk/openjdk8:latest'
+					label 'data'
+					args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
+					// root but with no maven caching
+				}
+			}
+			options { timeout(time: 30, unit: 'MINUTES') }
+			steps {
+				sh 'rm -rf ?'
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'
+				sh "chown -R 1001:1001 target"
+			}
+		}
+
+		stage("Test other configurations") {
 			when {
 				anyOf {
 					branch 'master'
@@ -20,10 +43,27 @@ pipeline {
 				}
 			}
 			parallel {
-				stage("test: baseline") {
+				stage("test: baseline (jdk11)") {
+					agent {
+						docker {
+							image 'adoptopenjdk/openjdk11:latest'
+							label 'data'
+							args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
+							// root but with no maven caching
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'rm -rf ?'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'
+						sh "chown -R 1001:1001 target"
+					}
+				}
+
+				stage("test: baseline (jdk13)") {
 					agent {
 						docker {
-							image 'adoptopenjdk/openjdk8:latest'
+							image 'adoptopenjdk/openjdk13:latest'
 							label 'data'
 							args '-u root -v /var/run/docker.sock:/var/run/docker.sock'
 							// root but with no maven caching
@@ -32,12 +72,13 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
 						sh 'rm -rf ?'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'
 						sh "chown -R 1001:1001 target"
 					}
 				}
 			}
 		}
+
 		stage('Release to artifactory') {
 			when {
 				anyOf {
@@ -70,6 +111,7 @@ pipeline {
 						'-Dmaven.test.skip=true clean deploy -U -B'
 			}
 		}
+		
 		stage('Publish documentation') {
 			when {
 				branch 'master'
diff --git a/pom.xml b/pom.xml
index 87b7e95eb..c7d878511 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0.JDK11-SNAPSHOT</version>
 	</parent>
 
 	<properties>