diff --git a/pom.xml b/pom.xml
index 849b878b6..c644be0ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 		<springdata.keyvalue>3.0.0-SNAPSHOT</springdata.keyvalue>
 		<servlet.version>5.0.0</servlet.version>
 
-		<hibernate.version>5.5.7.Final</hibernate.version>
+		<hibernate.version>6.1.1.Final</hibernate.version>
 	</properties>
 
 	<developers>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
index f82114987..b257fa851 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
@@ -35,9 +35,16 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
+			<!-- Avoid conflicts with ByteBuddy brought by Mockito -->
+			<exclusions>
+				<exclusion>
+					<groupId>net.bytebuddy</groupId>
+					<artifactId>byte-buddy</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
index 597b2d2e2..c695c157a 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongodb-driver-sync</artifactId>
-			<version>4.5.0</version>
+			<version>4.6.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml
index 6517abe4f..36fc69429 100644
--- a/spring-data-rest-webmvc/pom.xml
+++ b/spring-data-rest-webmvc/pom.xml
@@ -78,10 +78,17 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
 			<optional>true</optional>
+			<!-- Avoid conflicts with ByteBuddy brought by Mockito -->
+			<exclusions>
+				<exclusion>
+					<groupId>net.bytebuddy</groupId>
+					<artifactId>byte-buddy</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- Querydsl -->
diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelper.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelper.java
index e96f1b559..37cfa8f63 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelper.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelper.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule
  *
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class Jackson2DatatypeHelper {
 
@@ -37,7 +38,8 @@ public class Jackson2DatatypeHelper {
 
 	public static void configureObjectMapper(ObjectMapper mapper) {
 
-		if (IS_HIBERNATE_AVAILABLE && HibernateVersions.isHibernate5() && IS_HIBERNATE5_MODULE_AVAILABLE) {
+		if (IS_HIBERNATE_AVAILABLE && (HibernateVersions.isHibernate5() || HibernateVersions.isHibernate6())
+				&& IS_HIBERNATE5_MODULE_AVAILABLE) {
 			new Hibernate5ModuleRegistrar().registerModule(mapper);
 		}
 	}
@@ -47,6 +49,10 @@ public class Jackson2DatatypeHelper {
 		public static boolean isHibernate5() {
 			return Version.getVersionString().startsWith("5");
 		}
+
+		public static boolean isHibernate6() {
+			return Version.getVersionString().startsWith("6");
+		}
 	}
 
 	private static class Hibernate5ModuleRegistrar {