diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 6c8c0e0..be4fea7 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
diff --git a/pom.xml b/pom.xml
index 88e9407..6861ac4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.2</version>
+		<version>4.0.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -29,8 +29,8 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-core</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-flyway</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.flywaydb</groupId>
@@ -46,6 +46,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
@@ -54,7 +59,7 @@
 		<dependency>
 			<groupId>io.zonky.test</groupId>
 			<artifactId>embedded-database-spring-test</artifactId>
-			<version>2.5.1</version>
+			<version>2.8.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/src/test/java/com/github/tomix26/embedded/database/demo/SpringDataJpaAnnotationTest.java b/src/test/java/com/github/tomix26/embedded/database/demo/SpringDataJpaAnnotationTest.java
index c55b16b..3495b90 100644
--- a/src/test/java/com/github/tomix26/embedded/database/demo/SpringDataJpaAnnotationTest.java
+++ b/src/test/java/com/github/tomix26/embedded/database/demo/SpringDataJpaAnnotationTest.java
@@ -5,7 +5,7 @@
 import io.zonky.test.db.AutoConfigureEmbeddedDatabase;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 
 import java.util.Optional;
 
diff --git a/src/test/java/com/github/tomix26/embedded/database/demo/annotation/PostgresDataJpaTest.java b/src/test/java/com/github/tomix26/embedded/database/demo/annotation/PostgresDataJpaTest.java
index c67b5db..831bd33 100644
--- a/src/test/java/com/github/tomix26/embedded/database/demo/annotation/PostgresDataJpaTest.java
+++ b/src/test/java/com/github/tomix26/embedded/database/demo/annotation/PostgresDataJpaTest.java
@@ -1,7 +1,7 @@
 package com.github.tomix26.embedded.database.demo.annotation;
 
 import io.zonky.test.db.AutoConfigureEmbeddedDatabase;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.core.annotation.AliasFor;