diff --git a/.travis.yml b/.travis.yml
index 2f94a4f54..af73040a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ env:
     - PROFILE=hibernate-53-next
     - PROFILE=hibernate-54
     - PROFILE=hibernate-54-next
+    - PROFILE=hibernate-6
     - PROFILE=eclipselink-next
     - PROFILE=eclipselink-27
     - PROFILE=eclipselink-27-next
diff --git a/pom.xml b/pom.xml
index e34371c3c..f98688bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
 
 		<eclipselink>2.6.5</eclipselink>
 		<hibernate>5.2.17.Final</hibernate>
+		<hibernate.groupId>org.hibernate</hibernate.groupId>
 		<jpa>2.0.0</jpa>
 		<springdata.commons>2.1.4.BUILD-SNAPSHOT</springdata.commons>
 
@@ -81,6 +82,19 @@
 				</repository>
 			</repositories>
 		</profile>
+		<profile>
+			<id>hibernate-6-next</id>
+			<properties>
+				<hibernate>6.0.0-SNAPSHOT</hibernate>
+				<hibernate.groupId>org.hibernate.orm</hibernate.groupId>
+			</properties>
+			<repositories>
+				<repository>
+					<id>jboss</id>
+					<url>https://repository.jboss.org/nexus/content/repositories/public</url>
+				</repository>
+			</repositories>
+		</profile>
 		<profile>
 			<id>eclipselink-next</id>
 			<properties>
@@ -225,14 +239,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>${hibernate.groupId}</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>${hibernate.groupId}</groupId>
 			<artifactId>hibernate-jpamodelgen</artifactId>
 			<version>${hibernate}</version>
 			<scope>provided</scope>
diff --git a/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java b/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java
index 3b889e63d..8fa4c96af 100644
--- a/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java
+++ b/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java
@@ -380,7 +380,8 @@ public enum PersistenceProvider implements QueryExtractor, ProxyIdAccessor {
 				throw new NoSuchElementException("No ScrollableResults");
 			}
 
-			Object[] row = scrollableResults.get();
+			// Cast needed for Hibernate 6 compatibility
+			Object[] row = (Object[]) scrollableResults.get();
 
 			return row.length == 1 ? row[0] : row;
 		}