diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
index 939e741ce0..e96a599777 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
@@ -26,7 +26,6 @@ import javax.sql.DataSource;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.api.callback.FlywayCallback;
-import org.flywaydb.core.internal.callback.SqlScriptFlywayCallback;
 import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
 import org.junit.Test;
 import org.mockito.InOrder;
@@ -285,11 +284,9 @@ public class FlywayAutoConfigurationTests {
 							FlywayCallback.class);
 					FlywayCallback callbackTwo = context.getBean("callbackTwo",
 							FlywayCallback.class);
-					assertThat(flyway.getCallbacks()).hasSize(3);
-					assertThat(flyway.getCallbacks()).startsWith(callbackTwo,
+					assertThat(flyway.getCallbacks()).hasSize(2);
+					assertThat(flyway.getCallbacks()).containsExactly(callbackTwo,
 							callbackOne);
-					assertThat(flyway.getCallbacks()[2])
-							.isInstanceOf(SqlScriptFlywayCallback.class);
 					InOrder orderedCallbacks = inOrder(callbackOne, callbackTwo);
 					orderedCallbacks.verify(callbackTwo)
 							.beforeMigrate(any(Connection.class));
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 85272fb388..34fc24f171 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -49,7 +49,7 @@
 		<ehcache.version>2.10.4</ehcache.version>
 		<ehcache3.version>3.4.0</ehcache3.version>
 		<embedded-mongo.version>2.0.0</embedded-mongo.version>
-		<flyway.version>4.2.0</flyway.version>
+		<flyway.version>5.0.0</flyway.version>
 		<freemarker.version>2.3.27-incubating</freemarker.version>
 		<elasticsearch.version>5.5.3</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>