diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
index 917c7ff82a1e..ee1572019688 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -113,7 +113,7 @@ public Flyway flyway(FlywayProperties properties,
 				ObjectProvider<FlywayConfigurationCustomizer> fluentConfigurationCustomizers,
 				ObjectProvider<Callback> callbacks,
 				ObjectProvider<FlywayCallback> flywayCallbacks) {
-			FluentConfiguration configuration = new FluentConfiguration();
+			FluentConfiguration configuration = new FluentConfiguration(resourceLoader.getClassLoader());
 			DataSource dataSourceToMigrate = configureDataSource(configuration,
 					properties, dataSourceProperties, flywayDataSource.getIfAvailable(),
 					dataSource.getIfAvailable());
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 55746bc6ef9c..fe009a38fd42 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
@@ -36,6 +36,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 
+import org.mockito.internal.util.MockUtil;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
@@ -48,11 +49,14 @@
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.stereotype.Component;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.inOrder;
@@ -470,6 +474,16 @@ public void undoSqlMigrationPrefix() {
 				});
 	}
 
+	@Test
+	public void customFlywayClassLoader() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class,
+				ResourceLoaderConfiguration.class).run((context) -> {
+			assertThat(context).hasSingleBean(Flyway.class);
+			Flyway flyway = context.getBean(Flyway.class);
+			assertTrue(MockUtil.isMock(flyway.getConfiguration().getClassLoader()));
+		});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	protected static class FlywayDataSourceConfiguration {
 
@@ -489,6 +503,17 @@ public DataSource flywayDataSource() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	protected static class ResourceLoaderConfiguration {
+
+		@Bean
+		@Primary
+		public ResourceLoader customClassLoader() {
+			return new DefaultResourceLoader(mock(ClassLoader.class));
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	protected static class CustomFlywayMigrationInitializer {