diff --git a/.github/actions/sync-to-maven-central/action.yml b/.github/actions/sync-to-maven-central/action.yml
index 6512376acb3c..b45f66667089 100644
--- a/.github/actions/sync-to-maven-central/action.yml
+++ b/.github/actions/sync-to-maven-central/action.yml
@@ -37,6 +37,8 @@ runs:
         staging-profile-name: ${{ inputs.ossrh-s01-staging-profile }}
         upload: true
         username: ${{ inputs.ossrh-s01-token-username }}
+        close-timeout: 3600
+        release-timeout: 3600
     - name: Await
       uses: ./.github/actions/await-http-resource
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ffd5d6ec1128..8dbf7582be81 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
   build-and-stage-release:
     name: Build and Stage Release
     if: ${{ github.repository == 'spring-projects/spring-boot' || github.repository == 'spring-projects/spring-boot-commercial' }}
-    runs-on: ${{ vars.UBUNTU_MEDIUIM || 'ubuntu-latest' }}
+    runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
     steps:
       - name: Check Out Code
         uses: actions/checkout@v4
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 1c55b6bf3a6d..5b9c492bcc3f 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,8 +1,6 @@
 # Project name
 .name
 *.xml
-# Project icon
-icon.svg
 /modules/
 /shelf/
 /workspace.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8c8b10622eb7..cdd2a9295b1d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -51,6 +51,8 @@
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <emptyLine />
           <package name="java" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="javax" withSubpackages="true" static="false" />
@@ -119,4 +121,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/icon.svg b/.idea/icon.svg
new file mode 100644
index 000000000000..d84ae1cf9fb2
--- /dev/null
+++ b/.idea/icon.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 510 457.8" style="enable-background:new 0 0 510 457.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#6DB33F;}
+</style>
+<title>icon-spring-boot</title>
+<g id="Layer_2_1_">
+	<g id="Layer_1-2">
+		<path class="st0" d="M503.5,201.4L403,27.5C394.3,12.4,372.9,0,355.4,0H154.6c-17.4,0-38.9,12.4-47.6,27.5L6.6,201.4
+			c-8.7,15.1-8.7,39.8,0,54.9l100.4,174c8.7,15.1,30.1,27.5,47.6,27.5h200.9c17.4,0,38.8-12.4,47.6-27.5l100.4-174
+			C512.2,241.2,512.2,216.5,503.5,201.4z M233.3,96.2c0-11.4,9.3-20.7,20.7-20.7c11.4,0,20.7,9.3,20.7,20.7v123.7
+			c0,11.4-9.3,20.7-20.7,20.7c-11.4,0-20.7-9.3-20.7-20.7l0,0V96.2z M254,360.3c-77.4,0-140.4-63-140.4-140.4
+			c0.1-44.4,21.1-86.1,56.7-112.7c8.2-6.1,19.7-4.4,25.8,3.8s4.4,19.7-3.8,25.8l0,0c-45.9,34.1-55.5,99-21.4,144.9
+			s99,55.5,144.9,21.4c26.3-19.5,41.8-50.4,41.8-83.2c-0.1-32.9-15.7-63.8-42.2-83.4c-8.2-6-9.9-17.6-3.9-25.8s17.6-9.9,25.8-3.9
+			c35.9,26.5,57,68.5,57.1,113.1C394.4,297.4,331.4,360.3,254,360.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/antora/package-lock.json b/antora/package-lock.json
index 14b21bd5c056..96d4bd6a3c3a 100644
--- a/antora/package-lock.json
+++ b/antora/package-lock.json
@@ -13,7 +13,7 @@
         "@springio/antora-extensions": "1.11.1",
         "@springio/antora-xref-extension": "1.0.0-alpha.4",
         "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.8",
-        "@springio/asciidoctor-extensions": "1.0.0-alpha.16",
+        "@springio/asciidoctor-extensions": "1.0.0-alpha.17",
         "patch-package": "^8.0.0"
       }
     },
@@ -299,9 +299,10 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.24.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz",
-      "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
+      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -388,9 +389,9 @@
       }
     },
     "node_modules/@springio/asciidoctor-extensions": {
-      "version": "1.0.0-alpha.16",
-      "resolved": "https://registry.npmjs.org/@springio/asciidoctor-extensions/-/asciidoctor-extensions-1.0.0-alpha.16.tgz",
-      "integrity": "sha512-xUoe3sNxvjbxKXNt2hvg2dtykZj8UKg1kEr4nNhXM3Cg2lbGYCPTU1ow8z4/cV5rIVd7cq28b+afsDZoV5gc1g==",
+      "version": "1.0.0-alpha.17",
+      "resolved": "https://registry.npmjs.org/@springio/asciidoctor-extensions/-/asciidoctor-extensions-1.0.0-alpha.17.tgz",
+      "integrity": "sha512-mvVEKZNdGQu1+raOF+sy1DKWZrq1bB0dM4ZVlIIFV+jJ/mengXByq7YQk63nMOFsue6fGlgb3nQUte8EbvoQAw==",
       "license": "ASL-2.0",
       "dependencies": {
         "js-yaml": "~4.1"
@@ -2668,17 +2669,19 @@
       }
     },
     "node_modules/seroval": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.0.7.tgz",
-      "integrity": "sha512-n6ZMQX5q0Vn19Zq7CIKNIo7E75gPkGCFUEqDpa8jgwpYr/vScjqnQ6H09t1uIiZ0ZSK0ypEGvrYK2bhBGWsGdw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.2.1.tgz",
+      "integrity": "sha512-yBxFFs3zmkvKNmR0pFSU//rIsYjuX418TnlDmc2weaq5XFDqDIV/NOMPBoLrbxjLH42p4UzRuXHryXh9dYcKcw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/seroval-plugins": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.0.7.tgz",
-      "integrity": "sha512-GO7TkWvodGp6buMEX9p7tNyIkbwlyuAWbI6G9Ec5bhcm7mQdu3JOK1IXbEUwb3FVzSc363GraG/wLW23NSavIw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.2.1.tgz",
+      "integrity": "sha512-H5vs53+39+x4Udwp4J5rNZfgFuA+Lt+uU+09w1gYBVWomtAl98B+E9w7yC05Xc81/HgLvJdlyqJbU0fJCKCmdw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -2790,13 +2793,14 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.8.17",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.17.tgz",
-      "integrity": "sha512-E0FkUgv9sG/gEBWkHr/2XkBluHb1fkrHywUgA6o6XolPDCJ4g1HaLmQufcBBhiF36ee40q+HpG/vCZu7fLpI3Q==",
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.5.tgz",
+      "integrity": "sha512-ogI3DaFcyn6UhYhrgcyRAMbu/buBJitYQASZz5WzfQVPP10RD2AbCoRZ517psnezrasyCbWzIxZ6kVqet768xw==",
+      "license": "MIT",
       "dependencies": {
         "csstype": "^3.1.0",
-        "seroval": "^1.0.4",
-        "seroval-plugins": "^1.0.3"
+        "seroval": "^1.1.0",
+        "seroval-plugins": "^1.1.0"
       }
     },
     "node_modules/sonic-boom": {
diff --git a/antora/package.json b/antora/package.json
index 6c1da7b7c1a0..487d2532a37c 100644
--- a/antora/package.json
+++ b/antora/package.json
@@ -11,7 +11,7 @@
     "@springio/antora-xref-extension": "1.0.0-alpha.4",
     "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.8",
     "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.16",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.17",
     "patch-package": "^8.0.0"
   },
   "config": {
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
index 8bd7f2fb21d1..b8efe10f2df0 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ public void apply(Project project) {
 		new KotlinConventions().apply(project);
 		new WarConventions().apply(project);
 		new EclipseConventions().apply(project);
+		new TestFixturesConventions().apply(project);
 		RepositoryTransformersExtension.apply(project);
 	}
 
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
index 557d2628a60b..73fee9d6624a 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
@@ -32,6 +32,7 @@
 import io.spring.javaformat.gradle.tasks.Format;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.Project;
+import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.Dependency;
@@ -54,6 +55,8 @@
 import org.springframework.boot.build.architecture.ArchitecturePlugin;
 import org.springframework.boot.build.classpath.CheckClasspathForProhibitedDependencies;
 import org.springframework.boot.build.optional.OptionalDependenciesPlugin;
+import org.springframework.boot.build.springframework.CheckAotFactories;
+import org.springframework.boot.build.springframework.CheckSpringFactories;
 import org.springframework.boot.build.testing.TestFailuresPlugin;
 import org.springframework.boot.build.toolchain.ToolchainPlugin;
 import org.springframework.util.StringUtils;
@@ -98,6 +101,19 @@
  * <li>{@code Implementation-Version}
  * </ul>
  * <li>{@code spring-boot-parent} is used for dependency management</li>
+ * <li>Additional checks are configured:
+ * <ul>
+ * <li>For all source sets:
+ * <ul>
+ * <li>Prohibited dependencies on the compile classpath
+ * <li>Prohibited dependencies on the runtime classpath
+ * </ul>
+ * <li>For the {@code main} source set:
+ * <ul>
+ * <li>{@code META-INF/spring/aot.factories}
+ * <li>{@code META-INF/spring.factories}
+ * </ul>
+ * </ul>
  * </ul>
  *
  * <p/>
@@ -123,6 +139,7 @@ void apply(Project project) {
 			configureDependencyManagement(project);
 			configureToolchain(project);
 			configureProhibitedDependencyChecks(project);
+			configureFactoriesFilesChecks(project);
 		});
 	}
 
@@ -304,4 +321,26 @@ private void createProhibitedDependenciesCheck(Configuration classpath, Project
 		project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME).dependsOn(checkClasspathForProhibitedDependencies);
 	}
 
+	private void configureFactoriesFilesChecks(Project project) {
+		SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
+		sourceSets.matching((sourceSet) -> SourceSet.MAIN_SOURCE_SET_NAME.equals(sourceSet.getName()))
+			.configureEach((main) -> {
+				TaskProvider<Task> check = project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME);
+				TaskProvider<CheckAotFactories> checkAotFactories = project.getTasks()
+					.register("checkAotFactories", CheckAotFactories.class, (task) -> {
+						task.setSource(main.getResources());
+						task.setClasspath(main.getOutput().getClassesDirs());
+						task.setDescription("Checks the META-INF/spring/aot.factories file of the main source set.");
+					});
+				check.configure((task) -> task.dependsOn(checkAotFactories));
+				TaskProvider<CheckSpringFactories> checkSpringFactories = project.getTasks()
+					.register("checkSpringFactories", CheckSpringFactories.class, (task) -> {
+						task.setSource(main.getResources());
+						task.setClasspath(main.getOutput().getClassesDirs());
+						task.setDescription("Checks the META-INF/spring.factories file of the main source set.");
+					});
+				check.configure((task) -> task.dependsOn(checkSpringFactories));
+			});
+	}
+
 }
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/TestFixturesConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/TestFixturesConventions.java
new file mode 100644
index 000000000000..06316d71f9d0
--- /dev/null
+++ b/buildSrc/src/main/java/org/springframework/boot/build/TestFixturesConventions.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build;
+
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.ConfigurationContainer;
+import org.gradle.api.component.AdhocComponentWithVariants;
+import org.gradle.api.plugins.JavaTestFixturesPlugin;
+
+/**
+ * Conventions that are applied in the presence of the {@link JavaTestFixturesPlugin}.
+ * When the plugin is applied:
+ *
+ * <ul>
+ * <li>Publishing of the test fixtures is disabled.
+ * </ul>
+ *
+ * @author Andy Wilkinson
+ */
+class TestFixturesConventions {
+
+	void apply(Project project) {
+		project.getPlugins().withType(JavaTestFixturesPlugin.class, (testFixtures) -> disablePublishing(project));
+	}
+
+	private void disablePublishing(Project project) {
+		ConfigurationContainer configurations = project.getConfigurations();
+		AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.getComponents()
+			.getByName("java");
+		javaComponent.withVariantsFromConfiguration(configurations.getByName("testFixturesApiElements"),
+				(variant) -> variant.skip());
+		javaComponent.withVariantsFromConfiguration(configurations.getByName("testFixturesRuntimeElements"),
+				(variant) -> variant.skip());
+	}
+
+}
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckAotFactories.java b/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckAotFactories.java
new file mode 100644
index 000000000000..643f29302533
--- /dev/null
+++ b/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckAotFactories.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.springframework;
+
+import org.gradle.api.Task;
+
+/**
+ * {@link Task} that checks {@code META-INF/spring/aot.factories}.
+ *
+ * @author Andy Wilkinson
+ */
+public abstract class CheckAotFactories extends CheckFactoriesFile {
+
+	public CheckAotFactories() {
+		super("META-INF/spring/aot.factories");
+	}
+
+}
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckFactoriesFile.java b/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckFactoriesFile.java
new file mode 100644
index 000000000000..9c4227fd1b5c
--- /dev/null
+++ b/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckFactoriesFile.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.springframework;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.gradle.api.DefaultTask;
+import org.gradle.api.GradleException;
+import org.gradle.api.Task;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.file.FileTree;
+import org.gradle.api.tasks.Classpath;
+import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
+import org.gradle.api.tasks.SkipWhenEmpty;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.language.base.plugins.LifecycleBasePlugin;
+
+import org.springframework.core.io.support.SpringFactoriesLoader;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link Task} that checks files loaded by {@link SpringFactoriesLoader}.
+ *
+ * @author Andy Wilkinson
+ */
+public abstract class CheckFactoriesFile extends DefaultTask {
+
+	private final String path;
+
+	private FileCollection sourceFiles = getProject().getObjects().fileCollection();
+
+	private FileCollection classpath = getProject().getObjects().fileCollection();
+
+	protected CheckFactoriesFile(String path) {
+		this.path = path;
+		getOutputDirectory().convention(getProject().getLayout().getBuildDirectory().dir(getName()));
+		setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
+	}
+
+	@InputFiles
+	@SkipWhenEmpty
+	@PathSensitive(PathSensitivity.RELATIVE)
+	public FileTree getSource() {
+		return this.sourceFiles.getAsFileTree().matching((filter) -> filter.include(this.path));
+	}
+
+	public void setSource(Object source) {
+		this.sourceFiles = getProject().getObjects().fileCollection().from(source);
+	}
+
+	@Classpath
+	public FileCollection getClasspath() {
+		return this.classpath;
+	}
+
+	public void setClasspath(Object classpath) {
+		this.classpath = getProject().getObjects().fileCollection().from(classpath);
+	}
+
+	@OutputDirectory
+	public abstract DirectoryProperty getOutputDirectory();
+
+	@TaskAction
+	void execute() {
+		getSource().forEach(this::check);
+	}
+
+	private void check(File factoriesFile) {
+		Properties properties = load(factoriesFile);
+		Map<String, List<String>> problems = new LinkedHashMap<>();
+		for (String name : properties.stringPropertyNames()) {
+			String value = properties.getProperty(name);
+			List<String> classNames = Arrays.asList(StringUtils.commaDelimitedListToStringArray(value));
+			collectProblems(problems, name, classNames);
+			List<String> sortedValues = new ArrayList<>(classNames);
+			Collections.sort(sortedValues);
+			if (!sortedValues.equals(classNames)) {
+				List<String> problemsForClassName = problems.computeIfAbsent(name, (k) -> new ArrayList<>());
+				problemsForClassName.add("Entries should be sorted alphabetically");
+			}
+		}
+		File outputFile = getOutputDirectory().file("failure-report.txt").get().getAsFile();
+		writeReport(factoriesFile, problems, outputFile);
+		if (!problems.isEmpty()) {
+			throw new GradleException("%s check failed. See '%s' for details".formatted(this.path, outputFile));
+		}
+	}
+
+	private void collectProblems(Map<String, List<String>> problems, String key, List<String> classNames) {
+		for (String className : classNames) {
+			if (!find(className)) {
+				addNoFoundProblem(className, problems.computeIfAbsent(key, (k) -> new ArrayList<>()));
+			}
+		}
+	}
+
+	private void addNoFoundProblem(String className, List<String> problemsForClassName) {
+		String binaryName = binaryNameOf(className);
+		boolean foundBinaryForm = find(binaryName);
+		problemsForClassName.add(!foundBinaryForm ? "'%s' was not found".formatted(className)
+				: "'%s' should be listed using its binary name '%s'".formatted(className, binaryName));
+	}
+
+	private boolean find(String className) {
+		for (File root : this.classpath.getFiles()) {
+			String classFilePath = className.replace(".", "/") + ".class";
+			if (new File(root, classFilePath).isFile()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private String binaryNameOf(String className) {
+		int lastDotIndex = className.lastIndexOf('.');
+		return className.substring(0, lastDotIndex) + "$" + className.substring(lastDotIndex + 1);
+	}
+
+	private Properties load(File aotFactories) {
+		Properties properties = new Properties();
+		try (FileInputStream input = new FileInputStream(aotFactories)) {
+			properties.load(input);
+			return properties;
+		}
+		catch (IOException ex) {
+			throw new UncheckedIOException(ex);
+		}
+	}
+
+	private void writeReport(File factoriesFile, Map<String, List<String>> problems, File outputFile) {
+		outputFile.getParentFile().mkdirs();
+		StringBuilder report = new StringBuilder();
+		if (!problems.isEmpty()) {
+			report.append("Found problems in '%s':%n".formatted(factoriesFile));
+			problems.forEach((key, problemsForKey) -> {
+				report.append("  - %s:%n".formatted(key));
+				problemsForKey.forEach((problem) -> report.append("    - %s%n".formatted(problem)));
+			});
+		}
+		try {
+			Files.writeString(outputFile.toPath(), report.toString(), StandardOpenOption.CREATE,
+					StandardOpenOption.TRUNCATE_EXISTING);
+		}
+		catch (IOException ex) {
+			throw new UncheckedIOException(ex);
+		}
+	}
+
+}
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckSpringFactories.java b/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckSpringFactories.java
new file mode 100644
index 000000000000..6436b8756e1a
--- /dev/null
+++ b/buildSrc/src/main/java/org/springframework/boot/build/springframework/CheckSpringFactories.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.springframework;
+
+import org.gradle.api.Task;
+
+/**
+ * {@link Task} that checks {@code META-INF/spring.factories}.
+ *
+ * @author Andy Wilkinson
+ */
+public abstract class CheckSpringFactories extends CheckFactoriesFile {
+
+	public CheckSpringFactories() {
+		super("META-INF/spring.factories");
+	}
+
+}
diff --git a/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties b/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
index 82eba8024b6b..0183ad7e7c12 100644
--- a/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
+++ b/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
@@ -27,8 +27,8 @@ url-gradle-dsl=https://docs.gradle.org/current/dsl
 url-gradle-javadoc=https://docs.gradle.org/current/javadoc
 url-kotlin-docs-kotlin-plugin={url-kotlin-docs}/using-gradle.html
 url-micrometer-docs-concepts={url-micrometer-docs}/concepts
-url-micrometer-docs-observation={url-micrometer-docs}/observation
 url-micrometer-docs-implementations={url-micrometer-docs}/implementations
+url-micrometer-docs-observation={url-micrometer-docs}/observation
 url-native-build-tools-docs=https://graalvm.github.io/native-build-tools/{version-native-build-tools}
 url-native-build-tools-docs-gradle-plugin={url-native-build-tools-docs}/gradle-plugin.html
 url-native-build-tools-docs-maven-plugin={url-native-build-tools-docs}/maven-plugin.html
diff --git a/gradle.properties b/gradle.properties
index 6bb4715e0201..6433dc2183cf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=3.4.3-SNAPSHOT
+version=3.4.4
 latestVersion=false
 spring.build-type=oss
 
@@ -11,16 +11,16 @@ checkstyleToolVersion=10.12.4
 commonsCodecVersion=1.17.2
 graalVersion=22.3
 hamcrestVersion=2.2
-jacksonVersion=2.18.2
+jacksonVersion=2.18.3
 javaFormatVersion=0.0.43
 junitJupiterVersion=5.11.4
 kotlinVersion=1.9.25
 mavenVersion=3.9.4
 mockitoVersion=5.14.2
-nativeBuildToolsVersion=0.10.5
+nativeBuildToolsVersion=0.10.6
 snakeYamlVersion=2.3
-springFrameworkVersion=6.2.3
+springFrameworkVersion=6.2.5
 springFramework60xVersion=6.0.23
-tomcatVersion=10.1.36
+tomcatVersion=10.1.39
 
 kotlin.stdlib.default.dependency=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b9530d6..9bbc975c742b 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e18bc253b857..37f853b1c84d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b0d4f..faf93008b77e 100755
--- a/gradlew
+++ b/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/settings.gradle b/settings.gradle
index c56db1cf5d85..32a0a7fc9265 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -37,8 +37,18 @@ settings.gradle.projectsLoaded {
 	}
 }
 
+include "spring-boot-project:spring-boot"
+include "spring-boot-project:spring-boot-actuator"
+include "spring-boot-project:spring-boot-actuator-autoconfigure"
+include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-dependencies"
+include "spring-boot-project:spring-boot-devtools"
+include "spring-boot-project:spring-boot-docker-compose"
+include "spring-boot-project:spring-boot-docs"
 include "spring-boot-project:spring-boot-parent"
+include "spring-boot-project:spring-boot-test"
+include "spring-boot-project:spring-boot-test-autoconfigure"
+include "spring-boot-project:spring-boot-testcontainers"
 include "spring-boot-project:spring-boot-tools:spring-boot-antlib"
 include "spring-boot-project:spring-boot-tools:spring-boot-autoconfigure-processor"
 include "spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"
@@ -56,24 +66,14 @@ include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
 include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
-include "spring-boot-project:spring-boot"
-include "spring-boot-project:spring-boot-autoconfigure"
-include "spring-boot-project:spring-boot-actuator"
-include "spring-boot-project:spring-boot-actuator-autoconfigure"
-include "spring-boot-project:spring-boot-docker-compose"
-include "spring-boot-project:spring-boot-devtools"
-include "spring-boot-project:spring-boot-docs"
-include "spring-boot-project:spring-boot-test"
-include "spring-boot-project:spring-boot-testcontainers"
-include "spring-boot-project:spring-boot-test-autoconfigure"
+include "spring-boot-system-tests:spring-boot-deployment-tests"
+include "spring-boot-system-tests:spring-boot-image-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests"
-include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-classic-tests"
+include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-server-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-sni-tests"
-include "spring-boot-system-tests:spring-boot-deployment-tests"
-include "spring-boot-system-tests:spring-boot-image-tests"
 
 file("${rootDir}/spring-boot-project/spring-boot-starters").eachDirMatch(~/spring-boot-starter.*/) {
 	include "spring-boot-project:spring-boot-starters:${it.name}"
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
index f0a8d751bfd2..8b3c9334f860 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
@@ -10,8 +10,8 @@ plugins {
 description = "Spring Boot Actuator AutoConfigure"
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-actuator"))
 	api(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot-actuator"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	implementation("com.fasterxml.jackson.core:jackson-databind")
@@ -137,6 +137,7 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
 	testImplementation("io.micrometer:micrometer-observation-test")
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
@@ -196,7 +197,7 @@ dependencies {
 tasks.named("test") {
 	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
 	filter {
-		excludeTestsMatching("org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.*")
+		excludeTestsMatching("*DocumentationTests")
 	}
 }
 
@@ -205,7 +206,7 @@ def documentationTest = tasks.register("documentationTest", Test) {
 	classpath = testing.suites.test.sources.runtimeClasspath
 	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
 	filter {
-		includeTestsMatching("org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.*")
+		includeTestsMatching("*DocumentationTests")
 	}
 	outputs.dir(layout.buildDirectory.dir("generated-snippets"))
 	develocity {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java
index 3c06fd843ff8..1b69195ad0c6 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/data/redis/RedisReactiveHealthContributorAutoConfiguration.java
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.data.redis;
 
-import java.util.Map;
-
 import reactor.core.publisher.Flux;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -51,8 +49,7 @@
 public class RedisReactiveHealthContributorAutoConfiguration extends
 		CompositeReactiveHealthContributorConfiguration<RedisReactiveHealthIndicator, ReactiveRedisConnectionFactory> {
 
-	RedisReactiveHealthContributorAutoConfiguration(
-			Map<String, ReactiveRedisConnectionFactory> redisConnectionFactories) {
+	RedisReactiveHealthContributorAutoConfiguration() {
 		super(RedisReactiveHealthIndicator::new);
 	}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java
index f6d2ee07861a..379eb09e36de 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java
@@ -89,7 +89,7 @@ public void afterPropertiesSet() {
 	public HealthContributor dbHealthContributor(ConfigurableListableBeanFactory beanFactory,
 			DataSourceHealthIndicatorProperties dataSourceHealthIndicatorProperties) {
 		Map<String, DataSource> dataSources = SimpleAutowireCandidateResolver.resolveAutowireCandidates(beanFactory,
-				DataSource.class);
+				DataSource.class, false, true);
 		if (dataSourceHealthIndicatorProperties.isIgnoreRoutingDataSources()) {
 			Map<String, DataSource> filteredDatasources = dataSources.entrySet()
 				.stream()
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java
index 8af299bf52d2..e6893be93e8d 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java
@@ -72,9 +72,8 @@ static class DataSourcePoolMetadataMetricsConfiguration {
 		@Bean
 		DataSourcePoolMetadataMeterBinder dataSourcePoolMetadataMeterBinder(ConfigurableListableBeanFactory beanFactory,
 				ObjectProvider<DataSourcePoolMetadataProvider> metadataProviders) {
-			return new DataSourcePoolMetadataMeterBinder(
-					SimpleAutowireCandidateResolver.resolveAutowireCandidates(beanFactory, DataSource.class),
-					metadataProviders);
+			return new DataSourcePoolMetadataMeterBinder(SimpleAutowireCandidateResolver
+				.resolveAutowireCandidates(beanFactory, DataSource.class, false, true), metadataProviders);
 		}
 
 		static class DataSourcePoolMetadataMeterBinder implements MeterBinder {
@@ -141,7 +140,7 @@ static class HikariDataSourceMeterBinder implements MeterBinder {
 
 			@Override
 			public void bindTo(MeterRegistry registry) {
-				this.dataSources.stream(ObjectProvider.UNFILTERED).forEach((dataSource) -> {
+				this.dataSources.stream(ObjectProvider.UNFILTERED, false).forEach((dataSource) -> {
 					HikariDataSource hikariDataSource = DataSourceUnwrapper.unwrap(dataSource, HikariConfigMXBean.class,
 							HikariDataSource.class);
 					if (hikariDataSource != null) {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
index e476398f5415..297a885bd6b6 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
  * @since 2.0.0
  * @see ServerProperties
  */
-@ConfigurationProperties(prefix = "management.server", ignoreUnknownFields = true)
+@ConfigurationProperties("management.server")
 public class ManagementServerProperties {
 
 	/**
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/aot.factories
index 2625462c354e..e5251df8307a 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/aot.factories
@@ -1,2 +1,2 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.boot.actuate.autoconfigure.metrics.ServiceLevelObjectiveBoundary.ServiceLevelObjectiveBoundaryHints
+org.springframework.boot.actuate.autoconfigure.metrics.ServiceLevelObjectiveBoundary$ServiceLevelObjectiveBoundaryHints
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointDocumentationTests.java
similarity index 94%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointDocumentationTests.java
index 3e908b0ceb1c..e8d81d12d774 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.audit;
 
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -26,9 +26,9 @@
 import org.springframework.boot.actuate.audit.AuditEvent;
 import org.springframework.boot.actuate.audit.AuditEventRepository;
 import org.springframework.boot.actuate.audit.AuditEventsEndpoint;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -89,7 +89,6 @@ void filteredAuditEvents() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointDocumentationTests.java
similarity index 93%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointDocumentationTests.java
index 882d5f57a06c..b74ce7b94e70 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.beans;
 
 import java.util.Collection;
 import java.util.List;
@@ -23,11 +23,11 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.beans.BeansEndpoint;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.restdocs.payload.JsonFieldType;
 import org.springframework.restdocs.payload.ResponseFieldsSnippet;
@@ -72,7 +72,6 @@ private boolean isIndependentBean(Entry<String, Map<String, Object>> bean) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointDocumentationTests.java
similarity index 94%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointDocumentationTests.java
index 7f51ce42c411..83f9b25a417d 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.cache;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -23,13 +23,13 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.cache.CachesEndpoint;
 import org.springframework.boot.actuate.cache.CachesEndpointWebExtension;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.restdocs.payload.FieldDescriptor;
@@ -89,7 +89,6 @@ void evictNamedCache() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java
index cddbd59beacf..2a0e7adceea7 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfigurationTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.cloudfoundry.reactive;
 
+import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collection;
@@ -24,6 +25,8 @@
 
 import javax.net.ssl.SSLException;
 
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import reactor.netty.http.HttpResources;
@@ -52,12 +55,19 @@
 import org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
+import org.springframework.boot.ssl.SslBundle;
+import org.springframework.boot.ssl.jks.JksSslStoreBundle;
+import org.springframework.boot.ssl.jks.JksSslStoreDetails;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.reactive.function.client.WebClientCustomizer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.ResponseEntity;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
 import org.springframework.mock.web.server.MockServerWebExchange;
 import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
@@ -77,6 +87,7 @@
  * Tests for {@link ReactiveCloudFoundryActuatorAutoConfiguration}.
  *
  * @author Madhura Bhave
+ * @author Moritz Halbritter
  */
 class ReactiveCloudFoundryActuatorAutoConfigurationTests {
 
@@ -272,6 +283,21 @@ void healthEndpointInvokerShouldBeCloudFoundryWebExtension() {
 	}
 
 	@Test
+	@WithResource(name = "git.properties", content = """
+			#Generated by Git-Commit-Id-Plugin
+			#Thu May 23 09:26:42 BST 2013
+			git.commit.id.abbrev=e02a4f3
+			git.commit.user.email=dsyer@vmware.com
+			git.commit.message.full=Update Spring
+			git.commit.id=e02a4f3b6f452cdbf6dd311f1362679eb4c31ced
+			git.commit.message.short=Update Spring
+			git.commit.user.name=Dave Syer
+			git.build.user.name=Dave Syer
+			git.build.user.email=dsyer@vmware.com
+			git.branch=develop
+			git.commit.time=2013-04-24T08\\:42\\:13+0100
+			git.build.time=2013-05-23T09\\:26\\:42+0100
+			""")
 	@SuppressWarnings("unchecked")
 	void gitFullDetailsAlwaysPresent() {
 		this.contextRunner.withPropertyValues("VCAP_APPLICATION:---").run((context) -> {
@@ -284,53 +310,63 @@ void gitFullDetailsAlwaysPresent() {
 	}
 
 	@Test
-	void skipSslValidation() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
-			.withPropertyValues("VCAP_APPLICATION:---", "vcap.application.application_id:my-app-id",
-					"vcap.application.cf_api:https://my-cloud-controller.com",
-					"management.cloudfoundry.skip-ssl-validation:true")
-			.run((context) -> {
-				CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(context);
-				Object interceptor = ReflectionTestUtils.getField(handlerMapping, "securityInterceptor");
-				Object interceptorSecurityService = ReflectionTestUtils.getField(interceptor,
-						"cloudFoundrySecurityService");
-				WebClient webClient = (WebClient) ReflectionTestUtils.getField(interceptorSecurityService, "webClient");
-				doesNotFailWithSslException(() -> webClient.get()
-					.uri("https://self-signed.badssl.com/")
-					.retrieve()
-					.toBodilessEntity()
-					.block(Duration.ofSeconds(30)));
-			});
-	}
-
-	private static void doesNotFailWithSslException(Runnable action) {
-		try {
-			action.run();
-		}
-		catch (RuntimeException ex) {
-			assertThat(findCause(ex, SSLException.class)).isNull();
+	@WithPackageResources("test.jks")
+	void skipSslValidation() throws IOException {
+		JksSslStoreDetails keyStoreDetails = new JksSslStoreDetails("JKS", null, "classpath:test.jks", "secret");
+		SslBundle sslBundle = SslBundle.of(new JksSslStoreBundle(keyStoreDetails, keyStoreDetails));
+		try (MockWebServer server = new MockWebServer()) {
+			server.useHttps(sslBundle.createSslContext().getSocketFactory(), false);
+			server.enqueue(new MockResponse().setResponseCode(204));
+			server.start();
+			this.contextRunner.withConfiguration(AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
+				.withPropertyValues("VCAP_APPLICATION:---", "vcap.application.application_id:my-app-id",
+						"vcap.application.cf_api:https://my-cloud-controller.com",
+						"management.cloudfoundry.skip-ssl-validation:true")
+				.run((context) -> {
+					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(context);
+					Object interceptor = ReflectionTestUtils.getField(handlerMapping, "securityInterceptor");
+					Object interceptorSecurityService = ReflectionTestUtils.getField(interceptor,
+							"cloudFoundrySecurityService");
+					WebClient webClient = (WebClient) ReflectionTestUtils.getField(interceptorSecurityService,
+							"webClient");
+					ResponseEntity<Void> response = webClient.get()
+						.uri(server.url("/").uri())
+						.retrieve()
+						.toBodilessEntity()
+						.block(Duration.ofSeconds(30));
+					assertThat(response.getStatusCode()).isEqualTo(HttpStatusCode.valueOf(204));
+				});
 		}
 	}
 
 	@Test
-	void sslValidationNotSkippedByDefault() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
-			.withPropertyValues("VCAP_APPLICATION:---", "vcap.application.application_id:my-app-id",
-					"vcap.application.cf_api:https://my-cloud-controller.com")
-			.run((context) -> {
-				CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(context);
-				Object interceptor = ReflectionTestUtils.getField(handlerMapping, "securityInterceptor");
-				Object interceptorSecurityService = ReflectionTestUtils.getField(interceptor,
-						"cloudFoundrySecurityService");
-				WebClient webClient = (WebClient) ReflectionTestUtils.getField(interceptorSecurityService, "webClient");
-				assertThatExceptionOfType(RuntimeException.class)
-					.isThrownBy(() -> webClient.get()
-						.uri("https://self-signed.badssl.com/")
-						.retrieve()
-						.toBodilessEntity()
-						.block(Duration.ofSeconds(30)))
-					.withCauseInstanceOf(SSLException.class);
-			});
+	@WithPackageResources("test.jks")
+	void sslValidationNotSkippedByDefault() throws IOException {
+		JksSslStoreDetails keyStoreDetails = new JksSslStoreDetails("JKS", null, "classpath:test.jks", "secret");
+		SslBundle sslBundle = SslBundle.of(new JksSslStoreBundle(keyStoreDetails, keyStoreDetails));
+		try (MockWebServer server = new MockWebServer()) {
+			server.useHttps(sslBundle.createSslContext().getSocketFactory(), false);
+			server.enqueue(new MockResponse().setResponseCode(204));
+			server.start();
+			this.contextRunner.withConfiguration(AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
+				.withPropertyValues("VCAP_APPLICATION:---", "vcap.application.application_id:my-app-id",
+						"vcap.application.cf_api:https://my-cloud-controller.com")
+				.run((context) -> {
+					CloudFoundryWebFluxEndpointHandlerMapping handlerMapping = getHandlerMapping(context);
+					Object interceptor = ReflectionTestUtils.getField(handlerMapping, "securityInterceptor");
+					Object interceptorSecurityService = ReflectionTestUtils.getField(interceptor,
+							"cloudFoundrySecurityService");
+					WebClient webClient = (WebClient) ReflectionTestUtils.getField(interceptorSecurityService,
+							"webClient");
+					assertThatExceptionOfType(RuntimeException.class)
+						.isThrownBy(() -> webClient.get()
+							.uri(server.url("/").uri())
+							.retrieve()
+							.toBodilessEntity()
+							.block(Duration.ofSeconds(30)))
+						.withCauseInstanceOf(SSLException.class);
+				});
+		}
 	}
 
 	private CloudFoundryWebFluxEndpointHandlerMapping getHandlerMapping(ApplicationContext context) {
@@ -349,16 +385,6 @@ private WebOperation findOperationWithRequestPath(ExposableWebEndpoint endpoint,
 				"No operation found with request path " + requestPath + " from " + endpoint.getOperations());
 	}
 
-	private static <E extends Throwable> E findCause(Throwable failure, Class<E> type) {
-		while (failure != null) {
-			if (type.isInstance(failure)) {
-				return type.cast(failure);
-			}
-			failure = failure.getCause();
-		}
-		return null;
-	}
-
 	@Endpoint(id = "test")
 	static class TestEndpoint {
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java
index e8cebbf1dd21..ab9b5800c268 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -59,6 +60,21 @@ class CloudFoundryInfoEndpointWebExtensionTests {
 				HealthEndpointAutoConfiguration.class, CloudFoundryActuatorAutoConfiguration.class));
 
 	@Test
+	@WithResource(name = "git.properties", content = """
+			#Generated by Git-Commit-Id-Plugin
+			#Thu May 23 09:26:42 BST 2013
+			git.commit.id.abbrev=e02a4f3
+			git.commit.user.email=dsyer@vmware.com
+			git.commit.message.full=Update Spring
+			git.commit.id=e02a4f3b6f452cdbf6dd311f1362679eb4c31ced
+			git.commit.message.short=Update Spring
+			git.commit.user.name=Dave Syer
+			git.build.user.name=Dave Syer
+			git.build.user.email=dsyer@vmware.com
+			git.branch=develop
+			git.commit.time=2013-04-24T08\\:42\\:13+0100
+			git.build.time=2013-05-23T09\\:26\\:42+0100
+			""")
 	@SuppressWarnings("unchecked")
 	void gitFullDetailsAlwaysPresent() {
 		this.contextRunner.run((context) -> {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/SkipSslVerificationHttpRequestFactoryTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/SkipSslVerificationHttpRequestFactoryTests.java
index 6d7f0cf01940..edaca1f623cc 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/SkipSslVerificationHttpRequestFactoryTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/SkipSslVerificationHttpRequestFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.web.servlet.ExampleServlet;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.Ssl;
@@ -49,6 +50,7 @@ void shutdownContainer() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void restCallToSelfSignedServerShouldNotThrowSslException() {
 		String httpsUrl = getHttpsUrl();
 		SkipSslVerificationHttpRequestFactory requestFactory = new SkipSslVerificationHttpRequestFactory();
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointDocumentationTests.java
similarity index 92%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointDocumentationTests.java
index f00188109854..48dc730adb7b 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.condition;
 
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpoint;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.restdocs.payload.JsonFieldType;
@@ -74,7 +73,6 @@ void conditions() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointDocumentationTests.java
similarity index 89%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointDocumentationTests.java
index e4a742862bc8..2d9494f1aa97 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.context;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.context.ShutdownEndpoint;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.test.context.TestPropertySource;
 
@@ -46,7 +46,6 @@ void shutdown() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointDocumentationTests.java
similarity index 93%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointDocumentationTests.java
index edba8a0c740e..26865460c2f3 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.context.properties;
 
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.context.properties.ConfigurationPropertiesReportEndpoint;
 import org.springframework.boot.actuate.endpoint.Show;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -77,7 +77,6 @@ void configPropsFilterByPrefix() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java
index d8f93a6dcf10..153aebd2b133 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.AbstractEndpointDocumentationTests.BaseDocumentationConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive.WebFluxEndpointManagementContextConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.WebMvcEndpointManagementContextConfiguration;
 import org.springframework.boot.actuate.endpoint.jackson.EndpointObjectMapper;
@@ -44,6 +45,7 @@
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.operation.preprocess.ContentModifyingOperationPreprocessor;
 import org.springframework.restdocs.operation.preprocess.OperationPreprocessor;
 import org.springframework.restdocs.payload.FieldDescriptor;
@@ -60,6 +62,7 @@
  * @author Andy Wilkinson
  */
 @TestPropertySource(properties = { "management.endpoints.web.exposure.include=*" })
+@Import(BaseDocumentationConfiguration.class)
 public abstract class AbstractEndpointDocumentationTests {
 
 	protected static String describeEnumValues(Class<? extends Enum<?>> enumType) {
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointDocumentationTests.java
similarity index 95%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointDocumentationTests.java
index b5f504e844f3..2c63bfc925e1 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.env;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -28,11 +28,11 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.endpoint.Show;
 import org.springframework.boot.actuate.env.EnvironmentEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
@@ -57,7 +57,7 @@
  * @author Andy Wilkinson
  */
 @TestPropertySource(
-		properties = "spring.config.location=classpath:/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/")
+		properties = "spring.config.location=classpath:/org/springframework/boot/actuate/autoconfigure/env/")
 class EnvironmentEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
 
 	private static final FieldDescriptor activeProfiles = fieldWithPath("activeProfiles")
@@ -142,7 +142,6 @@ private boolean retainKey(String key) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointDocumentationTests.java
similarity index 90%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointDocumentationTests.java
index 6f41357d8a07..79d5f0be30ab 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.flyway;
 
 import java.util.List;
 
@@ -23,6 +23,7 @@
 import org.flywaydb.core.api.MigrationState;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.flyway.FlywayEndpoint;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
@@ -30,10 +31,10 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.restdocs.payload.FieldDescriptor;
+import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
@@ -44,6 +45,8 @@
  *
  * @author Andy Wilkinson
  */
+@TestPropertySource(
+		properties = "spring.flyway.locations=classpath:org/springframework/boot/actuate/autoconfigure/flyway")
 class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
 
 	@Test
@@ -80,7 +83,6 @@ private List<FieldDescriptor> migrationFieldDescriptors() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	@ImportAutoConfiguration(FlywayAutoConfiguration.class)
 	static class TestConfiguration {
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationIntegrationTests.java
index 7101dd9522b7..2c0cad8eeb52 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -34,6 +35,20 @@
  *
  * @author Dmytro Nosan
  */
+@WithResource(name = "hazelcast.xml", content = """
+		<hazelcast
+				xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
+				xmlns="http://www.hazelcast.com/schema/config"
+				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+			<map name="defaultCache" />
+			<network>
+				<join>
+					<auto-detection enabled="false"/>
+					<multicast enabled="false"/>
+				</join>
+			</network>
+		</hazelcast>
+		""")
 class HazelcastHealthContributorAutoConfigurationIntegrationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationTests.java
index 73ed857e1736..02a8f55a4617 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -31,6 +32,20 @@
  *
  * @author Dmytro Nosan
  */
+@WithResource(name = "hazelcast.xml", content = """
+		<hazelcast
+				xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
+				xmlns="http://www.hazelcast.com/schema/config"
+				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+			<map name="defaultCache" />
+			<network>
+				<join>
+					<auto-detection enabled="false"/>
+					<multicast enabled="false"/>
+				</join>
+			</network>
+		</hazelcast>
+		""")
 class HazelcastHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java
index 25ca3ec3e3e8..80a31f339d25 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/AbstractCompositeHealthContributorConfigurationTests.java
@@ -123,13 +123,11 @@ TestBean standard() {
 		@Bean(defaultCandidate = false)
 		TestBean nonDefault() {
 			return new TestBean();
-
 		}
 
 		@Bean(autowireCandidate = false)
 		TestBean nonAutowire() {
 			return new TestBean();
-
 		}
 
 	}
@@ -145,7 +143,6 @@ TestBean standard() {
 		@Bean(autowireCandidate = false)
 		TestBean nonAutowire() {
 			return new TestBean();
-
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointDocumentationTests.java
similarity index 96%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointDocumentationTests.java
index c0457082015b..505e3284b994 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.health;
 
 import java.io.File;
 import java.util.Collections;
@@ -26,6 +26,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.endpoint.SecurityContext;
 import org.springframework.boot.actuate.health.AdditionalHealthEndpointPath;
 import org.springframework.boot.actuate.health.CompositeHealthContributor;
@@ -47,7 +48,6 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.util.unit.DataSize;
@@ -101,7 +101,6 @@ void healthComponentInstance() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	@ImportAutoConfiguration(DataSourceAutoConfiguration.class)
 	static class TestConfiguration {
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java
similarity index 94%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java
index 63b760f6e5b6..fe19095e8c61 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/InfoEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.info;
 
 import java.time.Instant;
 import java.util.List;
@@ -22,6 +22,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.info.BuildInfoContributor;
 import org.springframework.boot.actuate.info.GitInfoContributor;
 import org.springframework.boot.actuate.info.InfoContributor;
@@ -30,7 +31,6 @@
 import org.springframework.boot.info.GitProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.restdocs.payload.JsonFieldType;
 
@@ -69,7 +69,6 @@ void info() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointDocumentationTests.java
similarity index 89%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointDocumentationTests.java
index 32b0b2a15c20..09b3c10d1eab 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/IntegrationGraphEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.integration;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.integration.IntegrationGraphEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.integration.config.EnableIntegration;
 import org.springframework.integration.graph.IntegrationGraphServer;
@@ -50,7 +50,6 @@ void rebuild() {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableIntegration
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java
index ab76ba5c1ea6..a5cfebe3a5aa 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java
@@ -19,12 +19,15 @@
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import javax.sql.DataSource;
 
+import com.zaxxer.hikari.HikariDataSource;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.jdbc.DataSourceHealthContributorAutoConfiguration.RoutingDataSourceHealthContributor;
@@ -41,6 +44,7 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -213,6 +217,16 @@ void runWhenDataSourceHasNullRoutingKeyShouldProduceUnnamedComposedIndicator() {
 		});
 	}
 
+	@Test
+	void prototypeDataSourceIsIgnored() {
+		this.contextRunner
+			.withUserConfiguration(EmbeddedDataSourceConfiguration.class, PrototypeDataSourceConfiguration.class)
+			.run((context) -> {
+				assertThat(context).doesNotHaveBean(CompositeHealthContributor.class);
+				assertThat(context.getBeansOfType(DataSourceHealthIndicator.class)).hasSize(1);
+			});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	static class DataSourceConfig {
@@ -317,4 +331,26 @@ AbstractRoutingDataSource routingDataSource() throws Exception {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class PrototypeDataSourceConfiguration {
+
+		@Bean
+		@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+		DataSource dataSourcePrototype(String username, String password) {
+			return createHikariDataSource(username, password);
+		}
+
+		private HikariDataSource createHikariDataSource(String username, String password) {
+			String url = "jdbc:hsqldb:mem:test-" + UUID.randomUUID();
+			HikariDataSource hikariDataSource = DataSourceBuilder.create()
+				.url(url)
+				.type(HikariDataSource.class)
+				.username(username)
+				.password(password)
+				.build();
+			return hikariDataSource;
+		}
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointDocumentationTests.java
similarity index 87%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointDocumentationTests.java
index 042e9e1e03ca..cd389d51a7d7 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LiquibaseEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.liquibase;
 
 import java.util.List;
 
 import liquibase.changelog.ChangeSet.ExecType;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.liquibase.LiquibaseEndpoint;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
@@ -31,6 +32,7 @@
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.restdocs.payload.JsonFieldType;
+import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
@@ -41,6 +43,8 @@
  *
  * @author Andy Wilkinson
  */
+@TestPropertySource(
+		properties = "spring.liquibase.change-log=classpath:org/springframework/boot/actuate/autoconfigure/liquibase/db.changelog-master.yaml")
 class LiquibaseEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
 
 	@Test
@@ -75,8 +79,7 @@ private List<FieldDescriptor> getChangeSetFieldDescriptors() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ BaseDocumentationConfiguration.class, EmbeddedDataSourceConfiguration.class,
-			LiquibaseAutoConfiguration.class })
+	@Import({ EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class })
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointDocumentationTests.java
similarity index 87%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointDocumentationTests.java
index 84ddd459bb90..16a67a863378 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LogFileWebEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.logging;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.logging.LogFileWebEndpoint;
 import org.springframework.boot.logging.LogFile;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
@@ -50,14 +50,13 @@ void logFileRange() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
 		LogFileWebEndpoint endpoint() {
 			MockEnvironment environment = new MockEnvironment();
 			environment.setProperty("logging.file.name",
-					"src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log");
+					"src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log");
 			return new LogFileWebEndpoint(LogFile.get(environment), null);
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointDocumentationTests.java
similarity index 96%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointDocumentationTests.java
index 94c212d2d12c..974d9dfd9d3d 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/LoggersEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LoggersEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.logging;
 
 import java.util.Collections;
 import java.util.EnumSet;
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.logging.LoggersEndpoint;
 import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.logging.LoggerConfiguration;
@@ -31,7 +32,6 @@
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
@@ -146,7 +146,6 @@ void clearLogLevel() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/management/HeapDumpWebEndpointDocumentationTests.java
similarity index 90%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/management/HeapDumpWebEndpointDocumentationTests.java
index d82fccef53f7..b4ebab1a92b4 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HeapDumpWebEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/management/HeapDumpWebEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.management;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -23,10 +23,10 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.management.HeapDumpWebEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.cli.CliDocumentation;
 import org.springframework.restdocs.cli.CurlRequestSnippet;
 import org.springframework.restdocs.operation.Operation;
@@ -58,7 +58,6 @@ protected Map<String, Object> createModel(Operation operation) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/management/ThreadDumpEndpointDocumentationTests.java
similarity index 97%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/management/ThreadDumpEndpointDocumentationTests.java
index d07911d0d033..dd5ccb5aa0a9 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ThreadDumpEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/management/ThreadDumpEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.management;
 
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CountDownLatch;
@@ -22,10 +22,10 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.management.ThreadDumpEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.restdocs.operation.preprocess.ContentModifyingOperationPreprocessor;
@@ -189,7 +189,6 @@ void textThreadDump() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointDocumentationTests.java
similarity index 93%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointDocumentationTests.java
index feadcd13cc56..1f347272cd8a 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MetricsEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.metrics;
 
 import io.micrometer.core.instrument.Statistic;
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.metrics.MetricsEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
@@ -74,7 +74,6 @@ void metricWithTags() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusScrapeEndpointDocumentationTests.java
similarity index 92%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusScrapeEndpointDocumentationTests.java
index d744c03fc69e..79124e8cdca7 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusScrapeEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus;
 
 import java.util.Properties;
 
@@ -25,10 +25,10 @@
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.metrics.export.prometheus.PrometheusScrapeEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
@@ -72,7 +72,6 @@ void filteredPrometheus() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusSimpleclientScrapeEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusSimpleclientScrapeEndpointDocumentationTests.java
similarity index 92%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusSimpleclientScrapeEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusSimpleclientScrapeEndpointDocumentationTests.java
index c831adea9909..195fde34c69a 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusSimpleclientScrapeEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusSimpleclientScrapeEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus;
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
@@ -22,9 +22,9 @@
 import io.prometheus.client.exporter.common.TextFormat;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
@@ -71,7 +71,6 @@ void filteredPrometheus() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java
index 5e20efa842a6..7f43cc4fb806 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
 import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
@@ -39,6 +40,7 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
 import org.springframework.core.Ordered;
 import org.springframework.core.PriorityOrdered;
 import org.springframework.jdbc.datasource.DelegatingDataSource;
@@ -222,6 +224,19 @@ void hikariDataSourceIsInstrumentedWithoutMetadataProvider() {
 		});
 	}
 
+	@Test
+	void prototypeDataSourceIsIgnored() {
+		this.contextRunner
+			.withUserConfiguration(OneHikariDataSourceConfiguration.class, PrototypeDataSourceConfiguration.class)
+			.run((context) -> {
+				context.getBean("hikariDataSource", DataSource.class).getConnection();
+				((DataSource) context.getBean("prototypeDataSource", "", "")).getConnection();
+				MeterRegistry registry = context.getBean(MeterRegistry.class);
+				assertThat(registry.get("hikaricp.connections").meter().getId().getTags())
+					.containsExactly(Tag.of("pool", "hikariDataSource"));
+			});
+	}
+
 	private static HikariDataSource createHikariDataSource(String poolName) {
 		String url = "jdbc:hsqldb:mem:test-" + UUID.randomUUID();
 		HikariDataSource hikariDataSource = DataSourceBuilder.create().url(url).type(HikariDataSource.class).build();
@@ -334,6 +349,28 @@ private org.apache.tomcat.jdbc.pool.DataSource createTomcatDataSource() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class PrototypeDataSourceConfiguration {
+
+		@Bean
+		@Scope(BeanDefinition.SCOPE_PROTOTYPE)
+		DataSource prototypeDataSource(String username, String password) {
+			return createHikariDataSource(username, password);
+		}
+
+		private HikariDataSource createHikariDataSource(String username, String password) {
+			String url = "jdbc:hsqldb:mem:test-" + UUID.randomUUID();
+			HikariDataSource hikariDataSource = DataSourceBuilder.create()
+				.url(url)
+				.type(HikariDataSource.class)
+				.username(username)
+				.password(password)
+				.build();
+			return hikariDataSource;
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class HikariSealingConfiguration {
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
index 651cfead8b03..fcbeb3adc6b3 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
@@ -16,8 +16,8 @@
 
 package org.springframework.boot.actuate.autoconfigure.metrics.orm.jpa;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 import javax.sql.DataSource;
 
@@ -41,6 +41,7 @@
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -138,6 +139,17 @@ void entityManagerFactoryInstrumentationIsDisabledIfHibernateIsNotAvailable() {
 	}
 
 	@Test
+	@WithResource(name = "city-schema.sql", content = """
+			CREATE TABLE CITY (
+			  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+			  name VARCHAR(30),
+			  state  VARCHAR(30),
+			  country  VARCHAR(30),
+			  map  VARCHAR(30)
+			);
+			""")
+	@WithResource(name = "city-data.sql",
+			content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');")
 	void entityManagerFactoryInstrumentationDoesNotDeadlockWithDeferredInitialization() {
 		this.contextRunner
 			.withPropertyValues("spring.jpa.properties.hibernate.generate_statistics:true",
@@ -194,9 +206,10 @@ LocalContainerEntityManagerFactoryBean nonAutowire(DataSource ds) {
 		}
 
 		private LocalContainerEntityManagerFactoryBean createSessionFactory(DataSource ds) {
-			Map<String, String> jpaProperties = new HashMap<>();
-			jpaProperties.put("hibernate.generate_statistics", "true");
-			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), jpaProperties, null).dataSource(ds)
+			Function<DataSource, Map<String, ?>> jpaPropertiesFactory = (dataSource) -> Map
+				.of("hibernate.generate_statistics", "true");
+			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), jpaPropertiesFactory, null)
+				.dataSource(ds)
 				.packages(PACKAGE_CLASSES)
 				.build();
 		}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java
index 0e8437a192be..23adfa9fa0e6 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/JettyMetricsAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.springframework.boot.context.event.ApplicationStartedEvent;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.web.embedded.jetty.JettyReactiveWebServerFactory;
 import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
 import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
@@ -132,13 +133,14 @@ void allowsCustomJettyConnectionMetricsBinderToBeUsed() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void autoConfiguresSslHandshakeMetricsWithEmbeddedServletJetty() {
 		new WebApplicationContextRunner(AnnotationConfigServletWebServerApplicationContext::new)
 			.withConfiguration(AutoConfigurations.of(JettyMetricsAutoConfiguration.class,
 					ServletWebServerFactoryAutoConfiguration.class))
 			.withUserConfiguration(ServletWebServerConfiguration.class, MeterRegistryConfiguration.class)
-			.withPropertyValues("server.ssl.enabled: true", "server.ssl.key-store: src/test/resources/test.jks",
-					"server.ssl.key-store-password: secret", "server.ssl.key-password: password")
+			.withPropertyValues("server.ssl.enabled=true", "server.ssl.key-store=classpath:test.jks",
+					"server.ssl.key-store-password=secret", "server.ssl.key-password=password")
 			.run((context) -> {
 				context.publishEvent(createApplicationStartedEvent(context.getSourceApplicationContext()));
 				assertThat(context).hasSingleBean(JettySslHandshakeMetricsBinder.class);
@@ -148,13 +150,14 @@ void autoConfiguresSslHandshakeMetricsWithEmbeddedServletJetty() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void autoConfiguresSslHandshakeMetricsWithEmbeddedReactiveJetty() {
 		new ReactiveWebApplicationContextRunner(AnnotationConfigReactiveWebServerApplicationContext::new)
 			.withConfiguration(AutoConfigurations.of(JettyMetricsAutoConfiguration.class,
 					ReactiveWebServerFactoryAutoConfiguration.class))
 			.withUserConfiguration(ReactiveWebServerConfiguration.class, MeterRegistryConfiguration.class)
-			.withPropertyValues("server.ssl.enabled: true", "server.ssl.key-store: src/test/resources/test.jks",
-					"server.ssl.key-store-password: secret", "server.ssl.key-password: password")
+			.withPropertyValues("server.ssl.enabled=true", "server.ssl.key-store=classpath:test.jks",
+					"server.ssl.key-store-password=secret", "server.ssl.key-password=password")
 			.run((context) -> {
 				context.publishEvent(createApplicationStartedEvent(context.getSourceApplicationContext()));
 				SimpleMeterRegistry registry = context.getBean(SimpleMeterRegistry.class);
@@ -163,14 +166,15 @@ void autoConfiguresSslHandshakeMetricsWithEmbeddedReactiveJetty() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void allowsCustomJettySslHandshakeMetricsBinderToBeUsed() {
 		new WebApplicationContextRunner(AnnotationConfigServletWebServerApplicationContext::new)
 			.withConfiguration(AutoConfigurations.of(JettyMetricsAutoConfiguration.class,
 					ServletWebServerFactoryAutoConfiguration.class))
 			.withUserConfiguration(ServletWebServerConfiguration.class, CustomJettySslHandshakeMetricsBinder.class,
 					MeterRegistryConfiguration.class)
-			.withPropertyValues("server.ssl.enabled: true", "server.ssl.key-store: src/test/resources/test.jks",
-					"server.ssl.key-store-password: secret", "server.ssl.key-password: password")
+			.withPropertyValues("server.ssl.enabled=true", "server.ssl.key-store=classpath:test.jks",
+					"server.ssl.key-store-password=secret", "server.ssl.key-password=password")
 			.run((context) -> {
 				context.publishEvent(createApplicationStartedEvent(context.getSourceApplicationContext()));
 				assertThat(context).hasSingleBean(JettySslHandshakeMetricsBinder.class)
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/QuartzEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointDocumentationTests.java
similarity index 99%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/QuartzEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointDocumentationTests.java
index 4f8a04060040..ca130aa5dea8 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/QuartzEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.quartz;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -51,12 +51,12 @@
 import org.quartz.impl.matchers.GroupMatcher;
 import org.quartz.spi.OperableTrigger;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.endpoint.Show;
 import org.springframework.boot.actuate.quartz.QuartzEndpoint;
 import org.springframework.boot.actuate.quartz.QuartzEndpointWebExtension;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.restdocs.payload.JsonFieldType;
 import org.springframework.scheduling.quartz.DelegatingJob;
@@ -482,7 +482,6 @@ private static Date fromUtc(String utcTime) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SbomEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointDocumentationTests.java
similarity index 86%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SbomEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointDocumentationTests.java
index 5fb4e5b54124..bf7655427caa 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SbomEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.sbom;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.sbom.SbomEndpoint;
 import org.springframework.boot.actuate.sbom.SbomEndpointWebExtension;
 import org.springframework.boot.actuate.sbom.SbomProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 
@@ -52,13 +52,13 @@ void sboms() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
 		SbomProperties sbomProperties() {
 			SbomProperties properties = new SbomProperties();
-			properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
+			properties.getApplication()
+				.setLocation("classpath:org/springframework/boot/actuate/autoconfigure/sbom/cyclonedx.json");
 			return properties;
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointDocumentationTests.java
similarity index 96%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointDocumentationTests.java
index e63717bccd87..9a3f1d0713e3 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ScheduledTasksEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/scheduling/ScheduledTasksEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.scheduling;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -22,10 +22,10 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.scheduling.ScheduledTasksEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.restdocs.payload.JsonFieldType;
 import org.springframework.scheduling.Trigger;
@@ -112,7 +112,6 @@ private FieldDescriptor[] lastExecution() {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableScheduling
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java
index b60d93ee2dfa..4693c86468fb 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.web.context.WebServerApplicationContext;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
@@ -143,13 +144,14 @@ void backOffIfOAuth2ResourceServerAutoConfigurationPresent() {
 	}
 
 	@Test
+	@WithPackageResources("saml-certificate")
 	void backOffIfSaml2RelyingPartyAutoConfigurationPresent() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(Saml2RelyingPartyAutoConfiguration.class))
 			.withPropertyValues(
 					"spring.security.saml2.relyingparty.registration.simplesamlphp.assertingparty.single-sign-on.url=https://simplesaml-for-spring-saml/SSOService.php",
 					"spring.security.saml2.relyingparty.registration.simplesamlphp.assertingparty.single-sign-on.sign-request=false",
 					"spring.security.saml2.relyingparty.registration.simplesamlphp.assertingparty.entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php",
-					"spring.security.saml2.relyingparty.registration.simplesamlphp.assertingparty.verification.credentials[0].certificate-location=classpath:saml/certificate-location")
+					"spring.security.saml2.relyingparty.registration.simplesamlphp.assertingparty.verification.credentials[0].certificate-location=classpath:saml-certificate")
 			.run((context) -> assertThat(context).doesNotHaveBean(ManagementWebSecurityAutoConfiguration.class)
 				.doesNotHaveBean(MANAGEMENT_SECURITY_FILTER_CHAIN_BEAN));
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointDocumentationTests.java
similarity index 95%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointDocumentationTests.java
index 012a2acb9ca2..d875027e3028 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/session/SessionsEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.session;
 
 import java.time.Instant;
 import java.util.HashMap;
@@ -24,11 +24,11 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.context.ShutdownEndpoint;
 import org.springframework.boot.actuate.session.SessionsEndpoint;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.session.FindByIndexNameSessionRepository;
@@ -116,7 +116,6 @@ private static MapSession createSession(String id, Instant creationTime, Instant
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthContributorAutoConfigurationTests.java
index d122d5041afc..6fd09acbdb71 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthContributorAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthContributorAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import org.springframework.boot.info.SslInfo.CertificateChainInfo;
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -42,6 +43,7 @@
  *
  * @author Jonatan Ivanov
  */
+@WithPackageResources("test.jks")
 class SslHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/StartupEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/startup/StartupEndpointDocumentationTests.java
similarity index 94%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/StartupEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/startup/StartupEndpointDocumentationTests.java
index 28d4f5bd29a5..96a715c8a9b3 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/StartupEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/startup/StartupEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.startup;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.startup.StartupEndpoint;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.metrics.StartupStep;
 import org.springframework.restdocs.payload.FieldDescriptor;
 import org.springframework.restdocs.payload.JsonFieldType;
@@ -89,7 +89,6 @@ private FieldDescriptor[] responseFields() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpExchangesEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesEndpointDocumentationTests.java
similarity index 95%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpExchangesEndpointDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesEndpointDocumentationTests.java
index be184eb11dd8..0ae36bc9db21 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpExchangesEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.web.exchanges;
 
 import java.net.URI;
 import java.security.Principal;
@@ -29,6 +29,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
 import org.springframework.boot.actuate.web.exchanges.HttpExchange;
 import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository;
 import org.springframework.boot.actuate.web.exchanges.HttpExchangesEndpoint;
@@ -37,7 +38,6 @@
 import org.springframework.boot.actuate.web.exchanges.RecordableHttpResponse;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpHeaders;
 import org.springframework.restdocs.payload.JsonFieldType;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -105,7 +105,6 @@ void httpExchanges() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointReactiveDocumentationTests.java
similarity index 97%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointReactiveDocumentationTests.java
index ea189c393f31..b801848014e0 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointReactiveDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointReactiveDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.web.mappings;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.AbstractEndpointDocumentationTests;
 import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
 import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider;
@@ -35,7 +36,6 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.RestDocumentationExtension;
@@ -143,7 +143,6 @@ private FieldDescriptor requestMappingConditionField(String path) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointServletDocumentationTests.java
similarity index 97%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointServletDocumentationTests.java
index b11040e97f84..c18c15fb322f 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/MappingsEndpointServletDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointServletDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
+package org.springframework.boot.actuate.autoconfigure.web.mappings;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.AbstractEndpointDocumentationTests;
 import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
 import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
 import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider;
@@ -37,7 +38,6 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.RestDocumentationExtension;
@@ -158,7 +158,6 @@ private FieldDescriptor requestMappingConditionField(String path) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(BaseDocumentationConfiguration.class)
 	static class TestConfiguration {
 
 		@Bean
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java
deleted file mode 100644
index c750ca4b83af..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/MockServletWebServerFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2012-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.actuate.autoconfigure.web.servlet;
-
-import java.util.Arrays;
-
-import jakarta.servlet.ServletContext;
-
-import org.springframework.boot.testsupport.web.servlet.MockServletWebServer.RegisteredFilter;
-import org.springframework.boot.testsupport.web.servlet.MockServletWebServer.RegisteredServlet;
-import org.springframework.boot.web.server.WebServer;
-import org.springframework.boot.web.servlet.ServletContextInitializer;
-import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
-import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
-
-import static org.mockito.Mockito.spy;
-
-/**
- * Mock {@link ServletWebServerFactory}.
- *
- * @author Phillip Webb
- * @author Andy Wilkinson
- */
-public class MockServletWebServerFactory extends AbstractServletWebServerFactory {
-
-	private MockServletWebServer webServer;
-
-	@Override
-	public WebServer getWebServer(ServletContextInitializer... initializers) {
-		this.webServer = spy(new MockServletWebServer(mergeInitializers(initializers), getPort()));
-		return this.webServer;
-	}
-
-	public MockServletWebServer getWebServer() {
-		return this.webServer;
-	}
-
-	public ServletContext getServletContext() {
-		return (getWebServer() != null) ? getWebServer().getServletContext() : null;
-	}
-
-	public RegisteredServlet getRegisteredServlet(int index) {
-		return (getWebServer() != null) ? getWebServer().getRegisteredServlet(index) : null;
-	}
-
-	public RegisteredFilter getRegisteredFilter(int index) {
-		return (getWebServer() != null) ? getWebServer().getRegisteredFilters(index) : null;
-	}
-
-	static class MockServletWebServer extends org.springframework.boot.testsupport.web.servlet.MockServletWebServer
-			implements WebServer {
-
-		MockServletWebServer(ServletContextInitializer[] initializers, int port) {
-			super(Arrays.stream(initializers)
-				.map((initializer) -> (Initializer) initializer::onStartup)
-				.toArray(Initializer[]::new), port);
-		}
-
-		@Override
-		public void start() {
-		}
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html
deleted file mode 100644
index 8b137891791f..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/city-data.sql b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/city-data.sql
deleted file mode 100644
index eb08623b4cf0..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/city-data.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/city-schema.sql b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/city-schema.sql
deleted file mode 100644
index b2a4112add91..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/city-schema.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE CITY (
-  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-  name VARCHAR(30),
-  state  VARCHAR(30),
-  country  VARCHAR(30),
-  map  VARCHAR(30)
-);
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/create-custom-schema.sql b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/create-custom-schema.sql
deleted file mode 100644
index 469b79ad8956..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/create-custom-schema.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE SCHEMA CUSTOMSCHEMA;
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/git.properties b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/git.properties
deleted file mode 100644
index d88056068a76..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/git.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#Generated by Git-Commit-Id-Plugin
-#Thu May 23 09:26:42 BST 2013
-git.commit.id.abbrev=e02a4f3
-git.commit.user.email=dsyer@vmware.com
-git.commit.message.full=Update Spring
-git.commit.id=e02a4f3b6f452cdbf6dd311f1362679eb4c31ced
-git.commit.message.short=Update Spring
-git.commit.user.name=Dave Syer
-git.build.user.name=Dave Syer
-git.build.user.email=dsyer@vmware.com
-git.branch=develop
-git.commit.time=2013-04-24T08\:42\:13+0100
-git.build.time=2013-05-23T09\:26\:42+0100
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml
deleted file mode 100644
index 566f53e3a14c..000000000000
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<hazelcast
-		xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
-		xmlns="http://www.hazelcast.com/schema/config"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<map name="defaultCache" />
-	<network>
-		<join>
-			<auto-detection enabled="false"/>
-			<multicast enabled="false"/>
-		</join>
-	</network>
-</hazelcast>
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/test.jks b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/test.jks
new file mode 100644
index 000000000000..b60731bcc842
Binary files /dev/null and b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/test.jks differ
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/test.jks b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/test.jks
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/test.jks
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/application.properties b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/env/application.properties
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/application.properties
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/env/application.properties
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/flyway/V1__init.sql
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/flyway/V1__init.sql
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/changelog/db.changelog-master.yaml b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/liquibase/db.changelog-master.yaml
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/changelog/db.changelog-master.yaml
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/liquibase/db.changelog-master.yaml
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log.2021-06-15.0.gz b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log.2021-06-15.0.gz
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log.2021-06-15.0.gz
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log.2021-06-15.0.gz
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/test.jks b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot-actuator/src/test/resources/test.jks
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/metrics/web/jetty/test.jks
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/sbom/cyclonedx.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/sbom/cyclonedx.json
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/sbom/cyclonedx.json
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/sbom/cyclonedx.json
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/saml/certificate-location b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/security/servlet/saml-certificate
similarity index 100%
rename from spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/saml/certificate-location
rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/security/servlet/saml-certificate
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/ssl/test.jks b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/ssl/test.jks
new file mode 100644
index 000000000000..cc0d7081c2e2
Binary files /dev/null and b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/org/springframework/boot/actuate/autoconfigure/ssl/test.jks differ
diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle
index dd23bd47775a..025dabe5021c 100644
--- a/spring-boot-project/spring-boot-actuator/build.gradle
+++ b/spring-boot-project/spring-boot-actuator/build.gradle
@@ -93,9 +93,9 @@ dependencies {
 	optional("org.springframework.security:spring-security-web")
 	optional("org.springframework.session:spring-session-core")
 
+	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
-	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("com.jayway.jsonpath:json-path")
 	testImplementation("io.micrometer:micrometer-observation-test")
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java
index 4a892135a6d2..191d83439b38 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -36,6 +37,9 @@
  * @author Andy Wilkinson
  * @author Phillip Webb
  */
+@WithResource(name = "db/migration/V1__init.sql", content = "DROP TABLE IF EXISTS TEST;")
+@WithResource(name = "db/migration/V2__update.sql", content = "DROP TABLE IF EXISTS TEST;")
+@WithResource(name = "db/migration/V3__update.sql", content = "DROP TABLE IF EXISTS TEST;")
 class FlywayEndpointTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/hazelcast/HazelcastHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/hazelcast/HazelcastHealthIndicatorTests.java
index d478843988ff..c2be01612567 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/hazelcast/HazelcastHealthIndicatorTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/hazelcast/HazelcastHealthIndicatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -40,6 +41,21 @@
 class HazelcastHealthIndicatorTests {
 
 	@Test
+	@WithResource(name = "hazelcast.xml", content = """
+			<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+					   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+					   xsi:schemaLocation="http://www.hazelcast.com/schema/config
+			           http://www.hazelcast.com/schema/config/hazelcast-config-5.0.xsd">
+				<instance-name>actuator-hazelcast</instance-name>
+				<map name="defaultCache" />
+				<network>
+					<join>
+						<auto-detection enabled="false"/>
+						<multicast enabled="false"/>
+					</join>
+				</network>
+			</hazelcast>
+			""")
 	void hazelcastUp() {
 		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(HazelcastAutoConfiguration.class))
 			.withPropertyValues("spring.hazelcast.config=hazelcast.xml")
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java
index c0f6900f1ab4..02ebb20d37dc 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
 import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -50,6 +51,12 @@
  * @author Stephane Nicoll
  * @author Leo Li
  */
+@WithResource(name = "db/changelog/db.changelog-master.yaml", content = """
+		databaseChangeLog:
+		  - changeSet:
+		      id: 1
+		      author: test
+		""")
 class LiquibaseEndpointTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
@@ -83,6 +90,7 @@ void liquibaseReportIsReturnedForContextHierarchy() {
 	}
 
 	@Test
+	@WithResource(name = "db/create-custom-schema.sql", content = "CREATE SCHEMA CUSTOMSCHEMA;")
 	void invokeWithCustomSchema() {
 		this.contextRunner.withUserConfiguration(Config.class, DataSourceWithSchemaConfiguration.class)
 			.withPropertyValues("spring.liquibase.default-schema=CUSTOMSCHEMA")
@@ -122,6 +130,12 @@ void connectionAutoCommitPropertyIsReset() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-master-backup.yaml", content = """
+			databaseChangeLog:
+			  - changeSet:
+			      id: 1
+			      author: test
+			""")
 	void whenMultipleLiquibaseBeansArePresentChangeSetsAreCorrectlyReportedForEachBean() {
 		this.contextRunner.withUserConfiguration(Config.class, MultipleDataSourceLiquibaseConfiguration.class)
 			.run((context) -> {
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointCycloneDxWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointCycloneDxWebIntegrationTests.java
index 85e5b12f1993..371a9542a20e 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointCycloneDxWebIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointCycloneDxWebIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ static class TestConfiguration {
 		@Bean
 		SbomProperties sbomProperties() {
 			SbomProperties properties = new SbomProperties();
-			properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
+			properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
 			return properties;
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSpdxWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSpdxWebIntegrationTests.java
index 264e8cd05df5..4e8eba326f65 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSpdxWebIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSpdxWebIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ static class TestConfiguration {
 		@Bean
 		SbomProperties sbomProperties() {
 			SbomProperties properties = new SbomProperties();
-			properties.getApplication().setLocation("classpath:sbom/spdx.json");
+			properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/spdx.json");
 			return properties;
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSyftWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSyftWebIntegrationTests.java
index 0c6469322d18..6ed52ec4fd3d 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSyftWebIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointSyftWebIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ static class TestConfiguration {
 		@Bean
 		SbomProperties sbomProperties() {
 			SbomProperties properties = new SbomProperties();
-			properties.getApplication().setLocation("classpath:sbom/syft.json");
+			properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/syft.json");
 			return properties;
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointTests.java
index f4c724d69031..63f3fd85984e 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,9 +48,11 @@ void setUp() {
 
 	@Test
 	void shouldListSboms() {
-		this.properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
-		this.properties.getAdditional().put("alpha", sbom("classpath:sbom/cyclonedx.json"));
-		this.properties.getAdditional().put("beta", sbom("classpath:sbom/cyclonedx.json"));
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
+		this.properties.getAdditional()
+			.put("alpha", sbom("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json"));
+		this.properties.getAdditional()
+			.put("beta", sbom("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json"));
 		Sboms sboms = createEndpoint().sboms();
 		assertThat(sboms.ids()).containsExactly("alpha", "application", "beta");
 	}
@@ -58,15 +60,16 @@ void shouldListSboms() {
 	@Test
 	void shouldFailIfDuplicateSbomIdIsRegistered() {
 		// This adds an SBOM with id 'application'
-		this.properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
-		this.properties.getAdditional().put("application", sbom("classpath:sbom/cyclonedx.json"));
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
+		this.properties.getAdditional()
+			.put("application", sbom("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json"));
 		assertThatIllegalStateException().isThrownBy(this::createEndpoint)
 			.withMessage("Duplicate SBOM registration with id 'application'");
 	}
 
 	@Test
 	void shouldUseLocationFromProperties() throws IOException {
-		this.properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
 		String content = createEndpoint().sbom("application").getContentAsString(StandardCharsets.UTF_8);
 		assertThat(content).contains("\"bomFormat\" : \"CycloneDX\"");
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebExtensionTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebExtensionTests.java
index 95831aacfdc1..03701f2f0ef9 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebExtensionTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import org.springframework.boot.actuate.endpoint.web.WebEndpointResponse;
 import org.springframework.boot.actuate.sbom.SbomEndpointWebExtension.SbomType;
 import org.springframework.boot.actuate.sbom.SbomProperties.Sbom;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
@@ -53,7 +54,7 @@ void setUp() {
 
 	@Test
 	void shouldReturnHttpOk() {
-		this.properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
 		WebEndpointResponse<Resource> response = createWebExtension().sbom("application");
 		assertThat(response.getStatus()).isEqualTo(200);
 	}
@@ -66,26 +67,27 @@ void shouldReturnNotFoundIfResourceDoesntExist() {
 
 	@Test
 	void shouldAutoDetectContentTypeForCycloneDx() {
-		this.properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
 		WebEndpointResponse<Resource> response = createWebExtension().sbom("application");
 		assertThat(response.getContentType()).isEqualTo(MimeType.valueOf("application/vnd.cyclonedx+json"));
 	}
 
 	@Test
 	void shouldAutoDetectContentTypeForSpdx() {
-		this.properties.getApplication().setLocation("classpath:sbom/spdx.json");
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/spdx.json");
 		WebEndpointResponse<Resource> response = createWebExtension().sbom("application");
 		assertThat(response.getContentType()).isEqualTo(MimeType.valueOf("application/spdx+json"));
 	}
 
 	@Test
 	void shouldAutoDetectContentTypeForSyft() {
-		this.properties.getApplication().setLocation("classpath:sbom/syft.json");
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/syft.json");
 		WebEndpointResponse<Resource> response = createWebExtension().sbom("application");
 		assertThat(response.getContentType()).isEqualTo(MimeType.valueOf("application/vnd.syft+json"));
 	}
 
 	@Test
+	@WithResource(name = "git.properties", content = "git.commit.id.abbrev=e02a4f3")
 	void shouldSupportUnknownFiles() {
 		this.properties.getApplication().setLocation("classpath:git.properties");
 		WebEndpointResponse<Resource> response = createWebExtension().sbom("application");
@@ -94,7 +96,7 @@ void shouldSupportUnknownFiles() {
 
 	@Test
 	void shouldUseContentTypeIfSet() {
-		this.properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
+		this.properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
 		this.properties.getApplication().setMediaType(MimeType.valueOf("text/plain"));
 		WebEndpointResponse<Resource> response = createWebExtension().sbom("application");
 		assertThat(response.getContentType()).isEqualTo(MimeType.valueOf("text/plain"));
@@ -103,7 +105,8 @@ void shouldUseContentTypeIfSet() {
 	@Test
 	void shouldUseContentTypeForAdditionalSbomsIfSet() {
 		this.properties.getAdditional()
-			.put("alpha", sbom("classpath:sbom/cyclonedx.json", MediaType.valueOf("text/plain")));
+			.put("alpha", sbom("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json",
+					MediaType.valueOf("text/plain")));
 		WebEndpointResponse<Resource> response = createWebExtension().sbom("alpha");
 		assertThat(response.getContentType()).isEqualTo(MimeType.valueOf("text/plain"));
 	}
@@ -120,9 +123,9 @@ void shouldAutodetectFormats(SbomType type) throws IOException {
 
 	private String getSbomContent(SbomType type) throws IOException {
 		return switch (type) {
-			case CYCLONE_DX -> readResource("/sbom/cyclonedx.json");
-			case SPDX -> readResource("/sbom/spdx.json");
-			case SYFT -> readResource("/sbom/syft.json");
+			case CYCLONE_DX -> readResource("cyclonedx.json");
+			case SPDX -> readResource("spdx.json");
+			case SYFT -> readResource("syft.json");
 			case UNKNOWN -> throw new IllegalArgumentException("UNKNOWN is not supported");
 		};
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebIntegrationTests.java
index 77b4ecdfc642..b41e9e14bc54 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/sbom/SbomEndpointWebIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ static class TestConfiguration {
 		@Bean
 		SbomProperties sbomProperties() {
 			SbomProperties properties = new SbomProperties();
-			properties.getApplication().setLocation("classpath:sbom/cyclonedx.json");
+			properties.getApplication().setLocation("classpath:org/springframework/boot/actuate/sbom/cyclonedx.json");
 			return properties;
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html
deleted file mode 100644
index 8b137891791f..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/changelog/db.changelog-master-backup.yaml b/spring-boot-project/spring-boot-actuator/src/test/resources/db/changelog/db.changelog-master-backup.yaml
deleted file mode 100644
index a3a19b43af3a..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/changelog/db.changelog-master-backup.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-databaseChangeLog:
-  - changeSet:
-      id: 1
-      author: leoli
-      changes:
-        - createTable:
-            tableName: customerbackup
-            columns:
-              - column:
-                  name: id
-                  type: int
-                  autoIncrement: true
-                  constraints:
-                    primaryKey: true
-                    nullable: false
-              - column:
-                  name: name
-                  type: varchar(50)
-                  constraints:
-                    nullable: false
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/changelog/db.changelog-master.yaml b/spring-boot-project/spring-boot-actuator/src/test/resources/db/changelog/db.changelog-master.yaml
deleted file mode 100644
index 134b17b543e9..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/changelog/db.changelog-master.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-databaseChangeLog:
-  - changeSet:
-      id: 1
-      author: marceloverdijk
-      changes:
-        - createTable:
-            tableName: customer
-            columns:
-              - column:
-                  name: id
-                  type: int
-                  autoIncrement: true
-                  constraints:
-                    primaryKey: true
-                    nullable: false
-              - column:
-                  name: name
-                  type: varchar(50)
-                  constraints:
-                    nullable: false
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
deleted file mode 100644
index 469b79ad8956..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE SCHEMA CUSTOMSCHEMA;
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql
deleted file mode 100644
index 867c7c24f526..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS TEST;
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql
deleted file mode 100644
index 867c7c24f526..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS TEST;
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql
deleted file mode 100644
index 867c7c24f526..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS TEST;
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/git.properties b/spring-boot-project/spring-boot-actuator/src/test/resources/git.properties
deleted file mode 100644
index d88056068a76..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/git.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#Generated by Git-Commit-Id-Plugin
-#Thu May 23 09:26:42 BST 2013
-git.commit.id.abbrev=e02a4f3
-git.commit.user.email=dsyer@vmware.com
-git.commit.message.full=Update Spring
-git.commit.id=e02a4f3b6f452cdbf6dd311f1362679eb4c31ced
-git.commit.message.short=Update Spring
-git.commit.user.name=Dave Syer
-git.build.user.name=Dave Syer
-git.build.user.email=dsyer@vmware.com
-git.branch=develop
-git.commit.time=2013-04-24T08\:42\:13+0100
-git.build.time=2013-05-23T09\:26\:42+0100
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
deleted file mode 100644
index d01639965c50..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<hazelcast xmlns="http://www.hazelcast.com/schema/config"
-		   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		   xsi:schemaLocation="http://www.hazelcast.com/schema/config
-           http://www.hazelcast.com/schema/config/hazelcast-config-5.0.xsd">
-	<instance-name>actuator-hazelcast</instance-name>
-	<map name="defaultCache" />
-	<network>
-		<join>
-			<auto-detection enabled="false"/>
-			<multicast enabled="false"/>
-		</join>
-	</network>
-</hazelcast>
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/log4j2-test.xml b/spring-boot-project/spring-boot-actuator/src/test/resources/log4j2-test.xml
deleted file mode 100644
index 8c0f7f465254..000000000000
--- a/spring-boot-project/spring-boot-actuator/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="warn" name="test" packages="">
-	<Properties>
-		<Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-		<Property name="LOG_LEVEL_PATTERN">%5p</Property>
-	</Properties>
-	<Appenders>
-		<Console name="STDOUT" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="%clr{%d{yyyy-MM-dd HH:mm:ss.SSS}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}"/>
-		</Console>
-	</Appenders>
-	<Loggers>
-		<Root level="info">
-			<AppenderRef ref="STDOUT"/>
-		</Root>
-	</Loggers>
-</Configuration>
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/sbom/cyclonedx.json b/spring-boot-project/spring-boot-actuator/src/test/resources/org/springframework/boot/actuate/sbom/cyclonedx.json
similarity index 100%
rename from spring-boot-project/spring-boot-actuator/src/test/resources/sbom/cyclonedx.json
rename to spring-boot-project/spring-boot-actuator/src/test/resources/org/springframework/boot/actuate/sbom/cyclonedx.json
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/sbom/spdx.json b/spring-boot-project/spring-boot-actuator/src/test/resources/org/springframework/boot/actuate/sbom/spdx.json
similarity index 100%
rename from spring-boot-project/spring-boot-actuator/src/test/resources/sbom/spdx.json
rename to spring-boot-project/spring-boot-actuator/src/test/resources/org/springframework/boot/actuate/sbom/spdx.json
diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/sbom/syft.json b/spring-boot-project/spring-boot-actuator/src/test/resources/org/springframework/boot/actuate/sbom/syft.json
similarity index 100%
rename from spring-boot-project/spring-boot-actuator/src/test/resources/sbom/syft.json
rename to spring-boot-project/spring-boot-actuator/src/test/resources/org/springframework/boot/actuate/sbom/syft.json
diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle
index 6d062d9ce6c2..873730bb35d6 100644
--- a/spring-boot-project/spring-boot-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle
@@ -24,6 +24,7 @@ dependencies {
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
 	dockerTestImplementation("com.redis:testcontainers-redis")
 	dockerTestImplementation("org.assertj:assertj-core")
 	dockerTestImplementation("org.awaitility:awaitility")
@@ -232,8 +233,9 @@ dependencies {
 	optional("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
 	optional("redis.clients:jedis")
 
-	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
 	testImplementation("ch.qos.logback:logback-classic")
 	testImplementation("commons-fileupload:commons-fileupload")
 	testImplementation("com.github.h-thurow:simple-jndi")
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java
index 3a21439df3c8..dfa81a438c5f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigureBefore.java
@@ -44,7 +44,7 @@
 public @interface AutoConfigureBefore {
 
 	/**
-	 * The auto-configure classes that should have not yet been applied.
+	 * The auto-configuration classes that should have not yet been applied.
 	 * @return the classes
 	 */
 	Class<?>[] value() default {};
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
index 1510e9adbed7..5d63ff2c8582 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import org.springframework.amqp.core.AcknowledgeMode;
 import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory.AddressShuffleMode;
@@ -194,7 +193,7 @@ public int determinePort() {
 			if (port != null) {
 				return port;
 			}
-			return (Optional.ofNullable(getSsl().getEnabled()).orElse(false)) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
+			return Boolean.TRUE.equals(getSsl().getEnabled()) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
 		}
 		return this.parsedAddresses.get(0).port;
 	}
@@ -235,7 +234,7 @@ public void setAddresses(List<String> addresses) {
 	private List<Address> parseAddresses(List<String> addresses) {
 		List<Address> parsedAddresses = new ArrayList<>();
 		for (String address : addresses) {
-			parsedAddresses.add(new Address(address, Optional.ofNullable(getSsl().getEnabled()).orElse(false)));
+			parsedAddresses.add(new Address(address, Boolean.TRUE.equals(getSsl().getEnabled())));
 		}
 		return parsedAddresses;
 	}
@@ -475,7 +474,7 @@ public Boolean getEnabled() {
 		 * @see #getEnabled() ()
 		 */
 		public boolean determineEnabled() {
-			boolean defaultEnabled = Optional.ofNullable(getEnabled()).orElse(false) || this.bundle != null;
+			boolean defaultEnabled = Boolean.TRUE.equals(getEnabled()) || this.bundle != null;
 			if (CollectionUtils.isEmpty(RabbitProperties.this.parsedAddresses)) {
 				return defaultEnabled;
 			}
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 d07ceeef606e..65780ae78171 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -305,7 +305,6 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
 			map.from(properties::getLoggers).to((loggers) -> configuration.loggers(loggers));
 			map.from(properties::getCommunityDbSupportEnabled)
 				.to((communityDbSupportEnabled) -> configuration.communityDBSupportEnabled(communityDbSupportEnabled));
-			// Flyway Teams properties
 			map.from(properties.getBatch()).to((batch) -> configuration.batch(batch));
 			map.from(properties.getDryRunOutput()).to((dryRunOutput) -> configuration.dryRunOutput(dryRunOutput));
 			map.from(properties.getErrorOverrides())
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
index e65b1ad515f7..fa828f5b8985 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -275,7 +275,7 @@ public class FlywayProperties {
 	private String[] loggers = { "slf4j" };
 
 	/**
-	 * Whether to batch SQL statements when executing them. Requires Flyway Teams.
+	 * Whether to batch SQL statements when executing them.
 	 */
 	private Boolean batch;
 
@@ -292,12 +292,12 @@ public class FlywayProperties {
 	private String[] errorOverrides;
 
 	/**
-	 * Whether to stream SQL migrations when executing them. Requires Flyway Teams.
+	 * Whether to stream SQL migrations when executing them.
 	 */
 	private Boolean stream;
 
 	/**
-	 * Properties to pass to the JDBC driver. Requires Flyway Teams.
+	 * Properties to pass to the JDBC driver.
 	 */
 	private Map<String, String> jdbcProperties = new HashMap<>();
 
@@ -308,25 +308,23 @@ public class FlywayProperties {
 
 	/**
 	 * Whether Flyway should output a table with the results of queries when executing
-	 * migrations. Requires Flyway Teams.
+	 * migrations.
 	 */
 	private Boolean outputQueryResults;
 
 	/**
 	 * Whether Flyway should skip executing the contents of the migrations and only update
-	 * the schema history table. Requires Flyway teams.
+	 * the schema history table.
 	 */
 	private Boolean skipExecutingMigrations;
 
 	/**
 	 * List of patterns that identify migrations to ignore when performing validation.
-	 * Requires Flyway Teams.
 	 */
 	private List<String> ignoreMigrationPatterns;
 
 	/**
-	 * Whether to attempt to automatically detect SQL migration file encoding. Requires
-	 * Flyway Teams.
+	 * Whether to attempt to automatically detect SQL migration file encoding.
 	 */
 	private Boolean detectEncoding;
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java
index e268c57cf740..6b9b8ae790ba 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ FreeMarkerViewResolver freeMarkerViewResolver() {
 
 	@Bean
 	@ConditionalOnEnabledResourceChain
-	@ConditionalOnMissingFilterBean(ResourceUrlEncodingFilter.class)
+	@ConditionalOnMissingFilterBean
 	FilterRegistrationBean<ResourceUrlEncodingFilter> resourceUrlEncodingFilter() {
 		FilterRegistrationBean<ResourceUrlEncodingFilter> registration = new FilterRegistrationBean<>(
 				new ResourceUrlEncodingFilter());
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
index ba548bad857c..85c694d3c916 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
  * @author Marten Deinum
  * @since 1.1.0
  */
-@ConfigurationProperties(prefix = "spring.groovy.template", ignoreUnknownFields = true)
+@ConfigurationProperties("spring.groovy.template")
 public class GroovyTemplateProperties extends AbstractTemplateViewResolverProperties {
 
 	public static final String DEFAULT_RESOURCE_LOADER_PATH = "classpath:/templates/";
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
index 2f739bf74fe7..be0d886e57e9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ public JerseyAutoConfiguration(JerseyProperties jersey, ResourceConfig config,
 	}
 
 	@Bean
-	@ConditionalOnMissingFilterBean(RequestContextFilter.class)
+	@ConditionalOnMissingFilterBean
 	public FilterRegistrationBean<RequestContextFilter> requestContextFilter() {
 		FilterRegistrationBean<RequestContextFilter> registration = new FilterRegistrationBean<>();
 		registration.setFilter(new RequestContextFilter());
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
index be9d767d0f26..f1165151eb27 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,7 +101,10 @@ void setJmsProperties(JmsProperties jmsProperties) {
 	 * Set the {@link ObservationRegistry} to use.
 	 * @param observationRegistry the {@link ObservationRegistry}
 	 * @since 3.2.1
+	 * @deprecated since 3.3.10 for removal in 3.6.0 as this should have been package
+	 * private
 	 */
+	@Deprecated(since = "3.3.10", forRemoval = true)
 	public void setObservationRegistry(ObservationRegistry observationRegistry) {
 		this.observationRegistry = observationRegistry;
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
index cea5d85401d4..ef7bf0f48d7a 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@ class JmsAnnotationDrivenConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
+	@SuppressWarnings("removal")
 	DefaultJmsListenerContainerFactoryConfigurer jmsListenerContainerFactoryConfigurer() {
 		DefaultJmsListenerContainerFactoryConfigurer configurer = new DefaultJmsListenerContainerFactoryConfigurer();
 		configurer.setDestinationResolver(this.destinationResolver.getIfUnique());
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
index d2944a6a6942..ba4110407cdf 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.producer.ProducerConfig;
 
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -38,6 +41,7 @@
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.ImportRuntimeHints;
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
 import org.springframework.kafka.core.DefaultKafkaProducerFactory;
@@ -73,6 +77,7 @@
 @ConditionalOnClass(KafkaTemplate.class)
 @EnableConfigurationProperties(KafkaProperties.class)
 @Import({ KafkaAnnotationDrivenConfiguration.class, KafkaStreamsAnnotationDrivenConfiguration.class })
+@ImportRuntimeHints(KafkaAutoConfiguration.KafkaRuntimeHints.class)
 public class KafkaAutoConfiguration {
 
 	private final KafkaProperties properties;
@@ -230,4 +235,13 @@ private static void setBackOffPolicy(RetryTopicConfigurationBuilder builder, Bac
 		}
 	}
 
+	static class KafkaRuntimeHints implements RuntimeHintsRegistrar {
+
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			hints.reflection().registerType(SslBundleSslEngineFactory.class, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
+		}
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
index 90133fab101f..61e06b015119 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1427,7 +1427,7 @@ public Map<String, Object> buildProperties(SslBundles sslBundles) {
 
 		private Map<String, Object> buildPropertiesForSslBundle(SslBundles sslBundles, String name) {
 			Properties properties = new Properties();
-			properties.in(SslConfigs.SSL_ENGINE_FACTORY_CLASS_CONFIG).accept(SslBundleSslEngineFactory.class.getName());
+			properties.in(SslConfigs.SSL_ENGINE_FACTORY_CLASS_CONFIG).accept(SslBundleSslEngineFactory.class);
 			properties.in(SslBundle.class.getName()).accept(sslBundles.getBundle(name));
 			return properties;
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
index 768d52c5b740..740c97dff7f9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,17 +52,17 @@ public class MongoProperties {
 	public static final String DEFAULT_URI = "mongodb://localhost/test";
 
 	/**
-	 * Mongo server host. Cannot be set with URI.
+	 * Mongo server host. Ignored if 'uri' is set.
 	 */
 	private String host;
 
 	/**
-	 * Mongo server port. Cannot be set with URI.
+	 * Mongo server port. Ignored if 'uri' is set.
 	 */
 	private Integer port = null;
 
 	/**
-	 * Additional server hosts. Cannot be set with URI or if 'host' is not specified.
+	 * Additional server hosts. Ignored if 'uri' is set or if 'host' is omitted.
 	 * Additional hosts will use the default mongo port of 27017. If you want to use a
 	 * different port you can use the "host:port" syntax.
 	 */
@@ -86,17 +86,17 @@ public class MongoProperties {
 	private final Gridfs gridfs = new Gridfs();
 
 	/**
-	 * Login user of the mongo server. Cannot be set with URI.
+	 * Login user of the mongo server. Ignored if 'uri' is set.
 	 */
 	private String username;
 
 	/**
-	 * Login password of the mongo server. Cannot be set with URI.
+	 * Login password of the mongo server. Ignored if 'uri' is set.
 	 */
 	private char[] password;
 
 	/**
-	 * Required replica set name for the cluster. Cannot be set with URI.
+	 * Required replica set name for the cluster. Ignored if 'uri' is set.
 	 */
 	private String replicaSetName;
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
index fe8b19db079a..8c9144b85ef7 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -138,8 +138,8 @@ protected AbstractJpaVendorAdapter createJpaVendorAdapter() {
 	}
 
 	@Override
-	protected Map<String, Object> getVendorProperties() {
-		Supplier<String> defaultDdlMode = () -> this.defaultDdlAutoProvider.getDefaultDdlAuto(getDataSource());
+	protected Map<String, Object> getVendorProperties(DataSource dataSource) {
+		Supplier<String> defaultDdlMode = () -> this.defaultDdlAutoProvider.getDefaultDdlAuto(dataSource);
 		return new LinkedHashMap<>(this.hibernateProperties.determineHibernateProperties(
 				getProperties().getProperties(), new HibernateSettings().ddlAuto(defaultDdlMode)
 					.hibernatePropertiesCustomizers(this.hibernatePropertiesCustomizers)));
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
index bf6a6ceff762..80306aaf906f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,15 +120,15 @@ public JpaVendorAdapter jpaVendorAdapter() {
 	public EntityManagerFactoryBuilder entityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter,
 			ObjectProvider<PersistenceUnitManager> persistenceUnitManager,
 			ObjectProvider<EntityManagerFactoryBuilderCustomizer> customizers) {
-		EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder(jpaVendorAdapter, buildJpaProperties(),
-				persistenceUnitManager.getIfAvailable());
+		EntityManagerFactoryBuilder builder = new EntityManagerFactoryBuilder(jpaVendorAdapter,
+				this::buildJpaProperties, persistenceUnitManager.getIfAvailable());
 		customizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
 		return builder;
 	}
 
-	private Map<String, ?> buildJpaProperties() {
+	private Map<String, ?> buildJpaProperties(DataSource dataSource) {
 		Map<String, Object> properties = new HashMap<>(this.properties.getProperties());
-		Map<String, Object> vendorProperties = getVendorProperties();
+		Map<String, Object> vendorProperties = getVendorProperties(dataSource);
 		customizeVendorProperties(vendorProperties);
 		properties.putAll(vendorProperties);
 		return properties;
@@ -148,7 +148,24 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManager
 
 	protected abstract AbstractJpaVendorAdapter createJpaVendorAdapter();
 
-	protected abstract Map<String, Object> getVendorProperties();
+	/**
+	 * Return the vendor-specific properties for the given {@link DataSource}.
+	 * @param dataSource the data source
+	 * @return the vendor properties
+	 * @since 3.4.4
+	 */
+	protected abstract Map<String, Object> getVendorProperties(DataSource dataSource);
+
+	/**
+	 * Return the vendor-specific properties.
+	 * @return the vendor properties
+	 * @deprecated since 3.4.4 for removal in 3.6.0 in favor of
+	 * {@link #getVendorProperties(DataSource)}
+	 */
+	@Deprecated(since = "3.4.4", forRemoval = true)
+	protected Map<String, Object> getVendorProperties() {
+		return getVendorProperties(getDataSource());
+	}
 
 	/**
 	 * Customize vendor properties before they are used. Allows for post-processing (for
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlR2dbcScriptDatabaseInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlR2dbcScriptDatabaseInitializer.java
index 1b94679cffea..7779bb72d403 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlR2dbcScriptDatabaseInitializer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlR2dbcScriptDatabaseInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 
 import io.r2dbc.spi.ConnectionFactory;
 
-import org.springframework.boot.autoconfigure.batch.BatchDataSourceScriptDatabaseInitializer;
 import org.springframework.boot.r2dbc.init.R2dbcScriptDatabaseInitializer;
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
 import org.springframework.context.annotation.ImportRuntimeHints;
@@ -35,7 +34,7 @@
 public class SqlR2dbcScriptDatabaseInitializer extends R2dbcScriptDatabaseInitializer {
 
 	/**
-	 * Create a new {@link SqlDataSourceScriptDatabaseInitializer} instance.
+	 * Create a new {@code SqlR2dbcScriptDatabaseInitializer} instance.
 	 * @param connectionFactory the primary SQL connection factory
 	 * @param properties the SQL initialization properties
 	 * @see #getSettings
@@ -46,7 +45,7 @@ public SqlR2dbcScriptDatabaseInitializer(ConnectionFactory connectionFactory,
 	}
 
 	/**
-	 * Create a new {@link BatchDataSourceScriptDatabaseInitializer} instance.
+	 * Create a new {@code SqlR2dbcScriptDatabaseInitializer} instance.
 	 * @param connectionFactory the primary SQL connection factory
 	 * @param settings the database initialization settings
 	 * @see #getSettings
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
index 6db961ccc1c1..7a088eb8af99 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -134,7 +134,7 @@ static class ThymeleafWebMvcConfiguration {
 
 		@Bean
 		@ConditionalOnEnabledResourceChain
-		@ConditionalOnMissingFilterBean(ResourceUrlEncodingFilter.class)
+		@ConditionalOnMissingFilterBean
 		FilterRegistrationBean<ResourceUrlEncodingFilter> resourceUrlEncodingFilter() {
 			FilterRegistrationBean<ResourceUrlEncodingFilter> registration = new FilterRegistrationBean<>(
 					new ResourceUrlEncodingFilter());
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
index 2882b7079cbe..9be86511b67b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.boot.convert.DurationUnit;
+import org.springframework.boot.system.JavaVersion;
 import org.springframework.boot.web.server.Compression;
 import org.springframework.boot.web.server.Cookie;
 import org.springframework.boot.web.server.Http2;
@@ -75,7 +76,7 @@
  * @author Lasse Wulff
  * @since 1.0.0
  */
-@ConfigurationProperties(prefix = "server", ignoreUnknownFields = true)
+@ConfigurationProperties("server")
 public class ServerProperties {
 
 	/**
@@ -513,6 +514,12 @@ public static class Tomcat {
 		 */
 		private DataSize maxHttpResponseHeaderSize = DataSize.ofKilobytes(8);
 
+		/**
+		 * Whether to use APR. If running on Java below 24, the default value is
+		 * 'WHEN_AVAILABLE'. On Java 24 or later, the default value is 'NEVER'.
+		 */
+		private UseApr useApr;
+
 		public DataSize getMaxHttpFormPostSize() {
 			return this.maxHttpFormPostSize;
 		}
@@ -669,6 +676,18 @@ public void setMaxHttpResponseHeaderSize(DataSize maxHttpResponseHeaderSize) {
 			this.maxHttpResponseHeaderSize = maxHttpResponseHeaderSize;
 		}
 
+		public UseApr getUseApr() {
+			if (this.useApr == null) {
+				return JavaVersion.getJavaVersion().isEqualOrNewerThan(JavaVersion.TWENTY_FOUR) ? UseApr.NEVER
+						: UseApr.WHEN_AVAILABLE;
+			}
+			return this.useApr;
+		}
+
+		public void setUseApr(UseApr useApr) {
+			this.useApr = useApr;
+		}
+
 		/**
 		 * Tomcat access log properties.
 		 */
@@ -1113,6 +1132,28 @@ public void setTrustedProxies(String trustedProxies) {
 
 		}
 
+		/**
+		 * When to use APR.
+		 */
+		public enum UseApr {
+
+			/**
+			 * Always use APR and fail if it's not available.
+			 */
+			ALWAYS,
+
+			/**
+			 * Use APR if it is available.
+			 */
+			WHEN_AVAILABLE,
+
+			/**
+			 * Never user APR.
+			 */
+			NEVER
+
+		}
+
 	}
 
 	/**
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/TomcatReactiveWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/TomcatReactiveWebServerFactoryCustomizer.java
index 5e5ca0c85462..58ef3a1bd83d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/TomcatReactiveWebServerFactoryCustomizer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/TomcatReactiveWebServerFactoryCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,14 @@
 
 package org.springframework.boot.autoconfigure.web.reactive;
 
+import org.apache.catalina.core.AprLifecycleListener;
+
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat;
+import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.UseApr;
 import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.util.Assert;
 
 /**
  * {@link WebServerFactoryCustomizer} to apply {@link ServerProperties} to Tomcat reactive
@@ -38,7 +43,27 @@ public TomcatReactiveWebServerFactoryCustomizer(ServerProperties serverPropertie
 
 	@Override
 	public void customize(TomcatReactiveWebServerFactory factory) {
-		factory.setDisableMBeanRegistry(!this.serverProperties.getTomcat().getMbeanregistry().isEnabled());
+		Tomcat tomcatProperties = this.serverProperties.getTomcat();
+		factory.setDisableMBeanRegistry(!tomcatProperties.getMbeanregistry().isEnabled());
+		factory.setUseApr(getUseApr(tomcatProperties.getUseApr()));
+	}
+
+	private boolean getUseApr(UseApr useApr) {
+		return switch (useApr) {
+			case ALWAYS -> {
+				Assert.state(isAprAvailable(), "APR has been configured to 'ALWAYS', but it's not available");
+				yield true;
+			}
+			case WHEN_AVAILABLE -> isAprAvailable();
+			case NEVER -> false;
+		};
+	}
+
+	private boolean isAprAvailable() {
+		// At least one instance of AprLifecycleListener has to be created for
+		// isAprAvailable() to work
+		new AprLifecycleListener();
+		return AprLifecycleListener.isAprAvailable();
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java
index f1dcfb7e265a..c59ad10c6544 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,15 @@
 
 package org.springframework.boot.autoconfigure.web.servlet;
 
+import org.apache.catalina.core.AprLifecycleListener;
+
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.UseApr;
 import org.springframework.boot.web.embedded.tomcat.ConfigurableTomcatWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.core.Ordered;
+import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -56,6 +60,7 @@ public void customize(TomcatServletWebServerFactory factory) {
 		}
 		customizeUseRelativeRedirects(factory, tomcatProperties.isUseRelativeRedirects());
 		factory.setDisableMBeanRegistry(!tomcatProperties.getMbeanregistry().isEnabled());
+		factory.setUseApr(getUseApr(tomcatProperties.getUseApr()));
 	}
 
 	private void customizeRedirectContextRoot(ConfigurableTomcatWebServerFactory factory, boolean redirectContextRoot) {
@@ -67,4 +72,22 @@ private void customizeUseRelativeRedirects(ConfigurableTomcatWebServerFactory fa
 		factory.addContextCustomizers((context) -> context.setUseRelativeRedirects(useRelativeRedirects));
 	}
 
+	private boolean getUseApr(UseApr useApr) {
+		return switch (useApr) {
+			case ALWAYS -> {
+				Assert.state(isAprAvailable(), "APR has been configured to 'ALWAYS', but it's not available");
+				yield true;
+			}
+			case WHEN_AVAILABLE -> isAprAvailable();
+			case NEVER -> false;
+		};
+	}
+
+	private boolean isAprAvailable() {
+		// At least one instance of AprLifecycleListener has to be created for
+		// isAprAvailable() to work
+		new AprLifecycleListener();
+		return AprLifecycleListener.isAprAvailable();
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
index 937d4b4f0edf..2231769e5b17 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -366,7 +366,7 @@ private void customizeResourceHandlerRegistration(ResourceHandlerRegistration re
 
 		@Bean
 		@ConditionalOnMissingBean({ RequestContextListener.class, RequestContextFilter.class })
-		@ConditionalOnMissingFilterBean(RequestContextFilter.class)
+		@ConditionalOnMissingFilterBean
 		public static RequestContextFilter requestContextFilter() {
 			return new OrderedRequestContextFilter();
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
index 6c4f3a005bee..450bee2bc69d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -37,8 +37,8 @@ org.springframework.boot.autoconfigure.ssl.BundleContentNotWatchableFailureAnaly
 # Template Availability Providers
 org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider=\
 org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider,\
-org.springframework.boot.autoconfigure.mustache.MustacheTemplateAvailabilityProvider,\
 org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilityProvider,\
+org.springframework.boot.autoconfigure.mustache.MustacheTemplateAvailabilityProvider,\
 org.springframework.boot.autoconfigure.thymeleaf.ThymeleafTemplateAvailabilityProvider,\
 org.springframework.boot.autoconfigure.web.servlet.JspTemplateAvailabilityProvider
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring/aot.factories
index 80ce2b103585..17302dfd9b9c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring/aot.factories
@@ -1,7 +1,7 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider.FreeMarkerTemplateAvailabilityRuntimeHints,\
-org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilityProvider.GroovyTemplateAvailabilityRuntimeHints,\
-org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration.JacksonAutoConfigurationRuntimeHints,\
+org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider$FreeMarkerTemplateAvailabilityRuntimeHints,\
+org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilityProvider$GroovyTemplateAvailabilityRuntimeHints,\
+org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration$JacksonAutoConfigurationRuntimeHints,\
 org.springframework.boot.autoconfigure.template.TemplateRuntimeHints
 
 org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java
index 41ced26ff2ba..34bd4c667ced 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,10 +36,8 @@
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
-import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
-import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.boot.context.annotation.ImportCandidates;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DeferredImportSelector.Group;
 import org.springframework.context.annotation.DeferredImportSelector.Group.Entry;
@@ -57,6 +55,15 @@
  * @author Stephane Nicoll
  * @author Madhura Bhave
  */
+@WithResource(name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports", content = """
+		com.example.one.FirstAutoConfiguration
+		com.example.two.SecondAutoConfiguration
+		com.example.three.ThirdAutoConfiguration
+		com.example.four.FourthAutoConfiguration
+		com.example.five.FifthAutoConfiguration
+		com.example.six.SixthAutoConfiguration
+		org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$SeventhAutoConfiguration
+		""")
 class AutoConfigurationImportSelectorTests {
 
 	private final TestAutoConfigurationImportSelector importSelector = new TestAutoConfigurationImportSelector(null);
@@ -84,7 +91,7 @@ void classExclusionsAreApplied() {
 		String[] imports = selectImports(EnableAutoConfigurationWithClassExclusions.class);
 		assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
 		assertThat(this.importSelector.getLastEvent().getExclusions())
-			.contains(FreeMarkerAutoConfiguration.class.getName());
+			.contains(SeventhAutoConfiguration.class.getName());
 	}
 
 	@Test
@@ -92,7 +99,7 @@ void classExclusionsAreAppliedWhenUsingSpringBootApplication() {
 		String[] imports = selectImports(SpringBootApplicationWithClassExclusions.class);
 		assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
 		assertThat(this.importSelector.getLastEvent().getExclusions())
-			.contains(FreeMarkerAutoConfiguration.class.getName());
+			.contains(SeventhAutoConfiguration.class.getName());
 	}
 
 	@Test
@@ -100,7 +107,7 @@ void classNamesExclusionsAreApplied() {
 		String[] imports = selectImports(EnableAutoConfigurationWithClassNameExclusions.class);
 		assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
 		assertThat(this.importSelector.getLastEvent().getExclusions())
-			.contains(MustacheAutoConfiguration.class.getName());
+			.contains("com.example.one.FirstAutoConfiguration");
 	}
 
 	@Test
@@ -108,36 +115,36 @@ void classNamesExclusionsAreAppliedWhenUsingSpringBootApplication() {
 		String[] imports = selectImports(SpringBootApplicationWithClassNameExclusions.class);
 		assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
 		assertThat(this.importSelector.getLastEvent().getExclusions())
-			.contains(MustacheAutoConfiguration.class.getName());
+			.contains("com.example.three.ThirdAutoConfiguration");
 	}
 
 	@Test
 	void propertyExclusionsAreApplied() {
-		this.environment.setProperty("spring.autoconfigure.exclude", FreeMarkerAutoConfiguration.class.getName());
+		this.environment.setProperty("spring.autoconfigure.exclude", "com.example.three.ThirdAutoConfiguration");
 		String[] imports = selectImports(BasicEnableAutoConfiguration.class);
 		assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 1);
 		assertThat(this.importSelector.getLastEvent().getExclusions())
-			.contains(FreeMarkerAutoConfiguration.class.getName());
+			.contains("com.example.three.ThirdAutoConfiguration");
 	}
 
 	@Test
 	void severalPropertyExclusionsAreApplied() {
 		this.environment.setProperty("spring.autoconfigure.exclude",
-				FreeMarkerAutoConfiguration.class.getName() + "," + MustacheAutoConfiguration.class.getName());
+				"com.example.two.SecondAutoConfiguration,com.example.four.FourthAutoConfiguration");
 		testSeveralPropertyExclusionsAreApplied();
 	}
 
 	@Test
 	void severalPropertyExclusionsAreAppliedWithExtraSpaces() {
 		this.environment.setProperty("spring.autoconfigure.exclude",
-				FreeMarkerAutoConfiguration.class.getName() + " , " + MustacheAutoConfiguration.class.getName() + " ");
+				"com.example.two.SecondAutoConfiguration , com.example.four.FourthAutoConfiguration  ");
 		testSeveralPropertyExclusionsAreApplied();
 	}
 
 	@Test
 	void severalPropertyYamlExclusionsAreApplied() {
-		this.environment.setProperty("spring.autoconfigure.exclude[0]", FreeMarkerAutoConfiguration.class.getName());
-		this.environment.setProperty("spring.autoconfigure.exclude[1]", MustacheAutoConfiguration.class.getName());
+		this.environment.setProperty("spring.autoconfigure.exclude[0]", "com.example.two.SecondAutoConfiguration");
+		this.environment.setProperty("spring.autoconfigure.exclude[1]", "com.example.four.FourthAutoConfiguration");
 		testSeveralPropertyExclusionsAreApplied();
 	}
 
@@ -145,20 +152,22 @@ private void testSeveralPropertyExclusionsAreApplied() {
 		String[] imports = selectImports(BasicEnableAutoConfiguration.class);
 		assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 2);
 		assertThat(this.importSelector.getLastEvent().getExclusions())
-			.contains(FreeMarkerAutoConfiguration.class.getName(), MustacheAutoConfiguration.class.getName());
+			.contains("com.example.two.SecondAutoConfiguration", "com.example.four.FourthAutoConfiguration");
 	}
 
 	@Test
 	void combinedExclusionsAreApplied() {
-		this.environment.setProperty("spring.autoconfigure.exclude", ThymeleafAutoConfiguration.class.getName());
+		this.environment.setProperty("spring.autoconfigure.exclude", "com.example.one.FirstAutoConfiguration");
 		String[] imports = selectImports(EnableAutoConfigurationWithClassAndClassNameExclusions.class);
 		assertThat(imports).hasSize(getAutoConfigurationClassNames().size() - 3);
 		assertThat(this.importSelector.getLastEvent().getExclusions()).contains(
-				FreeMarkerAutoConfiguration.class.getName(), MustacheAutoConfiguration.class.getName(),
-				ThymeleafAutoConfiguration.class.getName());
+				"com.example.one.FirstAutoConfiguration", "com.example.five.FifthAutoConfiguration",
+				SeventhAutoConfiguration.class.getName());
 	}
 
 	@Test
+	@WithTestAutoConfigurationImportsResource
+	@WithTestAutoConfigurationReplacementsResource
 	void removedExclusionsAreApplied() {
 		TestAutoConfigurationImportSelector importSelector = new TestAutoConfigurationImportSelector(
 				TestAutoConfiguration.class);
@@ -227,7 +236,9 @@ void getExclusionFilterReuseFilters() {
 	}
 
 	@Test
-	void soringConsidersReplacements() {
+	@WithTestAutoConfigurationImportsResource
+	@WithTestAutoConfigurationReplacementsResource
+	void sortingConsidersReplacements() {
 		TestAutoConfigurationImportSelector importSelector = new TestAutoConfigurationImportSelector(
 				TestAutoConfiguration.class);
 		setupImportSelector(importSelector);
@@ -247,13 +258,15 @@ private String[] selectImports(Class<?> source) {
 	}
 
 	private List<String> getAutoConfigurationClassNames() {
-		return ImportCandidates.load(AutoConfiguration.class, getClass().getClassLoader()).getCandidates();
+		return ImportCandidates.load(AutoConfiguration.class, Thread.currentThread().getContextClassLoader())
+			.getCandidates();
 	}
 
 	private void setupImportSelector(TestAutoConfigurationImportSelector importSelector) {
 		importSelector.setBeanFactory(this.beanFactory);
 		importSelector.setEnvironment(this.environment);
 		importSelector.setResourceLoader(new DefaultResourceLoader());
+		importSelector.setBeanClassLoader(Thread.currentThread().getContextClassLoader());
 	}
 
 	private final class TestAutoConfigurationImportSelector extends AutoConfigurationImportSelector {
@@ -322,23 +335,23 @@ private final class BasicEnableAutoConfiguration {
 
 	}
 
-	@EnableAutoConfiguration(exclude = FreeMarkerAutoConfiguration.class)
+	@EnableAutoConfiguration(exclude = SeventhAutoConfiguration.class)
 	private final class EnableAutoConfigurationWithClassExclusions {
 
 	}
 
-	@SpringBootApplication(exclude = FreeMarkerAutoConfiguration.class)
+	@SpringBootApplication(exclude = SeventhAutoConfiguration.class)
 	private final class SpringBootApplicationWithClassExclusions {
 
 	}
 
-	@EnableAutoConfiguration(excludeName = "org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration")
+	@EnableAutoConfiguration(excludeName = "com.example.one.FirstAutoConfiguration")
 	private final class EnableAutoConfigurationWithClassNameExclusions {
 
 	}
 
-	@EnableAutoConfiguration(exclude = MustacheAutoConfiguration.class,
-			excludeName = "org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration")
+	@EnableAutoConfiguration(exclude = SeventhAutoConfiguration.class,
+			excludeName = "com.example.five.FifthAutoConfiguration")
 	private final class EnableAutoConfigurationWithClassAndClassNameExclusions {
 
 	}
@@ -359,7 +372,7 @@ private final class EnableAutoConfigurationWithAbsentClassNameExclude {
 
 	}
 
-	@SpringBootApplication(excludeName = "org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration")
+	@SpringBootApplication(excludeName = "com.example.three.ThirdAutoConfiguration")
 	private final class SpringBootApplicationWithClassNameExclusions {
 
 	}
@@ -383,4 +396,33 @@ static class AfterDeprecatedAutoConfiguration {
 
 	}
 
+	@AutoConfiguration
+	static class SeventhAutoConfiguration {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.imports",
+			content = """
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$AfterDeprecatedAutoConfiguration
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$ReplacementAutoConfiguration
+					""")
+	@interface WithTestAutoConfigurationImportsResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.replacements",
+			content = """
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$DeprecatedAutoConfiguration=\
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$ReplacementAutoConfiguration
+					""")
+	@interface WithTestAutoConfigurationReplacementsResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoaderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoaderTests.java
index adb83a99bf10..ab919d4ec96f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoaderTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -27,6 +29,12 @@
  *
  * @author Phillip Webb
  */
+@WithResource(name = "metadata.properties", content = """
+		test=
+		test.string=abc
+		test.int=123
+		test.set=a,b,b,c
+		""")
 class AutoConfigurationMetadataLoaderTests {
 
 	@Test
@@ -90,8 +98,8 @@ void getWithDefaultWhenMissingShouldReturnDefault() {
 	}
 
 	private AutoConfigurationMetadata load() {
-		return AutoConfigurationMetadataLoader.loadMetadata(null,
-				"META-INF/AutoConfigurationMetadataLoaderTests.properties");
+		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+		return AutoConfigurationMetadataLoader.loadMetadata(classLoader, "metadata.properties");
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReplacementsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReplacementsTests.java
index 30ae61950a18..5e1b5b4e59c1 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReplacementsTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReplacementsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,11 @@
 import java.util.List;
 import java.util.Set;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -33,10 +36,21 @@
  *
  * @author Phillip Webb
  */
+@WithResource(
+		name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationReplacementsTests$TestAutoConfigurationReplacements.replacements",
+		content = """
+				com.example.A1=com.example.A2
+				com.example.B1=com.example.B2
+				""")
 class AutoConfigurationReplacementsTests {
 
-	private final AutoConfigurationReplacements replacements = AutoConfigurationReplacements
-		.load(TestAutoConfigurationReplacements.class, null);
+	private AutoConfigurationReplacements replacements;
+
+	@BeforeEach
+	void loadReplacements() {
+		this.replacements = AutoConfigurationReplacements.load(TestAutoConfigurationReplacements.class,
+				Thread.currentThread().getContextClassLoader());
+	}
 
 	@Test
 	void replaceWhenMatchReplacesClassName() {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java
deleted file mode 100644
index 900f0c0868fc..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReproTests.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests to reproduce reported issues.
- *
- * @author Phillip Webb
- */
-class AutoConfigurationReproTests {
-
-	private ConfigurableApplicationContext context;
-
-	@AfterEach
-	void cleanup() {
-		if (this.context != null) {
-			this.context.close();
-		}
-	}
-
-	@Test
-	void doesNotEarlyInitializeFactoryBeans() {
-		SpringApplication application = new SpringApplication(EarlyInitConfig.class,
-				PropertySourcesPlaceholderConfigurer.class, ServletWebServerFactoryAutoConfiguration.class);
-		this.context = application.run("--server.port=0");
-		String bean = (String) this.context.getBean("earlyInit");
-		assertThat(bean).isEqualTo("bucket");
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	static class Config {
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ImportResource("classpath:/early-init-test.xml")
-	static class EarlyInitConfig {
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java
index 7a794fd3c84f..5e6a9feccc98 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,7 @@
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
-import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.type.AnnotationMetadata;
@@ -58,76 +57,89 @@ void setup() {
 		this.importSelector.setBeanFactory(this.beanFactory);
 		this.importSelector.setEnvironment(this.environment);
 		this.importSelector.setResourceLoader(new DefaultResourceLoader());
+		this.importSelector.setBeanClassLoader(Thread.currentThread().getContextClassLoader());
 	}
 
 	@Test
 	void importsAreSelected() throws Exception {
-		AnnotationMetadata annotationMetadata = getAnnotationMetadata(ImportFreeMarker.class);
+		AnnotationMetadata annotationMetadata = getAnnotationMetadata(ImportImported.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
-		assertThat(imports).containsExactly(FreeMarkerAutoConfiguration.class.getName());
+		assertThat(imports).containsExactly(ImportedAutoConfiguration.class.getName());
 	}
 
 	@Test
 	void importsAreSelectedUsingClassesAttribute() throws Exception {
-		AnnotationMetadata annotationMetadata = getAnnotationMetadata(ImportFreeMarkerUsingClassesAttribute.class);
+		AnnotationMetadata annotationMetadata = getAnnotationMetadata(ImportImportedUsingClassesAttribute.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
-		assertThat(imports).containsExactly(FreeMarkerAutoConfiguration.class.getName());
+		assertThat(imports).containsExactly(ImportedAutoConfiguration.class.getName());
 	}
 
 	@Test
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports",
+			content = """
+					org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration
+					org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration
+					""")
 	void importsAreSelectedFromImportsFile() throws Exception {
 		AnnotationMetadata annotationMetadata = getAnnotationMetadata(FromImportsFile.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
 		assertThat(imports).containsExactly(
-				"org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration",
+				"org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration",
 				"org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration");
 	}
 
 	@Test
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports",
+			content = """
+					optional:org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration
+					optional:org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration
+					org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$AnotherImportedAutoConfiguration
+					""")
 	void importsSelectedFromImportsFileIgnoreMissingOptionalClasses() throws Exception {
-		AnnotationMetadata annotationMetadata = getAnnotationMetadata(
-				FromImportsFileIgnoresMissingOptionalClasses.class);
+		AnnotationMetadata annotationMetadata = getAnnotationMetadata(FromImportsFile.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
 		assertThat(imports).containsExactly(
-				"org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration",
-				"org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration");
+				"org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration",
+				"org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$AnotherImportedAutoConfiguration");
 	}
 
 	@Test
 	void propertyExclusionsAreApplied() throws IOException {
-		this.environment.setProperty("spring.autoconfigure.exclude", FreeMarkerAutoConfiguration.class.getName());
+		this.environment.setProperty("spring.autoconfigure.exclude", ImportedAutoConfiguration.class.getName());
 		AnnotationMetadata annotationMetadata = getAnnotationMetadata(MultipleImports.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
-		assertThat(imports).containsExactly(ThymeleafAutoConfiguration.class.getName());
+		assertThat(imports).containsExactly(AnotherImportedAutoConfiguration.class.getName());
 	}
 
 	@Test
 	void multipleImportsAreFound() throws Exception {
 		AnnotationMetadata annotationMetadata = getAnnotationMetadata(MultipleImports.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
-		assertThat(imports).containsOnly(FreeMarkerAutoConfiguration.class.getName(),
-				ThymeleafAutoConfiguration.class.getName());
+		assertThat(imports).containsOnly(ImportedAutoConfiguration.class.getName(),
+				AnotherImportedAutoConfiguration.class.getName());
 	}
 
 	@Test
 	void selfAnnotatingAnnotationDoesNotCauseStackOverflow() throws IOException {
 		AnnotationMetadata annotationMetadata = getAnnotationMetadata(ImportWithSelfAnnotatingAnnotation.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
-		assertThat(imports).containsOnly(ThymeleafAutoConfiguration.class.getName());
+		assertThat(imports).containsOnly(AnotherImportedAutoConfiguration.class.getName());
 	}
 
 	@Test
 	void exclusionsAreApplied() throws Exception {
 		AnnotationMetadata annotationMetadata = getAnnotationMetadata(MultipleImportsWithExclusion.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
-		assertThat(imports).containsOnly(FreeMarkerAutoConfiguration.class.getName());
+		assertThat(imports).containsOnly(ImportedAutoConfiguration.class.getName());
 	}
 
 	@Test
 	void exclusionsWithoutImport() throws Exception {
 		AnnotationMetadata annotationMetadata = getAnnotationMetadata(ExclusionWithoutImport.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
-		assertThat(imports).containsOnly(FreeMarkerAutoConfiguration.class.getName());
+		assertThat(imports).containsOnly(ImportedAutoConfiguration.class.getName());
 	}
 
 	@Test
@@ -199,13 +211,13 @@ private AnnotationMetadata getAnnotationMetadata(Class<?> source) throws IOExcep
 		return new SimpleMetadataReaderFactory().getMetadataReader(source.getName()).getAnnotationMetadata();
 	}
 
-	@ImportAutoConfiguration(FreeMarkerAutoConfiguration.class)
-	static class ImportFreeMarker {
+	@ImportAutoConfiguration(ImportedAutoConfiguration.class)
+	static class ImportImported {
 
 	}
 
-	@ImportAutoConfiguration(classes = FreeMarkerAutoConfiguration.class)
-	static class ImportFreeMarkerUsingClassesAttribute {
+	@ImportAutoConfiguration(classes = ImportedAutoConfiguration.class)
+	static class ImportImportedUsingClassesAttribute {
 
 	}
 
@@ -217,13 +229,13 @@ static class MultipleImports {
 
 	@ImportOne
 	@ImportTwo
-	@ImportAutoConfiguration(exclude = ThymeleafAutoConfiguration.class)
+	@ImportAutoConfiguration(exclude = AnotherImportedAutoConfiguration.class)
 	static class MultipleImportsWithExclusion {
 
 	}
 
 	@ImportOne
-	@ImportAutoConfiguration(exclude = ThymeleafAutoConfiguration.class)
+	@ImportAutoConfiguration(exclude = AnotherImportedAutoConfiguration.class)
 	static class ExclusionWithoutImport {
 
 	}
@@ -233,19 +245,19 @@ static class ImportWithSelfAnnotatingAnnotation {
 
 	}
 
-	@SelfAnnotating(excludeAutoConfiguration = ThymeleafAutoConfiguration.class)
+	@SelfAnnotating(excludeAutoConfiguration = AnotherImportedAutoConfiguration.class)
 	static class ImportWithSelfAnnotatingAnnotationExclude {
 
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
-	@ImportAutoConfiguration(FreeMarkerAutoConfiguration.class)
+	@ImportAutoConfiguration(ImportedAutoConfiguration.class)
 	@interface ImportOne {
 
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
-	@ImportAutoConfiguration(ThymeleafAutoConfiguration.class)
+	@ImportAutoConfiguration(AnotherImportedAutoConfiguration.class)
 	@interface ImportTwo {
 
 	}
@@ -274,25 +286,25 @@ static class ImportAutoConfigurationWithUnrelatedTwo {
 
 	}
 
-	@ImportAutoConfiguration(classes = ThymeleafAutoConfiguration.class)
+	@ImportAutoConfiguration(classes = AnotherImportedAutoConfiguration.class)
 	@UnrelatedOne
 	static class ImportAutoConfigurationWithItemsOne {
 
 	}
 
-	@ImportAutoConfiguration(classes = ThymeleafAutoConfiguration.class)
+	@ImportAutoConfiguration(classes = AnotherImportedAutoConfiguration.class)
 	@UnrelatedTwo
 	static class ImportAutoConfigurationWithItemsTwo {
 
 	}
 
-	@MetaImportAutoConfiguration(exclude = ThymeleafAutoConfiguration.class)
+	@MetaImportAutoConfiguration(exclude = AnotherImportedAutoConfiguration.class)
 	@UnrelatedOne
 	static class ImportMetaAutoConfigurationExcludeWithUnrelatedOne {
 
 	}
 
-	@MetaImportAutoConfiguration(exclude = ThymeleafAutoConfiguration.class)
+	@MetaImportAutoConfiguration(exclude = AnotherImportedAutoConfiguration.class)
 	@UnrelatedTwo
 	static class ImportMetaAutoConfigurationExcludeWithUnrelatedTwo {
 
@@ -320,7 +332,7 @@ Class<?>[] exclude() default {
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
-	@ImportAutoConfiguration(ThymeleafAutoConfiguration.class)
+	@ImportAutoConfiguration(AnotherImportedAutoConfiguration.class)
 	@SelfAnnotating
 	@interface SelfAnnotating {
 
@@ -348,12 +360,22 @@ static class TestImportAutoConfigurationImportSelector extends ImportAutoConfigu
 		@Override
 		protected Collection<String> loadFactoryNames(Class<?> source) {
 			if (source == MetaImportAutoConfiguration.class) {
-				return Arrays.asList(ThymeleafAutoConfiguration.class.getName(),
-						FreeMarkerAutoConfiguration.class.getName());
+				return Arrays.asList(AnotherImportedAutoConfiguration.class.getName(),
+						ImportedAutoConfiguration.class.getName());
 			}
 			return super.loadFactoryNames(source);
 		}
 
 	}
 
+	@AutoConfiguration
+	static class ImportedAutoConfiguration {
+
+	}
+
+	@AutoConfiguration
+	static class AnotherImportedAutoConfiguration {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java
deleted file mode 100644
index 84982b51e666..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.annotation.DirtiesContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- */
-@DirtiesContext
-@SpringBootTest
-class SpringJUnitTests {
-
-	@Autowired
-	private ApplicationContext context;
-
-	@Value("${foo:spam}")
-	private String foo = "bar";
-
-	@Test
-	void testContextCreated() {
-		assertThat(this.context).isNotNull();
-	}
-
-	@Test
-	void testContextInitialized() {
-		assertThat(this.foo).isEqualTo("bucket");
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import({ PropertyPlaceholderAutoConfiguration.class })
-	static class TestConfiguration {
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
index 1f3e84d18e78..a6bdc9fdfc56 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -910,9 +910,8 @@ void enableSslWithInvalidTrustStoreTypeShouldFail() {
 	void enableSslWithBundle() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 			.withPropertyValues("spring.rabbitmq.ssl.bundle=test-bundle",
-					"spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:test.jks",
-					"spring.ssl.bundle.jks.test-bundle.keystore.password=secret",
-					"spring.ssl.bundle.jks.test-bundle.key.password=password")
+					"spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/autoconfigure/amqp/test.jks",
+					"spring.ssl.bundle.jks.test-bundle.keystore.password=secret")
 			.run((context) -> {
 				com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
 				assertThat(rabbitConnectionFactory.isSSL()).isTrue();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
index 8f10bea4e035..5b6a4c3ccecc 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,6 +72,8 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -288,13 +290,13 @@ void testUsingJpa() {
 	}
 
 	@Test
+	@WithPackageResources("custom-schema.sql")
 	void testRenamePrefix() {
 		this.contextRunner
 			.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class,
 					HibernateJpaAutoConfiguration.class)
 			.withPropertyValues("spring.datasource.generate-unique-name=true",
-					"spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
-					"spring.batch.jdbc.tablePrefix:PREFIX_")
+					"spring.batch.jdbc.schema:classpath:custom-schema.sql", "spring.batch.jdbc.tablePrefix:PREFIX_")
 			.run((context) -> {
 				assertThat(context).hasSingleBean(JobLauncher.class);
 				assertThat(context.getBean(BatchProperties.class).getJdbc().getInitializeSchema())
@@ -412,6 +414,7 @@ void jobRepositoryBeansDependOnFlyway() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-master.yaml", content = "databaseChangeLog:")
 	void jobRepositoryBeansDependOnLiquibase() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class)
 			.withUserConfiguration(LiquibaseAutoConfiguration.class)
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java
index a907a075b251..3377b5a449a8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.boot.sql.init.DatabaseInitializationMode;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.Isolation;
 
@@ -70,11 +71,11 @@ void jdbcWithDefaultSettings() {
 	}
 
 	@Test
+	@WithPackageResources("custom-schema.sql")
 	void jdbcWithCustomPrefix() {
 		this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.datasource.generate-unique-name=true",
-					"spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
-					"spring.batch.jdbc.tablePrefix:PREFIX_")
+					"spring.batch.jdbc.schema:classpath:custom-schema.sql", "spring.batch.jdbc.tablePrefix:PREFIX_")
 			.run((context) -> {
 				assertThat(new JdbcTemplate(context.getBean(DataSource.class))
 					.queryForList("select * from PREFIX_JOB_EXECUTION")).isEmpty();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
index b29f64cce6cf..5b576c3974ef 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.autoconfigure.cache;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -48,6 +52,7 @@
 import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.cache.Cache;
 import org.springframework.cache.Cache.ValueWrapper;
 import org.springframework.cache.CacheManager;
@@ -481,6 +486,7 @@ void jCacheCacheWithPropertiesCustomizer() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void hazelcastCacheExplicit() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(HazelcastAutoConfiguration.class))
 			.withUserConfiguration(DefaultCacheConfiguration.class)
@@ -496,6 +502,7 @@ void hazelcastCacheExplicit() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void hazelcastCacheWithCustomizers() {
 		this.contextRunner.withUserConfiguration(HazelcastCacheAndCustomizersConfiguration.class)
 			.withPropertyValues("spring.cache.type=hazelcast")
@@ -548,10 +555,31 @@ void hazelcastAsJCacheWithCaches() {
 	}
 
 	@Test
+	@WithResource(name = "hazelcast-specific.xml", content = """
+			<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
+					   xmlns="http://www.hazelcast.com/schema/config"
+					   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+				<queue name="foobar"/>
+
+				<map name="foobar">
+					<time-to-live-seconds>3600</time-to-live-seconds>
+					<max-idle-seconds>600</max-idle-seconds>
+				</map>
+
+				<network>
+					<join>
+						<auto-detection enabled="false" />
+						<multicast enabled="false"/>
+					</join>
+				</network>
+
+			</hazelcast>
+			""")
 	void hazelcastAsJCacheWithConfig() {
 		String cachingProviderFqn = HazelcastServerCachingProvider.class.getName();
 		try {
-			String configLocation = "org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml";
+			String configLocation = "hazelcast-specific.xml";
 			this.contextRunner.withUserConfiguration(DefaultCacheConfiguration.class)
 				.withPropertyValues("spring.cache.type=jcache", "spring.cache.jcache.provider=" + cachingProviderFqn,
 						"spring.cache.jcache.config=" + configLocation)
@@ -568,6 +596,7 @@ void hazelcastAsJCacheWithConfig() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void hazelcastAsJCacheWithExistingHazelcastInstance() {
 		String cachingProviderFqn = HazelcastServerCachingProvider.class.getName();
 		this.contextRunner.withConfiguration(AutoConfigurations.of(HazelcastAutoConfiguration.class))
@@ -587,6 +616,7 @@ void hazelcastAsJCacheWithExistingHazelcastInstance() {
 	}
 
 	@Test
+	@WithInfinispanXmlResource
 	void infinispanCacheWithConfig() {
 		this.contextRunner.withUserConfiguration(DefaultCacheConfiguration.class)
 			.withPropertyValues("spring.cache.type=infinispan", "spring.cache.infinispan.config=infinispan.xml")
@@ -635,6 +665,7 @@ void infinispanAsJCacheWithCaches() {
 	}
 
 	@Test
+	@WithInfinispanXmlResource
 	void infinispanAsJCacheWithConfig() {
 		String cachingProviderClassName = JCachingProvider.class.getName();
 		String configLocation = "infinispan.xml";
@@ -1078,4 +1109,45 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "infinispan.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<infinispan>
+
+				<!-- ************************************** -->
+				<!-- Corresponds to @Cacheable("cache-name") -->
+				<!-- ************************************** -->
+				<cache-container default-cache="default">
+					<local-cache name="default"/>
+					<local-cache name="foo"/>
+					<local-cache name="bar" />
+				</cache-container>
+
+			</infinispan>
+			""")
+	@interface WithInfinispanXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "hazelcast.xml", content = """
+			<hazelcast
+				xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
+				xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+				<instance-name>default-instance</instance-name>
+				<map name="defaultCache" />
+				<network>
+					<join>
+						<auto-detection enabled="false" />
+						<multicast enabled="false" />
+					</join>
+				</network>
+			</hazelcast>
+			""")
+	@interface WithHazelcastXmlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java
index 3ee060cffee9..92f66b9ac9bb 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.springframework.boot.autoconfigure.cache.CacheAutoConfigurationTests.DefaultCacheConfiguration;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.cache.jcache.JCacheCacheManager;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -49,6 +50,34 @@ void ehcache3AsJCacheWithCaches() {
 	}
 
 	@Test
+	@WithResource(name = "ehcache3.xml", content = """
+			<config
+					xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+					xmlns='http://www.ehcache.org/v3'
+					xmlns:jsr107='http://www.ehcache.org/v3/jsr107'
+					xsi:schemaLocation="
+			        http://www.ehcache.org/v3 https://www.ehcache.org/schema/ehcache-core-3.10.xsd
+			        http://www.ehcache.org/v3/jsr107 https://www.ehcache.org/schema/ehcache-107-ext-3.10.xsd">
+
+				<cache-template name="example">
+					<heap unit="entries">200</heap>
+				</cache-template>
+
+				<cache alias="foo" uses-template="example">
+					<expiry>
+						<ttl unit="seconds">600</ttl>
+					</expiry>
+					<jsr107:mbeans enable-statistics="true"/>
+				</cache>
+
+				<cache alias="bar" uses-template="example">
+					<expiry>
+						<ttl unit="seconds">400</ttl>
+					</expiry>
+				</cache>
+
+			</config>
+			""")
 	void ehcache3AsJCacheWithConfig() {
 		String cachingProviderFqn = EhcacheCachingProvider.class.getName();
 		String configLocation = "ehcache3.xml";
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
index 4a276d96bd10..d7ef91cbe341 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
 import org.springframework.boot.ssl.NoSuchSslBundleException;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -89,6 +90,7 @@ void cqlSessionBuilderWithSslEnabled() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void cqlSessionBuilderWithSslBundle() {
 		this.contextRunner
 			.withPropertyValues("spring.cassandra.ssl.bundle=test-bundle",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java
index fc1df6ace290..bf8154c22fa4 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
 
 package org.springframework.boot.autoconfigure.condition;
 
-import java.util.ArrayList;
+import java.time.Duration;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -29,11 +28,12 @@
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport.ConditionAndOutcome;
 import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport.ConditionAndOutcomes;
+import org.springframework.boot.autoconfigure.condition.config.UniqueShortNameAutoConfiguration;
 import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportMessage;
-import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -42,7 +42,6 @@
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ConfigurationCondition;
-import org.springframework.context.annotation.Import;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.util.ClassUtils;
 
@@ -164,7 +163,17 @@ private void prepareMatches(boolean m1, boolean m2, boolean m3) {
 	void springBootConditionPopulatesReport() {
 		ConditionEvaluationReport report = ConditionEvaluationReport
 			.get(new AnnotationConfigApplicationContext(Config.class).getBeanFactory());
-		assertThat(report.getConditionAndOutcomesBySource()).isNotEmpty();
+		assertThat(report.getUnconditionalClasses()).containsExactly(UnconditionalAutoConfiguration.class.getName());
+		assertThat(report.getConditionAndOutcomesBySource()).containsOnlyKeys(MatchingAutoConfiguration.class.getName(),
+				NonMatchingAutoConfiguration.class.getName());
+		assertThat(report.getConditionAndOutcomesBySource().get(MatchingAutoConfiguration.class.getName()))
+			.satisfies((outcomes) -> assertThat(outcomes).extracting(ConditionAndOutcome::getOutcome)
+				.extracting(ConditionOutcome::isMatch)
+				.containsOnly(true));
+		assertThat(report.getConditionAndOutcomesBySource().get(NonMatchingAutoConfiguration.class.getName()))
+			.satisfies((outcomes) -> assertThat(outcomes).extracting(ConditionAndOutcome::getOutcome)
+				.extracting(ConditionOutcome::isMatch)
+				.containsOnly(false));
 	}
 
 	@Test
@@ -184,24 +193,6 @@ void testDuplicateConditionAndOutcomes() {
 		assertThat(outcomes).hasSize(2);
 	}
 
-	@Test
-	void duplicateOutcomes() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(DuplicateConfig.class);
-		ConditionEvaluationReport report = ConditionEvaluationReport.get(context.getBeanFactory());
-		String autoconfigKey = MultipartAutoConfiguration.class.getName();
-		ConditionAndOutcomes outcomes = report.getConditionAndOutcomesBySource().get(autoconfigKey);
-		assertThat(outcomes).isNotNull();
-		assertThat(outcomes).hasSize(2);
-		List<String> messages = new ArrayList<>();
-		for (ConditionAndOutcome outcome : outcomes) {
-			messages.add(outcome.getOutcome().getMessage());
-		}
-		assertThat(messages).anyMatch((message) -> message.contains("@ConditionalOnClass found required classes "
-				+ "'jakarta.servlet.Servlet', 'org.springframework.web.multipart."
-				+ "support.StandardServletMultipartResolver', 'jakarta.servlet.MultipartConfigElement'"));
-		context.close();
-	}
-
 	@Test
 	void negativeOuterPositiveInnerBean() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -220,13 +211,13 @@ void negativeOuterPositiveInnerBean() {
 	@Test
 	void reportWhenSameShortNamePresentMoreThanOnceShouldUseFullyQualifiedName() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(WebMvcAutoConfiguration.class,
+		context.register(UniqueShortNameAutoConfiguration.class,
 				org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration.class,
 				org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration.class);
 		context.refresh();
 		ConditionEvaluationReport report = ConditionEvaluationReport.get(context.getBeanFactory());
 		assertThat(report.getConditionAndOutcomesBySource()).containsKeys(
-				"org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration",
+				"org.springframework.boot.autoconfigure.condition.config.UniqueShortNameAutoConfiguration",
 				"org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration",
 				"org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration");
 		context.close();
@@ -235,32 +226,20 @@ void reportWhenSameShortNamePresentMoreThanOnceShouldUseFullyQualifiedName() {
 	@Test
 	void reportMessageWhenSameShortNamePresentMoreThanOnceShouldUseFullyQualifiedName() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(WebMvcAutoConfiguration.class,
+		context.register(UniqueShortNameAutoConfiguration.class,
 				org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration.class,
 				org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration.class);
 		context.refresh();
 		ConditionEvaluationReport report = ConditionEvaluationReport.get(context.getBeanFactory());
 		String reportMessage = new ConditionEvaluationReportMessage(report).toString();
-		assertThat(reportMessage).contains("WebMvcAutoConfiguration",
+		assertThat(reportMessage).contains("UniqueShortNameAutoConfiguration",
 				"org.springframework.boot.autoconfigure.condition.config.first.SampleAutoConfiguration",
 				"org.springframework.boot.autoconfigure.condition.config.second.SampleAutoConfiguration");
 		assertThat(reportMessage)
-			.doesNotContain("org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration");
+			.doesNotContain("org.springframework.boot.autoconfigure.condition.config.UniqueShortNameAutoConfiguration");
 		context.close();
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@Import(WebMvcAutoConfiguration.class)
-	static class Config {
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@Import(MultipartAutoConfiguration.class)
-	static class DuplicateConfig {
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@Conditional({ ConditionEvaluationReportTests.MatchParseCondition.class,
 			ConditionEvaluationReportTests.NoMatchBeanCondition.class })
@@ -334,4 +313,33 @@ static class NoMatchBeanCondition extends TestMatchCondition {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ImportAutoConfiguration({ MatchingAutoConfiguration.class, NonMatchingAutoConfiguration.class,
+			UnconditionalAutoConfiguration.class })
+	static class Config {
+
+	}
+
+	@AutoConfiguration
+	@ConditionalOnProperty(name = "com.example.property", matchIfMissing = true)
+	static class MatchingAutoConfiguration {
+
+	}
+
+	@AutoConfiguration
+	@ConditionalOnBean(Duration.class)
+	static class NonMatchingAutoConfiguration {
+
+	}
+
+	@AutoConfiguration
+	static class UnconditionalAutoConfiguration {
+
+		@Bean
+		String example() {
+			return "example";
+		}
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java
index 2c92ac5ee102..75c03bc0ba71 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
-import org.springframework.boot.autoconfigure.web.reactive.MockReactiveWebServerFactory;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.web.reactive.server.MockReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java
index e01c32696dd1..177603123f3c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -35,6 +36,7 @@ class ConditionalOnResourceTests {
 	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
 	@Test
+	@WithResource(name = "schema.sql")
 	void testResourceExists() {
 		this.context.register(BasicConfiguration.class);
 		this.context.refresh();
@@ -43,6 +45,7 @@ void testResourceExists() {
 	}
 
 	@Test
+	@WithResource(name = "schema.sql")
 	void testResourceExistsWithPlaceholder() {
 		TestPropertyValues.of("schema=schema.sql").applyTo(this.context);
 		this.context.register(PlaceholderConfiguration.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java
index 83ea467f2b5a..1ad6959d8d4f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnWebApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.autoconfigure.web.reactive.MockReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext;
+import org.springframework.boot.web.reactive.server.MockReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java
index dfc936fdd84e..f1daa8d5c976 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -45,6 +46,7 @@ void tearDown() {
 	}
 
 	@Test
+	@WithResource(name = "logging.properties")
 	void defaultResourceAndNoExplicitKey() {
 		load(DefaultLocationConfiguration.class);
 		assertThat(this.context.containsBean("foo")).isTrue();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/config/UniqueShortNameAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/config/UniqueShortNameAutoConfiguration.java
new file mode 100644
index 000000000000..818d070209cb
--- /dev/null
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/config/UniqueShortNameAutoConfiguration.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.autoconfigure.condition.config;
+
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * Uniquely named auto-configuration for {@link ConditionEvaluationReport} tests.
+ *
+ * @author Andy Wilkinson
+ */
+@AutoConfiguration
+@ConditionalOnProperty("unique")
+public class UniqueShortNameAutoConfiguration {
+
+}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java
deleted file mode 100644
index be856f254efa..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationIntegrationTests.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure.context;
-
-import java.util.Locale;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link MessageSourceAutoConfiguration}.
- *
- * @author Dave Syer
- */
-@SpringBootTest("spring.messages.basename:test/messages")
-@ImportAutoConfiguration({ MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
-@DirtiesContext
-class MessageSourceAutoConfigurationIntegrationTests {
-
-	@Autowired
-	private ApplicationContext context;
-
-	@Test
-	void testMessageSourceFromPropertySourceAnnotation() {
-		assertThat(this.context.getMessage("foo", null, "Foo message", Locale.UK)).isEqualTo("bar");
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	static class Config {
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java
deleted file mode 100644
index 049b86e06d9e..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationProfileTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure.context;
-
-import java.util.Locale;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ActiveProfiles;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link MessageSourceAutoConfiguration}.
- *
- * @author Dave Syer
- */
-@SpringBootTest
-@ImportAutoConfiguration({ MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class })
-@ActiveProfiles("switch-messages")
-@DirtiesContext
-class MessageSourceAutoConfigurationProfileTests {
-
-	@Autowired
-	private ApplicationContext context;
-
-	@Test
-	void testMessageSourceFromPropertySourceAnnotation() {
-		assertThat(this.context.getMessage("foo", null, "Foo message", Locale.UK)).isEqualTo("bar");
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	static class Config {
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
index fbe9204e4f94..2a239fd9173e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.autoconfigure.context;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Locale;
 
 import org.junit.jupiter.api.Disabled;
@@ -28,6 +32,7 @@
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.annotation.Bean;
@@ -59,6 +64,7 @@ void testDefaultMessageSource() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void propertiesBundleWithSlashIsDetected() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test/messages").run((context) -> {
 			assertThat(context).hasSingleBean(MessageSource.class);
@@ -67,6 +73,7 @@ void propertiesBundleWithSlashIsDetected() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void propertiesBundleWithDotIsDetected() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test.messages").run((context) -> {
 			assertThat(context).hasSingleBean(MessageSource.class);
@@ -75,6 +82,7 @@ void propertiesBundleWithDotIsDetected() {
 	}
 
 	@Test
+	@WithTestSwedishPropertiesResource
 	void testEncodingWorks() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test/swedish")
 			.run((context) -> assertThat(context.getMessage("foo", null, "Foo message", Locale.UK))
@@ -82,6 +90,7 @@ void testEncodingWorks() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testCacheDurationNoUnit() {
 		this.contextRunner
 			.withPropertyValues("spring.messages.basename=test/messages", "spring.messages.cache-duration=10")
@@ -89,6 +98,7 @@ void testCacheDurationNoUnit() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testCacheDurationWithUnit() {
 		this.contextRunner
 			.withPropertyValues("spring.messages.basename=test/messages", "spring.messages.cache-duration=1m")
@@ -103,6 +113,8 @@ private ContextConsumer<AssertableApplicationContext> assertCache(long expected)
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
+	@WithTestMessages2PropertiesResource
 	void testMultipleMessageSourceCreated() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test/messages,test/messages2")
 			.run((context) -> {
@@ -112,13 +124,17 @@ void testMultipleMessageSourceCreated() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	@Disabled("Expected to fail per gh-1075")
+	@WithResource(name = "application-switch-messages.properties", content = "spring.messages.basename:test/messages")
 	void testMessageSourceFromPropertySourceAnnotation() {
 		this.contextRunner.withUserConfiguration(Config.class)
 			.run((context) -> assertThat(context.getMessage("foo", null, "Foo message", Locale.UK)).isEqualTo("bar"));
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
+	@WithResource(name = "test/common-messages.properties", content = "hello=world")
 	void testCommonMessages() {
 		this.contextRunner
 			.withPropertyValues("spring.messages.basename=test/messages",
@@ -127,16 +143,18 @@ void testCommonMessages() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testCommonMessagesWhenNotFound() {
 		this.contextRunner
 			.withPropertyValues("spring.messages.basename=test/messages",
-					"spring.messages.common-messages=classpath:test/common-messages-missing.properties")
+					"spring.messages.common-messages=classpath:test/common-messages.properties")
 			.run((context) -> assertThat(context).getFailure()
 				.hasMessageContaining(
-						"Failed to load common messages from 'class path resource [test/common-messages-missing.properties]'"));
+						"Failed to load common messages from 'class path resource [test/common-messages.properties]'"));
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testFallbackDefault() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test/messages")
 			.run((context) -> assertThat(context.getBean(MessageSource.class))
@@ -144,6 +162,7 @@ void testFallbackDefault() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testFallbackTurnOff() {
 		this.contextRunner
 			.withPropertyValues("spring.messages.basename=test/messages",
@@ -153,6 +172,7 @@ void testFallbackTurnOff() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testFormatMessageDefault() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test/messages")
 			.run((context) -> assertThat(context.getBean(MessageSource.class))
@@ -160,6 +180,7 @@ void testFormatMessageDefault() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testFormatMessageOn() {
 		this.contextRunner
 			.withPropertyValues("spring.messages.basename=test/messages",
@@ -169,6 +190,7 @@ void testFormatMessageOn() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testUseCodeAsDefaultMessageDefault() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test/messages")
 			.run((context) -> assertThat(context.getBean(MessageSource.class))
@@ -176,6 +198,7 @@ void testUseCodeAsDefaultMessageDefault() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void testUseCodeAsDefaultMessageOn() {
 		this.contextRunner
 			.withPropertyValues("spring.messages.basename=test/messages",
@@ -191,6 +214,7 @@ void existingMessageSourceIsPreferred() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void existingMessageSourceInParentIsIgnored() {
 		this.contextRunner.run((parent) -> this.contextRunner.withParent(parent)
 			.withPropertyValues("spring.messages.basename=test/messages")
@@ -198,6 +222,7 @@ void existingMessageSourceInParentIsIgnored() {
 	}
 
 	@Test
+	@WithTestMessagesPropertiesResource
 	void messageSourceWithNonStandardBeanNameIsIgnored() {
 		this.contextRunner.withPropertyValues("spring.messages.basename=test/messages")
 			.withUserConfiguration(CustomBeanNameMessageSourceConfiguration.class)
@@ -258,4 +283,25 @@ public String getMessage(MessageSourceResolvable resolvable, Locale locale) {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "test/messages.properties", content = "foo=bar")
+	@interface WithTestMessagesPropertiesResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "test/messages2.properties", content = "foo-foo=bar-bar")
+	@interface WithTestMessages2PropertiesResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "test/swedish.properties", content = "foo=Some text with some swedish öäå!")
+	@interface WithTestSwedishPropertiesResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
index 73b5f3ded97c..0480ab955205 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
 import org.springframework.boot.ssl.NoSuchSslBundleException;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -201,13 +202,14 @@ void enableSsl() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void enableSslWithBundle() {
 		testClusterEnvironment((env) -> {
 			SecurityConfig securityConfig = env.securityConfig();
 			assertThat(securityConfig.tlsEnabled()).isTrue();
 			assertThat(securityConfig.trustManagerFactory()).isNotNull();
-		}, "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:test.jks",
-				"spring.ssl.bundle.jks.test-bundle.keystore.password=secret",
+		}, "spring.ssl.bundle.jks.test-bundle.truststore.location=classpath:test.jks",
+				"spring.ssl.bundle.jks.test-bundle.truststore.password=secret",
 				"spring.couchbase.env.ssl.bundle=test-bundle");
 	}
 
@@ -263,20 +265,22 @@ void passwordAuthenticationWithUsernameAndPassword() {
 	}
 
 	@Test
+	@WithPackageResources({ "key.crt", "key.pem" })
 	void certificateAuthenticationWithPemPrivateKeyAndCertificate() {
-		this.contextRunner.withPropertyValues("spring.couchbase.connection-string=localhost",
-				"spring.couchbase.env.ssl.enabled=true",
-				"spring.couchbase.authentication.pem.private-key=classpath:org/springframework/boot/autoconfigure/ssl/key2.pem",
-				"spring.couchbase.authentication.pem.certificates=classpath:org/springframework/boot/autoconfigure/ssl/key2.crt")
+		this.contextRunner
+			.withPropertyValues("spring.couchbase.connection-string=localhost", "spring.couchbase.env.ssl.enabled=true",
+					"spring.couchbase.authentication.pem.private-key=classpath:key.pem",
+					"spring.couchbase.authentication.pem.certificates=classpath:key.crt")
 			.run((context) -> assertThat(context).hasSingleBean(CertificateAuthenticator.class));
 	}
 
 	@Test
+	@WithPackageResources("keystore.jks")
 	void certificateAuthenticationWithJavaKeyStore() {
-		this.contextRunner.withPropertyValues("spring.couchbase.connection-string=localhost",
-				"spring.couchbase.env.ssl.enabled=true",
-				"spring.couchbase.authentication.jks.location=classpath:org/springframework/boot/autoconfigure/ssl/keystore.jks",
-				"spring.couchbase.authentication.jks.password=secret")
+		this.contextRunner
+			.withPropertyValues("spring.couchbase.connection-string=localhost", "spring.couchbase.env.ssl.enabled=true",
+					"spring.couchbase.authentication.jks.location=classpath:keystore.jks",
+					"spring.couchbase.authentication.jks.password=secret")
 			.run((context) -> assertThat(context).hasSingleBean(CertificateAuthenticator.class));
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java
index 1b481cb5062a..0c251b578ffd 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.ManagedTypes;
@@ -61,6 +62,17 @@
  * @author Mark Paluch
  * @author Jens Schauder
  */
+@WithResource(name = "schema.sql", content = """
+		CREATE TABLE CITY (
+		  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+		  name VARCHAR(30),
+		  state  VARCHAR(30),
+		  country  VARCHAR(30),
+		  map  VARCHAR(30)
+		);
+		""")
+@WithResource(name = "data.sql",
+		content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');")
 class JdbcRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
@@ -208,8 +220,8 @@ private Function<ApplicationContextRunner, ApplicationContextRunner> database()
 		return (runner) -> runner
 			.withConfiguration(
 					AutoConfigurations.of(DataSourceAutoConfiguration.class, SqlInitializationAutoConfiguration.class))
-			.withPropertyValues("spring.sql.init.schema-locations=classpath:data-city-schema.sql",
-					"spring.sql.init.data-locations=classpath:city.sql", "spring.datasource.generate-unique-name:true");
+			.withPropertyValues("spring.sql.init.schema-locations=classpath:schema.sql",
+					"spring.sql.init.data-locations=classpath:data.sql", "spring.datasource.generate-unique-name:true");
 	}
 
 	@TestAutoConfigurationPackage(City.class)
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/r2dbc/R2dbcRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/r2dbc/R2dbcRepositoriesAutoConfigurationTests.java
index b9bea3baf0c8..e9c9dd9bf6c8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/r2dbc/R2dbcRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/r2dbc/R2dbcRepositoriesAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
@@ -48,6 +49,17 @@
  *
  * @author Mark Paluch
  */
+@WithResource(name = "schema.sql", content = """
+		CREATE TABLE CITY (
+		  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+		  name VARCHAR(30),
+		  state  VARCHAR(30),
+		  country  VARCHAR(30),
+		  map  VARCHAR(30)
+		);
+		""")
+@WithResource(name = "data.sql",
+		content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');")
 class R2dbcRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
@@ -117,8 +129,8 @@ static class DatabaseInitializationConfiguration {
 		@Autowired
 		void initializeDatabase(ConnectionFactory connectionFactory) {
 			ResourceLoader resourceLoader = new DefaultResourceLoader();
-			Resource[] scripts = new Resource[] { resourceLoader.getResource("classpath:data-city-schema.sql"),
-					resourceLoader.getResource("classpath:city.sql") };
+			Resource[] scripts = new Resource[] { resourceLoader.getResource("classpath:schema.sql"),
+					resourceLoader.getResource("classpath:data.sql") };
 			new ResourceDatabasePopulator(scripts).populate(connectionFactory).block();
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java
index f66f5fe5af1c..bee589fa0ce8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java
@@ -28,6 +28,7 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.assertj.SimpleAsyncTaskExecutorAssert;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
@@ -255,6 +256,7 @@ void testRedisConfigurationWithSslEnabled() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void testRedisConfigurationWithSslBundle() {
 		this.contextRunner
 			.withPropertyValues("spring.data.redis.ssl.bundle:test-bundle",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
index 4e0802ff5893..2cc868b8687c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.testsupport.assertj.SimpleAsyncTaskExecutorAssert;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
@@ -571,6 +572,7 @@ void testRedisConfigurationWithSslEnabled() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void testRedisConfigurationWithSslBundle() {
 		this.contextRunner
 			.withPropertyValues("spring.data.redis.ssl.bundle:test-bundle",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java
index 25b0da05aebc..ffd4acd6cbd9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -288,6 +289,7 @@ void shouldUseCustomConnectionDetailsWhenDefined() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	@SuppressWarnings("unchecked")
 	void configureWithSslBundle() {
 		List<String> properties = new ArrayList<>();
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 49178e27473c..c695b70a98d8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,11 @@
 
 package org.springframework.boot.autoconfigure.flyway;
 
+import java.io.Serializable;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Arrays;
@@ -25,6 +30,10 @@
 
 import javax.sql.DataSource;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.Location;
 import org.flywaydb.core.api.MigrationVersion;
@@ -33,6 +42,7 @@
 import org.flywaydb.core.api.callback.Event;
 import org.flywaydb.core.api.configuration.FluentConfiguration;
 import org.flywaydb.core.api.migration.JavaMigration;
+import org.flywaydb.core.api.pattern.ValidatePattern;
 import org.flywaydb.core.internal.license.FlywayEditionUpgradeRequiredException;
 import org.flywaydb.database.oracle.OracleConfigurationExtension;
 import org.flywaydb.database.postgresql.PostgreSQLConfigurationExtension;
@@ -55,11 +65,14 @@
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration.OracleFlywayConfigurationCustomizer;
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration.PostgresqlFlywayConfigurationCustomizer;
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration.SqlServerFlywayConfigurationCustomizer;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
 import org.springframework.boot.jdbc.SchemaManagement;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.boot.test.context.FilteredClassLoader;
@@ -67,6 +80,8 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -410,7 +425,9 @@ void failOnMissingLocationsAllMissing() {
 	}
 
 	@Test
-	void failOnMissingLocationsAllExist() {
+	@WithResource(name = "db/changelog/V1.1__refine.sql")
+	@WithResource(name = "db/migration/V1__init.sql", content = "DROP TABLE IF EXISTS TEST")
+	void failOnMissingLocationsDoesNotFailWhenAllExist() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.flyway.fail-on-missing-locations=true")
 			.withPropertyValues("spring.flyway.locations:classpath:db/changelog,classpath:db/migration")
@@ -418,6 +435,8 @@ void failOnMissingLocationsAllExist() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/V1.1__refine.sql")
+	@WithResource(name = "db/migration/V1__init.sql", content = "DROP TABLE IF EXISTS TEST")
 	void failOnMissingLocationsAllExistWithImplicitClasspathPrefix() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.flyway.fail-on-missing-locations=true")
@@ -426,10 +445,11 @@ void failOnMissingLocationsAllExistWithImplicitClasspathPrefix() {
 	}
 
 	@Test
-	void failOnMissingLocationsAllExistWithFilesystemPrefix() {
+	@WithResource(name = "db/migration/V1__init.sql", content = "DROP TABLE IF EXISTS TEST")
+	void failOnMissingLocationsFilesystemPrefixDoesNotFailWhenAllExist(@ResourcePath("db/migration") String migration) {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.flyway.fail-on-missing-locations=true")
-			.withPropertyValues("spring.flyway.locations:filesystem:src/test/resources/db/migration")
+			.withPropertyValues("spring.flyway.locations:filesystem:" + migration)
 			.run((context) -> assertThat(context).hasNotFailed());
 	}
 
@@ -465,12 +485,43 @@ void customFlywayMigrationInitializer() {
 	}
 
 	@Test
+	@WithMetaInfPersistenceXmlResource
 	void customFlywayWithJpa() {
 		this.contextRunner
 			.withUserConfiguration(EmbeddedDataSourceConfiguration.class, CustomFlywayWithJpaConfiguration.class)
 			.run((context) -> assertThat(context).hasNotFailed());
 	}
 
+	@Test
+	@WithMetaInfPersistenceXmlResource
+	void jpaApplyDdl() {
+		this.contextRunner
+			.withConfiguration(
+					AutoConfigurations.of(DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class))
+			.run((context) -> {
+				Map<String, Object> jpaProperties = context.getBean(LocalContainerEntityManagerFactoryBean.class)
+					.getJpaPropertyMap();
+				assertThat(jpaProperties).doesNotContainKey("hibernate.hbm2ddl.auto");
+			});
+	}
+
+	@Test
+	@WithMetaInfPersistenceXmlResource
+	void jpaAndMultipleDataSourcesApplyDdl() {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(HibernateJpaAutoConfiguration.class))
+			.withUserConfiguration(JpaWithMultipleDataSourcesConfiguration.class)
+			.run((context) -> {
+				LocalContainerEntityManagerFactoryBean normalEntityManagerFactoryBean = context
+					.getBean("&normalEntityManagerFactory", LocalContainerEntityManagerFactoryBean.class);
+				assertThat(normalEntityManagerFactoryBean.getJpaPropertyMap()).containsEntry("configured", "normal")
+					.containsEntry("hibernate.hbm2ddl.auto", "create-drop");
+				LocalContainerEntityManagerFactoryBean flywayEntityManagerFactoryBean = context
+					.getBean("&flywayEntityManagerFactory", LocalContainerEntityManagerFactoryBean.class);
+				assertThat(flywayEntityManagerFactoryBean.getJpaPropertyMap()).containsEntry("configured", "flyway")
+					.doesNotContainKey("hibernate.hbm2ddl.auto");
+			});
+	}
+
 	@Test
 	void customFlywayWithJdbc() {
 		this.contextRunner
@@ -479,6 +530,7 @@ void customFlywayWithJdbc() {
 	}
 
 	@Test
+	@WithMetaInfPersistenceXmlResource
 	void customFlywayMigrationInitializerWithJpa() {
 		this.contextRunner
 			.withUserConfiguration(EmbeddedDataSourceConfiguration.class,
@@ -517,6 +569,7 @@ void overrideBaselineVersionNumber() {
 	}
 
 	@Test
+	@WithResource(name = "db/vendors/h2/V1__init.sql", content = "DROP TABLE IF EXISTS TEST;")
 	void useVendorDirectory() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.flyway.locations=classpath:db/vendors/{vendor},classpath:db/changelog")
@@ -529,6 +582,7 @@ void useVendorDirectory() {
 	}
 
 	@Test
+	@WithResource(name = "db/vendors/h2/V1__init.sql", content = "DROP TABLE IF EXISTS TEST;")
 	void useOneLocationWithVendorDirectory() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.flyway.locations=classpath:db/vendors/{vendor}")
@@ -916,6 +970,22 @@ void shouldRegisterResourceHints() {
 		assertThat(RuntimeHintsPredicates.resource().forResource("db/migration/V1__init.sql")).accepts(runtimeHints);
 	}
 
+	@Test
+	void detectEncodingCorrectlyMapped() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+			.withPropertyValues("spring.flyway.detect-encoding=true")
+			.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().isDetectEncoding())
+				.isEqualTo(true));
+	}
+
+	@Test
+	void ignoreMigrationPatternsCorrectlyMapped() {
+		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
+			.withPropertyValues("spring.flyway.ignore-migration-patterns=*:missing")
+			.run((context) -> assertThat(context.getBean(Flyway.class).getConfiguration().getIgnoreMigrationPatterns())
+				.containsExactly(ValidatePattern.fromPattern("*:missing")));
+	}
+
 	private ContextConsumer<AssertableApplicationContext> validateFlywayTeamsPropertyOnly(String propertyName) {
 		return (context) -> {
 			assertThat(context).hasFailed();
@@ -925,6 +995,13 @@ private ContextConsumer<AssertableApplicationContext> validateFlywayTeamsPropert
 		};
 	}
 
+	private static Map<String, ?> configureJpaProperties() {
+		Map<String, Object> properties = new HashMap<>();
+		properties.put("configured", "manually");
+		properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
+		return properties;
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class FlywayDataSourceConfiguration {
 
@@ -1020,10 +1097,8 @@ FlywayMigrationInitializer customFlywayMigrationInitializer(Flyway flyway) {
 
 		@Bean
 		LocalContainerEntityManagerFactoryBean entityManagerFactoryBean(DataSource dataSource) {
-			Map<String, Object> properties = new HashMap<>();
-			properties.put("configured", "manually");
-			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
-			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), properties, null)
+			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), (ds) -> configureJpaProperties(),
+					null)
 				.dataSource(dataSource)
 				.build();
 		}
@@ -1046,14 +1121,52 @@ Flyway customFlyway() {
 
 		@Bean
 		LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
+			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(),
+					(datasource) -> configureJpaProperties(), null)
+				.dataSource(this.dataSource)
+				.build();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	static class JpaWithMultipleDataSourcesConfiguration {
+
+		@Bean
+		@Primary
+		DataSource normalDataSource() {
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseConnection.HSQLDB.getType())
+				.generateUniqueName(true)
+				.build();
+		}
+
+		@Bean
+		@Primary
+		LocalContainerEntityManagerFactoryBean normalEntityManagerFactory(EntityManagerFactoryBuilder builder,
+				DataSource normalDataSource) {
 			Map<String, Object> properties = new HashMap<>();
-			properties.put("configured", "manually");
+			properties.put("configured", "normal");
 			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
-			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), properties, null)
-				.dataSource(this.dataSource)
+			return builder.dataSource(normalDataSource).properties(properties).build();
+		}
+
+		@Bean
+		@FlywayDataSource
+		DataSource flywayDataSource() {
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseConnection.HSQLDB.getType())
+				.generateUniqueName(true)
 				.build();
 		}
 
+		@Bean
+		LocalContainerEntityManagerFactoryBean flywayEntityManagerFactory(EntityManagerFactoryBuilder builder,
+				@FlywayDataSource DataSource flywayDataSource) {
+			Map<String, Object> properties = new HashMap<>();
+			properties.put("configured", "flyway");
+			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
+			return builder.dataSource(flywayDataSource).properties(properties).build();
+		}
+
 	}
 
 	@Configuration
@@ -1319,4 +1432,74 @@ public String getPassword() {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "META-INF/persistence.xml",
+			content = """
+					<?xml version="1.0" encoding="UTF-8"?>
+					<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+						<persistence-unit name="manually-configured">
+							<class>org.springframework.boot.autoconfigure.flyway.FlywayAutoConfigurationTests$City</class>
+							<exclude-unlisted-classes>true</exclude-unlisted-classes>
+						</persistence-unit>
+					</persistence>
+					""")
+	@interface WithMetaInfPersistenceXmlResource {
+
+	}
+
+	@Entity
+	public static class City implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@Column(nullable = false)
+		private String name;
+
+		@Column(nullable = false)
+		private String state;
+
+		@Column(nullable = false)
+		private String country;
+
+		@Column(nullable = false)
+		private String map;
+
+		protected City() {
+		}
+
+		City(String name, String state, String country, String map) {
+			this.name = name;
+			this.state = state;
+			this.country = country;
+			this.map = map;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public String getState() {
+			return this.state;
+		}
+
+		public String getCountry() {
+			return this.country;
+		}
+
+		public String getMap() {
+			return this.map;
+		}
+
+		@Override
+		public String toString() {
+			return getName() + "," + getState() + "," + getCountry();
+		}
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProviderCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProviderCustomizerTests.java
index 6928a3f89450..33b474d84149 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProviderCustomizerTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProviderCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@
 import org.flywaydb.core.internal.resource.NoopResourceProvider;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -44,6 +46,7 @@ void shouldInstallNativeImageResourceProvider() {
 	}
 
 	@Test
+	@WithResource(name = "db/migration/V1__init.sql")
 	void nativeImageResourceProviderShouldFindMigrations() {
 		FluentConfiguration configuration = new FluentConfiguration();
 		this.customizer.customize(configuration);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationReactiveIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationReactiveIntegrationTests.java
index 3a477755418f..14644c63c8b8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationReactiveIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationReactiveIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,15 @@
 import java.time.Duration;
 import java.util.Locale;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
@@ -46,6 +50,12 @@ class FreeMarkerAutoConfigurationReactiveIntegrationTests {
 	private final ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(FreeMarkerAutoConfiguration.class));
 
+	@BeforeEach
+	@AfterEach
+	void clearReactorSchedulers() {
+		Schedulers.shutdownNow();
+	}
+
 	@Test
 	void defaultConfiguration() {
 		this.contextRunner.run((context) -> {
@@ -57,6 +67,7 @@ void defaultConfiguration() {
 	}
 
 	@Test
+	@WithResource(name = "templates/home.ftlh", content = "home")
 	void defaultViewResolution() {
 		this.contextRunner.run((context) -> {
 			MockServerWebExchange exchange = render(context, "home");
@@ -67,6 +78,7 @@ void defaultViewResolution() {
 	}
 
 	@Test
+	@WithResource(name = "templates/prefix/prefixed.ftlh", content = "prefixed")
 	void customPrefix() {
 		this.contextRunner.withPropertyValues("spring.freemarker.prefix:prefix/").run((context) -> {
 			MockServerWebExchange exchange = render(context, "prefixed");
@@ -76,6 +88,7 @@ void customPrefix() {
 	}
 
 	@Test
+	@WithResource(name = "templates/suffixed.freemarker", content = "suffixed")
 	void customSuffix() {
 		this.contextRunner.withPropertyValues("spring.freemarker.suffix:.freemarker").run((context) -> {
 			MockServerWebExchange exchange = render(context, "suffixed");
@@ -85,6 +98,7 @@ void customSuffix() {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.ftlh", content = "custom")
 	void customTemplateLoaderPath() {
 		this.contextRunner.withPropertyValues("spring.freemarker.templateLoaderPath:classpath:/custom-templates/")
 			.run((context) -> {
@@ -104,6 +118,7 @@ void customFreeMarkerSettings() {
 	}
 
 	@Test
+	@WithResource(name = "templates/message.ftlh", content = "Message: ${greeting}")
 	void renderTemplate() {
 		this.contextRunner.withPropertyValues().run((context) -> {
 			FreeMarkerConfigurer freemarker = context.getBean(FreeMarkerConfigurer.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
index 975478d8aea7..080682664922 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
 import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter;
@@ -75,6 +76,7 @@ void defaultConfiguration() {
 	}
 
 	@Test
+	@WithResource(name = "templates/home.ftlh", content = "home")
 	void defaultViewResolution() throws Exception {
 		load();
 		MockHttpServletResponse response = render("home");
@@ -84,6 +86,7 @@ void defaultViewResolution() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "templates/home.ftlh", content = "home")
 	void customContentType() throws Exception {
 		load("spring.freemarker.contentType:application/json");
 		MockHttpServletResponse response = render("home");
@@ -93,6 +96,7 @@ void customContentType() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "templates/prefix/prefixed.ftlh", content = "prefixed")
 	void customPrefix() throws Exception {
 		load("spring.freemarker.prefix:prefix/");
 		MockHttpServletResponse response = render("prefixed");
@@ -101,6 +105,7 @@ void customPrefix() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "templates/suffixed.freemarker", content = "suffixed")
 	void customSuffix() throws Exception {
 		load("spring.freemarker.suffix:.freemarker");
 		MockHttpServletResponse response = render("suffixed");
@@ -109,6 +114,7 @@ void customSuffix() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.ftlh", content = "custom")
 	void customTemplateLoaderPath() throws Exception {
 		load("spring.freemarker.templateLoaderPath:classpath:/custom-templates/");
 		MockHttpServletResponse response = render("custom");
@@ -138,6 +144,7 @@ void customFreeMarkerSettings() {
 	}
 
 	@Test
+	@WithResource(name = "templates/message.ftlh", content = "Message: ${greeting}")
 	void renderTemplate() throws Exception {
 		load();
 		FreeMarkerConfigurer freemarker = this.context.getBean(FreeMarkerConfigurer.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java
index 156abc518671..c80bfc3fcb4d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.boot.testsupport.BuildOutput;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -51,6 +52,7 @@ class FreeMarkerAutoConfigurationTests {
 		.withConfiguration(AutoConfigurations.of(FreeMarkerAutoConfiguration.class));
 
 	@Test
+	@WithResource(name = "templates/message.ftlh", content = "Message: ${greeting}")
 	void renderNonWebAppTemplate() {
 		this.contextRunner.run((context) -> {
 			freemarker.template.Configuration freemarker = context.getBean(freemarker.template.Configuration.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java
index d39f11fb8bb8..1c510f5c5be9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerTemplateAvailabilityProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider.FreeMarkerTemplateAvailabilityProperties;
 import org.springframework.boot.autoconfigure.freemarker.FreeMarkerTemplateAvailabilityProvider.FreeMarkerTemplateAvailabilityRuntimeHints;
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.mock.env.MockEnvironment;
@@ -45,6 +46,7 @@ class FreeMarkerTemplateAvailabilityProviderTests {
 	private final MockEnvironment environment = new MockEnvironment();
 
 	@Test
+	@WithResource(name = "templates/home.ftlh")
 	void availabilityOfTemplateInDefaultLocation() {
 		assertThat(this.provider.isTemplateAvailable("home", this.environment, getClass().getClassLoader(),
 				this.resourceLoader))
@@ -59,6 +61,7 @@ void availabilityOfTemplateThatDoesNotExist() {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.ftlh")
 	void availabilityOfTemplateWithCustomLoaderPath() {
 		this.environment.setProperty("spring.freemarker.template-loader-path", "classpath:/custom-templates/");
 		assertThat(this.provider.isTemplateAvailable("custom", this.environment, getClass().getClassLoader(),
@@ -67,6 +70,7 @@ void availabilityOfTemplateWithCustomLoaderPath() {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.ftlh")
 	void availabilityOfTemplateWithCustomLoaderPathConfiguredAsAList() {
 		this.environment.setProperty("spring.freemarker.template-loader-path[0]", "classpath:/custom-templates/");
 		assertThat(this.provider.isTemplateAvailable("custom", this.environment, getClass().getClassLoader(),
@@ -75,6 +79,7 @@ void availabilityOfTemplateWithCustomLoaderPathConfiguredAsAList() {
 	}
 
 	@Test
+	@WithResource(name = "templates/prefix/prefixed.ftlh")
 	void availabilityOfTemplateWithCustomPrefix() {
 		this.environment.setProperty("spring.freemarker.prefix", "prefix/");
 		assertThat(this.provider.isTemplateAvailable("prefixed", this.environment, getClass().getClassLoader(),
@@ -83,6 +88,7 @@ void availabilityOfTemplateWithCustomPrefix() {
 	}
 
 	@Test
+	@WithResource(name = "templates/suffixed.freemarker")
 	void availabilityOfTemplateWithCustomSuffix() {
 		this.environment.setProperty("spring.freemarker.suffix", ".freemarker");
 		assertThat(this.provider.isTemplateAvailable("suffixed", this.environment, getClass().getClassLoader(),
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/DefaultGraphQlSchemaConditionTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/DefaultGraphQlSchemaConditionTests.java
index 197eaab69ec0..c486ac898a15 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/DefaultGraphQlSchemaConditionTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/DefaultGraphQlSchemaConditionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -38,6 +39,8 @@ class DefaultGraphQlSchemaConditionTests {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
 
 	@Test
+	@WithResource(name = "graphql/one.graphqls")
+	@WithResource(name = "graphql/two.graphqls")
 	void matchesWhenSchemaFilesAreDetected() {
 		this.contextRunner.withUserConfiguration(TestingConfiguration.class).run((context) -> {
 			didMatch(context);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
index f7e7543edeec..be1efca974c1 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,13 @@
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration.GraphQlResourcesRuntimeHints;
+import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
 import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
+import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ByteArrayResource;
@@ -59,6 +62,25 @@
 /**
  * Tests for {@link GraphQlAutoConfiguration}.
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 @ExtendWith(OutputCaptureExtension.class)
 class GraphQlAutoConfigurationTests {
 
@@ -67,11 +89,12 @@ class GraphQlAutoConfigurationTests {
 
 	@Test
 	void shouldContributeDefaultBeans() {
-		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(GraphQlSource.class)
-			.hasSingleBean(BatchLoaderRegistry.class)
-			.hasSingleBean(ExecutionGraphQlService.class)
-			.hasSingleBean(AnnotatedControllerConfigurer.class)
-			.hasSingleBean(EncodingCursorStrategy.class));
+		this.contextRunner.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
+			.run((context) -> assertThat(context).hasSingleBean(GraphQlSource.class)
+				.hasSingleBean(BatchLoaderRegistry.class)
+				.hasSingleBean(ExecutionGraphQlService.class)
+				.hasSingleBean(AnnotatedControllerConfigurer.class)
+				.hasSingleBean(EncodingCursorStrategy.class));
 	}
 
 	@Test
@@ -99,6 +122,12 @@ void shouldUseProgrammaticallyDefinedBuilder() {
 	}
 
 	@Test
+	@WithResource(name = "graphql/types/person.custom", content = """
+			type Person {
+			    id: ID
+			    name: String
+			}
+			""")
 	void shouldScanLocationsWithCustomExtension() {
 		this.contextRunner.withPropertyValues("spring.graphql.schema.file-extensions:.graphqls,.custom")
 			.run((context) -> {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQueryByExampleAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQueryByExampleAutoConfigurationTests.java
index 964bf0ebaff6..531c66fbac8b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQueryByExampleAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQueryByExampleAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,11 @@
 
 import java.util.Optional;
 
-import org.junit.jupiter.api.Test;
-
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.graphql.Book;
 import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.repository.CrudRepository;
@@ -41,6 +40,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlQueryByExampleAutoConfigurationTests {
 
 	private static final Book book = new Book("42", "Test title", 42, "Test Author");
@@ -51,7 +69,6 @@ class GraphQlQueryByExampleAutoConfigurationTests {
 		.withUserConfiguration(MockRepositoryConfig.class)
 		.withPropertyValues("spring.main.web-application-type=servlet");
 
-	@Test
 	void shouldRegisterDataFetcherForQueryByExampleRepositories() {
 		this.contextRunner.run((context) -> {
 			ExecutionGraphQlService graphQlService = context.getBean(ExecutionGraphQlService.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslAutoConfigurationTests.java
index ff2624099b2d..4b0c324847f7 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlQuerydslAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
@@ -44,6 +45,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlQuerydslAutoConfigurationTests {
 
 	private static final Book book = new Book("42", "Test title", 42, "Test Author");
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQueryByExampleAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQueryByExampleAutoConfigurationTests.java
index 8f4a94a41013..834c630f9031 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQueryByExampleAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQueryByExampleAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.boot.autoconfigure.graphql.Book;
 import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.repository.query.ReactiveQueryByExampleExecutor;
@@ -41,6 +42,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlReactiveQueryByExampleAutoConfigurationTests {
 
 	private static final Mono<Book> bookPublisher = Mono.just(new Book("42", "Test title", 42, "Test Author"));
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQuerydslAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQuerydslAutoConfigurationTests.java
index 8c807fe98984..9401bed26e3f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQuerydslAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/data/GraphQlReactiveQuerydslAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.springframework.boot.autoconfigure.graphql.GraphQlAutoConfiguration;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
@@ -43,6 +44,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlReactiveQuerydslAutoConfigurationTests {
 
 	private static final Mono<Book> bookPublisher = Mono.just(new Book("42", "Test title", 42, "Test Author"));
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfigurationTests.java
index 51978cc79fcd..2c15f2b1249c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -57,6 +58,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlWebFluxAutoConfigurationTests {
 
 	private static final String BASE_URL = "https://spring.example.org/";
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfigurationTests.java
index 69f664ef0e84..bdf39ff98b7c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
 import org.springframework.boot.autoconfigure.web.reactive.error.ErrorWebFluxAutoConfiguration;
 import org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
 import org.springframework.boot.web.embedded.netty.NettyRouteProvider;
@@ -53,6 +54,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlRSocketAutoConfigurationTests {
 
 	private final ReactiveWebApplicationContextRunner contextRunner = new ReactiveWebApplicationContextRunner()
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java
index 3d8fcc9fa677..fc4e623cf7d2 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.graphql.execution.ErrorType;
@@ -60,6 +61,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlWebFluxSecurityAutoConfigurationTests {
 
 	private static final String BASE_URL = "https://spring.example.org/graphql";
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java
index 809668c190bd..b4deaa3cb8a8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.graphql.execution.ErrorType;
@@ -60,6 +61,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlWebMvcSecurityAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java
index 9bd6618804fa..67de43459426 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -61,6 +62,25 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "graphql/types/book.graphqls", content = """
+		type Book {
+		    id: ID
+		    name: String
+		    pageCount: Int
+		    author: String
+		}
+		""")
+@WithResource(name = "graphql/schema.graphqls", content = """
+		type Query {
+		    greeting(name: String! = "Spring"): String!
+		    bookById(id: ID): Book
+		    books: BookConnection
+		}
+
+		type Subscription {
+		    booksOnSale(minPages: Int) : Book!
+		}
+		""")
 class GraphQlWebMvcAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java
index 03a0d821181e..d2eba9d5fb01 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.boot.testsupport.BuildOutput;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.io.ClassPathResource;
@@ -83,6 +84,7 @@ void emptyTemplateLocation() {
 	}
 
 	@Test
+	@WithResource(name = "templates/home.tpl", content = "yield 'home'")
 	void defaultViewResolution() throws Exception {
 		registerAndRefreshContext();
 		MockHttpServletResponse response = render("home");
@@ -92,6 +94,11 @@ void defaultViewResolution() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "templates/includes.tpl", content = """
+			yield 'include'
+			include template: 'included.tpl'
+			""")
+	@WithResource(name = "templates/included.tpl", content = "yield 'here'")
 	void includesViewResolution() throws Exception {
 		registerAndRefreshContext();
 		MockHttpServletResponse response = render("includes");
@@ -108,6 +115,11 @@ void disableViewResolution() {
 	}
 
 	@Test
+	@WithResource(name = "templates/includes.tpl", content = """
+			yield 'include'
+			include template: 'included.tpl'
+			""")
+	@WithResource(name = "templates/included_fr.tpl", content = "yield 'voila'")
 	void localeViewResolution() throws Exception {
 		registerAndRefreshContext();
 		MockHttpServletResponse response = render("includes", Locale.FRENCH);
@@ -117,6 +129,7 @@ void localeViewResolution() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "templates/home.tpl", content = "yield 'home'")
 	void customContentType() throws Exception {
 		registerAndRefreshContext("spring.groovy.template.contentType:application/json");
 		MockHttpServletResponse response = render("home");
@@ -126,6 +139,7 @@ void customContentType() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "templates/prefix/prefixed.tpl", content = "yield \"prefixed\"")
 	void customPrefix() throws Exception {
 		registerAndRefreshContext("spring.groovy.template.prefix:prefix/");
 		MockHttpServletResponse response = render("prefixed");
@@ -134,6 +148,7 @@ void customPrefix() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "templates/suffixed.groovytemplate", content = "yield \"suffixed\"")
 	void customSuffix() throws Exception {
 		registerAndRefreshContext("spring.groovy.template.suffix:.groovytemplate");
 		MockHttpServletResponse response = render("suffixed");
@@ -142,6 +157,7 @@ void customSuffix() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.tpl", content = "yield \"custom\"")
 	void customTemplateLoaderPath() throws Exception {
 		registerAndRefreshContext("spring.groovy.template.resource-loader-path:classpath:/custom-templates/");
 		MockHttpServletResponse response = render("custom");
@@ -156,6 +172,7 @@ void disableCache() {
 	}
 
 	@Test
+	@WithResource(name = "templates/message.tpl", content = "yield \"Message: ${greeting}\"")
 	void renderTemplate() throws Exception {
 		registerAndRefreshContext();
 		GroovyMarkupConfig config = this.context.getBean(GroovyMarkupConfig.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProviderTests.java
index 86c0158471e8..e3a3d1f80477 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProviderTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAvailabilityProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilityProvider.GroovyTemplateAvailabilityProperties;
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAvailabilityProvider.GroovyTemplateAvailabilityRuntimeHints;
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.mock.env.MockEnvironment;
@@ -45,6 +46,7 @@ class GroovyTemplateAvailabilityProviderTests {
 	private final MockEnvironment environment = new MockEnvironment();
 
 	@Test
+	@WithResource(name = "templates/home.tpl")
 	void availabilityOfTemplateInDefaultLocation() {
 		assertThat(this.provider.isTemplateAvailable("home", this.environment, getClass().getClassLoader(),
 				this.resourceLoader))
@@ -59,6 +61,7 @@ void availabilityOfTemplateThatDoesNotExist() {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.tpl")
 	void availabilityOfTemplateWithCustomLoaderPath() {
 		this.environment.setProperty("spring.groovy.template.resource-loader-path", "classpath:/custom-templates/");
 		assertThat(this.provider.isTemplateAvailable("custom", this.environment, getClass().getClassLoader(),
@@ -67,6 +70,7 @@ void availabilityOfTemplateWithCustomLoaderPath() {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.tpl")
 	void availabilityOfTemplateWithCustomLoaderPathConfiguredAsAList() {
 		this.environment.setProperty("spring.groovy.template.resource-loader-path[0]", "classpath:/custom-templates/");
 		assertThat(this.provider.isTemplateAvailable("custom", this.environment, getClass().getClassLoader(),
@@ -75,6 +79,7 @@ void availabilityOfTemplateWithCustomLoaderPathConfiguredAsAList() {
 	}
 
 	@Test
+	@WithResource(name = "templates/prefix/prefixed.tpl")
 	void availabilityOfTemplateWithCustomPrefix() {
 		this.environment.setProperty("spring.groovy.template.prefix", "prefix/");
 		assertThat(this.provider.isTemplateAvailable("prefixed", this.environment, getClass().getClassLoader(),
@@ -83,6 +88,7 @@ void availabilityOfTemplateWithCustomPrefix() {
 	}
 
 	@Test
+	@WithResource(name = "templates/suffixed.groovytemplate")
 	void availabilityOfTemplateWithCustomSuffix() {
 		this.environment.setProperty("spring.groovy.template.suffix", ".groovytemplate");
 		assertThat(this.provider.isTemplateAvailable("suffixed", this.environment, getClass().getClassLoader(),
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java
index 62816ee6740c..85dcdaa28374 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java
@@ -206,7 +206,6 @@ private static DataSource mockDataSource(String url, ClassLoader classLoader) th
 			given(metadata.getURL()).willReturn(url);
 			return connection;
 		});
-
 		return dataSource;
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java
index 1a578b657b1f..4d5e6c478c82 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.autoconfigure.hazelcast;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Map;
 
 import com.hazelcast.config.Config;
@@ -38,6 +42,7 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -57,6 +62,7 @@ class HazelcastAutoConfigurationServerTests {
 		.withConfiguration(AutoConfigurations.of(HazelcastAutoConfiguration.class));
 
 	@Test
+	@WithHazelcastXmlResource
 	void defaultConfigFile() {
 		// hazelcast.xml present in root classpath
 		this.contextRunner.run((context) -> {
@@ -201,6 +207,7 @@ void configInstanceWithoutName() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void autoConfiguredConfigUsesApplicationClassLoader() {
 		this.contextRunner.run((context) -> {
 			Config config = context.getBean(HazelcastInstance.class).getConfig();
@@ -209,6 +216,7 @@ void autoConfiguredConfigUsesApplicationClassLoader() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void autoConfiguredConfigUsesSpringManagedContext() {
 		this.contextRunner.run((context) -> {
 			Config config = context.getBean(HazelcastInstance.class).getConfig();
@@ -217,6 +225,7 @@ void autoConfiguredConfigUsesSpringManagedContext() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void autoConfiguredConfigCanUseSpringAwareComponent() {
 		this.contextRunner.withPropertyValues("test.hazelcast.key=42").run((context) -> {
 			HazelcastInstance hz = context.getBean(HazelcastInstance.class);
@@ -226,14 +235,19 @@ void autoConfiguredConfigCanUseSpringAwareComponent() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void autoConfiguredConfigWithoutHazelcastSpringDoesNotUseSpringManagedContext() {
-		this.contextRunner.withClassLoader(new FilteredClassLoader(SpringManagedContext.class)).run((context) -> {
-			Config config = context.getBean(HazelcastInstance.class).getConfig();
-			assertThat(config.getManagedContext()).isNull();
-		});
+		this.contextRunner
+			.withClassLoader(
+					new FilteredClassLoader(Thread.currentThread().getContextClassLoader(), SpringManagedContext.class))
+			.run((context) -> {
+				Config config = context.getBean(HazelcastInstance.class).getConfig();
+				assertThat(config.getManagedContext()).isNull();
+			});
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void autoConfiguredContextCanOverrideManagementContextUsingCustomizer() {
 		this.contextRunner.withBean(TestHazelcastConfigCustomizer.class).run((context) -> {
 			Config config = context.getBean(HazelcastInstance.class).getConfig();
@@ -242,6 +256,7 @@ void autoConfiguredContextCanOverrideManagementContextUsingCustomizer() {
 	}
 
 	@Test
+	@WithHazelcastXmlResource
 	void autoConfiguredConfigSetsHazelcastLoggingToSlf4j() {
 		this.contextRunner.run((context) -> {
 			Config config = context.getBean(HazelcastInstance.class).getConfig();
@@ -322,4 +337,24 @@ public void customize(Config config) {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "hazelcast.xml", content = """
+			<hazelcast
+				xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
+				xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+				<instance-name>default-instance</instance-name>
+				<map name="defaultCache" />
+				<network>
+					<join>
+						<auto-detection enabled="false" />
+						<multicast enabled="false" />
+					</join>
+				</network>
+			</hazelcast>
+			""")
+	@interface WithHazelcastXmlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java
index fdff5e4210b7..def1dcb18880 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -37,7 +38,39 @@ class HazelcastAutoConfigurationTests {
 		.withConfiguration(AutoConfigurations.of(HazelcastAutoConfiguration.class));
 
 	@Test
-	void defaultConfigFile() {
+	@WithResource(name = "hazelcast.xml", content = """
+			<hazelcast
+				xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
+				xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+				<instance-name>default-instance</instance-name>
+				<map name="defaultCache" />
+				<network>
+					<join>
+						<auto-detection enabled="false" />
+						<multicast enabled="false" />
+					</join>
+				</network>
+			</hazelcast>
+			""")
+	@WithResource(name = "hazelcast.yml", content = """
+			hazelcast:
+			  network:
+			    join:
+			      auto-detection:
+			        enabled: false
+			      multicast:
+			        enabled: false
+			""")
+	@WithResource(name = "hazelcast.yaml", content = """
+			hazelcast:
+			  network:
+			    join:
+			      auto-detection:
+			        enabled: false
+			      multicast:
+			        enabled: false
+			""")
+	void defaultConfigFileIsHazelcastXml() {
 		// no hazelcast-client.xml and hazelcast.xml is present in root classpath
 		// this also asserts that XML has priority over YAML
 		// as hazelcast.yaml, hazelcast.yml, and hazelcast.xml are available.
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java
index 7a65682b9306..38f420f6da67 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.info.GitProperties;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -90,6 +91,13 @@ void gitPropertiesEncodingCanBeConfigured() {
 	}
 
 	@Test
+	@WithResource(name = "META-INF/build-info.properties", content = """
+			build.group=com.example
+			build.artifact=demo
+			build.name=Demo Project
+			build.version=0.0.1-SNAPSHOT
+			build.time=2016-03-04T14:16:05.000Z
+			""")
 	void buildPropertiesDefaultLocation() {
 		this.contextRunner.run((context) -> {
 			BuildProperties buildProperties = context.getBean(BuildProperties.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
index f23e0fd71cf1..8ab1525fd768 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@
 import org.springframework.boot.sql.init.DatabaseInitializationSettings;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.assertj.SimpleAsyncTaskExecutorAssert;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -378,6 +379,8 @@ void integrationGlobalPropertiesUserBeanOverridesAutoConfiguration() {
 	}
 
 	@Test
+	@WithResource(name = "META-INF/spring.integration.properties",
+			content = "spring.integration.endpoints.noAutoStartup=testService*")
 	void integrationGlobalPropertiesFromSpringIntegrationPropertiesFile() {
 		this.contextRunner
 			.withPropertyValues("spring.integration.channel.auto-create=false",
@@ -558,7 +561,7 @@ static class CustomIntegrationComponentScanConfiguration {
 	}
 
 	@MessagingGateway
-	interface TestGateway extends RequestReplyExchanger {
+	public interface TestGateway extends RequestReplyExchanger {
 
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationPropertiesEnvironmentPostProcessorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationPropertiesEnvironmentPostProcessorTests.java
index 1b4bbab88445..4cacb3e54df4 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationPropertiesEnvironmentPostProcessorTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationPropertiesEnvironmentPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
 import org.springframework.boot.origin.Origin;
 import org.springframework.boot.origin.OriginLookup;
 import org.springframework.boot.origin.TextResourceOrigin;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
@@ -60,6 +61,8 @@
 class IntegrationPropertiesEnvironmentPostProcessorTests {
 
 	@Test
+	@WithResource(name = "META-INF/spring.integration.properties",
+			content = "spring.integration.endpoints.noAutoStartup=testService*")
 	void postProcessEnvironmentAddPropertySource() {
 		ConfigurableEnvironment environment = new StandardEnvironment();
 		new IntegrationPropertiesEnvironmentPostProcessor().postProcessEnvironment(environment,
@@ -69,6 +72,8 @@ void postProcessEnvironmentAddPropertySource() {
 	}
 
 	@Test
+	@WithResource(name = "META-INF/spring.integration.properties",
+			content = "spring.integration.endpoints.noAutoStartup=testService*")
 	void postProcessEnvironmentAddPropertySourceLast() {
 		ConfigurableEnvironment environment = new StandardEnvironment();
 		environment.getPropertySources()
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java
index 9dafdc04b7af..c9030edae208 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration;
 import org.springframework.boot.diagnostics.FailureAnalysis;
 import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
 
@@ -37,6 +38,7 @@
 class HikariDriverConfigurationFailureAnalyzerTests {
 
 	@Test
+	@WithResource(name = "schema.sql", content = "")
 	void failureAnalysisIsPerformed() {
 		FailureAnalysis failureAnalysis = performAnalysis(TestConfiguration.class);
 		assertThat(failureAnalysis).isNotNull();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcClientAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcClientAutoConfigurationTests.java
index 6c4035dc79e8..209f9df0e35e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcClientAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcClientAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.core.simple.JdbcClient;
@@ -68,6 +69,16 @@ void jdbcClientWithCustomJdbcClientIsNotCreated() {
 	}
 
 	@Test
+	@WithResource(name = "db/city/V1__init.sql", content = """
+			CREATE SEQUENCE city_seq INCREMENT BY 50;
+			CREATE TABLE CITY (
+			  id         BIGINT GENERATED BY DEFAULT AS IDENTITY,
+			  name VARCHAR(30),
+			  state VARCHAR(30),
+			  country VARCHAR(30),
+			  map VARCHAR(30)
+			);
+			""")
 	void jdbcClientIsOrderedAfterFlywayMigration() {
 		this.contextRunner.withUserConfiguration(JdbcClientDataSourceMigrationValidator.class)
 			.withPropertyValues("spring.flyway.locations:classpath:db/city")
@@ -79,6 +90,31 @@ void jdbcClientIsOrderedAfterFlywayMigration() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-city.yaml", content = """
+			databaseChangeLog:
+			- changeSet:
+			    id: 1
+			    author: dsyer
+			    changes:
+			      - createSequence:
+			          sequenceName: city_seq
+			          incrementBy: 50
+			      - createTable:
+			          tableName: city
+			          columns:
+			            - column:
+			                name: id
+			                type: bigint
+			                autoIncrement: true
+			                constraints:
+			                  primaryKey: true
+			                  nullable: false
+			            - column:
+			                name: name
+			                type: varchar(50)
+			                constraints:
+			                  nullable: false
+			""")
 	void jdbcClientIsOrderedAfterLiquibaseMigration() {
 		this.contextRunner.withUserConfiguration(JdbcClientDataSourceMigrationValidator.class)
 			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml")
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java
index 7154f618dd49..9326b731310a 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.autoconfigure.jdbc;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Collections;
 
 import javax.sql.DataSource;
@@ -27,6 +31,7 @@
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.autoconfigure.sql.init.SqlInitializationAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -149,6 +154,13 @@ void testExistingCustomNamedParameterJdbcTemplate() {
 	}
 
 	@Test
+	@WithResource(name = "schema.sql", content = """
+			CREATE TABLE BAR (
+			  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+			  name VARCHAR(30)
+			);
+			""")
+	@WithResource(name = "data.sql", content = "INSERT INTO BAR VALUES (1, 'Andy');")
 	void testDependencyToScriptBasedDataSourceInitialization() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(SqlInitializationAutoConfiguration.class))
 			.withUserConfiguration(DataSourceInitializationValidator.class)
@@ -159,6 +171,16 @@ void testDependencyToScriptBasedDataSourceInitialization() {
 	}
 
 	@Test
+	@WithResource(name = "db/city/V1__init.sql", content = """
+			CREATE SEQUENCE city_seq INCREMENT BY 50;
+			CREATE TABLE CITY (
+			  id         BIGINT GENERATED BY DEFAULT AS IDENTITY,
+			  name VARCHAR(30),
+			  state VARCHAR(30),
+			  country VARCHAR(30),
+			  map VARCHAR(30)
+			);
+			""")
 	void testDependencyToFlyway() {
 		this.contextRunner.withUserConfiguration(DataSourceMigrationValidator.class)
 			.withPropertyValues("spring.flyway.locations:classpath:db/city")
@@ -170,6 +192,16 @@ void testDependencyToFlyway() {
 	}
 
 	@Test
+	@WithResource(name = "db/city/V1__init.sql", content = """
+			CREATE SEQUENCE city_seq INCREMENT BY 50;
+			CREATE TABLE CITY (
+			  id         BIGINT GENERATED BY DEFAULT AS IDENTITY,
+			  name VARCHAR(30),
+			  state VARCHAR(30),
+			  country VARCHAR(30),
+			  map VARCHAR(30)
+			);
+			""")
 	void testDependencyToFlywayWithJdbcTemplateMixed() {
 		this.contextRunner.withUserConfiguration(NamedParameterDataSourceMigrationValidator.class)
 			.withPropertyValues("spring.flyway.locations:classpath:db/city")
@@ -182,6 +214,7 @@ void testDependencyToFlywayWithJdbcTemplateMixed() {
 	}
 
 	@Test
+	@WithDbChangelogCityYamlResource
 	void testDependencyToLiquibase() {
 		this.contextRunner.withUserConfiguration(DataSourceMigrationValidator.class)
 			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml")
@@ -193,6 +226,7 @@ void testDependencyToLiquibase() {
 	}
 
 	@Test
+	@WithDbChangelogCityYamlResource
 	void testDependencyToLiquibaseWithJdbcTemplateMixed() {
 		this.contextRunner.withUserConfiguration(NamedParameterDataSourceMigrationValidator.class)
 			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml")
@@ -291,4 +325,35 @@ static class NamedParameterDataSourceMigrationValidator {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "db/changelog/db.changelog-city.yaml", content = """
+			databaseChangeLog:
+			- changeSet:
+			    id: 1
+			    author: dsyer
+			    changes:
+			      - createSequence:
+			          sequenceName: city_seq
+			          incrementBy: 50
+			      - createTable:
+			          tableName: city
+			          columns:
+			            - column:
+			                name: id
+			                type: bigint
+			                autoIncrement: true
+			                constraints:
+			                  primaryKey: true
+			                  nullable: false
+			            - column:
+			                name: name
+			                type: varchar(50)
+			                constraints:
+			                  nullable: false
+			""")
+	@interface WithDbChangelogCityYamlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
index 7df4a2ad49c7..365cf5266a42 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,16 @@
 
 package org.springframework.boot.autoconfigure.jms;
 
-import java.io.IOException;
-
 import io.micrometer.observation.ObservationRegistry;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.ExceptionListener;
 import jakarta.jms.Session;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.aot.test.generate.TestGenerationContext;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -45,7 +41,6 @@
 import org.springframework.jms.config.JmsListenerEndpoint;
 import org.springframework.jms.config.SimpleJmsListenerContainerFactory;
 import org.springframework.jms.config.SimpleJmsListenerEndpoint;
-import org.springframework.jms.connection.CachingConnectionFactory;
 import org.springframework.jms.core.JmsMessagingTemplate;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.listener.DefaultMessageListenerContainer;
@@ -69,31 +64,30 @@
 class JmsAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(ArtemisAutoConfiguration.class, JmsAutoConfiguration.class));
+		.withBean(ConnectionFactory.class, () -> mock(ConnectionFactory.class))
+		.withConfiguration(AutoConfigurations.of(JmsAutoConfiguration.class));
+
+	@Test
+	void testNoConnectionFactoryJmsConfiguration() {
+		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(JmsAutoConfiguration.class))
+			.run((context) -> assertThat(context).doesNotHaveBean(JmsTemplate.class)
+				.doesNotHaveBean(JmsMessagingTemplate.class)
+				.doesNotHaveBean(DefaultJmsListenerContainerFactoryConfigurer.class)
+				.doesNotHaveBean(DefaultJmsListenerContainerFactory.class));
+	}
 
 	@Test
 	void testDefaultJmsConfiguration() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class).run((context) -> {
-			assertThat(context).hasSingleBean(ConnectionFactory.class);
-			assertThat(context).hasSingleBean(CachingConnectionFactory.class);
-			CachingConnectionFactory factory = context.getBean(CachingConnectionFactory.class);
-			assertThat(factory.getTargetConnectionFactory()).isInstanceOf(ActiveMQConnectionFactory.class);
+			ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class);
 			JmsTemplate jmsTemplate = context.getBean(JmsTemplate.class);
 			JmsMessagingTemplate messagingTemplate = context.getBean(JmsMessagingTemplate.class);
-			assertThat(factory).isEqualTo(jmsTemplate.getConnectionFactory());
+			assertThat(jmsTemplate.getConnectionFactory()).isEqualTo(connectionFactory);
 			assertThat(messagingTemplate.getJmsTemplate()).isEqualTo(jmsTemplate);
-			assertThat(getBrokerUrl(factory)).startsWith("vm://");
 			assertThat(context.containsBean("jmsListenerContainerFactory")).isTrue();
 		});
 	}
 
-	@Test
-	void testConnectionFactoryBackOff() {
-		this.contextRunner.withUserConfiguration(TestConfiguration2.class)
-			.run((context) -> assertThat(context.getBeansOfType(ActiveMQConnectionFactory.class))
-				.containsOnlyKeys("customConnectionFactory"));
-	}
-
 	@Test
 	void testJmsTemplateBackOff() {
 		this.contextRunner.withUserConfiguration(TestConfiguration3.class)
@@ -107,27 +101,10 @@ void testJmsMessagingTemplateBackOff() {
 				.isEqualTo("fooBar"));
 	}
 
-	@Test
-	void testJmsTemplateBackOffEverything() {
-		this.contextRunner
-			.withUserConfiguration(TestConfiguration2.class, TestConfiguration3.class, TestConfiguration5.class)
-			.run(this::testJmsTemplateBackOffEverything);
-	}
-
-	private void testJmsTemplateBackOffEverything(AssertableApplicationContext loaded) {
-		JmsTemplate jmsTemplate = loaded.getBean(JmsTemplate.class);
-		assertThat(jmsTemplate.getPriority()).isEqualTo(999);
-		assertThat(loaded.getBeansOfType(ActiveMQConnectionFactory.class)).containsOnlyKeys("customConnectionFactory");
-		JmsMessagingTemplate messagingTemplate = loaded.getBean(JmsMessagingTemplate.class);
-		assertThat(messagingTemplate.getDefaultDestinationName()).isEqualTo("fooBar");
-		assertThat(messagingTemplate.getJmsTemplate()).isEqualTo(jmsTemplate);
-	}
-
 	@Test
 	void testDefaultJmsListenerConfiguration() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class).run((loaded) -> {
-			assertThat(loaded).hasSingleBean(CachingConnectionFactory.class);
-			CachingConnectionFactory connectionFactory = loaded.getBean(CachingConnectionFactory.class);
+			ConnectionFactory connectionFactory = loaded.getBean(ConnectionFactory.class);
 			assertThat(loaded).hasSingleBean(DefaultJmsListenerContainerFactory.class);
 			DefaultJmsListenerContainerFactory containerFactory = loaded
 				.getBean(DefaultJmsListenerContainerFactory.class);
@@ -137,7 +114,7 @@ void testDefaultJmsListenerConfiguration() {
 			DefaultMessageListenerContainer container = containerFactory.createListenerContainer(jmsListenerEndpoint);
 			assertThat(container.getClientId()).isNull();
 			assertThat(container.getConcurrentConsumers()).isEqualTo(1);
-			assertThat(container.getConnectionFactory()).isSameAs(connectionFactory.getTargetConnectionFactory());
+			assertThat(container.getConnectionFactory()).isSameAs(connectionFactory);
 			assertThat(container.getMaxConcurrentConsumers()).isEqualTo(1);
 			assertThat(container.getSessionAcknowledgeMode()).isEqualTo(Session.AUTO_ACKNOWLEDGE);
 			assertThat(container.isAutoStartup()).isTrue();
@@ -425,16 +402,6 @@ void testPubSubDomainOverride() {
 			});
 	}
 
-	private String getBrokerUrl(CachingConnectionFactory connectionFactory) {
-		assertThat(connectionFactory.getTargetConnectionFactory()).isInstanceOf(ActiveMQConnectionFactory.class);
-		try {
-			return ((ActiveMQConnectionFactory) connectionFactory.getTargetConnectionFactory()).toURI().toString();
-		}
-		catch (IOException ex) {
-			throw new RuntimeException(ex);
-		}
-	}
-
 	@Test
 	void enableJmsAutomatically() {
 		this.contextRunner.withUserConfiguration(NoEnableJmsConfiguration.class)
@@ -446,7 +413,7 @@ void enableJmsAutomatically() {
 	@Test
 	void runtimeHintsAreRegisteredForBindingOfAcknowledgeMode() {
 		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) {
-			context.register(ArtemisAutoConfiguration.class, JmsAutoConfiguration.class);
+			context.register(TestConfiguration2.class, JmsAutoConfiguration.class);
 			TestGenerationContext generationContext = new TestGenerationContext();
 			new ApplicationContextAotGenerator().processAheadOfTime(context, generationContext);
 			assertThat(RuntimeHintsPredicates.reflection().onMethod(AcknowledgeMode.class, "of").invoke())
@@ -464,7 +431,7 @@ static class TestConfiguration2 {
 
 		@Bean
 		ConnectionFactory customConnectionFactory() {
-			return new ActiveMQConnectionFactory();
+			return mock(ConnectionFactory.class);
 		}
 
 	}
@@ -595,12 +562,12 @@ static class TestConfiguration10 {
 
 		@Bean
 		ConnectionFactory connectionFactory1() {
-			return new ActiveMQConnectionFactory();
+			return mock(ConnectionFactory.class);
 		}
 
 		@Bean
 		ConnectionFactory connectionFactory2() {
-			return new ActiveMQConnectionFactory();
+			return mock(ConnectionFactory.class);
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
index 8e34ee8da56f..05afc38597b8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,12 +45,16 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.testsupport.assertj.SimpleAsyncTaskExecutorAssert;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.task.AsyncTaskExecutor;
@@ -116,6 +120,8 @@ class KafkaAutoConfigurationTests {
 		.withConfiguration(AutoConfigurations.of(KafkaAutoConfiguration.class, SslAutoConfiguration.class));
 
 	@Test
+	@WithResource(name = "ksLoc")
+	@WithResource(name = "tsLoc")
 	void consumerProperties() {
 		this.contextRunner.withPropertyValues("spring.kafka.bootstrap-servers=foo:1234",
 				"spring.kafka.properties.foo=bar", "spring.kafka.properties.baz=qux",
@@ -197,6 +203,8 @@ void connectionDetailsAreAppliedToConsumer() {
 	}
 
 	@Test
+	@WithResource(name = "ksLocP")
+	@WithResource(name = "tsLocP")
 	void producerProperties() {
 		this.contextRunner.withPropertyValues("spring.kafka.clientId=cid",
 				"spring.kafka.properties.foo.bar.baz=qux.fiz.buz", "spring.kafka.producer.acks=all",
@@ -267,6 +275,8 @@ void connectionDetailsAreAppliedToProducer() {
 	}
 
 	@Test
+	@WithResource(name = "ksLocP")
+	@WithResource(name = "tsLocP")
 	void adminProperties() {
 		this.contextRunner
 			.withPropertyValues("spring.kafka.clientId=cid", "spring.kafka.properties.foo.bar.baz=qux.fiz.buz",
@@ -327,8 +337,10 @@ void connectionDetailsAreAppliedToAdmin() {
 			});
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
+	@SuppressWarnings("unchecked")
+	@WithResource(name = "ksLocP")
+	@WithResource(name = "tsLocP")
 	void streamsProperties() {
 		this.contextRunner.withUserConfiguration(EnableKafkaStreamsConfiguration.class)
 			.withPropertyValues("spring.kafka.client-id=cid",
@@ -896,6 +908,15 @@ void specificSecurityProtocolOverridesCommonSecurityProtocol() {
 			});
 	}
 
+	@Test
+	void shouldRegisterRuntimeHints() {
+		RuntimeHints runtimeHints = new RuntimeHints();
+		new KafkaAutoConfiguration.KafkaRuntimeHints().registerHints(runtimeHints, getClass().getClassLoader());
+		assertThat(RuntimeHintsPredicates.reflection()
+			.onType(SslBundleSslEngineFactory.class)
+			.withMemberCategories(MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS)).accepts(runtimeHints);
+	}
+
 	private KafkaConnectionDetails kafkaConnectionDetails() {
 		return new KafkaConnectionDetails() {
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java
index 08fb63213aeb..808bb4ba2705 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -108,7 +108,7 @@ void sslBundleConfiguration() {
 		Map<String, Object> consumerProperties = properties
 			.buildConsumerProperties(new DefaultSslBundleRegistry("myBundle", this.sslBundle));
 		assertThat(consumerProperties).containsEntry(SslConfigs.SSL_ENGINE_FACTORY_CLASS_CONFIG,
-				SslBundleSslEngineFactory.class.getName());
+				SslBundleSslEngineFactory.class);
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
index 8833ccd11ba6..74249e5d3545 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,11 @@
 
 package org.springframework.boot.autoconfigure.ldap.embedded;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 import com.unboundid.ldap.listener.InMemoryDirectoryServer;
 import com.unboundid.ldap.sdk.BindResult;
 import com.unboundid.ldap.sdk.DN;
@@ -30,6 +35,7 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -100,6 +106,7 @@ void testSetPartitionSuffix() {
 	}
 
 	@Test
+	@WithSchemaLdifResource
 	void testSetLdifFile() {
 		this.contextRunner.withPropertyValues("spring.ldap.embedded.base-dn:dc=spring,dc=org").run((context) -> {
 			InMemoryDirectoryServer server = context.getBean(InMemoryDirectoryServer.class);
@@ -108,6 +115,7 @@ void testSetLdifFile() {
 	}
 
 	@Test
+	@WithSchemaLdifResource
 	void testQueryEmbeddedLdap() {
 		this.contextRunner.withPropertyValues("spring.ldap.embedded.base-dn:dc=spring,dc=org")
 			.withConfiguration(AutoConfigurations.of(LdapAutoConfiguration.class))
@@ -130,6 +138,34 @@ void testDisableSchemaValidation() {
 	}
 
 	@Test
+	@WithResource(name = "custom-schema.ldif", content = """
+			dn: cn=schema
+			attributeTypes: ( 1.3.6.1.4.1.32473.1.1.1
+			  NAME 'exampleAttributeName'
+			  DESC 'An example attribute type definition'
+			  EQUALITY caseIgnoreMatch
+			  ORDERING caseIgnoreOrderingMatch
+			  SUBSTR caseIgnoreSubstringsMatch
+			  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+			  SINGLE-VALUE
+			  X-ORIGIN 'Managing Schema Document' )
+			objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
+			  NAME 'exampleAuxiliaryClass'
+			  DESC 'An example auxiliary object class definition'
+			  SUP top
+			  AUXILIARY
+			  MAY exampleAttributeName
+			  X-ORIGIN 'Managing Schema Document' )
+			""")
+	@WithResource(name = "custom-schema-sample.ldif", content = """
+			dn: dc=spring,dc=org
+			objectclass: top
+			objectclass: domain
+			objectclass: extensibleObject
+			objectClass: exampleAuxiliaryClass
+			dc: spring
+			exampleAttributeName: exampleAttributeName
+			""")
 	void testCustomSchemaValidation() {
 		this.contextRunner
 			.withPropertyValues("spring.ldap.embedded.validation.schema:classpath:custom-schema.ldif",
@@ -144,6 +180,122 @@ void testCustomSchemaValidation() {
 	}
 
 	@Test
+	@WithResource(name = "schema-multi-basedn.ldif", content = """
+			dn: dc=spring,dc=org
+			objectclass: top
+			objectclass: domain
+			objectclass: extensibleObject
+			dc: spring
+
+			dn: ou=groups,dc=spring,dc=org
+			objectclass: top
+			objectclass: organizationalUnit
+			ou: groups
+
+			dn: cn=ROLE_USER,ou=groups,dc=spring,dc=org
+			objectclass: top
+			objectclass: groupOfUniqueNames
+			cn: ROLE_USER
+			uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
+			uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
+			uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
+			uniqueMember: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
+
+			dn: cn=ROLE_ADMIN,ou=groups,dc=spring,dc=org
+			objectclass: top
+			objectclass: groupOfUniqueNames
+			cn: ROLE_ADMIN
+			uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
+
+			dn: c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: country
+			c: Sweden
+			description: The country of Sweden
+
+			dn: ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: organizationalUnit
+			ou: company1
+			description: First company in Sweden
+
+			dn: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person
+			userPassword: password
+			cn: Some Person
+			sn: Person
+			description: Sweden, Company1, Some Person
+			telephoneNumber: +46 555-123456
+
+			dn: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person2
+			userPassword: password
+			cn: Some Person2
+			sn: Person2
+			description: Sweden, Company1, Some Person2
+			telephoneNumber: +46 555-654321
+
+			dn: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person3
+			userPassword: password
+			cn: Some Person3
+			sn: Person3
+			description: Sweden, Company1, Some Person3
+			telephoneNumber: +46 555-123654
+
+			dn: cn=Some Person4,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person4
+			userPassword: password
+			cn: Some Person
+			sn: Person
+			description: Sweden, Company1, Some Person
+			telephoneNumber: +46 555-456321
+
+			dn: dc=vmware,dc=com
+			objectclass: top
+			objectclass: domain
+			objectclass: extensibleObject
+			dc: vmware
+
+			dn: ou=groups,dc=vmware,dc=com
+			objectclass: top
+			objectclass: organizationalUnit
+			ou: groups
+
+			dn: c=Sweden,dc=vmware,dc=com
+			objectclass: top
+			objectclass: country
+			c: Sweden
+			description:The country of Sweden
+
+			dn: cn=Some Random Person,c=Sweden,dc=vmware,dc=com
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.random.person
+			userPassword: password
+			cn: Some Random Person
+			sn: Person
+			description: Sweden, VMware, Some Random Person
+			telephoneNumber: +46 555-123456
+			""")
 	void testMultiBaseDn() {
 		this.contextRunner.withPropertyValues("spring.ldap.embedded.ldif:classpath:schema-multi-basedn.ldif",
 				"spring.ldap.embedded.base-dn[0]:dc=spring,dc=org", "spring.ldap.embedded.base-dn[1]:dc=vmware,dc=com")
@@ -206,4 +358,97 @@ LDAPConnection ldapConnection(@Value("${local.ldap.port}") int port) throws LDAP
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "schema.ldif", content = """
+			dn: dc=spring,dc=org
+			objectclass: top
+			objectclass: domain
+			objectclass: extensibleObject
+			dc: spring
+
+			dn: ou=groups,dc=spring,dc=org
+			objectclass: top
+			objectclass: organizationalUnit
+			ou: groups
+
+			dn: cn=ROLE_USER,ou=groups,dc=spring,dc=org
+			objectclass: top
+			objectclass: groupOfUniqueNames
+			cn: ROLE_USER
+			uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
+			uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
+			uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
+			uniqueMember: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
+
+			dn: cn=ROLE_ADMIN,ou=groups,dc=spring,dc=org
+			objectclass: top
+			objectclass: groupOfUniqueNames
+			cn: ROLE_ADMIN
+			uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
+
+			dn: c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: country
+			c: Sweden
+			description: The country of Sweden
+
+			dn: ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: organizationalUnit
+			ou: company1
+			description: First company in Sweden
+
+			dn: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person
+			userPassword: password
+			cn: Some Person
+			sn: Person
+			description: Sweden, Company1, Some Person
+			telephoneNumber: +46 555-123456
+
+			dn: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person2
+			userPassword: password
+			cn: Some Person2
+			sn: Person2
+			description: Sweden, Company1, Some Person2
+			telephoneNumber: +46 555-654321
+
+			dn: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person3
+			userPassword: password
+			cn: Some Person3
+			sn: Person3
+			description: Sweden, Company1, Some Person3
+			telephoneNumber: +46 555-123654
+
+			dn: cn=Some Person4,ou=company1,c=Sweden,dc=spring,dc=org
+			objectclass: top
+			objectclass: person
+			objectclass: organizationalPerson
+			objectclass: inetOrgPerson
+			uid: some.person4
+			userPassword: password
+			cn: Some Person
+			sn: Person
+			description: Sweden, Company1, Some Person
+			telephoneNumber: +46 555-456321
+			""")
+	@interface WithSchemaLdifResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/Liquibase423AutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/Liquibase423AutoConfigurationTests.java
index 850a1e66124d..f12d064a24f8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/Liquibase423AutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/Liquibase423AutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -43,6 +44,7 @@ class Liquibase423AutoConfigurationTests {
 		.withPropertyValues("spring.datasource.generate-unique-name=true");
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-master.yaml", content = "databaseChangeLog:")
 	void defaultSpringLiquibase() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.run(assertLiquibase((liquibase) -> {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
index 87acfb7078c7..798ebf0067e9 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,16 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.Serializable;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -29,6 +35,10 @@
 import javax.sql.DataSource;
 
 import com.zaxxer.hikari.HikariDataSource;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import liquibase.Liquibase;
 import liquibase.UpdateSummaryEnum;
 import liquibase.UpdateSummaryOutputEnum;
@@ -36,6 +46,7 @@
 import liquibase.integration.spring.Customizer;
 import liquibase.integration.spring.SpringLiquibase;
 import liquibase.ui.UIServiceEnum;
+import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.io.TempDir;
@@ -45,6 +56,7 @@
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
@@ -52,12 +64,15 @@
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration.LiquibaseAutoConfigurationRuntimeHints;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -66,6 +81,7 @@
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -100,6 +116,7 @@ void backsOffWithNoDataSourceBeanAndNoLiquibaseUrl() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void createsDataSourceWithNoDataSourceBeanAndLiquibaseUrl() {
 		String jdbcUrl = "jdbc:hsqldb:mem:liquibase" + UUID.randomUUID();
 		this.contextRunner.withPropertyValues("spring.liquibase.url:" + jdbcUrl).run(assertLiquibase((liquibase) -> {
@@ -116,6 +133,7 @@ void backsOffWithLiquibaseUrlAndNoSpringJdbc() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void defaultSpringLiquibase() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.run(assertLiquibase((liquibase) -> {
@@ -138,6 +156,7 @@ void shouldUseMainDataSourceWhenThereIsNoLiquibaseSpecificConfiguration() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void liquibaseDataSourceIsUsedOverJdbcConnectionDetails() {
 		this.contextRunner
 			.withUserConfiguration(LiquibaseDataSourceConfiguration.class, JdbcConnectionDetailsConfiguration.class)
@@ -150,6 +169,7 @@ void liquibaseDataSourceIsUsedOverJdbcConnectionDetails() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void liquibaseDataSourceIsUsedOverLiquibaseConnectionDetails() {
 		this.contextRunner
 			.withUserConfiguration(LiquibaseDataSourceConfiguration.class,
@@ -163,6 +183,7 @@ void liquibaseDataSourceIsUsedOverLiquibaseConnectionDetails() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void liquibasePropertiesAreUsedOverJdbcConnectionDetails() {
 		this.contextRunner
 			.withPropertyValues("spring.liquibase.url=jdbc:hsqldb:mem:liquibasetest", "spring.liquibase.user=some-user",
@@ -193,6 +214,18 @@ void liquibaseConnectionDetailsAreUsedOverLiquibaseProperties() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-override.xml",
+			content = """
+					<?xml version="1.0" encoding="UTF-8"?>
+					<databaseChangeLog
+					        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+					        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+					        xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+					        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd
+					        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
+
+					</databaseChangeLog>
+					""")
 	void changelogXml() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.xml")
@@ -201,6 +234,11 @@ void changelogXml() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-override.json", content = """
+			{
+			    "databaseChangeLog": []
+			}
+			""")
 	void changelogJson() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.json")
@@ -209,6 +247,16 @@ void changelogJson() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-override.sql", content = """
+			--liquibase formatted sql
+
+			--changeset author:awilkinson
+
+			CREATE TABLE customer (
+			    id int AUTO_INCREMENT NOT NULL PRIMARY KEY,
+			    name varchar(50) NOT NULL
+			);
+			""")
 	void changelogSql() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.sql")
@@ -217,6 +265,7 @@ void changelogSql() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void defaultValues() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.run(assertLiquibase((liquibase) -> {
@@ -235,6 +284,7 @@ void defaultValues() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideContexts() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.contexts:test, production")
@@ -242,6 +292,7 @@ void overrideContexts() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideDefaultSchema() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.default-schema:public")
@@ -249,6 +300,7 @@ void overrideDefaultSchema() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideLiquibaseInfrastructure() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.liquibase-schema:public",
@@ -269,6 +321,7 @@ void overrideLiquibaseInfrastructure() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideDropFirst() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.drop-first:true")
@@ -276,6 +329,7 @@ void overrideDropFirst() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideClearChecksums() {
 		String jdbcUrl = "jdbc:hsqldb:mem:liquibase" + UUID.randomUUID();
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -287,6 +341,7 @@ void overrideClearChecksums() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideDataSource() {
 		String jdbcUrl = "jdbc:hsqldb:mem:liquibase" + UUID.randomUUID();
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -299,6 +354,7 @@ void overrideDataSource() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideDataSourceAndDriverClassName() {
 		String jdbcUrl = "jdbc:hsqldb:mem:liquibase" + UUID.randomUUID();
 		String driverClassName = "org.hsqldb.jdbcDriver";
@@ -313,6 +369,7 @@ void overrideDataSourceAndDriverClassName() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideUser() {
 		String databaseName = "normal" + UUID.randomUUID();
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -327,6 +384,7 @@ void overrideUser() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideUserWhenCustom() {
 		this.contextRunner.withUserConfiguration(CustomDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.user:test", "spring.liquibase.password:secret")
@@ -340,6 +398,7 @@ void overrideUserWhenCustom() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void createDataSourceDoesNotFallbackToEmbeddedProperties() {
 		String jdbcUrl = "jdbc:hsqldb:mem:liquibase" + UUID.randomUUID();
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -352,6 +411,7 @@ void createDataSourceDoesNotFallbackToEmbeddedProperties() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideUserAndFallbackToEmbeddedProperties() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.user:sa")
@@ -362,6 +422,7 @@ void overrideUserAndFallbackToEmbeddedProperties() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideTestRollbackOnUpdate() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.test-rollback-on-update:true")
@@ -382,12 +443,14 @@ void changeLogDoesNotExist() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void logging(CapturedOutput output) {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.run(assertLiquibase((liquibase) -> assertThat(output).doesNotContain(": liquibase:")));
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideLabelFilter() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.label-filter:test, production")
@@ -395,6 +458,7 @@ void overrideLabelFilter() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideShowSummary() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.show-summary=off")
@@ -406,6 +470,7 @@ void overrideShowSummary() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideShowSummaryOutput() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.show-summary-output=all")
@@ -417,6 +482,7 @@ void overrideShowSummaryOutput() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideUiService() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.ui-service=console")
@@ -425,6 +491,7 @@ void overrideUiService() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	@SuppressWarnings("unchecked")
 	void testOverrideParameters() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -438,6 +505,7 @@ void testOverrideParameters() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void rollbackFile(@TempDir Path temp) throws IOException {
 		File file = Files.createTempFile(temp, "rollback-file", "sql").toFile();
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -451,6 +519,7 @@ void rollbackFile(@TempDir Path temp) throws IOException {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void liquibaseDataSource() {
 		this.contextRunner
 			.withUserConfiguration(LiquibaseDataSourceConfiguration.class, EmbeddedDataSourceConfiguration.class)
@@ -461,6 +530,7 @@ void liquibaseDataSource() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void liquibaseDataSourceWithoutDataSourceAutoConfiguration() {
 		this.contextRunner.withUserConfiguration(LiquibaseDataSourceConfiguration.class).run((context) -> {
 			SpringLiquibase liquibase = context.getBean(SpringLiquibase.class);
@@ -469,6 +539,7 @@ void liquibaseDataSourceWithoutDataSourceAutoConfiguration() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void userConfigurationBeans() {
 		this.contextRunner
 			.withUserConfiguration(LiquibaseUserConfiguration.class, EmbeddedDataSourceConfiguration.class)
@@ -479,6 +550,7 @@ void userConfigurationBeans() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void userConfigurationEntityManagerFactoryDependency() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(HibernateJpaAutoConfiguration.class))
 			.withUserConfiguration(LiquibaseUserConfiguration.class, EmbeddedDataSourceConfiguration.class)
@@ -489,6 +561,39 @@ void userConfigurationEntityManagerFactoryDependency() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
+	@WithMetaInfPersistenceXmlResource
+	void jpaApplyDdl() {
+		this.contextRunner
+			.withConfiguration(
+					AutoConfigurations.of(DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class))
+			.run((context) -> {
+				Map<String, Object> jpaProperties = context.getBean(LocalContainerEntityManagerFactoryBean.class)
+					.getJpaPropertyMap();
+				assertThat(jpaProperties).doesNotContainKey("hibernate.hbm2ddl.auto");
+			});
+	}
+
+	@Test
+	@WithDbChangelogMasterYamlResource
+	@WithMetaInfPersistenceXmlResource
+	void jpaAndMultipleDataSourcesApplyDdl() {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(HibernateJpaAutoConfiguration.class))
+			.withUserConfiguration(JpaWithMultipleDataSourcesConfiguration.class)
+			.run((context) -> {
+				LocalContainerEntityManagerFactoryBean normalEntityManagerFactoryBean = context
+					.getBean("&normalEntityManagerFactory", LocalContainerEntityManagerFactoryBean.class);
+				assertThat(normalEntityManagerFactoryBean.getJpaPropertyMap()).containsEntry("configured", "normal")
+					.containsEntry("hibernate.hbm2ddl.auto", "create-drop");
+				LocalContainerEntityManagerFactoryBean liquibaseEntityManagerFactory = context
+					.getBean("&liquibaseEntityManagerFactory", LocalContainerEntityManagerFactoryBean.class);
+				assertThat(liquibaseEntityManagerFactory.getJpaPropertyMap()).containsEntry("configured", "liquibase")
+					.doesNotContainKey("hibernate.hbm2ddl.auto");
+			});
+	}
+
+	@Test
+	@WithDbChangelogMasterYamlResource
 	void userConfigurationJdbcTemplateDependency() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class))
 			.withUserConfiguration(LiquibaseUserConfiguration.class, EmbeddedDataSourceConfiguration.class)
@@ -499,6 +604,7 @@ void userConfigurationJdbcTemplateDependency() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void overrideTag() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.liquibase.tag:1.0.0")
@@ -506,6 +612,7 @@ void overrideTag() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void whenLiquibaseIsAutoConfiguredThenJooqDslContextDependsOnSpringLiquibaseBeans() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(JooqAutoConfiguration.class))
 			.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
@@ -516,6 +623,7 @@ void whenLiquibaseIsAutoConfiguredThenJooqDslContextDependsOnSpringLiquibaseBean
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void whenCustomSpringLiquibaseIsDefinedThenJooqDslContextDependsOnSpringLiquibaseBeans() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(JooqAutoConfiguration.class))
 			.withUserConfiguration(LiquibaseUserConfiguration.class, EmbeddedDataSourceConfiguration.class)
@@ -536,6 +644,7 @@ void shouldRegisterHints() {
 	}
 
 	@Test
+	@WithDbChangelogMasterYamlResource
 	void whenCustomizerBeanIsDefinedThenItIsConfiguredOnSpringLiquibase() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class, CustomizerConfiguration.class)
 			.run(assertLiquibase((liquibase) -> assertThat(liquibase.getCustomizer()).isNotNull()));
@@ -583,6 +692,46 @@ SpringLiquibase springLiquibase(DataSource dataSource) {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class JpaWithMultipleDataSourcesConfiguration {
+
+		@Bean
+		@Primary
+		DataSource normalDataSource() {
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseConnection.HSQLDB.getType())
+				.generateUniqueName(true)
+				.build();
+		}
+
+		@Bean
+		@Primary
+		LocalContainerEntityManagerFactoryBean normalEntityManagerFactory(EntityManagerFactoryBuilder builder,
+				DataSource normalDataSource) {
+			Map<String, Object> properties = new HashMap<>();
+			properties.put("configured", "normal");
+			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
+			return builder.dataSource(normalDataSource).properties(properties).build();
+		}
+
+		@Bean
+		@LiquibaseDataSource
+		DataSource liquibaseDataSource() {
+			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseConnection.HSQLDB.getType())
+				.generateUniqueName(true)
+				.build();
+		}
+
+		@Bean
+		LocalContainerEntityManagerFactoryBean liquibaseEntityManagerFactory(EntityManagerFactoryBuilder builder,
+				@LiquibaseDataSource DataSource liquibaseDataSource) {
+			Map<String, Object> properties = new HashMap<>();
+			properties.put("configured", "liquibase");
+			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
+			return builder.dataSource(liquibaseDataSource).properties(properties).build();
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomDataSourceConfiguration {
 
@@ -691,4 +840,102 @@ static class CustomH2Driver extends org.h2.Driver {
 
 	}
 
+	@WithResource(name = "db/changelog/db.changelog-master.yaml", content = """
+			databaseChangeLog:
+			  - changeSet:
+			      id: 1
+			      author: marceloverdijk
+			      changes:
+			        - createTable:
+			            tableName: customer
+			            columns:
+			              - column:
+			                  name: id
+			                  type: int
+			                  autoIncrement: true
+			                  constraints:
+			                    primaryKey: true
+			                    nullable: false
+			              - column:
+			                  name: name
+			                  type: varchar(50)
+			                  constraints:
+			                    nullable: false
+			""")
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	@interface WithDbChangelogMasterYamlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "META-INF/persistence.xml",
+			content = """
+					<?xml version="1.0" encoding="UTF-8"?>
+					<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+						<persistence-unit name="manually-configured">
+							<class>org.springframework.boot.autoconfigure.flyway.FlywayAutoConfigurationTests$City</class>
+							<exclude-unlisted-classes>true</exclude-unlisted-classes>
+						</persistence-unit>
+					</persistence>
+					""")
+	@interface WithMetaInfPersistenceXmlResource {
+
+	}
+
+	@Entity
+	public static class City implements Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		@Id
+		@GeneratedValue
+		private Long id;
+
+		@Column(nullable = false)
+		private String name;
+
+		@Column(nullable = false)
+		private String state;
+
+		@Column(nullable = false)
+		private String country;
+
+		@Column(nullable = false)
+		private String map;
+
+		protected City() {
+		}
+
+		City(String name, String state, String country, String map) {
+			this.name = name;
+			this.state = state;
+			this.country = country;
+			this.map = map;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public String getState() {
+			return this.state;
+		}
+
+		public String getCountry() {
+			return this.country;
+		}
+
+		public String getMap() {
+			return this.map;
+		}
+
+		@Override
+		public String toString() {
+			return getName() + "," + getState() + "," + getCountry();
+		}
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggerTests.java
index c728158876e7..28d8fdf3c28a 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggerTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.autoconfigure.logging;
 
+import java.time.Duration;
 import java.util.Arrays;
 
 import ch.qos.logback.classic.Level;
@@ -25,12 +26,16 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.LoggerFactory;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
-import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListenerTests.Config;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -104,7 +109,8 @@ void logsOutput(CapturedOutput output) {
 			ConditionEvaluationReport.get(context.getBeanFactory()).recordExclusions(Arrays.asList("com.foo.Bar"));
 			context.refresh();
 			withDebugLogging(() -> logger.logReport(false));
-			assertThat(output).contains("not a servlet web application (OnWebApplicationCondition)");
+			assertThat(output).contains("did not find any beans of type java.time.Duration (OnBeanCondition)")
+				.contains("@ConditionalOnProperty (com.example.property) matched (OnPropertyCondition)");
 		}
 	}
 
@@ -121,4 +127,22 @@ private void withDebugLogging(Runnable runnable) {
 		}
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ImportAutoConfiguration({ MatchingAutoConfiguration.class, NonMatchingAutoConfiguration.class })
+	static class Config {
+
+	}
+
+	@AutoConfiguration
+	@ConditionalOnProperty(name = "com.example.property", matchIfMissing = true)
+	static class MatchingAutoConfiguration {
+
+	}
+
+	@AutoConfiguration
+	@ConditionalOnBean(Duration.class)
+	static class NonMatchingAutoConfiguration {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java
index 0c2d48f743fb..66d8d44a194b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.logging;
 
+import java.time.Duration;
+
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
@@ -24,10 +26,11 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationFailedEvent;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
@@ -35,7 +38,6 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.mock.web.MockServletContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -126,14 +128,15 @@ private void withLoggingLevel(Level logLevel, Runnable runnable) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import({ WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
-			PropertyPlaceholderAutoConfiguration.class })
+	@ImportAutoConfiguration({ MatchingAutoConfiguration.class, NonMatchingAutoConfiguration.class,
+			UnconditionalAutoConfiguration.class })
 	static class Config {
 
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@Import(WebMvcAutoConfiguration.class)
+	@ImportAutoConfiguration({ MatchingAutoConfiguration.class, NonMatchingAutoConfiguration.class,
+			UnconditionalAutoConfiguration.class })
 	static class ErrorConfig {
 
 		@Bean
@@ -143,4 +146,26 @@ String iBreak() {
 
 	}
 
+	@AutoConfiguration
+	@ConditionalOnProperty(name = "com.example.property", matchIfMissing = true)
+	static class MatchingAutoConfiguration {
+
+	}
+
+	@AutoConfiguration
+	@ConditionalOnBean(Duration.class)
+	static class NonMatchingAutoConfiguration {
+
+	}
+
+	@AutoConfiguration
+	static class UnconditionalAutoConfiguration {
+
+		@Bean
+		String example() {
+			return "example";
+		}
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java
index 27f4baddffdf..3c3452b59524 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import org.springframework.boot.autoconfigure.jndi.TestableInitialContextFactory;
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mail.MailSender;
@@ -64,7 +65,8 @@ void setupJndi() {
 		this.initialContextFactory = System.getProperty(Context.INITIAL_CONTEXT_FACTORY);
 		System.setProperty(Context.INITIAL_CONTEXT_FACTORY, TestableInitialContextFactory.class.getName());
 		this.threadContextClassLoader = Thread.currentThread().getContextClassLoader();
-		Thread.currentThread().setContextClassLoader(new JndiPropertiesHidingClassLoader(getClass().getClassLoader()));
+		Thread.currentThread()
+			.setContextClassLoader(new JndiPropertiesHidingClassLoader(Thread.currentThread().getContextClassLoader()));
 	}
 
 	@AfterEach
@@ -254,6 +256,7 @@ void smtpSslEnabled() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void smtpSslBundle() {
 		this.contextRunner
 			.withPropertyValues("spring.mail.host:localhost", "spring.mail.ssl.bundle:test-bundle",
@@ -282,6 +285,7 @@ void smtpsSslEnabled() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void smtpsSslBundle() {
 		this.contextRunner
 			.withPropertyValues("spring.mail.host:localhost", "spring.mail.protocol:smtps",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
index b2122ebecc2d..4ba66770174d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -85,6 +86,7 @@ void configuresSslWhenEnabled() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void configuresSslWithBundle() {
 		this.contextRunner
 			.withPropertyValues("spring.data.mongodb.ssl.bundle=test-bundle",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java
index a3225f4fea0f..44ee73001b15 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -93,6 +94,7 @@ void configuresSslWhenEnabled() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void configuresSslWithBundle() {
 		this.contextRunner
 			.withPropertyValues("spring.data.mongodb.ssl.bundle=test-bundle",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java
index 9f9524eaa721..0836b7d71767 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationReactiveIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,9 +105,10 @@ String layout(Model model) {
 		@Bean
 		MustacheViewResolver viewResolver() {
 			Mustache.Compiler compiler = Mustache.compiler()
-				.withLoader(new MustacheResourceTemplateLoader("classpath:/mustache-templates/", ".html"));
+				.withLoader(new MustacheResourceTemplateLoader(
+						"classpath:/org/springframework/boot/autoconfigure/mustache/", ".html"));
 			MustacheViewResolver resolver = new MustacheViewResolver(compiler);
-			resolver.setPrefix("classpath:/mustache-templates/");
+			resolver.setPrefix("classpath:/org/springframework/boot/autoconfigure/mustache/");
 			resolver.setSuffix(".html");
 			return resolver;
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java
index c6c892e3331f..aba169ffc335 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationServletIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,9 +115,10 @@ String layout(Map<String, Object> model) {
 		@Bean
 		MustacheViewResolver viewResolver() {
 			Mustache.Compiler compiler = Mustache.compiler()
-				.withLoader(new MustacheResourceTemplateLoader("classpath:/mustache-templates/", ".html"));
+				.withLoader(new MustacheResourceTemplateLoader(
+						"classpath:/org/springframework/boot/autoconfigure/mustache/", ".html"));
 			MustacheViewResolver resolver = new MustacheViewResolver(compiler);
-			resolver.setPrefix("classpath:/mustache-templates/");
+			resolver.setPrefix("classpath:/org/springframework/boot/autoconfigure/mustache/");
 			resolver.setSuffix(".html");
 			return resolver;
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jPropertiesTests.java
index 2e1f52327503..4ad2e7bdd2c3 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jPropertiesTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java
index 95b1f92f14f9..cc672e2f6a9c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,10 @@
 package org.springframework.boot.autoconfigure.orm.jpa;
 
 import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -47,6 +51,7 @@
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.testsupport.BuildOutput;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -209,6 +214,7 @@ void customJpaProperties() {
 	}
 
 	@Test
+	@WithMetaInfPersistenceXmlResource
 	void usesManuallyDefinedLocalContainerEntityManagerFactoryBeanUsingBuilder() {
 		this.contextRunner.withPropertyValues("spring.jpa.properties.a=b")
 			.withUserConfiguration(TestConfigurationWithEntityManagerFactoryBuilder.class)
@@ -221,6 +227,7 @@ void usesManuallyDefinedLocalContainerEntityManagerFactoryBeanUsingBuilder() {
 	}
 
 	@Test
+	@WithMetaInfPersistenceXmlResource
 	void usesManuallyDefinedLocalContainerEntityManagerFactoryBeanIfAvailable() {
 		this.contextRunner.withUserConfiguration(TestConfigurationWithLocalContainerEntityManagerFactoryBean.class)
 			.run((context) -> {
@@ -232,6 +239,7 @@ void usesManuallyDefinedLocalContainerEntityManagerFactoryBeanIfAvailable() {
 	}
 
 	@Test
+	@WithMetaInfPersistenceXmlResource
 	void usesManuallyDefinedEntityManagerFactoryIfAvailable() {
 		this.contextRunner.withUserConfiguration(TestConfigurationWithLocalContainerEntityManagerFactoryBean.class)
 			.run((context) -> {
@@ -501,4 +509,20 @@ static class CustomJpaTransactionManager extends JpaTransactionManager {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "META-INF/persistence.xml",
+			content = """
+					<?xml version="1.0" encoding="UTF-8"?>
+					<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+						<persistence-unit name="manually-configured">
+							<class>org.springframework.boot.autoconfigure.orm.jpa.test.City</class>
+							<exclude-unlisted-classes>true</exclude-unlisted-classes>
+						</persistence-unit>
+					</persistence>
+					""")
+	@interface WithMetaInfPersistenceXmlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
index 7d5fe8cdd7f3..64c538416a6d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -81,7 +81,8 @@ void namingStrategyBeansAreUsed() {
 			.withPropertyValues("spring.datasource.url:jdbc:h2:mem:naming-strategy-beans")
 			.run((context) -> {
 				HibernateJpaConfiguration jpaConfiguration = context.getBean(HibernateJpaConfiguration.class);
-				Map<String, Object> hibernateProperties = jpaConfiguration.getVendorProperties();
+				Map<String, Object> hibernateProperties = jpaConfiguration
+					.getVendorProperties(context.getBean(DataSource.class));
 				assertThat(hibernateProperties).containsEntry("hibernate.implicit_naming_strategy",
 						NamingStrategyConfiguration.implicitNamingStrategy);
 				assertThat(hibernateProperties).containsEntry("hibernate.physical_naming_strategy",
@@ -93,7 +94,8 @@ void namingStrategyBeansAreUsed() {
 	void hibernatePropertiesCustomizersAreAppliedInOrder() {
 		this.contextRunner.withUserConfiguration(HibernatePropertiesCustomizerConfiguration.class).run((context) -> {
 			HibernateJpaConfiguration jpaConfiguration = context.getBean(HibernateJpaConfiguration.class);
-			Map<String, Object> hibernateProperties = jpaConfiguration.getVendorProperties();
+			Map<String, Object> hibernateProperties = jpaConfiguration
+				.getVendorProperties(context.getBean(DataSource.class));
 			assertThat(hibernateProperties).containsEntry("test.counter", 2);
 		});
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java
index f3b2ff2521ac..274c373e0fc1 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Configuration;
 
@@ -41,6 +42,20 @@ class Hibernate2ndLevelCacheIntegrationTests {
 		.withUserConfiguration(TestConfiguration.class);
 
 	@Test
+	@WithResource(name = "hazelcast.xml", content = """
+			<hazelcast
+				xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
+				xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+				<instance-name>default-instance</instance-name>
+				<map name="defaultCache" />
+				<network>
+					<join>
+						<auto-detection enabled="false" />
+						<multicast enabled="false" />
+					</join>
+				</network>
+			</hazelcast>
+			""")
 	void hibernate2ndLevelCacheWithJCacheAndHazelcast() {
 		String cachingProviderFqn = HazelcastServerCachingProvider.class.getName();
 		String configLocation = "classpath:hazelcast.xml";
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
index 3d0d625c33b5..f25bfc362d44 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,8 +72,10 @@
 import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ContextConsumer;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -129,6 +131,8 @@ void testDmlScript() {
 	}
 
 	@Test
+	@WithResource(name = "city.sql",
+			content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google')")
 	void testDmlScriptRunsEarly() {
 		contextRunner().withUserConfiguration(TestInitializedJpaConfiguration.class)
 			.withClassLoader(new HideDataScriptClassLoader())
@@ -139,6 +143,16 @@ void testDmlScriptRunsEarly() {
 	}
 
 	@Test
+	@WithResource(name = "db/city/V1__init.sql", content = """
+			CREATE SEQUENCE city_seq INCREMENT BY 50;
+			CREATE TABLE CITY (
+			  id         BIGINT GENERATED BY DEFAULT AS IDENTITY,
+			  name VARCHAR(30),
+			  state VARCHAR(30),
+			  country VARCHAR(30),
+			  map VARCHAR(30)
+			);
+			""")
 	void testFlywaySwitchOffDdlAuto() {
 		contextRunner().withPropertyValues("spring.sql.init.mode:never", "spring.flyway.locations:classpath:db/city")
 			.withConfiguration(AutoConfigurations.of(FlywayAutoConfiguration.class))
@@ -146,6 +160,17 @@ void testFlywaySwitchOffDdlAuto() {
 	}
 
 	@Test
+	@WithResource(name = "db/city/V1__init.sql", content = """
+			CREATE SEQUENCE city_seq INCREMENT BY 50;
+
+			CREATE TABLE CITY (
+			  id         BIGINT GENERATED BY DEFAULT AS IDENTITY,
+			  name VARCHAR(30),
+			  state VARCHAR(30),
+			  country VARCHAR(30),
+			  map VARCHAR(30)
+			);
+			""")
 	void testFlywayPlusValidation() {
 		contextRunner()
 			.withPropertyValues("spring.sql.init.mode:never", "spring.flyway.locations:classpath:db/city",
@@ -155,6 +180,46 @@ void testFlywayPlusValidation() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-city.yaml", content = """
+			databaseChangeLog:
+			- changeSet:
+			    id: 1
+			    author: dsyer
+			    changes:
+			      - createSequence:
+			          sequenceName: city_seq
+			          incrementBy: 50
+			      - createTable:
+			          tableName: city
+			          columns:
+			            - column:
+			                name: id
+			                type: bigint
+			                autoIncrement: true
+			                constraints:
+			                  primaryKey: true
+			                  nullable: false
+			            - column:
+			                name: name
+			                type: varchar(50)
+			                constraints:
+			                  nullable: false
+			            - column:
+			                name: state
+			                type: varchar(50)
+			                constraints:
+			                  nullable: false
+			            - column:
+			                name: country
+			                type: varchar(50)
+			                constraints:
+			                  nullable: false
+			            - column:
+			                name: map
+			                type: varchar(50)
+			                constraints:
+			                  nullable: true
+			""")
 	void testLiquibasePlusValidation() {
 		contextRunner()
 			.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-city.yaml",
@@ -296,9 +361,32 @@ void providerDisablesAutoCommitIsNotConfiguredWithJta() {
 	}
 
 	@Test
+	@WithResource(name = "META-INF/mappings/non-annotated.xml",
+			content = """
+					<?xml version="1.0" encoding="UTF-8" ?>
+					<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
+									 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+									 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm https://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/orm_2_1.xsd"
+									 version="2.1">
+						<entity class="org.springframework.boot.autoconfigure.orm.jpa.mapping.NonAnnotatedEntity">
+							<table name="NON_ANNOTATED"/>
+							<attributes>
+								<id name="id">
+									<column name="id"/>
+									<generated-value strategy="IDENTITY"/>
+								</id>
+								<basic name="item">
+									<column name="item"/>
+								</basic>
+							</attributes>
+						</entity>
+					</entity-mappings>
+					""")
+	@WithResource(name = "non-annotated-data.sql",
+			content = "INSERT INTO NON_ANNOTATED (id, item) values (2000, 'Test');")
 	void customResourceMapping() {
 		contextRunner().withClassLoader(new HideDataScriptClassLoader())
-			.withPropertyValues("spring.sql.init.data-locations:classpath:/db/non-annotated-data.sql",
+			.withPropertyValues("spring.sql.init.data-locations:classpath:non-annotated-data.sql",
 					"spring.jpa.mapping-resources=META-INF/mappings/non-annotated.xml",
 					"spring.jpa.defer-datasource-initialization=true")
 			.run((context) -> {
@@ -312,8 +400,7 @@ void customResourceMapping() {
 	@Test
 	void physicalNamingStrategyCanBeUsed() {
 		contextRunner().withUserConfiguration(TestPhysicalNamingStrategyConfiguration.class).run((context) -> {
-			Map<String, Object> hibernateProperties = context.getBean(HibernateJpaConfiguration.class)
-				.getVendorProperties();
+			Map<String, Object> hibernateProperties = getVendorProperties(context);
 			assertThat(hibernateProperties)
 				.contains(entry("hibernate.physical_naming_strategy", context.getBean("testPhysicalNamingStrategy")));
 			assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
@@ -323,8 +410,7 @@ void physicalNamingStrategyCanBeUsed() {
 	@Test
 	void implicitNamingStrategyCanBeUsed() {
 		contextRunner().withUserConfiguration(TestImplicitNamingStrategyConfiguration.class).run((context) -> {
-			Map<String, Object> hibernateProperties = context.getBean(HibernateJpaConfiguration.class)
-				.getVendorProperties();
+			Map<String, Object> hibernateProperties = getVendorProperties(context);
 			assertThat(hibernateProperties)
 				.contains(entry("hibernate.implicit_naming_strategy", context.getBean("testImplicitNamingStrategy")));
 			assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
@@ -339,8 +425,7 @@ void namingStrategyInstancesTakePrecedenceOverNamingStrategyProperties() {
 			.withPropertyValues("spring.jpa.hibernate.naming.physical-strategy:com.example.Physical",
 					"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit")
 			.run((context) -> {
-				Map<String, Object> hibernateProperties = context.getBean(HibernateJpaConfiguration.class)
-					.getVendorProperties();
+				Map<String, Object> hibernateProperties = getVendorProperties(context);
 				assertThat(hibernateProperties).contains(
 						entry("hibernate.physical_naming_strategy", context.getBean("testPhysicalNamingStrategy")),
 						entry("hibernate.implicit_naming_strategy", context.getBean("testImplicitNamingStrategy")));
@@ -356,8 +441,7 @@ void hibernatePropertiesCustomizerTakesPrecedenceOverStrategyInstancesAndNamingS
 			.withPropertyValues("spring.jpa.hibernate.naming.physical-strategy:com.example.Physical",
 					"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit")
 			.run((context) -> {
-				Map<String, Object> hibernateProperties = context.getBean(HibernateJpaConfiguration.class)
-					.getVendorProperties();
+				Map<String, Object> hibernateProperties = getVendorProperties(context);
 				TestHibernatePropertiesCustomizerConfiguration configuration = context
 					.getBean(TestHibernatePropertiesCustomizerConfiguration.class);
 				assertThat(hibernateProperties).contains(
@@ -368,6 +452,8 @@ void hibernatePropertiesCustomizerTakesPrecedenceOverStrategyInstancesAndNamingS
 	}
 
 	@Test
+	@WithResource(name = "city.sql",
+			content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google')")
 	void eventListenerCanBeRegisteredAsBeans() {
 		contextRunner().withUserConfiguration(TestInitializedJpaConfiguration.class)
 			.withClassLoader(new HideDataScriptClassLoader())
@@ -447,8 +533,11 @@ void vendorPropertiesWhenBothDdlAutoPropertiesAreSet() {
 
 	private ContextConsumer<AssertableApplicationContext> vendorProperties(
 			Consumer<Map<String, Object>> vendorProperties) {
-		return (context) -> vendorProperties
-			.accept(context.getBean(HibernateJpaConfiguration.class).getVendorProperties());
+		return (context) -> vendorProperties.accept(getVendorProperties(context));
+	}
+
+	private static Map<String, Object> getVendorProperties(ConfigurableApplicationContext context) {
+		return context.getBean(HibernateJpaConfiguration.class).getVendorProperties(context.getBean(DataSource.class));
 	}
 
 	@Test
@@ -478,6 +567,7 @@ void withAsyncBootstrappingAnApplicationListenerThatUsesJpaDoesNotTriggerABeanCu
 	}
 
 	@Test
+	@WithMetaInfPersistenceXmlResource
 	void whenLocalContainerEntityManagerFactoryBeanHasNoJpaVendorAdapterAutoConfigurationSucceeds() {
 		contextRunner()
 			.withUserConfiguration(
@@ -698,7 +788,7 @@ static class HideDataScriptClassLoader extends URLClassLoader {
 		private static final List<String> HIDDEN_RESOURCES = Arrays.asList("schema-all.sql", "schema.sql");
 
 		HideDataScriptClassLoader() {
-			super(new URL[0], HideDataScriptClassLoader.class.getClassLoader());
+			super(new URL[0], Thread.currentThread().getContextClassLoader());
 		}
 
 		@Override
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java
index 9ef8ee88f397..fb4f3eb4f107 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,8 @@
 import org.springframework.boot.r2dbc.OptionsCapableConnectionFactory;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.ForkedClassPath;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.r2dbc.core.DatabaseClient;
@@ -237,6 +239,9 @@ void configureWithoutPoolShouldApplyAdditionalProperties() {
 	}
 
 	@Test
+	@WithResource(name = "META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider",
+			content = "org.springframework.boot.autoconfigure.r2dbc.SimpleConnectionFactoryProvider")
+	@ForkedClassPath
 	void configureWithPoolShouldApplyAdditionalProperties() {
 		this.contextRunner
 			.withPropertyValues("spring.r2dbc.url:r2dbc:simple://foo", "spring.r2dbc.properties.test=value",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java
index 62569319c380..7362a2aebc6b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -126,30 +127,32 @@ void shouldFailToSetFragmentWhenRSocketServerFragmentSizeIsBelow64() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void shouldUseSslWhenRocketServerSslIsConfigured() {
 		reactiveWebContextRunner()
-			.withPropertyValues("spring.rsocket.server.ssl.keyStore=classpath:rsocket/test.jks",
+			.withPropertyValues("spring.rsocket.server.ssl.keyStore=classpath:test.jks",
 					"spring.rsocket.server.ssl.keyPassword=password", "spring.rsocket.server.port=0")
 			.run((context) -> assertThat(context).hasSingleBean(RSocketServerFactory.class)
 				.hasSingleBean(RSocketServerBootstrap.class)
 				.hasSingleBean(RSocketServerCustomizer.class)
 				.getBean(RSocketServerFactory.class)
-				.hasFieldOrPropertyWithValue("ssl.keyStore", "classpath:rsocket/test.jks")
+				.hasFieldOrPropertyWithValue("ssl.keyStore", "classpath:test.jks")
 				.hasFieldOrPropertyWithValue("ssl.keyPassword", "password"));
 	}
 
 	@Test
 	@Disabled
+	@WithPackageResources("test.jks")
 	void shouldUseSslWhenRocketServerSslIsConfiguredWithSslBundle() {
 		reactiveWebContextRunner()
 			.withPropertyValues("spring.rsocket.server.port=0", "spring.rsocket.server.ssl.bundle=test-bundle",
-					"spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:rsocket/test.jks",
+					"spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:test.jks",
 					"spring.ssl.bundle.jks.test-bundle.key.password=password")
 			.run((context) -> assertThat(context).hasSingleBean(RSocketServerFactory.class)
 				.hasSingleBean(RSocketServerBootstrap.class)
 				.hasSingleBean(RSocketServerCustomizer.class)
 				.getBean(RSocketServerFactory.class)
-				.hasFieldOrPropertyWithValue("sslBundle.details.keyStore", "classpath:rsocket/test.jks")
+				.hasFieldOrPropertyWithValue("sslBundle.details.keyStore", "classpath:test.jks")
 				.hasFieldOrPropertyWithValue("sslBundle.details.keyPassword", "password"));
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java
index 771c5cb4b677..3e845727128d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,10 @@
 package org.springframework.boot.autoconfigure.security.oauth2.resource.reactive;
 
 import java.io.IOException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.net.URI;
 import java.net.URL;
 import java.time.Duration;
@@ -49,6 +53,7 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -173,6 +178,7 @@ void autoConfigurationUsingJwkSetUriShouldConfigureResourceServerUsingMultipleJw
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationUsingPublicKeyValueShouldConfigureResourceServerUsingSingleJwsAlgorithm() {
 		this.contextRunner
 			.withPropertyValues(
@@ -186,6 +192,7 @@ void autoConfigurationUsingPublicKeyValueShouldConfigureResourceServerUsingSingl
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationUsingPublicKeyValueWithMultipleJwsAlgorithmsShouldFail() {
 		this.contextRunner
 			.withPropertyValues(
@@ -284,6 +291,7 @@ void autoConfigurationShouldConfigureResourceServerUsingOAuthIssuerUri() throws
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationShouldConfigureResourceServerUsingPublicKeyValue() {
 		this.contextRunner
 			.withPropertyValues(
@@ -539,6 +547,7 @@ void autoConfigurationShouldConfigureAudienceValidatorIfPropertyProvidedAndIssue
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationShouldConfigureAudienceValidatorIfPropertyProvidedAndPublicKey() throws Exception {
 		this.server = new MockWebServer();
 		this.server.start();
@@ -891,4 +900,18 @@ ReactiveJwtAuthenticationConverter customReactiveJwtAuthenticationConverter() {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "public-key-location", content = """
+			-----BEGIN PUBLIC KEY-----
+			MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd
+			UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs
+			HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D
+			o2kQ+X5xK9cipRgEKwIDAQAB
+			-----END PUBLIC KEY-----
+			""")
+	@interface WithPublicKeyResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java
index 9de6d030a840..776615eb2d6f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.autoconfigure.security.oauth2.resource.servlet;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.net.URI;
 import java.net.URL;
 import java.time.Instant;
@@ -48,6 +52,7 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -174,6 +179,7 @@ void autoConfigurationShouldConfigureResourceServerWithMultipleJwsAlgorithms() {
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationUsingPublicKeyValueShouldConfigureResourceServerUsingSingleJwsAlgorithm() {
 		this.contextRunner
 			.withPropertyValues(
@@ -187,6 +193,7 @@ void autoConfigurationUsingPublicKeyValueShouldConfigureResourceServerUsingSingl
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationUsingPublicKeyValueWithMultipleJwsAlgorithmsShouldFail() {
 		this.contextRunner
 			.withPropertyValues(
@@ -277,6 +284,7 @@ void autoConfigurationShouldConfigureResourceServerUsingOAuthIssuerUri() throws
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationShouldConfigureResourceServerUsingPublicKeyValue() throws Exception {
 		this.server = new MockWebServer();
 		this.server.start();
@@ -304,6 +312,7 @@ void autoConfigurationShouldFailIfPublicKeyLocationDoesNotExist() {
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationShouldFailIfAlgorithmIsInvalid() {
 		this.contextRunner
 			.withPropertyValues(
@@ -583,6 +592,7 @@ void autoConfigurationShouldConfigureCustomValidators() throws Exception {
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void autoConfigurationShouldConfigureAudienceValidatorIfPropertyProvidedAndPublicKey() throws Exception {
 		this.server = new MockWebServer();
 		this.server.start();
@@ -877,4 +887,18 @@ JwtAuthenticationConverter customJwtAuthenticationConverter() {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "public-key-location", content = """
+			-----BEGIN PUBLIC KEY-----
+			MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd
+			UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs
+			HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D
+			o2kQ+X5xK9cipRgEKwIDAQAB
+			-----END PUBLIC KEY-----
+			""")
+	@interface WithPublicKeyResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java
index 37ceafca1adb..2892f7439296 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java
index 07aab477a6b3..8ad935049d86 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
@@ -90,6 +91,7 @@ void relyingPartyRegistrationRepositoryBeanShouldNotBeCreatedWhenPropertiesAbsen
 	}
 
 	@Test
+	@WithPackageResources({ "certificate-location", "private-key-location" })
 	void relyingPartyRegistrationRepositoryBeanShouldBeCreatedWhenPropertiesPresent() {
 		this.contextRunner.withPropertyValues(getPropertyValues()).run((context) -> {
 			RelyingPartyRegistrationRepository repository = context.getBean(RelyingPartyRegistrationRepository.class);
@@ -124,6 +126,7 @@ void relyingPartyRegistrationRepositoryBeanShouldBeCreatedWhenPropertiesPresent(
 	}
 
 	@Test
+	@WithPackageResources({ "certificate-location", "private-key-location" })
 	void autoConfigurationWhenSignRequestsTrueAndNoSigningCredentialsShouldThrowException() {
 		this.contextRunner.withPropertyValues(getPropertyValuesWithoutSigningCredentials(true)).run((context) -> {
 			assertThat(context).hasFailed();
@@ -133,17 +136,19 @@ void autoConfigurationWhenSignRequestsTrueAndNoSigningCredentialsShouldThrowExce
 	}
 
 	@Test
+	@WithPackageResources({ "certificate-location", "private-key-location" })
 	void autoConfigurationWhenSignRequestsFalseAndNoSigningCredentialsShouldNotThrowException() {
 		this.contextRunner.withPropertyValues(getPropertyValuesWithoutSigningCredentials(false))
 			.run((context) -> assertThat(context).hasSingleBean(RelyingPartyRegistrationRepository.class));
 	}
 
 	@Test
+	@WithPackageResources("idp-metadata")
 	void autoconfigurationShouldQueryAssertingPartyMetadataWhenMetadataUrlIsPresent() throws Exception {
 		try (MockWebServer server = new MockWebServer()) {
 			server.start();
 			String metadataUrl = server.url("").toString();
-			setupMockResponse(server, new ClassPathResource("saml/idp-metadata"));
+			setupMockResponse(server, new ClassPathResource("idp-metadata"));
 			this.contextRunner.withPropertyValues(PREFIX + ".foo.assertingparty.metadata-uri=" + metadataUrl)
 				.run((context) -> {
 					assertThat(context).hasSingleBean(RelyingPartyRegistrationRepository.class);
@@ -153,11 +158,12 @@ void autoconfigurationShouldQueryAssertingPartyMetadataWhenMetadataUrlIsPresent(
 	}
 
 	@Test
+	@WithPackageResources("idp-metadata")
 	void autoconfigurationShouldUseBindingFromMetadataUrlIfPresent() throws Exception {
 		try (MockWebServer server = new MockWebServer()) {
 			server.start();
 			String metadataUrl = server.url("").toString();
-			setupMockResponse(server, new ClassPathResource("saml/idp-metadata"));
+			setupMockResponse(server, new ClassPathResource("idp-metadata"));
 			this.contextRunner.withPropertyValues(PREFIX + ".foo.assertingparty.metadata-uri=" + metadataUrl)
 				.run((context) -> {
 					RelyingPartyRegistrationRepository repository = context
@@ -170,11 +176,12 @@ void autoconfigurationShouldUseBindingFromMetadataUrlIfPresent() throws Exceptio
 	}
 
 	@Test
+	@WithPackageResources("idp-metadata")
 	void autoconfigurationWhenMetadataUrlAndPropertyPresentShouldUseBindingFromProperty() throws Exception {
 		try (MockWebServer server = new MockWebServer()) {
 			server.start();
 			String metadataUrl = server.url("").toString();
-			setupMockResponse(server, new ClassPathResource("saml/idp-metadata"));
+			setupMockResponse(server, new ClassPathResource("idp-metadata"));
 			this.contextRunner
 				.withPropertyValues(PREFIX + ".foo.assertingparty.metadata-uri=" + metadataUrl,
 						PREFIX + ".foo.assertingparty.singlesignon.binding=redirect")
@@ -189,6 +196,7 @@ void autoconfigurationWhenMetadataUrlAndPropertyPresentShouldUseBindingFromPrope
 	}
 
 	@Test
+	@WithPackageResources({ "certificate-location", "private-key-location" })
 	void autoconfigurationWhenNoMetadataUrlOrPropertyPresentShouldUseRedirectBinding() {
 		this.contextRunner.withPropertyValues(getPropertyValuesWithoutSsoBinding()).run((context) -> {
 			RelyingPartyRegistrationRepository repository = context.getBean(RelyingPartyRegistrationRepository.class);
@@ -209,12 +217,14 @@ void relyingPartyRegistrationRepositoryShouldBeConditionalOnMissingBean() {
 	}
 
 	@Test
+	@WithPackageResources({ "certificate-location", "private-key-location" })
 	void samlLoginShouldBeConfigured() {
 		this.contextRunner.withPropertyValues(getPropertyValues())
 			.run((context) -> assertThat(hasSecurityFilter(context, Saml2WebSsoAuthenticationFilter.class)).isTrue());
 	}
 
 	@Test
+	@WithPackageResources({ "private-key-location", "certificate-location" })
 	void samlLoginShouldBackOffWhenASecurityFilterChainBeanIsPresent() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(WebMvcAutoConfiguration.class))
 			.withUserConfiguration(TestSecurityFilterChainConfig.class)
@@ -223,13 +233,17 @@ void samlLoginShouldBackOffWhenASecurityFilterChainBeanIsPresent() {
 	}
 
 	@Test
+	@WithPackageResources({ "certificate-location", "private-key-location" })
 	void samlLoginShouldShouldBeConditionalOnSecurityWebFilterClass() {
-		this.contextRunner.withClassLoader(new FilteredClassLoader(SecurityFilterChain.class))
+		this.contextRunner
+			.withClassLoader(
+					new FilteredClassLoader(Thread.currentThread().getContextClassLoader(), SecurityFilterChain.class))
 			.withPropertyValues(getPropertyValues())
 			.run((context) -> assertThat(context).doesNotHaveBean(SecurityFilterChain.class));
 	}
 
 	@Test
+	@WithPackageResources({ "certificate-location", "private-key-location" })
 	void samlLogoutShouldBeConfigured() {
 		this.contextRunner.withPropertyValues(getPropertyValues())
 			.run((context) -> assertThat(hasSecurityFilter(context, Saml2LogoutRequestFilter.class)).isTrue());
@@ -241,26 +255,29 @@ private String[] getPropertyValuesWithoutSigningCredentials(boolean signRequests
 				PREFIX + ".foo.assertingparty.singlesignon.binding=post",
 				PREFIX + ".foo.assertingparty.singlesignon.sign-request=" + signRequests,
 				PREFIX + ".foo.assertingparty.entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php",
-				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:saml/certificate-location" };
+				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:certificate-location" };
 	}
 
 	@Test
+	@WithPackageResources("idp-metadata-with-multiple-providers")
 	void autoconfigurationWhenMultipleProvidersAndNoSpecifiedEntityId() throws Exception {
 		testMultipleProviders(null, "https://idp.example.com/idp/shibboleth");
 	}
 
 	@Test
+	@WithPackageResources("idp-metadata-with-multiple-providers")
 	void autoconfigurationWhenMultipleProvidersAndSpecifiedEntityId() throws Exception {
 		testMultipleProviders("https://idp.example.com/idp/shibboleth", "https://idp.example.com/idp/shibboleth");
 		testMultipleProviders("https://idp2.example.com/idp/shibboleth", "https://idp2.example.com/idp/shibboleth");
 	}
 
 	@Test
+	@WithPackageResources("idp-metadata")
 	void signRequestShouldApplyIfMetadataUriIsSet() throws Exception {
 		try (MockWebServer server = new MockWebServer()) {
 			server.start();
 			String metadataUrl = server.url("").toString();
-			setupMockResponse(server, new ClassPathResource("saml/idp-metadata"));
+			setupMockResponse(server, new ClassPathResource("idp-metadata"));
 			this.contextRunner.withPropertyValues(PREFIX + ".foo.assertingparty.metadata-uri=" + metadataUrl,
 					PREFIX + ".foo.assertingparty.singlesignon.sign-request=true",
 					PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:org/springframework/boot/autoconfigure/security/saml2/rsa.key",
@@ -275,15 +292,16 @@ void signRequestShouldApplyIfMetadataUriIsSet() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("certificate-location")
 	void autoconfigurationWithInvalidPrivateKeyShouldFail() {
 		this.contextRunner.withPropertyValues(
-				PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:saml/certificate-location",
-				PREFIX + ".foo.signing.credentials[0].certificate-location=classpath:saml/certificate-location",
+				PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:certificate-location",
+				PREFIX + ".foo.signing.credentials[0].certificate-location=classpath:certificate-location",
 				PREFIX + ".foo.assertingparty.singlesignon.url=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php",
 				PREFIX + ".foo.assertingparty.singlesignon.binding=post",
 				PREFIX + ".foo.assertingparty.singlesignon.sign-request=false",
 				PREFIX + ".foo.assertingparty.entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php",
-				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:saml/certificate-location")
+				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:certificate-location")
 			.run((context) -> assertThat(context).hasFailed()
 				.getFailure()
 				.rootCause()
@@ -291,15 +309,16 @@ void autoconfigurationWithInvalidPrivateKeyShouldFail() {
 	}
 
 	@Test
+	@WithPackageResources("private-key-location")
 	void autoconfigurationWithInvalidCertificateShouldFail() {
 		this.contextRunner.withPropertyValues(
-				PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:saml/private-key-location",
-				PREFIX + ".foo.signing.credentials[0].certificate-location=classpath:saml/private-key-location",
+				PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:private-key-location",
+				PREFIX + ".foo.signing.credentials[0].certificate-location=classpath:private-key-location",
 				PREFIX + ".foo.assertingparty.singlesignon.url=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php",
 				PREFIX + ".foo.assertingparty.singlesignon.binding=post",
 				PREFIX + ".foo.assertingparty.singlesignon.sign-request=false",
 				PREFIX + ".foo.assertingparty.entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php",
-				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:saml/certificate-location")
+				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:private-key-location")
 			.run((context) -> assertThat(context).hasFailed()
 				.getFailure()
 				.rootCause()
@@ -310,7 +329,7 @@ private void testMultipleProviders(String specifiedEntityId, String expected) th
 		try (MockWebServer server = new MockWebServer()) {
 			server.start();
 			String metadataUrl = server.url("").toString();
-			setupMockResponse(server, new ClassPathResource("saml/idp-metadata-with-multiple-providers"));
+			setupMockResponse(server, new ClassPathResource("idp-metadata-with-multiple-providers"));
 			WebApplicationContextRunner contextRunner = this.contextRunner
 				.withPropertyValues(PREFIX + ".foo.assertingparty.metadata-uri=" + metadataUrl);
 			if (specifiedEntityId != null) {
@@ -333,15 +352,15 @@ private String[] getPropertyValuesWithoutSsoBinding() {
 				+ ".foo.assertingparty.singlesignon.url=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SSOService.php",
 				PREFIX + ".foo.assertingparty.singlesignon.sign-request=false",
 				PREFIX + ".foo.assertingparty.entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php",
-				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:saml/certificate-location" };
+				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:certificate-location" };
 	}
 
 	private String[] getPropertyValues() {
 		return new String[] {
-				PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:saml/private-key-location",
-				PREFIX + ".foo.signing.credentials[0].certificate-location=classpath:saml/certificate-location",
-				PREFIX + ".foo.decryption.credentials[0].private-key-location=classpath:saml/private-key-location",
-				PREFIX + ".foo.decryption.credentials[0].certificate-location=classpath:saml/certificate-location",
+				PREFIX + ".foo.signing.credentials[0].private-key-location=classpath:private-key-location",
+				PREFIX + ".foo.signing.credentials[0].certificate-location=classpath:certificate-location",
+				PREFIX + ".foo.decryption.credentials[0].private-key-location=classpath:private-key-location",
+				PREFIX + ".foo.decryption.credentials[0].certificate-location=classpath:certificate-location",
 				PREFIX + ".foo.singlelogout.url=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SLOService.php",
 				PREFIX + ".foo.singlelogout.response-url=https://simplesaml-for-spring-saml.cfapps.io/",
 				PREFIX + ".foo.singlelogout.binding=post",
@@ -349,7 +368,7 @@ private String[] getPropertyValues() {
 				PREFIX + ".foo.assertingparty.singlesignon.binding=post",
 				PREFIX + ".foo.assertingparty.singlesignon.sign-request=false",
 				PREFIX + ".foo.assertingparty.entity-id=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/metadata.php",
-				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:saml/certificate-location",
+				PREFIX + ".foo.assertingparty.verification.credentials[0].certificate-location=classpath:certificate-location",
 				PREFIX + ".foo.asserting-party.singlelogout.url=https://simplesaml-for-spring-saml.cfapps.io/saml2/idp/SLOService.php",
 				PREFIX + ".foo.asserting-party.singlelogout.response-url=https://simplesaml-for-spring-saml.cfapps.io/",
 				PREFIX + ".foo.asserting-party.singlelogout.binding=post",
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
index 3a75d04394b9..3a26ce94b7bc 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.autoconfigure.security.servlet;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.security.interfaces.RSAPublicKey;
 import java.util.EnumSet;
 
@@ -36,6 +40,7 @@
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
 import org.springframework.boot.web.servlet.filter.OrderedFilter;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -193,6 +198,7 @@ void emptyFilterDispatcherTypesDoNotThrowException() {
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void whenAConfigurationPropertyBindingConverterIsDefinedThenBindingToAnRsaKeySucceeds() {
 		this.contextRunner.withUserConfiguration(ConverterConfiguration.class, PropertiesConfiguration.class)
 			.withPropertyValues("jwt.public-key=classpath:public-key-location")
@@ -200,6 +206,7 @@ void whenAConfigurationPropertyBindingConverterIsDefinedThenBindingToAnRsaKeySuc
 	}
 
 	@Test
+	@WithPublicKeyResource
 	void whenTheBeanFactoryHasAConversionServiceAndAConfigurationPropertyBindingConverterIsDefinedThenBindingToAnRsaKeySucceeds() {
 		this.contextRunner
 			.withInitializer(
@@ -295,4 +302,18 @@ static class TargetType {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "public-key-location", content = """
+			-----BEGIN PUBLIC KEY-----
+			MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd
+			UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs
+			HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D
+			o2kQ+X5xK9cipRgEKwIDAQAB
+			-----END PUBLIC KEY-----
+			""")
+	@interface WithPublicKeyResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java
index a01c6b534b46..f6203e7076db 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
 import java.util.Collections;
 import java.util.function.Consumer;
 
-import org.springframework.boot.autoconfigure.web.reactive.MockReactiveWebServerFactory;
 import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext;
+import org.springframework.boot.web.reactive.server.MockReactiveWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java
index 30202631d842..047e06369a5e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import javax.sql.DataSource;
 
 import org.apache.commons.dbcp2.BasicDataSource;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -37,6 +38,7 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.AbstractFilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -63,13 +65,19 @@
  */
 class SessionAutoConfigurationJdbcTests extends AbstractSessionAutoConfigurationTests {
 
-	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-		.withClassLoader(new FilteredClassLoader(HazelcastIndexedSessionRepository.class,
-				MongoIndexedSessionRepository.class, RedisIndexedSessionRepository.class))
-		.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
-				DataSourceTransactionManagerAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,
-				SessionAutoConfiguration.class))
-		.withPropertyValues("spring.datasource.generate-unique-name=true");
+	private WebApplicationContextRunner contextRunner;
+
+	@BeforeEach
+	void prepareRunner() {
+		this.contextRunner = new WebApplicationContextRunner()
+			.withClassLoader(new FilteredClassLoader(Thread.currentThread().getContextClassLoader(),
+					HazelcastIndexedSessionRepository.class, MongoIndexedSessionRepository.class,
+					RedisIndexedSessionRepository.class))
+			.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
+					DataSourceTransactionManagerAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,
+					SessionAutoConfiguration.class))
+			.withPropertyValues("spring.datasource.generate-unique-name=true");
+	}
 
 	@Test
 	void defaultConfig() {
@@ -127,9 +135,8 @@ void customTimeout() {
 
 	@Test
 	void customTableName() {
-		this.contextRunner
-			.withPropertyValues("spring.session.jdbc.table-name=FOO_BAR",
-					"spring.session.jdbc.schema=classpath:session/custom-schema-h2.sql")
+		this.contextRunner.withPropertyValues("spring.session.jdbc.table-name=FOO_BAR",
+				"spring.session.jdbc.schema=classpath:org/springframework/boot/autoconfigure/session/custom-schema-h2.sql")
 			.run((context) -> {
 				JdbcIndexedSessionRepository repository = validateSessionRepository(context,
 						JdbcIndexedSessionRepository.class);
@@ -211,6 +218,7 @@ void sessionRepositoryBeansDependOnFlyway() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-master.yaml", content = "databaseChangeLog:")
 	void sessionRepositoryBeansDependOnLiquibase() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(LiquibaseAutoConfiguration.class))
 			.withPropertyValues("spring.session.jdbc.initialize-schema=never")
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ssl/SslPropertiesBundleRegistrarTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ssl/SslPropertiesBundleRegistrarTests.java
index dafabd8801b1..19df0b1f9a43 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ssl/SslPropertiesBundleRegistrarTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ssl/SslPropertiesBundleRegistrarTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,9 +67,9 @@ void setUp() {
 	void shouldWatchJksBundles() {
 		JksSslBundleProperties jks = new JksSslBundleProperties();
 		jks.setReloadOnUpdate(true);
-		jks.getKeystore().setLocation("classpath:test.jks");
+		jks.getKeystore().setLocation("classpath:org/springframework/boot/autoconfigure/ssl/test.jks");
 		jks.getKeystore().setPassword("secret");
-		jks.getTruststore().setLocation("classpath:test.jks");
+		jks.getTruststore().setLocation("classpath:org/springframework/boot/autoconfigure/ssl/test.jks");
 		jks.getTruststore().setPassword("secret");
 		this.properties.getBundle().getJks().put("bundle1", jks);
 		this.registrar.registerBundles(this.registry);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
index 6d17a0ef7527..dcc16694ea47 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.boot.testsupport.BuildOutput;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
@@ -70,6 +71,7 @@ class ThymeleafReactiveAutoConfigurationTests {
 		.withConfiguration(AutoConfigurations.of(ThymeleafAutoConfiguration.class));
 
 	@Test
+	@WithResource(name = "templates/template.html", content = "<html th:text=\"${foo}\">foo</html>")
 	void createFromConfigClass() {
 		this.contextRunner.withPropertyValues("spring.thymeleaf.suffix:.html").run((context) -> {
 			TemplateEngine engine = context.getBean(TemplateEngine.class);
@@ -188,6 +190,7 @@ void templateLocationEmpty(CapturedOutput output) {
 	}
 
 	@Test
+	@WithResource(name = "templates/data-dialect.html", content = "<html><body data:foo=\"${foo}\"></body></html>")
 	void useDataDialect() {
 		this.contextRunner.run((context) -> {
 			ISpringWebFluxTemplateEngine engine = context.getBean(ISpringWebFluxTemplateEngine.class);
@@ -198,6 +201,8 @@ void useDataDialect() {
 	}
 
 	@Test
+	@WithResource(name = "templates/java8time-dialect.html",
+			content = "<html><body th:text=\"${#temporals.create('2015','11','24')}\"></body></html>")
 	void useJava8TimeDialect() {
 		this.contextRunner.run((context) -> {
 			ISpringWebFluxTemplateEngine engine = context.getBean(ISpringWebFluxTemplateEngine.class);
@@ -208,6 +213,8 @@ void useJava8TimeDialect() {
 	}
 
 	@Test
+	@WithResource(name = "templates/security-dialect.html",
+			content = "<html><body><div sec:authentication=\"name\"></div></body></html>")
 	void useSecurityDialect() {
 		this.contextRunner.run((context) -> {
 			ISpringWebFluxTemplateEngine engine = context.getBean(ISpringWebFluxTemplateEngine.class);
@@ -218,7 +225,7 @@ void useSecurityDialect() {
 			WebContext attrs = new WebContext(SpringWebFluxWebApplication.buildApplication(null)
 				.buildExchange(exchange, Locale.US, MediaType.TEXT_HTML, StandardCharsets.UTF_8));
 			String result = engine.process("security-dialect", attrs);
-			assertThat(result).isEqualTo("<html><body><div>alice</div></body></html>" + System.lineSeparator());
+			assertThat(result).isEqualTo("<html><body><div>alice</div></body></html>");
 		});
 	}
 
@@ -229,6 +236,7 @@ void securityDialectAutoConfigurationBacksOffWithoutSpringSecurity() {
 	}
 
 	@Test
+	@WithResource(name = "templates/home.html", content = "<html><body th:text=\"${foo}\">Home</body></html>")
 	void renderTemplate() {
 		this.contextRunner.run((context) -> {
 			ISpringWebFluxTemplateEngine engine = context.getBean(ISpringWebFluxTemplateEngine.class);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
index 9f58eefb4a5d..03fc003dc8bb 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
@@ -46,6 +46,7 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.boot.testsupport.BuildOutput;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter;
 import org.springframework.context.annotation.Bean;
@@ -89,6 +90,7 @@ void autoConfigurationBackOffWithoutThymeleafSpring() {
 	}
 
 	@Test
+	@WithResource(name = "templates/template.html", content = "<html th:text=\"${foo}\">foo</html>")
 	void createFromConfigClass() {
 		this.contextRunner.withPropertyValues("spring.thymeleaf.mode:HTML", "spring.thymeleaf.suffix:")
 			.run((context) -> {
@@ -184,6 +186,19 @@ void templateLocationEmpty(CapturedOutput output) {
 	}
 
 	@Test
+	@WithResource(name = "templates/view.html",
+			content = """
+					<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
+					  <head>
+					    <title layout:fragment="title">Content</title>
+					  </head>
+					  <body>
+					    <div layout:fragment="content">
+					    	<span th:text="${foo}">foo</span>
+					    </div>
+					  </body>
+					</html>
+					""")
 	void createLayoutFromConfigClass() {
 		this.contextRunner.run((context) -> {
 			ThymeleafView view = (ThymeleafView) context.getBean(ThymeleafViewResolver.class)
@@ -200,6 +215,7 @@ void createLayoutFromConfigClass() {
 	}
 
 	@Test
+	@WithResource(name = "templates/data-dialect.html", content = "<html><body data:foo=\"${foo}\"></body></html>")
 	void useDataDialect() {
 		this.contextRunner.run((context) -> {
 			TemplateEngine engine = context.getBean(TemplateEngine.class);
@@ -210,6 +226,8 @@ void useDataDialect() {
 	}
 
 	@Test
+	@WithResource(name = "templates/java8time-dialect.html",
+			content = "<html><body th:text=\"${#temporals.create('2015','11','24')}\"></body></html>")
 	void useJava8TimeDialect() {
 		this.contextRunner.run((context) -> {
 			TemplateEngine engine = context.getBean(TemplateEngine.class);
@@ -220,6 +238,8 @@ void useJava8TimeDialect() {
 	}
 
 	@Test
+	@WithResource(name = "templates/security-dialect.html",
+			content = "<html><body><div sec:authentication=\"name\"></div></body></html>")
 	void useSecurityDialect() {
 		this.contextRunner.run((context) -> {
 			TemplateEngine engine = context.getBean(TemplateEngine.class);
@@ -231,7 +251,7 @@ void useSecurityDialect() {
 				SecurityContextHolder
 					.setContext(new SecurityContextImpl(new TestingAuthenticationToken("alice", "admin")));
 				String result = engine.process("security-dialect", attrs);
-				assertThat(result).isEqualTo("<html><body><div>alice</div></body></html>" + System.lineSeparator());
+				assertThat(result).isEqualTo("<html><body><div>alice</div></body></html>");
 			}
 			finally {
 				SecurityContextHolder.clearContext();
@@ -246,6 +266,7 @@ void securityDialectAutoConfigurationBacksOffWithoutSpringSecurity() {
 	}
 
 	@Test
+	@WithResource(name = "templates/home.html", content = "<html><body th:text=\"${foo}\">Home</body></html>")
 	void renderTemplate() {
 		this.contextRunner.run((context) -> {
 			TemplateEngine engine = context.getBean(TemplateEngine.class);
@@ -256,6 +277,8 @@ void renderTemplate() {
 	}
 
 	@Test
+	@WithResource(name = "templates/message.html",
+			content = "<html><body>Message: <span th:text=\"${greeting}\">Hello</span></body></html>")
 	void renderNonWebAppTemplate() {
 		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(ThymeleafAutoConfiguration.class))
 			.run((context) -> {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafTemplateAvailabilityProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafTemplateAvailabilityProviderTests.java
index 7861c74fc127..406dc9b104c5 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafTemplateAvailabilityProviderTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafTemplateAvailabilityProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.mock.env.MockEnvironment;
@@ -39,6 +40,7 @@ class ThymeleafTemplateAvailabilityProviderTests {
 	private final MockEnvironment environment = new MockEnvironment();
 
 	@Test
+	@WithResource(name = "templates/home.html")
 	void availabilityOfTemplateInDefaultLocation() {
 		assertThat(this.provider.isTemplateAvailable("home", this.environment, getClass().getClassLoader(),
 				this.resourceLoader))
@@ -53,6 +55,7 @@ void availabilityOfTemplateThatDoesNotExist() {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.html")
 	void availabilityOfTemplateWithCustomPrefix() {
 		this.environment.setProperty("spring.thymeleaf.prefix", "classpath:/custom-templates/");
 		assertThat(this.provider.isTemplateAvailable("custom", this.environment, getClass().getClassLoader(),
@@ -61,6 +64,7 @@ void availabilityOfTemplateWithCustomPrefix() {
 	}
 
 	@Test
+	@WithResource(name = "templates/suffixed.thymeleaf")
 	void availabilityOfTemplateWithCustomSuffix() {
 		this.environment.setProperty("spring.thymeleaf.suffix", ".thymeleaf");
 		assertThat(this.provider.isTemplateAvailable("suffixed", this.environment, getClass().getClassLoader(),
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
index 231df5b4c927..a7fa8a4dd642 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,9 +35,12 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 import reactor.netty.http.HttpDecoderSpec;
 
 import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.Accesslog;
+import org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat.UseApr;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
@@ -69,6 +72,7 @@
  * @author Chris Bono
  * @author Parviz Rozikov
  * @author Lasse Wulff
+ * @author Moritz Halbritter
  */
 @DirtiesUrlFactories
 class ServerPropertiesTests {
@@ -494,6 +498,18 @@ void nettyInitialBufferSizeMatchesHttpDecoderSpecDefault() {
 			.isEqualTo(HttpDecoderSpec.DEFAULT_INITIAL_BUFFER_SIZE);
 	}
 
+	@Test
+	@EnabledForJreRange(max = JRE.JAVA_23)
+	void shouldDefaultAprToWhenAvailableUntilJava23() {
+		assertThat(this.properties.getTomcat().getUseApr()).isEqualTo(UseApr.WHEN_AVAILABLE);
+	}
+
+	@Test
+	@EnabledForJreRange(min = JRE.JAVA_24)
+	void shouldDefaultAprToNeverOnJava24AndLater() {
+		assertThat(this.properties.getTomcat().getUseApr()).isEqualTo(UseApr.NEVER);
+	}
+
 	private Connector getDefaultConnector() {
 		return new Connector(TomcatServletWebServerFactory.DEFAULT_PROTOCOL);
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java
index 9c4f337bab6d..29cb54d08c5f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.boot.autoconfigure.web;
 
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
@@ -27,6 +26,7 @@
 import org.springframework.aot.hint.ResourcePatternHint;
 import org.springframework.aot.hint.ResourcePatternHints;
 import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,6 +35,7 @@
  *
  * @author Stephane Nicoll
  */
+@WithResource(name = "web/custom-resource.txt")
 class WebResourcesRuntimeHintsTests {
 
 	@Test
@@ -71,12 +72,12 @@ private Consumer<ResourcePatternHints> include(String... patterns) {
 		};
 	}
 
-	private static class TestClassLoader extends URLClassLoader {
+	private static class TestClassLoader extends ClassLoader {
 
 		private final List<String> availableResources;
 
 		TestClassLoader(List<String> availableResources) {
-			super(new URL[0], TestClassLoader.class.getClassLoader());
+			super(Thread.currentThread().getContextClassLoader());
 			this.availableResources = availableResources;
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/MockReactiveWebServerFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/MockReactiveWebServerFactory.java
deleted file mode 100644
index 706fac198b2b..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/MockReactiveWebServerFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2012-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure.web.reactive;
-
-import java.util.Map;
-
-import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactory;
-import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;
-import org.springframework.boot.web.server.WebServer;
-import org.springframework.http.server.reactive.HttpHandler;
-
-import static org.mockito.Mockito.spy;
-
-/**
- * Mock {@link ReactiveWebServerFactory}.
- *
- * @author Brian Clozel
- */
-public class MockReactiveWebServerFactory extends AbstractReactiveWebServerFactory {
-
-	private MockReactiveWebServer webServer;
-
-	@Override
-	public WebServer getWebServer(HttpHandler httpHandler) {
-		this.webServer = spy(new MockReactiveWebServer(httpHandler, getPort()));
-		return this.webServer;
-	}
-
-	public MockReactiveWebServer getWebServer() {
-		return this.webServer;
-	}
-
-	static class MockReactiveWebServer implements WebServer {
-
-		private final int port;
-
-		private HttpHandler httpHandler;
-
-		private Map<String, HttpHandler> httpHandlerMap;
-
-		MockReactiveWebServer(HttpHandler httpHandler, int port) {
-			this.httpHandler = httpHandler;
-			this.port = port;
-		}
-
-		MockReactiveWebServer(Map<String, HttpHandler> httpHandlerMap, int port) {
-			this.httpHandlerMap = httpHandlerMap;
-			this.port = port;
-		}
-
-		HttpHandler getHttpHandler() {
-			return this.httpHandler;
-		}
-
-		Map<String, HttpHandler> getHttpHandlerMap() {
-			return this.httpHandlerMap;
-		}
-
-		@Override
-		public void start() {
-
-		}
-
-		@Override
-		public void stop() {
-
-		}
-
-		@Override
-		public int getPort() {
-			return this.port;
-		}
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java
index 044c1bfff9f1..d10f6185a6e4 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
 import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext;
 import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
 import org.springframework.boot.web.reactive.server.ConfigurableReactiveWebServerFactory;
+import org.springframework.boot.web.reactive.server.MockReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.context.ApplicationContextException;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java
index 09f3c40478ac..ac9ed313b725 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,9 +57,11 @@
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.codec.CodecCustomizer;
 import org.springframework.boot.web.reactive.context.ReactiveWebApplicationContext;
 import org.springframework.boot.web.reactive.filter.OrderedHiddenHttpMethodFilter;
+import org.springframework.boot.web.reactive.server.MockReactiveWebServerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -530,6 +532,7 @@ void customPrinterAndParserShouldBeRegisteredAsConverters() {
 	}
 
 	@Test
+	@WithResource(name = "welcome-page/index.html", content = "welcome-page-static")
 	void welcomePageHandlerMapping() {
 		this.contextRunner.withPropertyValues("spring.web.resources.static-locations=classpath:/welcome-page/")
 			.run((context) -> {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WelcomePageRouterFunctionFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WelcomePageRouterFunctionFactoryTests.java
index 7a464da43e71..996956eede10 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WelcomePageRouterFunctionFactoryTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WelcomePageRouterFunctionFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider;
 import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProviders;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
@@ -46,6 +47,7 @@
  *
  * @author Brian Clozel
  */
+@WithResource(name = "welcome-page/index.html", content = "welcome-page-static")
 class WelcomePageRouterFunctionFactoryTests {
 
 	private StaticApplicationContext applicationContext;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
index 838055707b7b..01c1481f91ca 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,12 @@
 import java.util.Map;
 
 import jakarta.validation.Valid;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -39,6 +42,7 @@
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.error.ErrorAttributeOptions.Include;
 import org.springframework.boot.web.reactive.error.DefaultErrorAttributes;
@@ -88,6 +92,12 @@ class DefaultErrorWebExceptionHandlerIntegrationTests {
 		.withPropertyValues("spring.main.web-application-type=reactive", "server.port=0")
 		.withUserConfiguration(Application.class);
 
+	@BeforeEach
+	@AfterEach
+	void clearReactorSchedulers() {
+		Schedulers.shutdownNow();
+	}
+
 	@Test
 	void jsonError(CapturedOutput output) {
 		this.contextRunner.run((context) -> {
@@ -141,7 +151,18 @@ void notFound() {
 	}
 
 	@Test
+	@WithResource(name = "templates/error/error.mustache", content = """
+			<html>
+			<body>
+			<ul>
+				<li>status: {{status}}</li>
+				<li>message: {{message}}</li>
+			</ul>
+			</body>
+			</html>
+			""")
 	void htmlError() {
+		Schedulers.shutdownNow();
 		this.contextRunner.withPropertyValues("server.error.include-message=always").run((context) -> {
 			WebTestClient client = getWebClient(context);
 			String body = client.get()
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerTests.java
index 0d3683139470..51970676f01c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 
 import org.springframework.boot.autoconfigure.web.ErrorProperties;
 import org.springframework.boot.autoconfigure.web.WebProperties.Resources;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext;
 import org.springframework.boot.web.reactive.error.ErrorAttributes;
 import org.springframework.context.ApplicationContext;
@@ -52,6 +53,16 @@
 class DefaultErrorWebExceptionHandlerTests {
 
 	@Test
+	@WithResource(name = "templates/error/error.mustache", content = """
+			<html>
+			<body>
+			<ul>
+				<li>status: {{status}}</li>
+				<li>message: {{message}}</li>
+			</ul>
+			</body>
+			</html>
+			""")
 	void nonStandardErrorStatusCodeShouldNotFail() {
 		ErrorAttributes errorAttributes = mock(ErrorAttributes.class);
 		given(errorAttributes.getErrorAttributes(any(), any())).willReturn(Collections.singletonMap("status", 498));
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/AbstractClientHttpConnectorFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/AbstractClientHttpConnectorFactoryTests.java
index 5210a6102873..44f573b737b0 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/AbstractClientHttpConnectorFactoryTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/AbstractClientHttpConnectorFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import org.springframework.boot.ssl.SslBundleKey;
 import org.springframework.boot.ssl.jks.JksSslStoreBundle;
 import org.springframework.boot.ssl.jks.JksSslStoreDetails;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.Ssl;
 import org.springframework.boot.web.server.Ssl.ClientAuth;
@@ -62,6 +63,7 @@ void insecureConnection() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void secureConnection() throws Exception {
 		TomcatServletWebServerFactory webServerFactory = new TomcatServletWebServerFactory(0);
 		Ssl ssl = new Ssl();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorFactoryConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorFactoryConfigurationTests.java
index 5d7fd0fab66e..78b02ef97d9c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorFactoryConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorFactoryConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.boot.ssl.jks.JksSslStoreDetails;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.client.reactive.HttpComponentsClientHttpConnector;
 
@@ -42,6 +43,7 @@
 class ClientHttpConnectorFactoryConfigurationTests {
 
 	@Test
+	@WithPackageResources("test.jks")
 	void shouldApplyHttpClientMapper() {
 		JksSslStoreDetails storeDetails = JksSslStoreDetails.forLocation("classpath:test.jks");
 		JksSslStoreBundle stores = new JksSslStoreBundle(storeDetails, storeDetails);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java
index 3c3e1c3a6b28..9be535ab8201 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ class ConditionalOnMissingFilterBeanTests {
 
 	@Test
 	void outcomeWhenValueIsOfMissingBeanReturnsMatch() {
-
 		this.contextRunner.withUserConfiguration(WithoutTestFilterConfig.class, OnMissingWithValueConfig.class)
 			.run((context) -> assertThat(context).satisfies(filterBeanRequirement("myOtherFilter", "testFilter")));
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java
index 93d5f4f744d7..e567ba366005 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,12 @@
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.session.SessionAutoConfiguration;
 import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.boot.testsupport.web.servlet.MockServletWebServer.RegisteredFilter;
 import org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
 import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter;
 import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter;
+import org.springframework.boot.web.servlet.server.MockServletWebServer.RegisteredFilter;
+import org.springframework.boot.web.servlet.server.MockServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java
index cde862aba143..4cf0d35ca6cb 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
 import org.springframework.boot.web.servlet.filter.OrderedFormContentFilter;
 import org.springframework.boot.web.servlet.filter.OrderedHiddenHttpMethodFilter;
+import org.springframework.boot.web.servlet.server.MockServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/JspTemplateAvailabilityProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/JspTemplateAvailabilityProviderTests.java
index 01ea06f34de1..ccb3b7bca59a 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/JspTemplateAvailabilityProviderTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/JspTemplateAvailabilityProviderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.mock.env.MockEnvironment;
@@ -43,15 +44,16 @@ void availabilityOfTemplateThatDoesNotExist() {
 	}
 
 	@Test
+	@WithResource(name = "custom-templates/custom.jsp")
 	void availabilityOfTemplateWithCustomPrefix() {
 		this.environment.setProperty("spring.mvc.view.prefix", "classpath:/custom-templates/");
 		assertThat(isTemplateAvailable("custom.jsp")).isTrue();
 	}
 
 	@Test
+	@WithResource(name = "suffixed.java-server-pages")
 	void availabilityOfTemplateWithCustomSuffix() {
-		this.environment.setProperty("spring.mvc.view.prefix", "classpath:/custom-templates/");
-		this.environment.setProperty("spring.mvc.view.suffix", ".jsp");
+		this.environment.setProperty("spring.mvc.view.suffix", ".java-server-pages");
 		assertThat(isTemplateAvailable("suffixed")).isTrue();
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MockServletWebServerFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MockServletWebServerFactory.java
deleted file mode 100644
index 0726b960a37c..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MockServletWebServerFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2012-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.autoconfigure.web.servlet;
-
-import java.util.Arrays;
-
-import jakarta.servlet.ServletContext;
-
-import org.springframework.boot.testsupport.web.servlet.MockServletWebServer.RegisteredFilter;
-import org.springframework.boot.testsupport.web.servlet.MockServletWebServer.RegisteredServlet;
-import org.springframework.boot.web.server.WebServer;
-import org.springframework.boot.web.servlet.ServletContextInitializer;
-import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
-import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
-
-import static org.mockito.Mockito.spy;
-
-/**
- * Mock {@link ServletWebServerFactory}.
- *
- * @author Phillip Webb
- * @author Andy Wilkinson
- */
-public class MockServletWebServerFactory extends AbstractServletWebServerFactory {
-
-	private MockServletWebServer webServer;
-
-	@Override
-	public WebServer getWebServer(ServletContextInitializer... initializers) {
-		this.webServer = spy(new MockServletWebServer(mergeInitializers(initializers), getPort()));
-		return this.webServer;
-	}
-
-	public MockServletWebServer getWebServer() {
-		return this.webServer;
-	}
-
-	public ServletContext getServletContext() {
-		return (getWebServer() != null) ? getWebServer().getServletContext() : null;
-	}
-
-	public RegisteredServlet getRegisteredServlet(int index) {
-		return (getWebServer() != null) ? getWebServer().getRegisteredServlet(index) : null;
-	}
-
-	public RegisteredFilter getRegisteredFilter(int index) {
-		return (getWebServer() != null) ? getWebServer().getRegisteredFilters(index) : null;
-	}
-
-	static class MockServletWebServer extends org.springframework.boot.testsupport.web.servlet.MockServletWebServer
-			implements WebServer {
-
-		MockServletWebServer(ServletContextInitializer[] initializers, int port) {
-			super(Arrays.stream(initializers)
-				.map((initializer) -> (Initializer) initializer::onStartup)
-				.toArray(Initializer[]::new), port);
-		}
-
-		@Override
-		public void start() {
-		}
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java
index 689b15bcaf07..9bad1433a18d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java
@@ -47,6 +47,7 @@
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.CookieSameSiteSupplier;
+import org.springframework.boot.web.servlet.server.MockServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
index 474c049e3532..5a3acfa30443 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,12 +57,14 @@
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
 import org.springframework.boot.web.servlet.filter.OrderedFormContentFilter;
+import org.springframework.boot.web.servlet.server.MockServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -678,6 +680,7 @@ private ContextConsumer<AssertableWebApplicationContext> assertExceptionResolver
 	}
 
 	@Test
+	@WithResource(name = "welcome-page/index.html", content = "welcome-page-static")
 	void welcomePageHandlerMappingIsAutoConfigured() {
 		this.contextRunner.withPropertyValues("spring.web.resources.static-locations:classpath:/welcome-page/")
 			.run((context) -> {
@@ -688,6 +691,7 @@ void welcomePageHandlerMappingIsAutoConfigured() {
 	}
 
 	@Test
+	@WithResource(name = "welcome-page/index.html", content = "welcome-page-static")
 	void welcomePageHandlerIncludesCorsConfiguration() {
 		this.contextRunner.withPropertyValues("spring.web.resources.static-locations:classpath:/welcome-page/")
 			.withUserConfiguration(CorsConfigurer.class)
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java
index 52397e4e4e5f..8e9be182b5b2 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.autoconfigure.web.servlet;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Map;
 
@@ -39,7 +40,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -173,7 +174,7 @@ static class StaticResourceConfiguration {
 
 		@Bean
 		Resource staticIndexPage() {
-			return new FileSystemResource("src/test/resources/welcome-page/index.html");
+			return new ByteArrayResource("welcome-page-static".getBytes(StandardCharsets.UTF_8));
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageIntegrationTests.java
index 14fe3858386e..a34b15f8bed4 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WelcomePageIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,9 +41,10 @@
  *
  * @author Madhura Bhave
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		properties = { "spring.web.resources.chain.strategy.content.enabled=true",
-				"spring.thymeleaf.prefix=classpath:/templates/thymeleaf/" })
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
+		"spring.web.resources.chain.strategy.content.enabled=true",
+		"spring.thymeleaf.prefix=classpath:/org/springframework/boot/autoconfigure/web/servlet/",
+		"spring.web.resources.static-locations=classpath:/org/springframework/boot/autoconfigure/web/servlet/static" })
 class WelcomePageIntegrationTests {
 
 	@LocalServerPort
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java
index 909e5908703d..5baf1f67c345 100755
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
 import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.error.ErrorAttributeOptions.Include;
 import org.springframework.boot.web.servlet.error.ErrorAttributes;
@@ -326,6 +327,7 @@ void testBindingExceptionForMachineClientDefault() {
 	}
 
 	@Test
+	@WithResource(name = "templates/error/507.ftlh", content = "We are out of storage")
 	void testConventionTemplateMapping() {
 		load();
 		RequestEntity<?> request = RequestEntity.get(URI.create(createUrl("/noStorage")))
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java
index 89aed095a373..d00d451819ab 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,13 @@
 import java.util.Collection;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.ws.wsdl.wsdl11.SimpleWsdl11Definition;
@@ -87,17 +90,67 @@ void customInitParameters() {
 				.containsEntry("key2", "value2"));
 	}
 
-	@Test
-	void withWsdlBeans() {
-		this.contextRunner.withPropertyValues("spring.webservices.wsdl-locations=classpath:/wsdl").run((context) -> {
-			assertThat(context.getBeansOfType(SimpleWsdl11Definition.class)).containsOnlyKeys("service");
-			assertThat(context.getBeansOfType(SimpleXsdSchema.class)).containsOnlyKeys("types");
-		});
-	}
-
-	@Test
-	void withWsdlBeansAsList() {
-		this.contextRunner.withPropertyValues("spring.webservices.wsdl-locations[0]=classpath:/wsdl").run((context) -> {
+	@ParameterizedTest
+	@WithResource(name = "wsdl/service.wsdl", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<wsdl:definitions
+				xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+				xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+				xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
+				targetNamespace="https://www.springframework.org/spring-ws/wsdl">
+				<wsdl:types>
+					<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+						elementFormDefault="qualified"
+						targetNamespace="https://www.springframework.org/spring-ws/wsdl">
+						<xsd:element name="request" type="xsd:string" />
+						<xsd:element name="response" type="xsd:string" />
+					</xsd:schema>
+				</wsdl:types>
+				<wsdl:message name="responseMessage">
+					<wsdl:part name="body" element="tns:response" />
+				</wsdl:message>
+				<wsdl:message name="requestMessage">
+					<wsdl:part name="body" element="tns:request" />
+				</wsdl:message>
+				<wsdl:portType name="portType">
+					<wsdl:operation name="operation">
+						<wsdl:input message="tns:requestMessage" name="request" />
+						<wsdl:output message="tns:responseMessage"
+							name="response" />
+					</wsdl:operation>
+				</wsdl:portType>
+				<wsdl:binding name="binding" type="tns:portType">
+					<soap:binding style="document"
+						transport="http://schemas.xmlsoap.org/soap/http" />
+					<wsdl:operation name="operation">
+						<soap:operation soapAction="" />
+						<wsdl:input name="request">
+							<soap:body use="literal" />
+						</wsdl:input>
+						<wsdl:output name="response">
+							<soap:body use="literal" />
+						</wsdl:output>
+					</wsdl:operation>
+				</wsdl:binding>
+				<wsdl:service name="service">
+					<wsdl:port binding="tns:binding" name="port">
+						<soap:address location="/services" />
+					</wsdl:port>
+				</wsdl:service>
+			</wsdl:definitions>
+			""")
+	@WithResource(name = "wsdl/types.xsd", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<schema xmlns="http://www.w3.org/2001/XMLSchema"
+				elementFormDefault="qualified"
+				targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas">
+				<element name="request" type="string" />
+				<element name="response" type="string" />
+			</schema>
+			""")
+	@ValueSource(strings = { "spring.webservices.wsdl-locations", "spring.webservices.wsdl-locations[0]" })
+	void withWsdlBeans(String propertyName) {
+		this.contextRunner.withPropertyValues(propertyName + "=classpath:/wsdl").run((context) -> {
 			assertThat(context.getBeansOfType(SimpleWsdl11Definition.class)).containsOnlyKeys("service");
 			assertThat(context.getBeansOfType(SimpleXsdSchema.class)).containsOnlyKeys("types");
 		});
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/AutoConfigurationMetadataLoaderTests.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/AutoConfigurationMetadataLoaderTests.properties
deleted file mode 100644
index 2dc12708cec2..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/AutoConfigurationMetadataLoaderTests.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-test=
-test.string=abc
-test.int=123
-test.set=a,b,b,c
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/build-info.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/build-info.properties
deleted file mode 100644
index c0ad96bbba85..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/build-info.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-build.group=com.example
-build.artifact=demo
-build.name=Demo Project
-build.version=0.0.1-SNAPSHOT
-build.time=2016-03-04T14:16:05.000Z
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml
deleted file mode 100644
index 3b33b0dff381..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
-				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-				 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm https://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/orm_2_1.xsd"
-				 version="2.1">
-	<entity class="org.springframework.boot.autoconfigure.orm.jpa.mapping.NonAnnotatedEntity">
-		<table name="NON_ANNOTATED"/>
-		<attributes>
-			<id name="id">
-				<column name="id"/>
-				<generated-value strategy="IDENTITY"/>
-			</id>
-			<basic name="item">
-				<column name="item"/>
-			</basic>
-		</attributes>
-	</entity>
-</entity-mappings>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/persistence.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index 439d601d8fad..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-	<persistence-unit name="manually-configured">
-		<class>org.springframework.boot.autoconfigure.orm.jpa.test.City</class>
-		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-	</persistence-unit>
-</persistence>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring.integration.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring.integration.properties
deleted file mode 100644
index 2b2aca228b9e..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring.integration.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.integration.endpoints.noAutoStartup=testService*
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.imports b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.imports
deleted file mode 100644
index 3d625bcf4103..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.imports
+++ /dev/null
@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$AfterDeprecatedAutoConfiguration
-org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$ReplacementAutoConfiguration
-
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.replacements b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.replacements
deleted file mode 100644
index b63c6b88df3c..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.replacements
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$DeprecatedAutoConfiguration=\
-org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$ReplacementAutoConfiguration
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationReplacementsTests$TestAutoConfigurationReplacements.replacements b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationReplacementsTests$TestAutoConfigurationReplacements.replacements
deleted file mode 100644
index 9924a4a0c109..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationReplacementsTests$TestAutoConfigurationReplacements.replacements
+++ /dev/null
@@ -1,2 +0,0 @@
-com.example.A1=com.example.A2
-com.example.B1=com.example.B2
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports
deleted file mode 100644
index 42102d02a8fc..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration
-org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFileIgnoresMissingOptionalClasses.imports b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFileIgnoresMissingOptionalClasses.imports
deleted file mode 100644
index b16393474237..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFileIgnoresMissingOptionalClasses.imports
+++ /dev/null
@@ -1,3 +0,0 @@
-optional:org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration
-optional:org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration
-org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application-switch-messages.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application-switch-messages.properties
deleted file mode 100644
index f771bfbfbaa8..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application-switch-messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.messages.basename:test/messages
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application.properties
deleted file mode 100644
index a8d63792d0b4..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo: bucket
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/cache/ehcache-override.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/cache/ehcache-override.xml
deleted file mode 100644
index e902bdeba15f..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/cache/ehcache-override.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ehcache>
-	<cache name="cacheOverrideTest1"
-	       maxBytesLocalHeap="50m"
-	       timeToLiveSeconds="100">
-	</cache>
-	<cache name="cacheOverrideTest2"
-	       maxBytesLocalHeap="50m"
-	       timeToLiveSeconds="100">
-	</cache>
-</ehcache>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql
deleted file mode 100644
index eb08623b4cf0..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema-sample.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema-sample.ldif
deleted file mode 100644
index 91159a86b0f7..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema-sample.ldif
+++ /dev/null
@@ -1,7 +0,0 @@
-dn: dc=spring,dc=org
-objectclass: top
-objectclass: domain
-objectclass: extensibleObject
-objectClass: exampleAuxiliaryClass
-dc: spring
-exampleAttributeName: exampleAttributeName
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
deleted file mode 100644
index ca6a82170d19..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
+++ /dev/null
@@ -1,17 +0,0 @@
-dn: cn=schema
-attributeTypes: ( 1.3.6.1.4.1.32473.1.1.1
-  NAME 'exampleAttributeName'
-  DESC 'An example attribute type definition'
-  EQUALITY caseIgnoreMatch
-  ORDERING caseIgnoreOrderingMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE
-  X-ORIGIN 'Managing Schema Document' )
-objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
-  NAME 'exampleAuxiliaryClass'
-  DESC 'An example auxiliary object class definition'
-  SUP top
-  AUXILIARY
-  MAY exampleAttributeName
-  X-ORIGIN 'Managing Schema Document' )
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftlh b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftlh
deleted file mode 100644
index 0d82d79c85dd..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftlh
+++ /dev/null
@@ -1 +0,0 @@
-custom
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
deleted file mode 100644
index 8b137891791f..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl
deleted file mode 100644
index cd07d3d3c647..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl
+++ /dev/null
@@ -1 +0,0 @@
-yield "custom"
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm
deleted file mode 100644
index 0d82d79c85dd..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm
+++ /dev/null
@@ -1 +0,0 @@
-custom
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/suffixed.jsp b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/suffixed.jsp
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data-city-schema.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data-city-schema.sql
deleted file mode 100644
index b2a4112add91..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data-city-schema.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE CITY (
-  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-  name VARCHAR(30),
-  state  VARCHAR(30),
-  country  VARCHAR(30),
-  map  VARCHAR(30)
-);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql
deleted file mode 100644
index 487614d44091..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO BAR VALUES (1, 'Andy');
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-city.yaml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-city.yaml
deleted file mode 100644
index c46dc1dacbf0..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-city.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-databaseChangeLog:
-  - changeSet:
-      id: 1
-      author: dsyer
-      changes:
-        - createSequence:
-            sequenceName: city_seq
-            incrementBy: 50
-        - createTable:
-            tableName: city
-            columns:
-              - column:
-                  name: id
-                  type: bigint
-                  autoIncrement: true
-                  constraints:
-                    primaryKey: true
-                    nullable: false
-              - column:
-                  name: name
-                  type: varchar(50)
-                  constraints:
-                    nullable: false
-              - column:
-                  name: state
-                  type: varchar(50)
-                  constraints:
-                    nullable: false
-              - column:
-                  name: country
-                  type: varchar(50)
-                  constraints:
-                    nullable: false
-              - column:
-                  name: map
-                  type: varchar(50)
-                  constraints:
-                    nullable: true
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-master.yaml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-master.yaml
deleted file mode 100644
index 134b17b543e9..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-master.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-databaseChangeLog:
-  - changeSet:
-      id: 1
-      author: marceloverdijk
-      changes:
-        - createTable:
-            tableName: customer
-            columns:
-              - column:
-                  name: id
-                  type: int
-                  autoIncrement: true
-                  constraints:
-                    primaryKey: true
-                    nullable: false
-              - column:
-                  name: name
-                  type: varchar(50)
-                  constraints:
-                    nullable: false
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.json b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.json
deleted file mode 100644
index acaa0e211840..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "databaseChangeLog": [
-        {
-            "changeSet": {
-                "author": "awilkinson",
-                "id": "1",
-                "changes": [
-                    {
-                        "createTable": {
-                            "tableName": "customer",
-                            "columns": [
-                                {
-                                    "column": {
-                                       "name": "id",
-                                        "type": "int",
-                                        "autoIncrement": true,
-                                        "constraints": {
-                                            "nullable": false,
-                                            "primaryKey": true
-                                        }
-                                    }
-                                },
-                                {
-                                    "column": {
-                                       "name": "name",
-                                        "type": "varchar(50)",
-                                        "constraints": {
-                                            "nullable": false
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    ]
-}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql
deleted file mode 100644
index cd68b45850ae..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.sql
+++ /dev/null
@@ -1,8 +0,0 @@
---liquibase formatted sql
-
---changeset author:awilkinson
-
-CREATE TABLE customer (
-    id int AUTO_INCREMENT NOT NULL PRIMARY KEY,
-    name varchar(50) NOT NULL
-);
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.xml
deleted file mode 100644
index 77c318e58232..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/changelog/db.changelog-override.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<databaseChangeLog
-        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
-        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd
-        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
-
-    <changeSet id="1" author="marceloverdijk">
-        <createTable tableName="customer">
-            <column name="id" type="int" autoIncrement="true">
-                <constraints primaryKey="true" nullable="false"/>
-            </column>
-            <column name="name" type="varchar(50)">
-                <constraints nullable="false"/>
-            </column>
-        </createTable>
-    </changeSet>
-
-</databaseChangeLog>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/city/V1__init.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/city/V1__init.sql
deleted file mode 100644
index 571f6fa46ebf..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/city/V1__init.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE SEQUENCE city_seq INCREMENT BY 50;
-
-CREATE TABLE CITY (
-  id         BIGINT GENERATED BY DEFAULT AS IDENTITY,
-  name VARCHAR(30),
-  state VARCHAR(30),
-  country VARCHAR(30),
-  map VARCHAR(30)
-);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql
deleted file mode 100644
index 867c7c24f526..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS TEST;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql
deleted file mode 100644
index b741d23ccf82..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO NON_ANNOTATED (id, item) values (2000, 'Test');
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql
deleted file mode 100644
index 867c7c24f526..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS TEST;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml
deleted file mode 100644
index 2ef5e73d1208..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/early-init-test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="earlyInit" class="org.springframework.boot.autoconfigure.EarlyInitFactoryBean" >
-		<property name="propertyFromConfig" value="${foo}" />
-	</bean>
-
-</beans>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache.xml
deleted file mode 100644
index f3653ed78912..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ehcache>
-
-	<cache name="cacheTest1" maxBytesLocalHeap="50m" timeToLiveSeconds="100">
-	</cache>
-
-	<cache name="cacheTest2" maxBytesLocalHeap="50m" timeToLiveSeconds="100">
-	</cache>
-
-</ehcache>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
deleted file mode 100644
index 5f048f21863e..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<config
-		xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-		xmlns='http://www.ehcache.org/v3'
-		xmlns:jsr107='http://www.ehcache.org/v3/jsr107'
-		xsi:schemaLocation="
-        http://www.ehcache.org/v3 https://www.ehcache.org/schema/ehcache-core-3.10.xsd
-        http://www.ehcache.org/v3/jsr107 https://www.ehcache.org/schema/ehcache-107-ext-3.10.xsd">
-
-	<cache-template name="example">
-		<heap unit="entries">200</heap>
-	</cache-template>
-
-	<cache alias="foo" uses-template="example">
-		<expiry>
-			<ttl unit="seconds">600</ttl>
-		</expiry>
-		<jsr107:mbeans enable-statistics="true"/>
-	</cache>
-
-	<cache alias="bar" uses-template="example">
-		<expiry>
-			<ttl unit="seconds">400</ttl>
-		</expiry>
-	</cache>
-
-</config>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/schema.graphqls b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/schema.graphqls
deleted file mode 100644
index dc80e899dd85..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/schema.graphqls
+++ /dev/null
@@ -1,9 +0,0 @@
-type Query {
-    greeting(name: String! = "Spring"): String!
-    bookById(id: ID): Book
-    books: BookConnection
-}
-
-type Subscription {
-    booksOnSale(minPages: Int) : Book!
-}
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/types/book.graphqls b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/types/book.graphqls
deleted file mode 100644
index 16217d759b11..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/types/book.graphqls
+++ /dev/null
@@ -1,6 +0,0 @@
-type Book {
-    id: ID
-    name: String
-    pageCount: Int
-    author: String
-}
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/types/person.custom b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/types/person.custom
deleted file mode 100644
index 8cff728ad180..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/graphql/types/person.custom
+++ /dev/null
@@ -1,4 +0,0 @@
-type Person {
-    id: ID
-    name: String
-}
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
deleted file mode 100644
index cd6993911850..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<hazelcast
-	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
-	xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<instance-name>default-instance</instance-name>
-	<map name="defaultCache" />
-	<network>
-		<join>
-			<auto-detection enabled="false" />
-			<multicast enabled="false" />
-		</join>
-	</network>
-</hazelcast>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml
deleted file mode 100644
index 686d75638a9c..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-hazelcast:
-  network:
-    join:
-      auto-detection:
-        enabled: false
-      multicast:
-        enabled: false
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yml
deleted file mode 100644
index 686d75638a9c..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-hazelcast:
-  network:
-    join:
-      auto-detection:
-        enabled: false
-      multicast:
-        enabled: false
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/infinispan.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/infinispan.xml
deleted file mode 100644
index 55f7b2ec2df1..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/infinispan.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<infinispan>
-
-	<!-- ************************************** -->
-	<!-- Corresponds to @Cacheable("cache-name") -->
-	<!-- ************************************** -->
-	<cache-container default-cache="default">
-		<local-cache name="default"/>
-		<local-cache name="foo"/>
-		<local-cache name="bar" />
-	</cache-container>
-
-</infinispan>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ksLoc b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ksLoc
deleted file mode 100644
index 696f2109e662..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ksLoc
+++ /dev/null
@@ -1 +0,0 @@
-Test file for Kafka.
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ksLocP b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ksLocP
deleted file mode 100644
index 696f2109e662..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ksLocP
+++ /dev/null
@@ -1 +0,0 @@
-Test file for Kafka.
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/logging.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/logging.properties
deleted file mode 100644
index b69c75b0382a..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/logging.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Enable this by setting -Djava.util.logging.config.file=src/test/resources/logging.properties
-handlers = java.util.logging.ConsoleHandler
-.level = INFO
-java.util.logging.ConsoleHandler.level = FINE
-org.springframework.security.level = ALL
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/batch/custom-schema.sql
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/batch/custom-schema.sql
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/batch/custom-schema.sql
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/rsocket/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cassandra/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/rsocket/test.jks
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cassandra/test.jks
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/key.crt b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/key.crt
new file mode 100644
index 000000000000..127882627896
--- /dev/null
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/key.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDJjCCAhECFFjLlXVdTxDdLlCifzrA0dTHHJ2mMA0GCSqGSIb3DQEBCwUAME8x
+CzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl
+ZmF1bHQgQ29tcGFueSBMdGQxCzAJBgNVBAMMAkNBMCAXDTIzMTAwNTA3Mjg1MFoY
+DzIxMjMwOTExMDcyODUwWjBRMQswCQYDVQQGEwJYWDEVMBMGA1UEBwwMRGVmYXVs
+dCBDaXR5MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBhbnkgTHRkMQ0wCwYDVQQDDARr
+ZXkyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAspCMUdFGyKkgpMbW
++UwSg4fdKM4qLSH7voTdsdVM9aAvLvYjBQ4gpORxDZNfUz67R0Ua0/oJt9jD49Wp
+qcq+tDOnp0dPtn2hFluV5PxM6d+MCSx/frPsfvyt9234okLL1zdLDNFYEbLhSPjA
+ku3vHw/OwlJOxCRwTkPqcElIV4+IvIbzAgSffyokzm/wKVKEhoT6NcfeU+6wCkTu
+al1X8loJ+27N6jN13oGZfH7EveBqgR8rPs55+54S/OcVG/uqL9ggOGRJiIZ3jUBk
+m5cN27wKkaNg/CQwa1UjcU4qshVpknHw1dpgJ2Gbs/yUphwpEZl/FTsZFcK1KCHD
+rOp3PQIDAQABMA0GCSqGSIb3DQEBCwUAA4H/AAFmEq86broBFxs0cpImaM884PBT
+bvJBSsFhsOg6mi4Gt01G/lPSj/ExNtH3G5bytCYAPaRxNx/dCs7uON3p86ta4zL8
+2PxgyhX1oY/GG63ETwn5s3GKpRaGTNVDWvPIM9RX6+bvX/wOg8eYXVaQlG5XYadC
+Ms9lWqHaM1C/iLGNmUTGcdbvhnmQDky2CwPNm+lXogSWbrsGpAmCkXJD1H+0Mx8I
+wjDVtGLBwr/8oXI8WbhvISMnS9+dd7+GLm6mU+14Kswi5I7EmBmREvkswi2IVJ6M
+GL7EY3qA6iqJWqsseYyLxiMr3nBT0SETphzoDanUQI1/jXQPrWIyjqvs
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/key.pem b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/key.pem
new file mode 100644
index 000000000000..9e21a1c3f421
--- /dev/null
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCykIxR0UbIqSCk
+xtb5TBKDh90oziotIfu+hN2x1Uz1oC8u9iMFDiCk5HENk19TPrtHRRrT+gm32MPj
+1ampyr60M6enR0+2faEWW5Xk/Ezp34wJLH9+s+x+/K33bfiiQsvXN0sM0VgRsuFI
++MCS7e8fD87CUk7EJHBOQ+pwSUhXj4i8hvMCBJ9/KiTOb/ApUoSGhPo1x95T7rAK
+RO5qXVfyWgn7bs3qM3XegZl8fsS94GqBHys+znn7nhL85xUb+6ov2CA4ZEmIhneN
+QGSblw3bvAqRo2D8JDBrVSNxTiqyFWmScfDV2mAnYZuz/JSmHCkRmX8VOxkVwrUo
+IcOs6nc9AgMBAAECggEAPN9dDolG1aIeYD3uzCa8Sv2WjdIWe7NRlEXMI9MgvL1i
+SGKdVpxV0ZCU37llLkY85tNujWP4SyXIxdMxVxIoR9syJKsBSCd0sl//bgP6nmHY
+Zco3HnTswu+VyLtDHuGhhtkxKwn0uXffKBaw44XcVhz38bPIaUI4zN2HPscks8BG
+j2MEl0N8P/TVrTkhgdjfoRi73VAisrEe+1wCg74BT7cmR8fEr7iNFrv955sdPGdw
+UTmx8U26++wbeYQs1ZE1713SYnRQuCUFs5GGjzOhNFi27zuhI6TafoVm9PO4j+ZC
+JUKTyUTBUsRMvm9z1IoHdjM8yInAv2g0J1bAeCTY+wKBgQDuMNMbNVoiXRKsSUry
+22T3W6HVLfLNKiYMNxsAkJjOiyyJcC+yg9BErn/haIHSafD2WmuWbW5ASViyl6fn
+D8qMluTwEaSrTgHXWI4ahWyapDShDQYp1s4dB75Aa/LVcFCay54YEtyCPzCPlj1K
+jz5OBV14NEVVA2cf59fIc/LXCwKBgQC/6m3TefUp5jnN/QUOx2OtZo8Y1pVrsuMB
+AuTtb21Khxn/86ZpVzySzg79/DkSNf9/sZhzj0IkviWNP5S8iAAaFC1q08CYhdCX
+d7tVnHlzpZmmoHUhG6dlJZayr1duZrURp2rP18+wIsKiFRImAyjc6yswVRpZgAiG
+gOkHCB231wKBgGlwXZMWy/6YOtLfYvkcm5ZQDtSCkY+2j78qiZ53Y91SiHWSntqk
+NQaiRGOw0n8lfJBhOG0PphV5InV0YtQLDnurtE59UOqwDmqYfddJpujRtaZxUIAm
+4XjCW7rCzm0jWdscNbCscMaLWGDHffxKaqc5AsZaRTK73eOmysOmaCI/AoGAf/yd
+RZ1dzJWHE0Kb7uE2LlvpLo1clLh1/ySo+1eGMV+sDS+2WSYedWEKSoO8o9JzE/ui
+Sd7OI6bTcEFotdqVBs9SAp45IP6Mv5bPziZOMLvNnnv/4RaKKkBJId0hl7TTKHTY
+HMg176ce2eznb4ZH6BzFbrQyoGFsThcGUPQurX0CgYBYtkDTp21TI1nuak7xpMIY
+BJQpqF5ahBf/+QYWtL0f3ca9MO2++zv5/XXitvt48cY1bCHNrVvSHgRzwSrOorZA
+5u7a5zyvfXjY3LY3k0VHddaVjU0mHsjx/1ux0wO2v8wQjOVZpT7XweB3WlUEGV7C
+5T/p+rmGg5Y5dTKUVCyvbQ==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/keystore.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/keystore.jks
new file mode 100644
index 000000000000..4e5e1399aee4
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/keystore.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/test.jks
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/couchbase/test.jks
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/data/redis/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/data/redis/test.jks
new file mode 100644
index 000000000000..0fc3e802f754
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/data/redis/test.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/elasticsearch/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/elasticsearch/test.jks
new file mode 100644
index 000000000000..0fc3e802f754
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/elasticsearch/test.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mail/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mail/test.jks
new file mode 100644
index 000000000000..0fc3e802f754
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mail/test.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mongo/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mongo/test.jks
new file mode 100644
index 000000000000..0fc3e802f754
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mongo/test.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/content.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/content.html
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/content.html
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/content.html
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/foo.html
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/foo.html
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/foo_de.html
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/foo_de.html
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/home.html
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/home.html
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/layout.html
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/layout.html
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/partial.html
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/mustache/partial.html
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/rsocket/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/rsocket/test.jks
new file mode 100644
index 000000000000..0fc3e802f754
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/rsocket/test.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/certificate-location b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/certificate-location
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/certificate-location
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/certificate-location
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/idp-metadata b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/idp-metadata
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/idp-metadata
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/idp-metadata
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/idp-metadata-with-multiple-providers b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/idp-metadata-with-multiple-providers
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/idp-metadata-with-multiple-providers
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/idp-metadata-with-multiple-providers
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/private-key-location b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/private-key-location
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/saml/private-key-location
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/security/saml2/private-key-location
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/session/custom-schema-h2.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/session/custom-schema-h2.sql
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/session/custom-schema-h2.sql
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/session/custom-schema-h2.sql
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/ssl/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/ssl/test.jks
new file mode 100644
index 000000000000..0fc3e802f754
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/ssl/test.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/function/client/test.jks b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/function/client/test.jks
new file mode 100644
index 000000000000..0fc3e802f754
Binary files /dev/null and b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/function/client/test.jks differ
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/thymeleaf/index.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/servlet/index.html
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/thymeleaf/index.html
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/servlet/index.html
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.jsp b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/servlet/static/custom.css
old mode 100755
new mode 100644
similarity index 100%
rename from spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.jsp
rename to spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/servlet/static/custom.css
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public-key-location b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public-key-location
deleted file mode 100644
index c6bbd08e3a50..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public-key-location
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd
-UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs
-HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D
-o2kQ+X5xK9cipRgEKwIDAQAB
------END PUBLIC KEY-----
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public/custom.css b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public/custom.css
deleted file mode 100644
index 139597f9cb07..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/public/custom.css
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif
deleted file mode 100644
index 42380080c93f..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema-multi-basedn.ldif
+++ /dev/null
@@ -1,114 +0,0 @@
-dn: dc=spring,dc=org
-objectclass: top
-objectclass: domain
-objectclass: extensibleObject
-dc: spring
-
-dn: ou=groups,dc=spring,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: groups
-
-dn: cn=ROLE_USER,ou=groups,dc=spring,dc=org
-objectclass: top
-objectclass: groupOfUniqueNames
-cn: ROLE_USER
-uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
-uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
-uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
-uniqueMember: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
-
-dn: cn=ROLE_ADMIN,ou=groups,dc=spring,dc=org
-objectclass: top
-objectclass: groupOfUniqueNames
-cn: ROLE_ADMIN
-uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
-
-dn: c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: country
-c: Sweden
-description: The country of Sweden
-
-dn: ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: company1
-description: First company in Sweden
-
-dn: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person
-userPassword: password
-cn: Some Person
-sn: Person
-description: Sweden, Company1, Some Person
-telephoneNumber: +46 555-123456
-
-dn: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person2
-userPassword: password
-cn: Some Person2
-sn: Person2
-description: Sweden, Company1, Some Person2
-telephoneNumber: +46 555-654321
-
-dn: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person3
-userPassword: password
-cn: Some Person3
-sn: Person3
-description: Sweden, Company1, Some Person3
-telephoneNumber: +46 555-123654
-
-dn: cn=Some Person4,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person4
-userPassword: password
-cn: Some Person
-sn: Person
-description: Sweden, Company1, Some Person
-telephoneNumber: +46 555-456321
-
-dn: dc=vmware,dc=com
-objectclass: top
-objectclass: domain
-objectclass: extensibleObject
-dc: vmware
-
-dn: ou=groups,dc=vmware,dc=com
-objectclass: top
-objectclass: organizationalUnit
-ou: groups
-
-dn: c=Sweden,dc=vmware,dc=com
-objectclass: top
-objectclass: country
-c: Sweden
-description:The country of Sweden
-
-dn: cn=Some Random Person,c=Sweden,dc=vmware,dc=com
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.random.person
-userPassword: password
-cn: Some Random Person
-sn: Person
-description: Sweden, VMware, Some Random Person
-telephoneNumber: +46 555-123456
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.ldif
deleted file mode 100644
index df76aace51f9..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.ldif
+++ /dev/null
@@ -1,85 +0,0 @@
-dn: dc=spring,dc=org
-objectclass: top
-objectclass: domain
-objectclass: extensibleObject
-dc: spring
-
-dn: ou=groups,dc=spring,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: groups
-
-dn: cn=ROLE_USER,ou=groups,dc=spring,dc=org
-objectclass: top
-objectclass: groupOfUniqueNames
-cn: ROLE_USER
-uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
-uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
-uniqueMember: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
-uniqueMember: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
-
-dn: cn=ROLE_ADMIN,ou=groups,dc=spring,dc=org
-objectclass: top
-objectclass: groupOfUniqueNames
-cn: ROLE_ADMIN
-uniqueMember: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
-
-dn: c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: country
-c: Sweden
-description: The country of Sweden
-
-dn: ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: organizationalUnit
-ou: company1
-description: First company in Sweden
-
-dn: cn=Some Person,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person
-userPassword: password
-cn: Some Person
-sn: Person
-description: Sweden, Company1, Some Person
-telephoneNumber: +46 555-123456
-
-dn: cn=Some Person2,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person2
-userPassword: password
-cn: Some Person2
-sn: Person2
-description: Sweden, Company1, Some Person2
-telephoneNumber: +46 555-654321
-
-dn: cn=Some Person3,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person3
-userPassword: password
-cn: Some Person3
-sn: Person3
-description: Sweden, Company1, Some Person3
-telephoneNumber: +46 555-123654
-
-dn: cn=Some Person4,ou=company1,c=Sweden,dc=spring,dc=org
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-uid: some.person4
-userPassword: password
-cn: Some Person
-sn: Person
-description: Sweden, Company1, Some Person
-telephoneNumber: +46 555-456321
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql
deleted file mode 100644
index 7f7a6f01a578..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE BAR (
-  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-  name VARCHAR(30)
-);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/switch-messages.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/switch-messages.properties
deleted file mode 100644
index f771bfbfbaa8..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/switch-messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.messages.basename:test/messages
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
deleted file mode 100644
index f1a6716764af..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body data:foo="${foo}"></body></html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/507.ftlh b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/507.ftlh
deleted file mode 100644
index a562b8fe9cf0..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/507.ftlh
+++ /dev/null
@@ -1 +0,0 @@
-We are out of storage
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache
deleted file mode 100644
index c29c825d826b..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<body>
-<ul>
-	<li>status: {{status}}</li>
-	<li>message: {{message}}</li>
-</ul>
-</body>
-</html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftlh b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftlh
deleted file mode 100644
index 5e72f75cb401..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftlh
+++ /dev/null
@@ -1 +0,0 @@
-home
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html
deleted file mode 100644
index d8a1185cc019..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body th:text="${foo}">Home</body></html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.tpl
deleted file mode 100644
index eb07ff6f939d..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.tpl
+++ /dev/null
@@ -1 +0,0 @@
-yield "home"
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm
deleted file mode 100644
index 5e72f75cb401..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm
+++ /dev/null
@@ -1 +0,0 @@
-home
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/included.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/included.tpl
deleted file mode 100644
index a1bbaa02e9a0..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/included.tpl
+++ /dev/null
@@ -1 +0,0 @@
-yield "here"
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/included_fr.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/included_fr.tpl
deleted file mode 100644
index 035e2e957592..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/included_fr.tpl
+++ /dev/null
@@ -1 +0,0 @@
-yield "voila"
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/includes.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/includes.tpl
deleted file mode 100644
index 9ea4039123d6..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/includes.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-yield "include"
-include template: "included.tpl"
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
deleted file mode 100644
index 2c2bce877b22..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html
deleted file mode 100644
index 57add3758e62..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect">
-  <head>
-    <title layout:fragment="title">Layout</title>
-  </head>
-  <body>
-    <div class="container">
-      <h1 layout:fragment="title">Layout</h1>
-      <div layout:fragment="content">
-        Fake content
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftlh b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftlh
deleted file mode 100644
index b3992342b271..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftlh
+++ /dev/null
@@ -1 +0,0 @@
-Message: ${greeting}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html
deleted file mode 100644
index ba236128ec27..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.tpl
deleted file mode 100644
index 6a9df3b50d1b..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.tpl
+++ /dev/null
@@ -1 +0,0 @@
-yield "Message: ${greeting}"
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm
deleted file mode 100644
index b3992342b271..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm
+++ /dev/null
@@ -1 +0,0 @@
-Message: ${greeting}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftlh b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftlh
deleted file mode 100644
index 278ed4033303..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftlh
+++ /dev/null
@@ -1 +0,0 @@
-prefixed
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl
deleted file mode 100644
index 05426ef6995a..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl
+++ /dev/null
@@ -1 +0,0 @@
-yield "prefixed"
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm
deleted file mode 100644
index 278ed4033303..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm
+++ /dev/null
@@ -1 +0,0 @@
-prefixed
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/security-dialect.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/security-dialect.html
deleted file mode 100644
index a22a79e60732..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/security-dialect.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body><div sec:authentication="name"></div></body></html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker
deleted file mode 100644
index cfe8d439ab10..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker
+++ /dev/null
@@ -1 +0,0 @@
-suffixed
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.groovytemplate b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.groovytemplate
deleted file mode 100644
index 3539f6d6f4aa..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.groovytemplate
+++ /dev/null
@@ -1,3 +0,0 @@
-yield """
-suffixed
-"""
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.thymeleaf b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.thymeleaf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html
deleted file mode 100644
index 123f6966f701..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html
+++ /dev/null
@@ -1 +0,0 @@
-<html th:text="${foo}">foo</html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html
deleted file mode 100644
index 4ff0e1335246..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
-  <head>
-    <title layout:fragment="title">Content</title>
-  </head>
-  <body>
-    <div layout:fragment="content">
-    	<span th:text="${foo}">foo</span>
-    </div>
-  </body>
-</html>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/common-messages.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/common-messages.properties
deleted file mode 100644
index 432ea479457a..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/common-messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-hello=world
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/messages.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/messages.properties
deleted file mode 100644
index 74d0a43fccfe..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo=bar
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/messages2.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/messages2.properties
deleted file mode 100644
index 46858857b995..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/messages2.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo-foo=bar-bar
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/swedish.properties b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/swedish.properties
deleted file mode 100644
index 9a876aade961..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/test/swedish.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo=Some text with some swedish öäå!
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/tsLoc b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/tsLoc
deleted file mode 100644
index 696f2109e662..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/tsLoc
+++ /dev/null
@@ -1 +0,0 @@
-Test file for Kafka.
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/tsLocP b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/tsLocP
deleted file mode 100644
index 696f2109e662..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/tsLocP
+++ /dev/null
@@ -1 +0,0 @@
-Test file for Kafka.
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/web/custom-resource.txt b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/web/custom-resource.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
deleted file mode 100644
index 10babc651190..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
+++ /dev/null
@@ -1 +0,0 @@
-welcome-page-static
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
deleted file mode 100644
index ec828428aced..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
-	targetNamespace="https://www.springframework.org/spring-ws/wsdl">
-	<wsdl:types>
-		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified"
-			targetNamespace="https://www.springframework.org/spring-ws/wsdl">
-			<xsd:element name="request" type="xsd:string" />
-			<xsd:element name="response" type="xsd:string" />
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="responseMessage">
-		<wsdl:part name="body" element="tns:response" />
-	</wsdl:message>
-	<wsdl:message name="requestMessage">
-		<wsdl:part name="body" element="tns:request" />
-	</wsdl:message>
-	<wsdl:portType name="portType">
-		<wsdl:operation name="operation">
-			<wsdl:input message="tns:requestMessage" name="request" />
-			<wsdl:output message="tns:responseMessage"
-				name="response" />
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="binding" type="tns:portType">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="operation">
-			<soap:operation soapAction="" />
-			<wsdl:input name="request">
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output name="response">
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="service">
-		<wsdl:port binding="tns:binding" name="port">
-			<soap:address location="/services" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd
deleted file mode 100644
index dc559d26b73a..000000000000
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified"
-	targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas">
-	<element name="request" type="string" />
-	<element name="response" type="string" />
-</schema>
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 3398fa2fd455..4e81187d0a97 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -13,7 +13,7 @@ bom {
 			issueLabels = ["type: dependency-upgrade"]
 		}
 	}
-	library("ActiveMQ", "6.1.5") {
+	library("ActiveMQ", "6.1.6") {
 		group("org.apache.activemq") {
 			modules = [
 					"activemq-console" {
@@ -65,7 +65,7 @@ bom {
 			releaseNotes("https://activemq.apache.org/components/artemis/download/release-notes-{version}")
 		}
 	}
-	library("AspectJ", "1.9.22.1") {
+	library("AspectJ", "1.9.23") {
 		group("org.aspectj") {
 			modules = [
 				"aspectjrt",
@@ -455,7 +455,7 @@ bom {
 			releaseNotes("https://github.com/graphql-java/graphql-java/releases/tag/v{version}")
 		}
 	}
-	library("Groovy", "4.0.25") {
+	library("Groovy", "4.0.26") {
 		group("org.apache.groovy") {
 			imports = [
 				"groovy-bom"
@@ -514,7 +514,7 @@ bom {
 			releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}")
 		}
 	}
-	library("Hibernate", "6.6.8.Final") {
+	library("Hibernate", "6.6.11.Final") {
 		group("org.hibernate.orm") {
 			modules = [
 				"hibernate-agroal",
@@ -624,7 +624,7 @@ bom {
 			]
 		}
 	}
-	library("Infinispan", "15.0.13.Final") {
+	library("Infinispan", "15.0.14.Final") {
 		group("org.infinispan") {
 			imports = [
 				"infinispan-bom"
@@ -980,14 +980,14 @@ bom {
 			releaseNotes("https://github.com/eclipse-ee4j/jersey/releases/tag/{version}")
 		}
 	}
-	library("Jetty Reactive HTTPClient", "4.0.8") {
+	library("Jetty Reactive HTTPClient", "4.0.9") {
 		group("org.eclipse.jetty") {
 			modules = [
 				"jetty-reactive-httpclient"
 			]
 		}
 	}
-	library("Jetty", "12.0.16") {
+	library("Jetty", "12.0.18") {
 		group("org.eclipse.jetty.ee10") {
 			imports = [
 				"jetty-ee10-bom"
@@ -1011,7 +1011,7 @@ bom {
 			]
 		}
 	}
-	library("jOOQ", "3.19.19") {
+	library("jOOQ", "3.19.21") {
 		group("org.jooq") {
 			modules = [
 				"jooq",
@@ -1233,7 +1233,7 @@ bom {
 			releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}")
 		}
 	}
-	library("Logback", "1.5.16") {
+	library("Logback", "1.5.18") {
 		group("ch.qos.logback") {
 			modules = [
 				"logback-classic",
@@ -1315,7 +1315,7 @@ bom {
 			releaseNotes("https://github.com/apache/maven-dependency-plugin/releases/tag/maven-dependency-plugin-{version}")
 		}
 	}
-	library("Maven Deploy Plugin", "3.1.3") {
+	library("Maven Deploy Plugin", "3.1.4") {
 		group("org.apache.maven.plugins") {
 			plugins = [
 				"maven-deploy-plugin"
@@ -1352,7 +1352,7 @@ bom {
 			]
 		}
 	}
-	library("Maven Install Plugin", "3.1.3") {
+	library("Maven Install Plugin", "3.1.4") {
 		group("org.apache.maven.plugins") {
 			plugins = [
 				"maven-install-plugin"
@@ -1442,7 +1442,7 @@ bom {
 			releaseNotes("https://github.com/apache/maven-war-plugin/releases/tag/maven-war-plugin-{version}")
 		}
 	}
-	library("Micrometer", "1.14.4") {
+	library("Micrometer", "1.14.5") {
 		considerSnapshots()
 		group("io.micrometer") {
 			modules = [
@@ -1466,7 +1466,7 @@ bom {
 			releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}")
 		}
 	}
-	library("Micrometer Tracing", "1.4.3") {
+	library("Micrometer Tracing", "1.4.4") {
 		considerSnapshots()
 		group("io.micrometer") {
 			imports = [
@@ -1562,7 +1562,7 @@ bom {
 			]
 		}
 	}
-	library("Neo4j Java Driver", "5.28.1") {
+	library("Neo4j Java Driver", "5.28.3") {
 		alignWith {
 			version {
 				from "org.springframework.data:spring-data-neo4j"
@@ -1580,7 +1580,7 @@ bom {
 			releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}")
 		}
 	}
-	library("Netty", "4.1.118.Final") {
+	library("Netty", "4.1.119.Final") {
 		group("io.netty") {
 			imports = [
 				"netty-bom"
@@ -1702,7 +1702,7 @@ bom {
 			releaseNotes("https://github.com/prometheus/client_java/releases/tag/parent-{version}")
 		}
 	}
-	library("Pulsar", "3.3.4") {
+	library("Pulsar", "3.3.5") {
 		group("org.apache.pulsar") {
 			imports = [
 				"pulsar-bom"
@@ -1876,7 +1876,7 @@ bom {
 			]
 		}
 	}
-	library("Reactor Bom", "2024.0.3") {
+	library("Reactor Bom", "2024.0.4") {
 		considerSnapshots()
 		calendarName = "Reactor"
 		group("io.projectreactor") {
@@ -1925,9 +1925,6 @@ bom {
 		group("org.springframework.boot") {
 			modules = [
 				"spring-boot",
-				"spring-boot-test",
-				"spring-boot-test-autoconfigure",
-				"spring-boot-testcontainers",
 				"spring-boot-actuator",
 				"spring-boot-actuator-autoconfigure",
 				"spring-boot-autoconfigure",
@@ -1960,10 +1957,10 @@ bom {
 				"spring-boot-starter-data-ldap",
 				"spring-boot-starter-data-mongodb",
 				"spring-boot-starter-data-mongodb-reactive",
+				"spring-boot-starter-data-neo4j",
 				"spring-boot-starter-data-r2dbc",
 				"spring-boot-starter-data-redis",
 				"spring-boot-starter-data-redis-reactive",
-				"spring-boot-starter-data-neo4j",
 				"spring-boot-starter-data-rest",
 				"spring-boot-starter-freemarker",
 				"spring-boot-starter-graphql",
@@ -1994,9 +1991,12 @@ bom {
 				"spring-boot-starter-undertow",
 				"spring-boot-starter-validation",
 				"spring-boot-starter-web",
+				"spring-boot-starter-web-services",
 				"spring-boot-starter-webflux",
 				"spring-boot-starter-websocket",
-				"spring-boot-starter-web-services"
+				"spring-boot-test",
+				"spring-boot-test-autoconfigure",
+				"spring-boot-testcontainers"
 			]
 			plugins = [
 				"spring-boot-maven-plugin"
@@ -2053,7 +2053,7 @@ bom {
 			releaseNotes("https://github.com/sendgrid/sendgrid-java/releases/tag/{version}")
 		}
 	}
-	library("SLF4J", "2.0.16") {
+	library("SLF4J", "2.0.17") {
 		group("org.slf4j") {
 			modules = [
 				"jcl-over-slf4j",
@@ -2077,7 +2077,7 @@ bom {
 			]
 		}
 	}
-	library("Spring AMQP", "3.2.3") {
+	library("Spring AMQP", "3.2.4") {
 		considerSnapshots()
 		group("org.springframework.amqp") {
 			imports = [
@@ -2111,7 +2111,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-authorization-server/releases/tag/{version}")
 		}
 	}
-	library("Spring Batch", "5.2.1") {
+	library("Spring Batch", "5.2.2") {
 		considerSnapshots()
 		group("org.springframework.batch") {
 			imports = [
@@ -2128,7 +2128,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")
 		}
 	}
-	library("Spring Data Bom", "2024.1.3") {
+	library("Spring Data Bom", "2024.1.4") {
 		considerSnapshots()
 		calendarName = "Spring Data Release"
 		group("org.springframework.data") {
@@ -2197,7 +2197,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-hateoas/releases/tag/{version}")
 		}
 	}
-	library("Spring Integration", "6.4.2") {
+	library("Spring Integration", "6.4.3") {
 		considerSnapshots()
 		group("org.springframework.integration") {
 			imports = [
@@ -2214,7 +2214,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}")
 		}
 	}
-	library("Spring Kafka", "3.3.3") {
+	library("Spring Kafka", "3.3.4") {
 		considerSnapshots()
 		group("org.springframework.kafka") {
 			modules = [
@@ -2252,7 +2252,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-ldap/releases/tag/{version}")
 		}
 	}
-	library("Spring Pulsar", "1.2.3") {
+	library("Spring Pulsar", "1.2.4") {
 		considerSnapshots()
 		group("org.springframework.pulsar") {
 			imports = [
@@ -2299,7 +2299,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-retry/releases/tag/v{version}")
 		}
 	}
-	library("Spring Security", "6.4.3") {
+	library("Spring Security", "6.4.4") {
 		considerSnapshots()
 		group("org.springframework.security") {
 			imports = [
@@ -2337,7 +2337,7 @@ bom {
 			releaseNotes("https://github.com/spring-projects/spring-session/releases/tag/{version}")
 		}
 	}
-	library("Spring WS", "4.0.11") {
+	library("Spring WS", "4.0.12") {
 		considerSnapshots()
 		group("org.springframework.ws") {
 			imports = [
@@ -2365,7 +2365,7 @@ bom {
 			releaseNotes("https://github.com/xerial/sqlite-jdbc/releases/tag/{version}")
 		}
 	}
-	library("Testcontainers", "1.20.5") {
+	library("Testcontainers", "1.20.6") {
 		group("org.testcontainers") {
 			imports = [
 				"testcontainers-bom"
diff --git a/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/spring.factories
index f96fa063b405..baec9665ae1d 100644
--- a/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-project/spring-boot-devtools/src/main/resources/META-INF/spring.factories
@@ -4,8 +4,8 @@ org.springframework.boot.devtools.restart.RestartScopeInitializer
 
 # Application Listeners
 org.springframework.context.ApplicationListener=\
-org.springframework.boot.devtools.restart.RestartApplicationListener,\
-org.springframework.boot.devtools.logger.DevToolsLogFactory.Listener
+org.springframework.boot.devtools.logger.DevToolsLogFactory$Listener,\
+org.springframework.boot.devtools.restart.RestartApplicationListener
 
 # Environment Post Processors
 org.springframework.boot.env.EnvironmentPostProcessor=\
diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
index 1ce414201304..764985ae3b65 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,11 @@
 import java.time.Duration;
 
 import org.awaitility.Awaitility;
-import org.junit.jupiter.api.condition.OS;
 
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.boot.testsupport.container.TestImage;
-import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.util.ClassUtils;
@@ -38,8 +36,6 @@
  *
  * @author Andy Wilkinson
  */
-@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
-		disabledReason = "The Oracle image has no ARM support")
 class OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 
 	@SuppressWarnings("unchecked")
diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
index 3f9e80cf6559..415bf6cb455c 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,11 @@
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactoryOptions;
 import org.awaitility.Awaitility;
-import org.junit.jupiter.api.condition.OS;
 
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.boot.testsupport.container.TestImage;
-import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.r2dbc.core.DatabaseClient;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -37,8 +35,6 @@
  *
  * @author Andy Wilkinson
  */
-@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
-		disabledReason = "The Oracle image has no ARM support")
 class OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests {
 
 	@DockerComposeTest(composeFile = "oracle-compose.yaml", image = TestImage.ORACLE_FREE)
diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java
index c0ee2a7cf09b..d2470524b015 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/test/DockerComposeTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.boot.docker.compose.service.connection.test;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.LinkedHashMap;
@@ -39,6 +40,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.util.FileSystemUtils;
 
 import static org.assertj.core.api.Assertions.fail;
 
@@ -46,22 +48,24 @@
  * {@link Extension} for {@link DockerComposeTest @DockerComposeTest}.
  *
  * @author Andy Wilkinson
+ * @author Moritz Halbritter
  */
 class DockerComposeTestExtension implements BeforeTestExecutionCallback, AfterTestExecutionCallback, ParameterResolver {
 
 	private static final Namespace NAMESPACE = Namespace.create(DockerComposeTestExtension.class);
 
-	private static final String STORE_KEY_COMPOSE_FILE = "compose-file";
+	private static final String STORE_KEY_WORKSPACE = "workspace";
 
 	private static final String STORE_KEY_APPLICATION_CONTEXT = "application-context";
 
 	@Override
 	public void beforeTestExecution(ExtensionContext context) throws Exception {
-		Path transformedComposeFile = prepareComposeFile(context);
 		Store store = context.getStore(NAMESPACE);
-		store.put(STORE_KEY_COMPOSE_FILE, transformedComposeFile);
+		Path workspace = Files.createTempDirectory("DockerComposeTestExtension-");
+		store.put(STORE_KEY_WORKSPACE, workspace);
 		try {
-			SpringApplication application = prepareApplication(transformedComposeFile);
+			Path composeFile = prepareComposeFile(workspace, context);
+			SpringApplication application = prepareApplication(composeFile);
 			store.put(STORE_KEY_APPLICATION_CONTEXT, application.run());
 		}
 		catch (Exception ex) {
@@ -70,33 +74,33 @@ public void beforeTestExecution(ExtensionContext context) throws Exception {
 		}
 	}
 
-	private Path prepareComposeFile(ExtensionContext context) {
+	private Path prepareComposeFile(Path workspace, ExtensionContext context) {
 		DockerComposeTest dockerComposeTest = context.getRequiredTestMethod().getAnnotation(DockerComposeTest.class);
 		TestImage image = dockerComposeTest.image();
 		Resource composeResource = new ClassPathResource(dockerComposeTest.composeFile(),
 				context.getRequiredTestClass());
-		return transformedComposeFile(composeResource, image);
+		return transformedComposeFile(workspace, composeResource, image);
 	}
 
-	private Path transformedComposeFile(Resource composeFileResource, TestImage image) {
+	private Path transformedComposeFile(Path workspace, Resource composeFileResource, TestImage image) {
 		try {
-			Path composeFile = composeFileResource.getFile().toPath();
-			Path transformedComposeFile = Files.createTempFile("", "-" + composeFile.getFileName().toString());
-			String transformedContent = Files.readString(composeFile).replace("{imageName}", image.toString());
-			Files.writeString(transformedComposeFile, transformedContent);
-			return transformedComposeFile;
+			String template = composeFileResource.getContentAsString(StandardCharsets.UTF_8);
+			String content = template.replace("{imageName}", image.toString());
+			Path composeFile = workspace.resolve("compose.yaml");
+			Files.writeString(composeFile, content);
+			return composeFile;
 		}
 		catch (IOException ex) {
-			fail("Error transforming Docker compose file '" + composeFileResource + "': " + ex.getMessage());
+			fail("Error transforming Docker compose file '" + composeFileResource + "': " + ex.getMessage(), ex);
+			return null;
 		}
-		return null;
 	}
 
-	private SpringApplication prepareApplication(Path transformedComposeFile) {
+	private SpringApplication prepareApplication(Path composeFile) {
 		SpringApplication application = new SpringApplication(Config.class);
 		Map<String, Object> properties = new LinkedHashMap<>();
 		properties.put("spring.docker.compose.skip.in-tests", "false");
-		properties.put("spring.docker.compose.file", transformedComposeFile);
+		properties.put("spring.docker.compose.file", composeFile);
 		properties.put("spring.docker.compose.stop.command", "down");
 		application.setDefaultProperties(properties);
 		return application;
@@ -110,7 +114,7 @@ public void afterTestExecution(ExtensionContext context) throws Exception {
 	private void cleanUp(ExtensionContext context) throws Exception {
 		Store store = context.getStore(NAMESPACE);
 		runShutdownHandlers();
-		deleteComposeFile(store);
+		deleteWorkspace(store);
 	}
 
 	private void runShutdownHandlers() {
@@ -118,10 +122,10 @@ private void runShutdownHandlers() {
 		((Runnable) shutdownHandlers).run();
 	}
 
-	private void deleteComposeFile(Store store) throws IOException {
-		Path composeFile = store.get(STORE_KEY_COMPOSE_FILE, Path.class);
-		if (composeFile != null) {
-			Files.delete(composeFile);
+	private void deleteWorkspace(Store store) throws IOException {
+		Path workspace = (Path) store.get(STORE_KEY_WORKSPACE);
+		if (workspace != null) {
+			FileSystemUtils.deleteRecursively(workspace);
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
index 5b9aea34ba50..ba25b57d84be 100644
--- a/spring-boot-project/spring-boot-docs/build.gradle
+++ b/spring-boot-project/spring-boot-docs/build.gradle
@@ -50,8 +50,8 @@ plugins.withType(EclipsePlugin) {
 }
 
 dependencies {
-	autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "autoConfigurationMetadata"))
+	autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "autoConfigurationMetadata"))
 
@@ -59,8 +59,8 @@ dependencies {
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "configurationPropertiesMetadata"))
-	configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "configurationPropertiesMetadata"))
+	configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
 
@@ -70,13 +70,13 @@ dependencies {
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator"))
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-autoconfigure"))
+	implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
 	implementation(project(path: ":spring-boot-project:spring-boot-docker-compose"))
-	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
-	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-testcontainers"))
-	implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
 	implementation("ch.qos.logback:logback-classic")
 	implementation("com.zaxxer:HikariCP")
 	implementation("io.micrometer:micrometer-jakarta9")
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/redirect.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/redirect.adoc
index ed71f4aff3f3..ec4127f1ae33 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/redirect.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/redirect.adoc
@@ -1192,8 +1192,6 @@
 * xref:reference:actuator/metrics.adoc#actuator.metrics.supported.system[#actuator.metrics.supported.system]
 * xref:reference:actuator/metrics.adoc#actuator.metrics.supported.system[#production-ready-metrics-system]
 * xref:reference:actuator/metrics.adoc#actuator.metrics.supported.tasks[#actuator.metrics.supported.tasks]
-* xref:reference:actuator/observability.adoc#actuator.observability.annotations[#actuator.metrics.supported.timed-annotation]
-* xref:reference:actuator/observability.adoc#actuator.observability.annotations[#production-ready-metrics-timed-annotation]
 * xref:reference:actuator/metrics.adoc#actuator.metrics.supported.tomcat[#actuator.metrics.supported.tomcat]
 * xref:reference:actuator/metrics.adoc#actuator.metrics.supported.tomcat[#production-ready-metrics-tomcat]
 * xref:reference:actuator/metrics.adoc#actuator.metrics.supported[#actuator.metrics.supported]
@@ -1212,7 +1210,9 @@
 * xref:reference:actuator/monitoring.adoc#actuator.monitoring.management-specific-ssl[#production-ready-management-specific-ssl]
 * xref:reference:actuator/monitoring.adoc#actuator.monitoring[#actuator.monitoring]
 * xref:reference:actuator/monitoring.adoc#actuator.monitoring[#production-ready-monitoring]
+* xref:reference:actuator/observability.adoc#actuator.observability.annotations[#actuator.metrics.supported.timed-annotation]
 * xref:reference:actuator/observability.adoc#actuator.observability.annotations[#actuator.observability.annotations]
+* xref:reference:actuator/observability.adoc#actuator.observability.annotations[#production-ready-metrics-timed-annotation]
 * xref:reference:actuator/observability.adoc#actuator.observability.common-tags[#actuator.observability.common-tags]
 * xref:reference:actuator/observability.adoc#actuator.observability.opentelemetry[#actuator.observability.opentelemetry]
 * xref:reference:actuator/observability.adoc#actuator.observability.preventing-observations[#actuator.observability.preventing-observations]
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc
index 8c82cbd552c2..fc09b8ed379e 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/ROOT/pages/system-requirements.adoc
@@ -1,7 +1,7 @@
 [[getting-started.system-requirements]]
 = System Requirements
 
-Spring Boot {version-spring-boot} requires at least https://www.java.com[Java 17] and is compatible with versions up to and including Java 23.
+Spring Boot {version-spring-boot} requires at least https://www.java.com[Java 17] and is compatible with versions up to and including Java 24.
 {url-spring-framework-docs}/[Spring Framework {version-spring-framework}] or above is also required.
 
 Explicit build support is provided for the following build tools:
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/data-access.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/data-access.adoc
index f9c988585ad7..c539f635f3c5 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/data-access.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/data-access.adoc
@@ -403,4 +403,4 @@ include-code::ElasticsearchEntityManagerFactoryDependsOnPostProcessor[]
 If you need to use jOOQ with multiple data sources, you should create your own javadoc:org.jooq.DSLContext[] for each one.
 See {code-spring-boot-autoconfigure-src}/jooq/JooqAutoConfiguration.java[`JooqAutoConfiguration`] for more details.
 
-TIP: In particular, javadoc:org.springframework.boot.autoconfigure.jooq.JooqExceptionTranslator[] and javadoc:org.springframework.boot.autoconfigure.jooq.SpringTransactionProvider[] can be reused to provide similar features to what the auto-configuration does with a single javadoc:javax.sql.DataSource[].
+TIP: In particular, javadoc:org.springframework.boot.autoconfigure.jooq.ExceptionTranslatorExecuteListener[] and javadoc:org.springframework.boot.autoconfigure.jooq.SpringTransactionProvider[] can be reused to provide similar features to what the auto-configuration does with a single javadoc:javax.sql.DataSource[].
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/deployment/cloud.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/deployment/cloud.adoc
index 078082721275..d1e3bcb83d9c 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/deployment/cloud.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/how-to/pages/deployment/cloud.adoc
@@ -244,7 +244,6 @@ For more details, see https://devcenter.heroku.com/articles/deploying-spring-boo
 https://www.openshift.com/[OpenShift] has many resources describing how to deploy Spring Boot applications, including:
 
 * https://blog.openshift.com/using-openshift-enterprise-grade-spring-boot-deployments/[Using the S2I builder]
-* https://access.redhat.com/documentation/en-us/reference_architectures/2017/html-single/spring_boot_microservices_on_red_hat_openshift_container_platform_3/[Architecture guide]
 * https://blog.openshift.com/using-spring-boot-on-openshift/[Running as a traditional web application on Wildfly]
 * https://blog.openshift.com/openshift-commons-briefing-96-cloud-native-applications-spring-rhoar/[OpenShift Commons Briefing]
 
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/http-exchanges.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/http-exchanges.adoc
index 641ed6484ed8..6fc12027434e 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/http-exchanges.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/http-exchanges.adoc
@@ -16,4 +16,4 @@ You can use the `httpexchanges` endpoint to obtain information about the request
 
 To customize the items that are included in each recorded exchange, use the configprop:management.httpexchanges.recording.include[] configuration property.
 
-To disable recoding entirely, set configprop:management.httpexchanges.recording.enabled[] to `false`.
+To disable recording entirely, set configprop:management.httpexchanges.recording.enabled[] to `false`.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/observability.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/observability.adoc
index ec359162185c..349ae05782ec 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/observability.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/observability.adoc
@@ -108,9 +108,9 @@ The next sections will provide more details about logging, metrics and traces.
 [[actuator.observability.annotations]]
 == Micrometer Observation Annotations support
 
-To enable scanning of observability annotations like javadoc:io.micrometer.observation.annotation.Observed[format=annotation], javadoc:io.micrometer.core.annotation.Timed[format=annotation], javadoc:io.micrometer.core.annotation.Counted[format=annotation], javadoc:io.micrometer.core.aop.MeterTag[format=annotation] and javadoc:io.micrometer.tracing.annotation.NewSpan[format=annotation] annotations, you need to set the configprop:management.observations.annotations.enabled[] property to `true`.
+To enable scanning of observability annotations like javadoc:io.micrometer.observation.annotation.Observed[format=annotation], javadoc:io.micrometer.core.annotation.Timed[format=annotation], javadoc:io.micrometer.core.annotation.Counted[format=annotation], javadoc:io.micrometer.core.aop.MeterTag[format=annotation] and javadoc:io.micrometer.tracing.annotation.NewSpan[format=annotation], you need to set the configprop:management.observations.annotations.enabled[] property to `true`.
 This feature is supported by Micrometer directly.
 Please refer to the {url-micrometer-docs-concepts}/timers.html#_the_timed_annotation[Micrometer], {url-micrometer-docs-observation}/components.html#micrometer-observation-annotations[Micrometer Observation] and {url-micrometer-tracing-docs}/api.html#_aspect_oriented_programming[Micrometer Tracing] reference docs.
 
-NOTE: When you annotate methods or classes which are already instrumented (for example xref:reference:actuator/metrics.adoc#actuator.metrics.supported.spring-data-repository[Spring Data repositories] or xref:reference:actuator/metrics.adoc#actuator.metrics.supported.spring-mvc[Spring MVC controllers]), you will get duplicate observations.
-In that case you can either disable the automatic instrumentation using xref:reference:actuator/observability.adoc#actuator.observability.preventing-observations[properties] or an javadoc:io.micrometer.observation.ObservationPredicate[] and rely on your annotations, or you can remove your annotation.
+NOTE: When you annotate methods or classes which are already instrumented (for example, xref:reference:actuator/metrics.adoc#actuator.metrics.supported.spring-data-repository[Spring Data repositories] or xref:reference:actuator/metrics.adoc#actuator.metrics.supported.spring-mvc[Spring MVC controllers]), you will get duplicate observations.
+In that case you can either disable the automatic instrumentation using xref:reference:actuator/observability.adoc#actuator.observability.preventing-observations[properties] or an javadoc:io.micrometer.observation.ObservationPredicate[] and rely on your annotations, or you can remove your annotations.
diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java
index fdc5f258768a..381ce63216fc 100644
--- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java
+++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,6 @@ public int getPort() {
 	public void setPort(int port) {
 		this.port = port;
 	}
-	// fold:off
+	// @fold:off
 
 }
diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java
index 67a35712c632..fbb00298d855 100644
--- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java
+++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@ public int getPort() {
 		public void setPort(int port) {
 			this.port = port;
 		}
-		// @fold:off // getters/setters ...
+		// @fold:off
 
 	}
 
diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.java
index 8d26116a7350..76a05743a0c6 100644
--- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.java
+++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.docs.howto.dataaccess.usemultipleentitymanagers;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Function;
+
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -48,7 +52,9 @@ public LocalContainerEntityManagerFactoryBean secondEntityManagerFactory(@Qualif
 
 	private EntityManagerFactoryBuilder createEntityManagerFactoryBuilder(JpaProperties jpaProperties) {
 		JpaVendorAdapter jpaVendorAdapter = createJpaVendorAdapter(jpaProperties);
-		return new EntityManagerFactoryBuilder(jpaVendorAdapter, jpaProperties.getProperties(), null);
+		Function<DataSource, Map<String, ?>> jpaPropertiesFactory = (dataSource) -> createJpaProperties(dataSource,
+				jpaProperties.getProperties());
+		return new EntityManagerFactoryBuilder(jpaVendorAdapter, jpaPropertiesFactory, null);
 	}
 
 	private JpaVendorAdapter createJpaVendorAdapter(JpaProperties jpaProperties) {
@@ -56,4 +62,10 @@ private JpaVendorAdapter createJpaVendorAdapter(JpaProperties jpaProperties) {
 		return new HibernateJpaVendorAdapter();
 	}
 
+	private Map<String, ?> createJpaProperties(DataSource dataSource, Map<String, ?> existingProperties) {
+		Map<String, ?> jpaProperties = new LinkedHashMap<>(existingProperties);
+		// ... map JPA properties that require the DataSource (e.g. DDL flags)
+		return jpaProperties;
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt
index 55eefdd7e58e..4b57a239fdef 100644
--- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt
+++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/usemultipleentitymanagers/MyAdditionalEntityManagerFactoryConfiguration.kt
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.docs.howto.dataaccess.usemultipleentitymanagers
 
-import javax.sql.DataSource
-
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties
 import org.springframework.boot.context.properties.ConfigurationProperties
@@ -27,6 +25,7 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.orm.jpa.JpaVendorAdapter
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter
+import javax.sql.DataSource
 
 @Suppress("UNUSED_PARAMETER")
 @Configuration(proxyBeanMethods = false)
@@ -51,7 +50,9 @@ class MyAdditionalEntityManagerFactoryConfiguration {
 
 	private fun createEntityManagerFactoryBuilder(jpaProperties: JpaProperties): EntityManagerFactoryBuilder {
 		val jpaVendorAdapter = createJpaVendorAdapter(jpaProperties)
-		return EntityManagerFactoryBuilder(jpaVendorAdapter, jpaProperties.properties, null)
+		val jpaPropertiesFactory = { dataSource: DataSource ->
+				createJpaProperties(dataSource, jpaProperties.properties) }
+		return EntityManagerFactoryBuilder(jpaVendorAdapter, jpaPropertiesFactory, null)
 	}
 
 	private fun createJpaVendorAdapter(jpaProperties: JpaProperties): JpaVendorAdapter {
@@ -59,4 +60,10 @@ class MyAdditionalEntityManagerFactoryConfiguration {
 		return HibernateJpaVendorAdapter()
 	}
 
+	private fun createJpaProperties(dataSource: DataSource, existingProperties: Map<String, *>): Map<String, *> {
+		val jpaProperties: Map<String, *> = LinkedHashMap(existingProperties)
+		// ... map JPA properties that require the DataSource (e.g. DDL flags)
+		return jpaProperties
+	}
+
 }
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestContextBootstrapper.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestContextBootstrapper.java
index 0fdbbb9c3748..8dd518551b57 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestContextBootstrapper.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestContextBootstrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 package org.springframework.boot.test.autoconfigure.orm.jpa;
 
 import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
-import org.springframework.core.annotation.MergedAnnotations;
-import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
+import org.springframework.test.context.TestContextAnnotationUtils;
 import org.springframework.test.context.TestContextBootstrapper;
 
 /**
@@ -30,10 +29,8 @@ class DataJpaTestContextBootstrapper extends SpringBootTestContextBootstrapper {
 
 	@Override
 	protected String[] getProperties(Class<?> testClass) {
-		return MergedAnnotations.from(testClass, SearchStrategy.INHERITED_ANNOTATIONS)
-			.get(DataJpaTest.class)
-			.getValue("properties", String[].class)
-			.orElse(null);
+		DataJpaTest dataJpaTest = TestContextAnnotationUtils.findMergedAnnotation(testClass, DataJpaTest.class);
+		return (dataJpaTest != null) ? dataJpaTest.properties() : null;
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestPropertiesIntegrationTests.java
new file mode 100644
index 000000000000..b4990c013d40
--- /dev/null
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestPropertiesIntegrationTests.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test.autoconfigure.orm.jpa;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for the {@link DataJpaTest#properties properties} attribute of
+ * {@link DataJpaTest @DataJpaTest}.
+ *
+ * @author Bernie Schelberg
+ */
+@DataJpaTest(properties = "spring.profiles.active=test")
+class DataJpaTestPropertiesIntegrationTests {
+
+	@Autowired
+	private Environment environment;
+
+	@Test
+	void environmentWithNewProfile() {
+		assertThat(this.environment.getActiveProfiles()).containsExactly("test");
+	}
+
+	@Nested
+	class NestedTests {
+
+		@Autowired
+		private Environment innerEnvironment;
+
+		@Test
+		void propertiesFromEnclosingClassAffectNestedTests() {
+			assertThat(DataJpaTestPropertiesIntegrationTests.this.environment.getActiveProfiles())
+				.containsExactly("test");
+			assertThat(this.innerEnvironment.getActiveProfiles()).containsExactly("test");
+		}
+
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java
index 39d498e642c2..e92455173aef 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/FilteredClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,16 @@ public FilteredClassLoader(Class<?>... hiddenClasses) {
 		this(Collections.singleton(ClassFilter.of(hiddenClasses)), Collections.emptyList());
 	}
 
+	/**
+	 * Create a {@link FilteredClassLoader} with the given {@code parent} that hides the
+	 * given classes.
+	 * @param parent the parent class loader
+	 * @param hiddenClasses the classes to hide
+	 */
+	public FilteredClassLoader(ClassLoader parent, Class<?>... hiddenClasses) {
+		this(parent, Collections.singleton(ClassFilter.of(hiddenClasses)), Collections.emptyList());
+	}
+
 	/**
 	 * Create a {@link FilteredClassLoader} that hides classes from the given packages.
 	 * @param hiddenPackages the packages to hide
@@ -86,7 +96,12 @@ public FilteredClassLoader(Predicate<String>... filters) {
 
 	private FilteredClassLoader(Collection<Predicate<String>> classesFilters,
 			Collection<Predicate<String>> resourcesFilters) {
-		super(new URL[0], FilteredClassLoader.class.getClassLoader());
+		this(FilteredClassLoader.class.getClassLoader(), classesFilters, resourcesFilters);
+	}
+
+	private FilteredClassLoader(ClassLoader parent, Collection<Predicate<String>> classesFilters,
+			Collection<Predicate<String>> resourcesFilters) {
+		super(new URL[0], parent);
 		this.classesFilters = classesFilters;
 		this.resourcesFilters = resourcesFilters;
 	}
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
index c58f1bc4da2e..d5b96e2e5c6b 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.springframework.aot.hint.ExecutableMode;
+import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.beans.BeanUtils;
 import org.springframework.boot.ApplicationContextFactory;
 import org.springframework.boot.Banner;
@@ -105,28 +107,33 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
 
 	@Override
 	public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
-		return loadContext(mergedConfig, Mode.STANDARD, null);
+		return loadContext(mergedConfig, Mode.STANDARD, null, null);
 	}
 
 	@Override
-	public ApplicationContext loadContextForAotProcessing(MergedContextConfiguration mergedConfig) throws Exception {
-		return loadContext(mergedConfig, Mode.AOT_PROCESSING, null);
+	public ApplicationContext loadContextForAotProcessing(MergedContextConfiguration mergedConfig,
+			RuntimeHints runtimeHints) throws Exception {
+		return loadContext(mergedConfig, Mode.AOT_PROCESSING, null, runtimeHints);
 	}
 
 	@Override
 	public ApplicationContext loadContextForAotRuntime(MergedContextConfiguration mergedConfig,
 			ApplicationContextInitializer<ConfigurableApplicationContext> initializer) throws Exception {
-		return loadContext(mergedConfig, Mode.AOT_RUNTIME, initializer);
+		return loadContext(mergedConfig, Mode.AOT_RUNTIME, initializer, null);
 	}
 
 	private ApplicationContext loadContext(MergedContextConfiguration mergedConfig, Mode mode,
-			ApplicationContextInitializer<ConfigurableApplicationContext> initializer) throws Exception {
+			ApplicationContextInitializer<ConfigurableApplicationContext> initializer, RuntimeHints runtimeHints)
+			throws Exception {
 		assertHasClassesOrLocations(mergedConfig);
 		SpringBootTestAnnotation annotation = SpringBootTestAnnotation.get(mergedConfig);
 		String[] args = annotation.getArgs();
 		UseMainMethod useMainMethod = annotation.getUseMainMethod();
 		Method mainMethod = getMainMethod(mergedConfig, useMainMethod);
 		if (mainMethod != null) {
+			if (runtimeHints != null) {
+				runtimeHints.reflection().registerMethod(mainMethod, ExecutableMode.INVOKE);
+			}
 			ContextLoaderHook hook = new ContextLoaderHook(mode, initializer,
 					(application) -> configure(mergedConfig, application));
 			return hook.runMain(() -> ReflectionUtils.invokeMethod(mainMethod, null, new Object[] { args }));
@@ -158,20 +165,23 @@ private Method getMainMethod(MergedContextConfiguration mergedConfig, UseMainMet
 			.orElse(null);
 		Assert.state(springBootConfiguration != null || useMainMethod == UseMainMethod.WHEN_AVAILABLE,
 				"Cannot use main method as no @SpringBootConfiguration-annotated class is available");
-		Method mainMethod = (springBootConfiguration != null)
-				? ReflectionUtils.findMethod(springBootConfiguration, "main", String[].class) : null;
+		Method mainMethod = findMainMethod(springBootConfiguration);
+		Assert.state(mainMethod != null || useMainMethod == UseMainMethod.WHEN_AVAILABLE,
+				() -> "Main method not found on '%s'".formatted(springBootConfiguration.getName()));
+		return mainMethod;
+	}
+
+	private static Method findMainMethod(Class<?> type) {
+		Method mainMethod = (type != null) ? ReflectionUtils.findMethod(type, "main", String[].class) : null;
 		if (mainMethod == null && KotlinDetector.isKotlinPresent()) {
 			try {
-				Class<?> kotlinClass = ClassUtils.forName(springBootConfiguration.getName() + "Kt",
-						springBootConfiguration.getClassLoader());
+				Class<?> kotlinClass = ClassUtils.forName(type.getName() + "Kt", type.getClassLoader());
 				mainMethod = ReflectionUtils.findMethod(kotlinClass, "main", String[].class);
 			}
 			catch (ClassNotFoundException ex) {
 				// Ignore
 			}
 		}
-		Assert.state(mainMethod != null || useMainMethod == UseMainMethod.WHEN_AVAILABLE,
-				() -> "Main method not found on '%s'".formatted(springBootConfiguration.getName()));
 		return mainMethod;
 	}
 
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java
index 3f6a4888d110..f58b1cf832ff 100644
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.boot.ApplicationContextFactory;
 import org.springframework.boot.SpringApplication;
@@ -41,6 +43,7 @@
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ApplicationContextFailureProcessor;
+import org.springframework.test.context.BootstrapUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextHierarchy;
 import org.springframework.test.context.MergedContextConfiguration;
@@ -53,6 +56,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link SpringBootContextLoader}
@@ -248,6 +253,29 @@ void whenUseMainMethodWithContextHierarchyThrowsException() {
 			.withMessage("UseMainMethod.ALWAYS cannot be used with @ContextHierarchy tests");
 	}
 
+	@Test
+	void whenMainMethodNotAvailableReturnsNoAotContribution() throws Exception {
+		SpringBootContextLoader contextLoader = new SpringBootContextLoader();
+		MergedContextConfiguration contextConfiguration = BootstrapUtils
+			.resolveTestContextBootstrapper(UseMainMethodWhenAvailableAndNoMainMethod.class)
+			.buildMergedContextConfiguration();
+		RuntimeHints runtimeHints = mock(RuntimeHints.class);
+		contextLoader.loadContextForAotProcessing(contextConfiguration, runtimeHints);
+		then(runtimeHints).shouldHaveNoInteractions();
+	}
+
+	@Test
+	void whenMainMethodPresentRegisterReflectionHints() throws Exception {
+		SpringBootContextLoader contextLoader = new SpringBootContextLoader();
+		MergedContextConfiguration contextConfiguration = BootstrapUtils
+			.resolveTestContextBootstrapper(UseMainMethodWhenAvailableAndMainMethod.class)
+			.buildMergedContextConfiguration();
+		RuntimeHints runtimeHints = new RuntimeHints();
+		contextLoader.loadContextForAotProcessing(contextConfiguration, runtimeHints);
+		assertThat(RuntimeHintsPredicates.reflection().onMethod(ConfigWithMain.class, "main").invoke())
+			.accepts(runtimeHints);
+	}
+
 	@Test
 	void whenSubclassProvidesCustomApplicationContextFactory() {
 		TestContext testContext = new ExposedTestContextManager(CustomApplicationContextTest.class)
diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java
index 2294e0877973..c58193b2dc96 100644
--- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java
+++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.OS;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.oracle.OracleContainer;
@@ -31,7 +30,6 @@
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.boot.testsupport.container.TestImage;
-import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.r2dbc.core.DatabaseClient;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -45,8 +43,6 @@
  */
 @SpringJUnitConfig
 @Testcontainers(disabledWithoutDocker = true)
-@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
-		disabledReason = "The Oracle image has no ARM support")
 class OracleFreeR2dbcContainerConnectionDetailsFactoryIntegrationTests {
 
 	@Container
diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring/aot.factories
index 5b3d49bd5020..4d6de8757e62 100644
--- a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring/aot.factories
@@ -1,5 +1,5 @@
 org.springframework.beans.factory.aot.BeanRegistrationExcludeFilter=\
-org.springframework.boot.testcontainers.service.connection.ConnectionDetailsRegistrar.ServiceConnectionBeanRegistrationExcludeFilter
+org.springframework.boot.testcontainers.service.connection.ConnectionDetailsRegistrar$ServiceConnectionBeanRegistrationExcludeFilter
 
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory.ContainerConnectionDetailsFactoriesRuntimeHints
+org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory$ContainerConnectionDetailsFactoriesRuntimeHints
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java
index 09baf1db3292..ebbca2b0534b 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Builder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -236,14 +236,14 @@ Image fetchImage(ImageType type, ImageReference reference) throws IOException {
 					() -> String.format("%s '%s' must be pulled from the '%s' authenticated registry",
 							StringUtils.capitalize(type.getDescription()), reference, this.domain));
 			if (this.pullPolicy == PullPolicy.ALWAYS) {
-				return pullImage(reference, type);
+				return checkPlatformMismatch(pullImage(reference, type), reference);
 			}
 			try {
-				return Builder.this.docker.image().inspect(reference);
+				return checkPlatformMismatch(Builder.this.docker.image().inspect(reference), reference);
 			}
 			catch (DockerEngineException ex) {
 				if (this.pullPolicy == PullPolicy.IF_NOT_PRESENT && ex.getStatusCode() == 404) {
-					return pullImage(reference, type);
+					return checkPlatformMismatch(pullImage(reference, type), reference);
 				}
 				throw ex;
 			}
@@ -260,6 +260,26 @@ private Image pullImage(ImageReference reference, ImageType imageType) throws IO
 			return image;
 		}
 
+		private Image checkPlatformMismatch(Image image, ImageReference imageReference) {
+			if (this.defaultPlatform != null) {
+				ImagePlatform imagePlatform = ImagePlatform.from(image);
+				if (!imagePlatform.equals(this.defaultPlatform)) {
+					throw new PlatformMismatchException(imageReference, this.defaultPlatform, imagePlatform);
+				}
+			}
+			return image;
+		}
+
+	}
+
+	private static final class PlatformMismatchException extends RuntimeException {
+
+		private PlatformMismatchException(ImageReference imageReference, ImagePlatform requestedPlatform,
+				ImagePlatform actualPlatform) {
+			super("Image platform mismatch detected. The configured platform '%s' is not supported by the image '%s'. Requested platform '%s' but got '%s'"
+				.formatted(requestedPlatform, imageReference, requestedPlatform, actualPlatform));
+		}
+
 	}
 
 	/**
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
index e5659f9bce4c..a61564b68c79 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/DockerApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -136,9 +136,11 @@ private URI buildUrl(ApiVersion apiVersion, String path, Object... params) {
 		verifyApiVersion(apiVersion);
 		try {
 			URIBuilder builder = new URIBuilder("/v" + apiVersion + path);
-			int param = 0;
-			while (param < params.length) {
-				builder.addParameter(Objects.toString(params[param++]), Objects.toString(params[param++]));
+			if (params != null) {
+				int param = 0;
+				while (param < params.length) {
+					builder.addParameter(Objects.toString(params[param++]), Objects.toString(params[param++]));
+				}
 			}
 			return builder.build();
 		}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListener.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListener.java
index b81cfb85a364..9c5e3395f628 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListener.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListener.java
@@ -120,7 +120,7 @@ void finish() {
 		}
 
 		int getProgress() {
-			return withinPercentageBounds((this.progressByStatus.values().stream().mapToInt(Integer::valueOf).sum())
+			return withinPercentageBounds((this.progressByStatus.values().stream().mapToInt(Integer::intValue).sum())
 					/ this.progressByStatus.size());
 		}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java
index 718912e2a38e..28eaf45715b9 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
-import org.apache.hc.core5.http.message.StatusLine;
 
 import org.springframework.boot.buildpack.platform.io.Content;
 import org.springframework.boot.buildpack.platform.io.IOConsumer;
@@ -51,6 +50,7 @@
  * @author Phillip Webb
  * @author Mike Smithson
  * @author Scott Frederick
+ * @author Moritz Halbritter
  */
 abstract class HttpClientTransport implements HttpTransport {
 
@@ -159,12 +159,12 @@ private Response execute(HttpUriRequest request) {
 			ClassicHttpResponse response = this.client.executeOpen(this.host, request, null);
 			int statusCode = response.getCode();
 			if (statusCode >= 400 && statusCode <= 500) {
-				HttpEntity entity = response.getEntity();
-				Errors errors = (statusCode != 500) ? getErrorsFromResponse(entity) : null;
-				Message message = getMessageFromResponse(entity);
-				StatusLine statusLine = new StatusLine(response);
+				byte[] content = readContent(response);
+				response.close();
+				Errors errors = (statusCode != 500) ? deserializeErrors(content) : null;
+				Message message = deserializeMessage(content);
 				throw new DockerEngineException(this.host.toHostString(), request.getUri(), statusCode,
-						statusLine.getReasonPhrase(), errors, message);
+						response.getReasonPhrase(), errors, message);
 			}
 			return new HttpClientResponse(response);
 		}
@@ -173,19 +173,35 @@ private Response execute(HttpUriRequest request) {
 		}
 	}
 
-	private Errors getErrorsFromResponse(HttpEntity entity) {
+	private byte[] readContent(ClassicHttpResponse response) throws IOException {
+		HttpEntity entity = response.getEntity();
+		if (entity == null) {
+			return null;
+		}
+		try (InputStream stream = entity.getContent()) {
+			return (stream != null) ? stream.readAllBytes() : null;
+		}
+	}
+
+	private Errors deserializeErrors(byte[] content) {
+		if (content == null) {
+			return null;
+		}
 		try {
-			return SharedObjectMapper.get().readValue(entity.getContent(), Errors.class);
+			return SharedObjectMapper.get().readValue(content, Errors.class);
 		}
 		catch (IOException ex) {
 			return null;
 		}
 	}
 
-	private Message getMessageFromResponse(HttpEntity entity) {
+	private Message deserializeMessage(byte[] content) {
+		if (content == null) {
+			return null;
+		}
 		try {
-			return (entity.getContent() != null)
-					? SharedObjectMapper.get().readValue(entity.getContent(), Message.class) : null;
+			Message message = SharedObjectMapper.get().readValue(content, Message.class);
+			return (message.getMessage() != null) ? message : null;
 		}
 		catch (IOException ex) {
 			return null;
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java
index 40bd62e2a4ed..508c0e54c941 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@
  * @author Phillip Webb
  * @author Mike Smithson
  * @author Scott Frederick
+ * @author Moritz Halbritter
  */
 @ExtendWith(MockitoExtension.class)
 class HttpClientTransportTests {
@@ -309,6 +310,18 @@ void executeWhenResponseIsIn500RangeWithOtherContentShouldThrowDockerException()
 			});
 	}
 
+	@Test
+	void shouldReturnErrorsAndMessage() throws IOException {
+		givenClientWillReturnResponse();
+		given(this.entity.getContent()).willReturn(getClass().getResourceAsStream("message-and-errors.json"));
+		given(this.response.getCode()).willReturn(404);
+		assertThatExceptionOfType(DockerEngineException.class).isThrownBy(() -> this.http.get(this.uri))
+			.satisfies((ex) -> {
+				assertThat(ex.getErrors()).hasSize(2);
+				assertThat(ex.getResponseMessage().getMessage()).contains("test message");
+			});
+	}
+
 	@Test
 	void executeWhenClientThrowsIOExceptionRethrowsAsDockerException() throws IOException {
 		given(this.client.executeOpen(any(HttpHost.class), any(HttpUriRequest.class), isNull()))
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/message-and-errors.json b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/message-and-errors.json
new file mode 100644
index 000000000000..ec5357ab093b
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/message-and-errors.json
@@ -0,0 +1,15 @@
+{
+  "message": "test message",
+  "errors": [
+    {
+      "code": "TEST1",
+      "message": "Test One",
+      "detail": 123
+    },
+    {
+      "code": "TEST2",
+      "message": "Test Two",
+      "detail": "fail"
+    }
+  ]
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
index a8d01cf1865c..cad3e53ba22e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -513,6 +513,14 @@ void failsWhenCachesAreConfiguredTwice() throws IOException {
 		assertThat(result.getOutput()).containsPattern("Each image building cache can be configured only once");
 	}
 
+	@TestTemplate
+	void failsWithIncompatiblePlatform() throws IOException {
+		writeMainClass();
+		BuildResult result = this.gradleBuild.buildAndFail("bootBuildImage");
+		assertThat(result.getOutput()).contains(
+				"Image platform mismatch detected. The configured platform 'linux/arm64' is not supported by the image 'ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64'. Requested platform 'linux/arm64' but got 'linux/amd64'");
+	}
+
 	private void writeMainClass() throws IOException {
 		File examplePackage = new File(this.gradleBuild.getProjectDir(), "src/main/java/example");
 		examplePackage.mkdirs();
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle
new file mode 100644
index 000000000000..e5b41bf85e6c
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-failsWithIncompatiblePlatform.gradle
@@ -0,0 +1,9 @@
+plugins {
+	id 'java'
+	id 'org.springframework.boot' version '{version}'
+}
+
+bootBuildImage {
+	builder = "ghcr.io/spring-io/spring-boot-cnb-test-builder:0.0.3-amd64"
+	imagePlatform = "linux/arm64"
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging.adoc
index 1b2a13aa0818..86a13d1761fd 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/packaging.adoc
@@ -9,7 +9,7 @@ The plugin can create executable archives (jar files and war files) that contain
 == Packaging Executable Jars
 
 Executable jars can be built using the `bootJar` task.
-The task is automatically created when the `java` plugin is applied and is an instance of xref:api/java/org/springframework/boot/gradle/tasks/bundling/BootJar.html[`BootJar`].
+The task is automatically created when the `java` plugin is applied and is an instance of {apiref-gradle-plugin-boot-jar}[`BootJar`].
 The `assemble` task is automatically configured to depend upon the `bootJar` task so running `assemble` (or `build`) will also run the `bootJar` task.
 
 
@@ -101,7 +101,7 @@ See https://github.com/spring-projects/spring-boot/issues/33238[#33238] for deta
 [[packaging-executable.configuring]]
 == Configuring Executable Archive Packaging
 
-The xref:api/java/org/springframework/boot/gradle/tasks/bundling/BootJar.html[`BootJar`] and {apiref-gradle-plugin-boot-war}[`BootWar`] tasks are subclasses of Gradle's `Jar` and `War` tasks respectively.
+The {apiref-gradle-plugin-boot-jar}[`BootJar`] and {apiref-gradle-plugin-boot-war}[`BootWar`] tasks are subclasses of Gradle's `Jar` and `War` tasks respectively.
 As a result, all of the standard configuration options that are available when packaging a jar or war are also available when packaging an executable jar or war.
 A number of configuration options that are specific to executable jars and wars are also provided.
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/running.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/running.adoc
index 4c82fce250ad..1d791a189156 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/running.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/antora/modules/gradle-plugin/pages/running.adoc
@@ -8,7 +8,7 @@ To run your application without first building an archive use the `bootRun` task
 $ ./gradlew bootRun
 ----
 
-The `bootRun` task is an instance of xref:api/java/org/springframework/boot/gradle/tasks/run/BootRun.html[`BootRun`] which is a `JavaExec` subclass.
+The `bootRun` task is an instance of {apiref-gradle-plugin-boot-run}[`BootRun`] which is a `JavaExec` subclass.
 As such, all of the {url-gradle-dsl}/org.gradle.api.tasks.JavaExec.html[usual configuration options] for executing a Java process in Gradle are available to you.
 The task is automatically configured to use the runtime classpath of the main source set.
 
@@ -100,7 +100,7 @@ For example, to run your application with a profile named `dev` active the follo
 $ ./gradlew bootRun --args='--spring.profiles.active=dev'
 ----
 
-See {url-gradle-javadoc}/org/gradle/api/tasks/JavaExec.html#setArgsString-java.lang.String-[the javadoc for `JavaExec.setArgsString`] for further details.
+See {url-gradle-javadoc}/org/gradle/api/tasks/JavaExec.html#setArgsString(java.lang.String)[the javadoc for `JavaExec.setArgsString`] for further details.
 
 
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
index 1f2ae35e032d..924c67342184 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ public enum TestImage {
 	/**
 	 * A container image suitable for testing Elasticsearch 7.
 	 */
-	ELASTICSEARCH("docker.elastic.co/elasticsearch/elasticsearch", "7.17.5", () -> ElasticsearchContainer.class,
+	ELASTICSEARCH("docker.elastic.co/elasticsearch/elasticsearch", "7.17.28", () -> ElasticsearchContainer.class,
 			(container) -> ((ElasticsearchContainer) container).withEnv("ES_JAVA_OPTS", "-Xms32m -Xmx512m")
 				.withStartupAttempts(5)
 				.withStartupTimeout(Duration.ofMinutes(10))),
@@ -175,14 +175,14 @@ public enum TestImage {
 	/**
 	 * A container image suitable for testing Neo4j.
 	 */
-	NEO4J("neo4j", "4.4.11", () -> Neo4jContainer.class,
+	NEO4J("neo4j", "4.4.41", () -> Neo4jContainer.class,
 			(container) -> ((Neo4jContainer<?>) container).withStartupAttempts(5)
 				.withStartupTimeout(Duration.ofMinutes(10))),
 
 	/**
 	 * A container image suitable for testing Oracle Free.
 	 */
-	ORACLE_FREE("gvenzl/oracle-free", "23.3-slim", () -> org.testcontainers.oracle.OracleContainer.class,
+	ORACLE_FREE("gvenzl/oracle-free", "23.6-slim", () -> org.testcontainers.oracle.OracleContainer.class,
 			(container) -> ((org.testcontainers.oracle.OracleContainer) container)
 				.withStartupTimeout(Duration.ofMinutes(2))),
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resource.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resource.java
new file mode 100644
index 000000000000..dae49e5afd39
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resource.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.nio.file.Path;
+
+/**
+ * A resource that is to be made available in tests.
+ *
+ * @param path the path of the resoure
+ * @param additional whether the resource should be made available in addition to those
+ * that already exist elsewhere
+ * @author Andy Wilkinson
+ */
+record Resource(Path path, boolean additional) {
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourceContent.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourceContent.java
new file mode 100644
index 000000000000..85a81e3aa395
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourceContent.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation that indicates that the content of a resource should be injected. Supported
+ * on parameters of type:
+ *
+ * <ul>
+ * <li>{@link String}</li>
+ * </ul>
+ *
+ * @author Andy Wilkinson
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface ResourceContent {
+
+	/**
+	 * The name of the resource whose content should be injected.
+	 * @return the resource name
+	 */
+	String value();
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcePath.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcePath.java
new file mode 100644
index 000000000000..95644acee2f2
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcePath.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.nio.file.Path;
+
+/**
+ * Annotation that indicates that the path of a resource should be injected. Supported on
+ * parameters of type:
+ *
+ * <ul>
+ * <li>{@link File}</li>
+ * <li>{@link Path}</li>
+ * <li>{@link String}</li>
+ * </ul>
+ *
+ * @author Andy Wilkinson
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface ResourcePath {
+
+	/**
+	 * The name of the resource whose path should be injected.
+	 * @return the resource name
+	 */
+	String value();
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java
new file mode 100644
index 000000000000..491afac531b5
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/Resources.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystemNotFoundException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.util.Assert;
+import org.springframework.util.FileSystemUtils;
+import org.springframework.util.function.ThrowingConsumer;
+
+/**
+ * A collection of resources.
+ *
+ * @author Andy Wilkinson
+ */
+class Resources {
+
+	private final Path root;
+
+	private final Map<String, Resource> resources = new HashMap<>();
+
+	Resources(Path root) {
+		this.root = root;
+	}
+
+	Resources addPackage(Package root, String[] resourceNames) {
+		String packageName = root.getName();
+		Set<String> unmatchedNames = new HashSet<>(Arrays.asList(resourceNames));
+		withPathsForPackage(packageName, (packagePath) -> {
+			for (String resourceName : resourceNames) {
+				Path resource = packagePath.resolve(resourceName);
+				if (Files.exists(resource) && !Files.isDirectory(resource)) {
+					Path target = this.root.resolve(resourceName);
+					Path targetDirectory = target.getParent();
+					if (!Files.isDirectory(targetDirectory)) {
+						Files.createDirectories(targetDirectory);
+					}
+					Files.copy(resource, target);
+					register(resourceName, target, true);
+					unmatchedNames.remove(resourceName);
+				}
+			}
+		});
+		Assert.isTrue(unmatchedNames.isEmpty(),
+				"Package '" + packageName + "' did not contain resources: " + unmatchedNames);
+		return this;
+	}
+
+	private void withPathsForPackage(String packageName, ThrowingConsumer<Path> consumer) {
+		try {
+			List<URL> sources = Collections
+				.list(getClass().getClassLoader().getResources(packageName.replace(".", "/")));
+			for (URL source : sources) {
+				URI sourceUri = source.toURI();
+				try {
+					consumer.accept(Paths.get(sourceUri));
+				}
+				catch (FileSystemNotFoundException ex) {
+					try (FileSystem fileSystem = FileSystems.newFileSystem(sourceUri, Collections.emptyMap())) {
+						consumer.accept(Paths.get(sourceUri));
+					}
+				}
+			}
+		}
+		catch (IOException ex) {
+			throw new UncheckedIOException(ex);
+		}
+		catch (URISyntaxException ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+
+	Resources addResource(String name, String content, boolean additional) {
+		Path resourcePath = this.root.resolve(name);
+		if (Files.isDirectory(resourcePath)) {
+			throw new IllegalStateException(
+					"Cannot create resource '" + name + "' as a directory already exists at that location");
+		}
+		Path parent = resourcePath.getParent();
+		try {
+			if (!Files.isDirectory(resourcePath)) {
+				Files.createDirectories(parent);
+			}
+			Files.writeString(resourcePath, processContent(content));
+			register(name, resourcePath, additional);
+		}
+		catch (IOException ex) {
+			throw new UncheckedIOException(ex);
+		}
+		return this;
+	}
+
+	private void register(String name, Path resourcePath, boolean additional) {
+		Resource resource = new Resource(resourcePath, additional);
+		register(name, resource);
+		Path ancestor = resourcePath.getParent();
+		while (!this.root.equals(ancestor)) {
+			Resource ancestorResource = new Resource(ancestor, additional);
+			register(this.root.relativize(ancestor).toString(), ancestorResource);
+			ancestor = ancestor.getParent();
+		}
+	}
+
+	private void register(String name, Resource resource) {
+		String normalized = name.replace("\\", "/");
+		this.resources.put(normalized, resource);
+		if (Files.isDirectory(resource.path())) {
+			if (normalized.endsWith("/")) {
+				this.resources.put(normalized.substring(0, normalized.length() - 1), resource);
+			}
+			else {
+				this.resources.put(normalized + "/", resource);
+			}
+		}
+	}
+
+	private String processContent(String content) {
+		return content.replace("${resourceRoot}", this.root.toString());
+	}
+
+	Resources addDirectory(String name) {
+		Path directoryPath = this.root.resolve(name);
+		if (Files.isRegularFile(directoryPath)) {
+			throw new IllegalStateException(
+					"Cannot create directory '" + name + " as a file already exists at that location");
+		}
+		try {
+			Files.createDirectories(directoryPath);
+			register(name, directoryPath, true);
+		}
+		catch (IOException ex) {
+			throw new UncheckedIOException(ex);
+		}
+		return this;
+	}
+
+	void delete() {
+		try {
+			FileSystemUtils.deleteRecursively(this.root);
+			this.resources.clear();
+		}
+		catch (IOException ex) {
+			throw new UncheckedIOException(ex);
+		}
+	}
+
+	Path getRoot() {
+		return this.root;
+	}
+
+	Resource find(String name) {
+		return this.resources.get(name);
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesClassLoader.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesClassLoader.java
new file mode 100644
index 000000000000..2eeef880c1c1
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesClassLoader.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+
+/**
+ * A {@link ClassLoader} that provides access to {@link Resources resources}.
+ *
+ * @author Andy Wilkinson
+ */
+class ResourcesClassLoader extends ClassLoader {
+
+	private final Resources resources;
+
+	ResourcesClassLoader(ClassLoader parent, Resources resources) {
+		super(parent);
+		this.resources = resources;
+	}
+
+	@Override
+	public URL getResource(String name) {
+		Resource resource = this.resources.find(name);
+		return (resource != null) ? urlOf(resource) : getParent().getResource(name);
+	}
+
+	private URL urlOf(Resource resource) {
+		try {
+			return resource.path().toUri().toURL();
+		}
+		catch (IOException ex) {
+			throw new UncheckedIOException(ex);
+		}
+	}
+
+	@Override
+	public Enumeration<URL> getResources(String name) throws IOException {
+		Resource resource = this.resources.find(name);
+		ArrayList<URL> urls = new ArrayList<>();
+		if (resource != null) {
+			URL resourceUrl = urlOf(resource);
+			urls.add(resourceUrl);
+		}
+		if (resource == null || resource.additional()) {
+			urls.addAll(Collections.list(getParent().getResources(name)));
+		}
+		return Collections.enumeration(urls);
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesExtension.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesExtension.java
new file mode 100644
index 000000000000..4d0d9ab2c981
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesExtension.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.platform.commons.support.AnnotationSupport;
+import org.junit.platform.commons.support.SearchOption;
+
+import org.springframework.util.StreamUtils;
+
+/**
+ * {@link Extension} for managing resources in tests. Resources are made available through
+ * {@link Thread#getContextClassLoader() thread context class loader}.
+ *
+ * @author Andy Wilkinson
+ * @see WithPackageResources
+ * @see WithResource
+ * @see WithResourceDirectory
+ */
+class ResourcesExtension implements BeforeEachCallback, AfterEachCallback, ParameterResolver {
+
+	private static final String RESOURCES_KEY = ResourcesExtension.class.getName() + ".resources";
+
+	private static final String TCCL_KEY = ResourcesExtension.class.getName() + ".tccl";
+
+	@Override
+	public void beforeEach(ExtensionContext context) throws Exception {
+		Store store = context.getStore(Namespace.create(ResourcesExtension.class));
+		Resources resources = new Resources(Files.createTempDirectory("resources"));
+		store.put(RESOURCES_KEY, resources);
+		Method testMethod = context.getRequiredTestMethod();
+		resourcesOf(testMethod)
+			.forEach((resource) -> resources.addResource(resource.name(), resource.content(), resource.additional()));
+		resourceDirectoriesOf(testMethod).forEach((directory) -> resources.addDirectory(directory.value()));
+		packageResourcesOf(testMethod).forEach((withPackageResources) -> resources
+			.addPackage(testMethod.getDeclaringClass().getPackage(), withPackageResources.value()));
+		ResourcesClassLoader classLoader = new ResourcesClassLoader(context.getRequiredTestClass().getClassLoader(),
+				resources);
+		store.put(TCCL_KEY, Thread.currentThread().getContextClassLoader());
+		Thread.currentThread().setContextClassLoader(classLoader);
+	}
+
+	private List<WithResource> resourcesOf(Method method) {
+		return withAnnotationsOf(method, WithResource.class);
+	}
+
+	private List<WithResourceDirectory> resourceDirectoriesOf(Method method) {
+		return withAnnotationsOf(method, WithResourceDirectory.class);
+	}
+
+	private <A extends Annotation> List<A> withAnnotationsOf(Method method, Class<A> annotationType) {
+		List<A> annotations = new ArrayList<>();
+		AnnotationSupport.findRepeatableAnnotations(method, annotationType).forEach(annotations::add);
+		Class<?> type = method.getDeclaringClass();
+		while (type != null) {
+			AnnotationSupport.findRepeatableAnnotations(type, annotationType).forEach(annotations::add);
+			type = type.getEnclosingClass();
+		}
+		return annotations;
+	}
+
+	private List<WithPackageResources> packageResourcesOf(Method method) {
+		List<WithPackageResources> annotations = new ArrayList<>();
+		AnnotationSupport.findAnnotation(method, WithPackageResources.class).ifPresent(annotations::add);
+		AnnotationSupport
+			.findAnnotation(method.getDeclaringClass(), WithPackageResources.class,
+					SearchOption.INCLUDE_ENCLOSING_CLASSES)
+			.ifPresent(annotations::add);
+		return annotations;
+	}
+
+	@Override
+	public void afterEach(ExtensionContext context) throws Exception {
+		Store store = context.getStore(Namespace.create(ResourcesExtension.class));
+		store.get(RESOURCES_KEY, Resources.class).delete();
+		Thread.currentThread().setContextClassLoader(store.get(TCCL_KEY, ClassLoader.class));
+	}
+
+	@Override
+	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+			throws ParameterResolutionException {
+		return parameterContext.isAnnotated(ResourcesRoot.class) || parameterContext.isAnnotated(ResourcePath.class)
+				|| parameterContext.isAnnotated(ResourceContent.class);
+	}
+
+	@Override
+	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+			throws ParameterResolutionException {
+		if (parameterContext.isAnnotated(ResourcesRoot.class)) {
+			return resolveResourcesRoot(parameterContext, extensionContext);
+		}
+		if (parameterContext.isAnnotated(ResourcePath.class)) {
+			return resolveResourcePath(parameterContext, extensionContext);
+		}
+		if (parameterContext.isAnnotated(ResourceContent.class)) {
+			return resolveResourceContent(parameterContext, extensionContext);
+		}
+		throw new ParameterResolutionException(
+				"Parameter is not annotated with @ResourcesRoot, @ResourceContent, or @ResourcePath");
+	}
+
+	private Object resolveResourcesRoot(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		Resources resources = getResources(extensionContext);
+		Class<?> parameterType = parameterContext.getParameter().getType();
+		if (parameterType.isAssignableFrom(Path.class)) {
+			return resources.getRoot();
+		}
+		else if (parameterType.isAssignableFrom(File.class)) {
+			return resources.getRoot().toFile();
+		}
+		throw new IllegalStateException(
+				"@ResourcesRoot is not supported with parameter type '" + parameterType.getName() + "'");
+	}
+
+	private Object resolveResourcePath(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		Resources resources = getResources(extensionContext);
+		Class<?> parameterType = parameterContext.getParameter().getType();
+		Path resourcePath = resources.find(parameterContext.findAnnotation(ResourcePath.class).get().value()).path();
+		if (parameterType.isAssignableFrom(Path.class)) {
+			return resourcePath;
+		}
+		else if (parameterType.isAssignableFrom(File.class)) {
+			return resourcePath.toFile();
+		}
+		else if (parameterType.isAssignableFrom(String.class)) {
+			return resourcePath.toString();
+		}
+		throw new IllegalStateException(
+				"@ResourcePath is not supported with parameter type '" + parameterType.getName() + "'");
+	}
+
+	private Object resolveResourceContent(ParameterContext parameterContext, ExtensionContext extensionContext) {
+		Resources resources = getResources(extensionContext);
+		Class<?> parameterType = parameterContext.getParameter().getType();
+		Path resourcePath = resources.find(parameterContext.findAnnotation(ResourceContent.class).get().value()).path();
+		if (parameterType.isAssignableFrom(String.class)) {
+			try (InputStream in = Files.newInputStream(resourcePath)) {
+				return StreamUtils.copyToString(in, StandardCharsets.UTF_8);
+			}
+			catch (IOException ex) {
+				throw new UncheckedIOException(ex);
+			}
+		}
+		throw new IllegalStateException(
+				"@ResourceContent is not supported with parameter type '" + parameterType.getName() + "'");
+	}
+
+	private Resources getResources(ExtensionContext extensionContext) {
+		Store store = extensionContext.getStore(Namespace.create(ResourcesExtension.class));
+		Resources resources = store.get(RESOURCES_KEY, Resources.class);
+		return resources;
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesRoot.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesRoot.java
new file mode 100644
index 000000000000..f3d7123c30d9
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/ResourcesRoot.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.nio.file.Path;
+
+/**
+ * Annotation that indicates that the resources root should be injected. Supported on
+ * parameters of type:
+ *
+ * <ul>
+ * <li>{@link File}</li>
+ * <li>{@link Path}</li>
+ * </ul>
+ *
+ * @author Andy Wilkinson
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface ResourcesRoot {
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResources.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResources.java
new file mode 100644
index 000000000000..074d05bdf7ec
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResources.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Makes resources in the package of the annotated class available from the root of the
+ * classpath.
+ *
+ * @author Andy Wilkinson
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@ExtendWith(ResourcesExtension.class)
+public @interface WithPackageResources {
+
+	/**
+	 * The resources to make available from the root.
+	 * @return the resources
+	 */
+	String[] value();
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResource.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResource.java
new file mode 100644
index 000000000000..6c19f9f766c0
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResource.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Makes a resource directory available from the thread context class loader.
+ * <p>
+ * For cases where one resource needs to refer to another, the resource's content may
+ * contain the placeholder <code>${resourceRoot}</code>. It will be replaced with the path
+ * to the root of the resources. For example, a resource with the {@link #name}
+ * {@code example.txt} can be referenced using <code>${resourceRoot}/example.txt</code>.
+ *
+ * @author Andy Wilkinson
+ */
+@Inherited
+@Repeatable(WithResources.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@ExtendWith(ResourcesExtension.class)
+public @interface WithResource {
+
+	/**
+	 * The name of the resource.
+	 * @return the name
+	 */
+	String name();
+
+	/**
+	 * The content of the resource. When omitted an empty resource will be created.
+	 * @return the content
+	 */
+	String content() default "";
+
+	/**
+	 * Whether the resource should be available in addition to those that are already on
+	 * the classpath are instead of any existing resources with the same name.
+	 * @return whether this is an additional resource
+	 */
+	boolean additional() default true;
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectories.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectories.java
new file mode 100644
index 000000000000..973931c65c29
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectories.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Container annotation for {@link WithResourceDirectory}.
+ *
+ * @author Andy Wilkinson
+ */
+@Inherited
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+public @interface WithResourceDirectories {
+
+	WithResourceDirectory[] value();
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectory.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectory.java
new file mode 100644
index 000000000000..95fb2ef7585f
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectory.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Makes a resource available from the thread context class loader. Typically used when a
+ * test requires an empty directory to exist.
+ *
+ * @author Andy Wilkinson
+ */
+@Inherited
+@Repeatable(WithResourceDirectories.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@ExtendWith(ResourcesExtension.class)
+public @interface WithResourceDirectory {
+
+	/**
+	 * The name of the directory.
+	 * @return the name
+	 */
+	String value();
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResources.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResources.java
new file mode 100644
index 000000000000..1f9b72e767b9
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/WithResources.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Container annotation for {@link WithResource}.
+ *
+ * @author Andy Wilkinson
+ */
+@Inherited
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+public @interface WithResources {
+
+	WithResource[] value();
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/package-info.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/package-info.java
new file mode 100644
index 000000000000..ddc2e5c98ecb
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/resources/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Custom JUnit extension for testing with resources.
+ */
+package org.springframework.boot.testsupport.classpath.resources;
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnClassWithPackageResourcesTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnClassWithPackageResourcesTests.java
new file mode 100644
index 000000000000..31949514396f
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnClassWithPackageResourcesTests.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WithPackageResources} on a class.
+ *
+ * @author Andy Wilkinson
+ */
+@WithPackageResources({ "resource-1.txt", "resource-2.txt", "sub/resource-3.txt" })
+class OnClassWithPackageResourcesTests {
+
+	@Test
+	void whenWithPackageResourcesIsUsedOnAClassThenResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("resource-1.txt").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("one");
+		assertThat(new ClassPathResource("resource-2.txt").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("two");
+		assertThat(new ClassPathResource("sub/resource-3.txt").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("three");
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnClassWithResourceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnClassWithResourceTests.java
new file mode 100644
index 000000000000..a1c701e166c7
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnClassWithResourceTests.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WithResource} when used on a class.
+ *
+ * @author Andy Wilkinson
+ */
+@WithResource(name = "on-class", content = "class content")
+class OnClassWithResourceTests {
+
+	@Test
+	void whenWithResourceIsUsedOnAClassThenResourceIsAvailable() throws IOException {
+		assertThat(new ClassPathResource("on-class").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("class content");
+	}
+
+	@Test
+	@WithResource(name = "method-resource", content = "method")
+	void whenWithResourceIsUsedOnClassAndMethodThenBothResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("on-class").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("class content");
+		assertThat(new ClassPathResource("method-resource").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("method");
+	}
+
+	@Test
+	@WithResource(name = "method-resource-1", content = "method-1")
+	@WithResource(name = "method-resource-2", content = "method-2")
+	void whenWithResourceIsUsedOnClassAndRepeatedOnMethodThenAllResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("on-class").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("class content");
+		assertThat(new ClassPathResource("method-resource-1").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("method-1");
+		assertThat(new ClassPathResource("method-resource-2").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("method-2");
+	}
+
+	@Nested
+	class NestedTests {
+
+		@Test
+		void whenWithResourceIsUsedOnEnclosingClassThenResourceIsAvailable() throws IOException {
+			assertThat(new ClassPathResource("on-class").getContentAsString(StandardCharsets.UTF_8))
+				.isEqualTo("class content");
+		}
+
+	}
+
+	@Nested
+	@WithResource(name = "on-nested-class", content = "nested class content")
+	class WithResourceNestedTests {
+
+		@Test
+		void whenWithResourceIsUsedOnEnclosingClassAndClassThenBothResourcesAreAvailable() throws IOException {
+			assertThat(new ClassPathResource("on-class").getContentAsString(StandardCharsets.UTF_8))
+				.isEqualTo("class content");
+			assertThat(new ClassPathResource("on-nested-class").getContentAsString(StandardCharsets.UTF_8))
+				.isEqualTo("nested class content");
+		}
+
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnSuperClassWithPackageResourcesTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnSuperClassWithPackageResourcesTests.java
new file mode 100644
index 000000000000..2a3b3739a097
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnSuperClassWithPackageResourcesTests.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WithPackageResources} when used on a super-class.
+ *
+ * @author Andy Wilkinson
+ */
+class OnSuperClassWithPackageResourcesTests extends WithPackageResourcesClass {
+
+	@Test
+	void whenWithPackageResourcesIsUsedOnASuperClassThenResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("resource-1.txt").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("one");
+		assertThat(new ClassPathResource("resource-2.txt").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("two");
+		assertThat(new ClassPathResource("sub/resource-3.txt").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("three");
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnSuperClassWithResourceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnSuperClassWithResourceTests.java
new file mode 100644
index 000000000000..2e47735fb148
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/OnSuperClassWithResourceTests.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WithResource} when used on a super-class.
+ *
+ * @author Andy Wilkinson
+ */
+class OnSuperClassWithResourceTests extends WithResourceClass {
+
+	@Test
+	void whenWithResourceIsUsedOnASuperClassThenResourceIsAvailable() throws IOException {
+		assertThat(new ClassPathResource("on-super-class").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("super-class content");
+	}
+
+	@Test
+	@WithResource(name = "method-resource", content = "method")
+	void whenWithResourceIsUsedOnASuperClassAndMethodThenBothResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("on-super-class").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("super-class content");
+		assertThat(new ClassPathResource("method-resource").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("method");
+	}
+
+	@Test
+	@WithResource(name = "method-resource-1", content = "method-1")
+	@WithResource(name = "method-resource-2", content = "method-2")
+	void whenWithResourceIsUsedOnASuperClassAndRepeatedOnMethodThenAllResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("on-super-class").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("super-class content");
+		assertThat(new ClassPathResource("method-resource-1").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("method-1");
+		assertThat(new ClassPathResource("method-resource-2").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("method-2");
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/ResourcesTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/ResourcesTests.java
new file mode 100644
index 000000000000..be3a319f1048
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/ResourcesTests.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+
+/**
+ * Tests for {@link Resources}.
+ *
+ * @author Andy Wilkinson
+ */
+class ResourcesTests {
+
+	@TempDir
+	private Path root;
+
+	private Resources resources;
+
+	@BeforeEach
+	void setUp() {
+		this.resources = new Resources(this.root);
+	}
+
+	@Test
+	void whenAddResourceThenResourceIsCreatedAndCanBeFound() {
+		this.resources.addResource("test", "test-content", true);
+		assertThat(this.root.resolve("test")).hasContent("test-content");
+		assertThat(this.resources.find("test")).isNotNull();
+	}
+
+	@Test
+	void whenAddResourceHasContentReferencingResourceRootThenResourceIsCreatedWithReferenceToRoot() {
+		this.resources.addResource("test", "*** ${resourceRoot} ***", true);
+		assertThat(this.root.resolve("test")).hasContent("*** " + this.root + " ***");
+	}
+
+	@Test
+	void whenAddResourceWithPathThenResourceIsCreatedAndItAndItsAncestorsCanBeFound() {
+		this.resources.addResource("a/b/c/test", "test-content", true);
+		assertThat(this.root.resolve("a/b/c/test")).hasContent("test-content");
+		assertThat(this.resources.find("a/b/c/test")).isNotNull();
+		assertThat(this.resources.find("a/b/c/")).isNotNull();
+		assertThat(this.resources.find("a/b/")).isNotNull();
+		assertThat(this.resources.find("a/")).isNotNull();
+	}
+
+	@Test
+	void whenAddResourceAndResourceAlreadyExistsThenResourcesIsOverwritten() {
+		this.resources.addResource("a/b/c/test", "original-content", true);
+		this.resources.addResource("a/b/c/test", "new-content", true);
+		assertThat(this.root.resolve("a/b/c/test")).hasContent("new-content");
+	}
+
+	@Test
+	void whenAddPackageThenNamedResourcesFromPackageAreCreatedAndCanBeFound() {
+		this.resources.addPackage(getClass().getPackage(), new String[] { "resource-1.txt", "sub/resource-3.txt" });
+		assertThat(this.root.resolve("resource-1.txt")).hasContent("one");
+		assertThat(this.root.resolve("resource-2.txt")).doesNotExist();
+		assertThat(this.root.resolve("sub/resource-3.txt")).hasContent("three");
+		assertThat(this.resources.find("resource-1.txt")).isNotNull();
+		assertThat(this.resources.find("resource-2.txt")).isNull();
+		assertThat(this.resources.find("sub/resource-3.txt")).isNotNull();
+		assertThat(this.resources.find("sub/")).isNotNull();
+	}
+
+	@Test
+	void whenAddResourceAndDeleteThenResourceDoesNotExistAndCannotBeFound() {
+		this.resources.addResource("test", "test-content", true);
+		assertThat(this.root.resolve("test")).hasContent("test-content");
+		assertThat(this.resources.find("test")).isNotNull();
+		this.resources.delete();
+		assertThat(this.root.resolve("test")).doesNotExist();
+		assertThat(this.resources.find("test")).isNull();
+	}
+
+	@Test
+	void whenAddPackageAndDeleteThenResourcesDoNotExistAndCannotBeFound() {
+		this.resources.addPackage(getClass().getPackage(),
+				new String[] { "resource-1.txt", "resource-2.txt", "sub/resource-3.txt" });
+		assertThat(this.root.resolve("resource-1.txt")).hasContent("one");
+		assertThat(this.root.resolve("resource-2.txt")).hasContent("two");
+		assertThat(this.root.resolve("sub/resource-3.txt")).hasContent("three");
+		assertThat(this.resources.find("resource-1.txt")).isNotNull();
+		assertThat(this.resources.find("resource-2.txt")).isNotNull();
+		assertThat(this.resources.find("sub/resource-3.txt")).isNotNull();
+		assertThat(this.resources.find("sub/")).isNotNull();
+		this.resources.delete();
+		assertThat(this.root.resolve("resource-1.txt")).doesNotExist();
+		assertThat(this.root.resolve("resource-2.txt")).doesNotExist();
+		assertThat(this.root.resolve("sub/resource-3.txt")).doesNotExist();
+		assertThat(this.root.resolve("sub")).doesNotExist();
+		assertThat(this.resources.find("resource-1.txt")).isNull();
+		assertThat(this.resources.find("resource-2.txt")).isNull();
+		assertThat(this.resources.find("sub/resource-3.txt")).isNull();
+		assertThat(this.resources.find("sub/")).isNull();
+	}
+
+	@Test
+	void whenAddDirectoryThenDirectoryIsCreatedAndCanBeFound() {
+		this.resources.addDirectory("dir");
+		assertThat(this.root.resolve("dir")).isDirectory();
+		assertThat(this.resources.find("dir/")).isNotNull();
+	}
+
+	@Test
+	void whenAddDirectoryWithPathThenDirectoryIsCreatedAndItAndItsAncestorsCanBeFound() {
+		this.resources.addDirectory("one/two/three/dir");
+		assertThat(this.root.resolve("one/two/three/dir")).isDirectory();
+		assertThat(this.resources.find("one/two/three/dir/")).isNotNull();
+		assertThat(this.resources.find("one/two/three/")).isNotNull();
+		assertThat(this.resources.find("one/two/")).isNotNull();
+		assertThat(this.resources.find("one/")).isNotNull();
+	}
+
+	@Test
+	void whenAddDirectoryAndDirectoryAlreadyExistsThenDoesNotThrow() {
+		this.resources.addDirectory("one/two/three/dir");
+		this.resources.addDirectory("one/two/three/dir");
+		assertThat(this.root.resolve("one/two/three/dir")).isDirectory();
+	}
+
+	@Test
+	void whenAddDirectoryAndResourceAlreadyExistsThenIllegalStateExceptionIsThrown() {
+		this.resources.addResource("one/two/three/", "content", true);
+		assertThatIllegalStateException().isThrownBy(() -> this.resources.addDirectory("one/two/three"));
+	}
+
+	@Test
+	void whenAddResourceAndDirectoryAlreadyExistsThenIllegalStateExceptionIsThrown() {
+		this.resources.addDirectory("one/two/three");
+		assertThatIllegalStateException()
+			.isThrownBy(() -> this.resources.addResource("one/two/three", "content", true));
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResourcesClass.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResourcesClass.java
new file mode 100644
index 000000000000..754e48c8fb7d
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResourcesClass.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+/**
+ * Class to test the use of {@link WithPackageResources} on a super-class.
+ *
+ * @author Andy Wilkinson
+ */
+@WithPackageResources({ "resource-1.txt", "resource-2.txt", "sub/resource-3.txt" })
+class WithPackageResourcesClass {
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResourcesTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResourcesTests.java
new file mode 100644
index 000000000000..8d5f425b30c5
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithPackageResourcesTests.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WithPackageResources}.
+ *
+ * @author Andy Wilkinson
+ */
+class WithPackageResourcesTests {
+
+	@Test
+	@WithPackageResources({ "resource-1.txt", "resource-2.txt", "sub/resource-3.txt" })
+	void whenWithPackageResourcesIsUsedOnAMethodThenResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("resource-1.txt").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("one");
+		assertThat(new ClassPathResource("resource-2.txt").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("two");
+		assertThat(new ClassPathResource("sub/resource-3.txt").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("three");
+	}
+
+	@Test
+	@WithPackageResources("sub/resource-3.txt")
+	void whenWithPackageResourcesOnlyIncludesSomeResourcesThenOnlyIncludedResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("resource-1.txt").exists()).isFalse();
+		assertThat(new ClassPathResource("resource-2.txt").exists()).isFalse();
+		assertThat(new ClassPathResource("sub/resource-3.txt").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("three");
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceClass.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceClass.java
new file mode 100644
index 000000000000..0b386bbd5fbc
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceClass.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+/**
+ * Class to test the use of {@link WithResource} on a super-class
+ *
+ * @author Andy Wilkinson
+ */
+@WithResource(name = "on-super-class", content = "super-class content")
+class WithResourceClass {
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectoryTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectoryTests.java
new file mode 100644
index 000000000000..7e3d29a4de6f
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceDirectoryTests.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WithResourceDirectory}.
+ *
+ * @author Andy Wilkinson
+ */
+class WithResourceDirectoryTests {
+
+	@Test
+	@WithResourceDirectory("test")
+	void whenWithResourceDirectoryIsUsedOnAMethodThenDirectoryIsCreated() throws IOException {
+		assertThat(new ClassPathResource("test").getFile()).isDirectory();
+	}
+
+	@Test
+	@WithResourceDirectory("com/example/nested")
+	void whenWithResourceDirectoryNamesANestedDirectoryThenDirectoryIsCreated() throws IOException {
+		assertThat(new ClassPathResource("com/example/nested").getFile()).isDirectory();
+	}
+
+	@Test
+	@WithResourceDirectory("1")
+	@WithResourceDirectory("2")
+	@WithResourceDirectory("3")
+	void whenWithResourceDirectoryIsRepeatedOnAMethodThenAllResourceDirectoriesAreCreated() throws IOException {
+		assertThat(new ClassPathResource("1").getFile()).isDirectory();
+		assertThat(new ClassPathResource("2").getFile()).isDirectory();
+		assertThat(new ClassPathResource("3").getFile()).isDirectory();
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceTests.java
new file mode 100644
index 000000000000..5142196b71aa
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/resources/WithResourceTests.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.classpath.resources;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link WithResource}.
+ *
+ * @author Andy Wilkinson
+ */
+class WithResourceTests {
+
+	@Test
+	@WithResource(name = "test", content = "content")
+	void whenWithResourceIsUsedOnAMethodThenResourceIsAvailable() throws IOException {
+		assertThat(new ClassPathResource("test").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("content");
+	}
+
+	@Test
+	@WithResource(name = "test", content = "content")
+	void whenWithResourceIsUsedOnAMethodThenResourceIsAvailableFromFileResourcesRoot(@ResourcesRoot File root) {
+		assertThat(new File(root, "test")).hasContent("content");
+	}
+
+	@Test
+	@WithResource(name = "test", content = "content")
+	void whenWithResourceIsUsedOnAMethodThenResourceIsAvailableFromPathResourcesRoot(@ResourcesRoot Path root) {
+		assertThat(root.resolve("test")).hasContent("content");
+	}
+
+	@Test
+	@WithResource(name = "test", content = "content")
+	void whenWithResourceIsUsedOnAMethodThenResourceIsAvailableFromPathResourcePath(
+			@ResourcePath("test") Path resource) {
+		assertThat(resource).hasContent("content");
+	}
+
+	@Test
+	@WithResource(name = "test", content = "content")
+	void whenWithResourceIsUsedOnAMethodThenResourceIsAvailableFromFileResourcePath(
+			@ResourcePath("test") File resource) {
+		assertThat(resource).hasContent("content");
+	}
+
+	@Test
+	@WithResource(name = "test", content = "content")
+	void whenWithResourceIsUsedOnAMethodThenResourceIsAvailableFromStringResourcePath(
+			@ResourcePath("test") String resource) {
+		assertThat(new File(resource)).hasContent("content");
+	}
+
+	@Test
+	@WithResource(name = "test", content = "content")
+	void whenWithResourceIsUsedOnAMethodThenResourceContentIsAvailableAsAString(
+			@ResourceContent("test") String content) {
+		assertThat(content).isEqualTo("content");
+	}
+
+	@Test
+	@WithResource(name = "com/example/test-resource", content = "content")
+	void whenWithResourceNameIncludesADirectoryThenResourceIsAvailable() throws IOException {
+		assertThat(new ClassPathResource("com/example/test-resource").getContentAsString(StandardCharsets.UTF_8))
+			.isEqualTo("content");
+	}
+
+	@Test
+	@WithResource(name = "1", content = "one")
+	@WithResource(name = "2", content = "two")
+	@WithResource(name = "3", content = "three")
+	void whenWithResourceIsRepeatedOnAMethodThenAllResourcesAreAvailable() throws IOException {
+		assertThat(new ClassPathResource("1").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("one");
+		assertThat(new ClassPathResource("2").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("two");
+		assertThat(new ClassPathResource("3").getContentAsString(StandardCharsets.UTF_8)).isEqualTo("three");
+	}
+
+	@Test
+	@WithResource(name = "org/springframework/boot/testsupport/classpath/resources/resource-1.txt",
+			content = "from-with-resource")
+	void whenWithResourceCreatesResourceThatIsAvailableElsewhereBothResourcesCanBeLoaded() throws IOException {
+		Resource[] resources = new PathMatchingResourcePatternResolver()
+			.getResources("classpath*:org/springframework/boot/testsupport/classpath/resources/resource-1.txt");
+		assertThat(resources).hasSize(2);
+		assertThat(resources).extracting((resource) -> resource.getContentAsString(StandardCharsets.UTF_8))
+			.containsExactly("from-with-resource", "one");
+	}
+
+	@Test
+	@WithResource(name = "org/springframework/boot/testsupport/classpath/resources/resource-1.txt",
+			content = "from-with-resource", additional = false)
+	void whenWithResourceCreatesResourceThatIsNotAdditionalThenResourceThatIsAvailableElsewhereCannotBeLoaded()
+			throws IOException {
+		Resource[] resources = new PathMatchingResourcePatternResolver()
+			.getResources("classpath*:org/springframework/boot/testsupport/classpath/resources/resource-1.txt");
+		assertThat(resources).hasSize(1);
+		assertThat(resources[0].getContentAsString(StandardCharsets.UTF_8)).isEqualTo("from-with-resource");
+	}
+
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServerTests.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServerTests.java
deleted file mode 100644
index 7004abb4c2d3..000000000000
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServerTests.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2012-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.boot.testsupport.web.servlet;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.mock.web.MockSessionCookieConfig;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link MockServletWebServer}.
- *
- * @author Stephane Nicoll
- */
-class MockServletWebServerTests {
-
-	@Test
-	void servletContextIsConfigured() {
-		MockServletWebServer server = TestMockServletWebServer.create();
-		assertThat(server.getServletContext()).isNotNull();
-	}
-
-	@Test
-	void servletContextHasSessionCookieConfigConfigured() {
-		MockServletWebServer server = TestMockServletWebServer.create();
-		assertThat(server.getServletContext().getSessionCookieConfig()).isInstanceOf(MockSessionCookieConfig.class);
-	}
-
-	private static final class TestMockServletWebServer extends MockServletWebServer {
-
-		private TestMockServletWebServer(Initializer[] initializers, int port) {
-			super(initializers, port);
-		}
-
-		static MockServletWebServer create(Initializer... initializers) {
-			return new TestMockServletWebServer(initializers, 8080);
-		}
-
-	}
-
-}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/resource-1.txt b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/resource-1.txt
new file mode 100644
index 000000000000..43dd47ea691c
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/resource-1.txt
@@ -0,0 +1 @@
+one
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/resource-2.txt b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/resource-2.txt
new file mode 100644
index 000000000000..64c5e5885a4b
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/resource-2.txt
@@ -0,0 +1 @@
+two
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/sub/resource-3.txt b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/sub/resource-3.txt
new file mode 100644
index 000000000000..1d19714ffbc2
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/resources/org/springframework/boot/testsupport/classpath/resources/sub/resource-3.txt
@@ -0,0 +1 @@
+three
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
index 6d8fac07ede6..2550468bd776 100644
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -1,6 +1,7 @@
 plugins {
 	id "dev.adamko.dokkatoo-html"
 	id "java-library"
+	id "java-test-fixtures"
 	id "org.jetbrains.kotlin.jvm"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.deployed"
@@ -100,6 +101,10 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 
+	testFixturesCompileOnly("jakarta.servlet:jakarta.servlet-api")
+	testFixturesCompileOnly("org.mockito:mockito-core")
+	testFixturesCompileOnly("org.springframework:spring-web")
+
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation("org.springframework:spring-core-test")
 	testImplementation("com.ibm.db2:jcc")
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
index 5d7cdf73cae4..5db3c468d2fc 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot;
 
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -64,8 +65,8 @@ public ResourceBanner(Resource resource) {
 
 	@Override
 	public void printBanner(Environment environment, Class<?> sourceClass, PrintStream out) {
-		try {
-			String banner = StreamUtils.copyToString(this.resource.getInputStream(),
+		try (InputStream input = this.resource.getInputStream()) {
+			String banner = StreamUtils.copyToString(input,
 					environment.getProperty("spring.banner.charset", Charset.class, StandardCharsets.UTF_8));
 			for (PropertyResolver resolver : getPropertyResolvers(environment, sourceClass)) {
 				banner = resolver.resolvePlaceholders(banner);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java
index 5758a898d856..b1ba87d66b0b 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java
index beb076ad8692..5da6bd1bb7a3 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/StandardConfigDataLocationResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ public StandardConfigDataLocationResolver(DeferredLogFactory logFactory, Binder
 			ResourceLoader resourceLoader) {
 		this.logger = logFactory.getLog(StandardConfigDataLocationResolver.class);
 		this.propertySourceLoaders = SpringFactoriesLoader.loadFactories(PropertySourceLoader.class,
-				getClass().getClassLoader());
+				resourceLoader.getClassLoader());
 		this.configNames = getConfigNames(binder);
 		this.resourceLoader = new LocationResourceLoader(resourceLoader);
 	}
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
index 7fb5db460b35..b601ab33af77 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -176,7 +176,7 @@ public void cleanUp() {
 	/**
 	 * {@link LoggingSystemFactory} that returns {@link JavaLoggingSystem} if possible.
 	 */
-	@Order(Ordered.LOWEST_PRECEDENCE)
+	@Order(Ordered.LOWEST_PRECEDENCE - 1024)
 	public static class Factory implements LoggingSystemFactory {
 
 		private static final boolean PRESENT = ClassUtils.isPresent("java.util.logging.LogManager",
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
index 55b71ec8d89b..0bd4bf9538b3 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
@@ -17,6 +17,7 @@
 package org.springframework.boot.logging.log4j2;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
@@ -64,7 +65,6 @@
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.boot.logging.LoggingSystemFactory;
 import org.springframework.core.Conventions;
-import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.Resource;
@@ -284,13 +284,11 @@ protected void loadConfiguration(String location, LogFile logFile, List<String>
 
 	private Configuration load(String location, LoggerContext context) throws IOException {
 		Resource resource = ApplicationResourceLoader.get().getResource(location);
-		ConfigurationSource source = getConfigurationSource(resource);
-		return ConfigurationFactory.getInstance().getConfiguration(context, source);
-	}
-
-	private ConfigurationSource getConfigurationSource(Resource resource) throws IOException {
+		ConfigurationFactory factory = ConfigurationFactory.getInstance();
 		if (resource.isFile()) {
-			return new ConfigurationSource(resource.getInputStream(), resource.getFile());
+			try (InputStream inputStream = resource.getInputStream()) {
+				return factory.getConfiguration(context, new ConfigurationSource(inputStream, resource.getFile()));
+			}
 		}
 		URL url = resource.getURL();
 		AuthorizationProvider authorizationProvider = ConfigurationFactory
@@ -299,7 +297,10 @@ private ConfigurationSource getConfigurationSource(Resource resource) throws IOE
 				? SslConfigurationFactory.getSslConfiguration() : null;
 		URLConnection connection = UrlConnectionFactory.createConnection(url, 0, sslConfiguration,
 				authorizationProvider);
-		return new ConfigurationSource(connection.getInputStream(), url, connection.getLastModified());
+		try (InputStream inputStream = connection.getInputStream()) {
+			return factory.getConfiguration(context,
+					new ConfigurationSource(inputStream, url, connection.getLastModified()));
+		}
 	}
 
 	private CompositeConfiguration createComposite(List<Configuration> configurations) {
@@ -445,7 +446,7 @@ public void cleanUp() {
 		super.cleanUp();
 		LoggerContext loggerContext = getLoggerContext();
 		markAsUninitialized(loggerContext);
-		StatusConsoleListener listener = (StatusConsoleListener) getLoggerContext().getObject(STATUS_LISTENER_KEY);
+		StatusConsoleListener listener = (StatusConsoleListener) loggerContext.getObject(STATUS_LISTENER_KEY);
 		if (listener != null) {
 			StatusLogger.getLogger().removeListener(listener);
 			loggerContext.removeObject(STATUS_LISTENER_KEY);
@@ -503,7 +504,7 @@ public static Environment getEnvironment(LoggerContext loggerContext) {
 	/**
 	 * {@link LoggingSystemFactory} that returns {@link Log4J2LoggingSystem} if possible.
 	 */
-	@Order(Ordered.LOWEST_PRECEDENCE)
+	@Order(0)
 	public static class Factory implements LoggingSystemFactory {
 
 		private static final boolean PRESENT = ClassUtils
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
index e30da9139bf0..9f0274b985c1 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -494,7 +494,7 @@ void setStatusPrinterStream(PrintStream stream) {
 	/**
 	 * {@link LoggingSystemFactory} that returns {@link LogbackLoggingSystem} if possible.
 	 */
-	@Order(Ordered.LOWEST_PRECEDENCE)
+	@Order(Ordered.HIGHEST_PRECEDENCE + 1024)
 	public static class Factory implements LoggingSystemFactory {
 
 		private static final boolean PRESENT = ClassUtils.isPresent("ch.qos.logback.classic.LoggerContext",
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/CommonStructuredLogFormat.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/CommonStructuredLogFormat.java
index acba34b7cd68..16be28491d6e 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/CommonStructuredLogFormat.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/CommonStructuredLogFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 public enum CommonStructuredLogFormat {
 
 	/**
-	 * <a href="https://www.elastic.co/guide/en/ecs/current/ecs-log.html">Elasic Common
+	 * <a href="https://www.elastic.co/guide/en/ecs/current/ecs-log.html">Elastic Common
 	 * Schema</a> (ECS) log format.
 	 */
 	ELASTIC_COMMON_SCHEMA("ecs"),
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
index 8091f99b06a1..15bbcea920c9 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 
 import javax.sql.DataSource;
 
@@ -54,7 +55,7 @@ public class EntityManagerFactoryBuilder {
 
 	private final PersistenceUnitManager persistenceUnitManager;
 
-	private final Map<String, Object> jpaProperties;
+	private final Function<DataSource, Map<String, ?>> jpaPropertiesFactory;
 
 	private final URL persistenceUnitRootLocation;
 
@@ -62,6 +63,42 @@ public class EntityManagerFactoryBuilder {
 
 	private PersistenceUnitPostProcessor[] persistenceUnitPostProcessors;
 
+	/**
+	 * Create a new instance passing in the common pieces that will be shared if multiple
+	 * EntityManagerFactory instances are created.
+	 * @param jpaVendorAdapter a vendor adapter
+	 * @param jpaPropertiesFactory the JPA properties to be passed to the persistence
+	 * provider, based on the {@linkplain #dataSource(DataSource) configured data source}
+	 * @param persistenceUnitManager optional source of persistence unit information (can
+	 * be null)
+	 * @since 3.4.4
+	 */
+	public EntityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter,
+			Function<DataSource, Map<String, ?>> jpaPropertiesFactory, PersistenceUnitManager persistenceUnitManager) {
+		this(jpaVendorAdapter, jpaPropertiesFactory, persistenceUnitManager, null);
+	}
+
+	/**
+	 * Create a new instance passing in the common pieces that will be shared if multiple
+	 * EntityManagerFactory instances are created.
+	 * @param jpaVendorAdapter a vendor adapter
+	 * @param jpaPropertiesFactory the JPA properties to be passed to the persistence
+	 * provider, based on the {@linkplain #dataSource(DataSource) configured data source}
+	 * @param persistenceUnitManager optional source of persistence unit information (can
+	 * be null)
+	 * @param persistenceUnitRootLocation the persistence unit root location to use as a
+	 * fallback or {@code null}
+	 * @since 3.4.4
+	 */
+	public EntityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter,
+			Function<DataSource, Map<String, ?>> jpaPropertiesFactory, PersistenceUnitManager persistenceUnitManager,
+			URL persistenceUnitRootLocation) {
+		this.jpaVendorAdapter = jpaVendorAdapter;
+		this.persistenceUnitManager = persistenceUnitManager;
+		this.jpaPropertiesFactory = jpaPropertiesFactory;
+		this.persistenceUnitRootLocation = persistenceUnitRootLocation;
+	}
+
 	/**
 	 * Create a new instance passing in the common pieces that will be shared if multiple
 	 * EntityManagerFactory instances are created.
@@ -69,10 +106,13 @@ public class EntityManagerFactoryBuilder {
 	 * @param jpaProperties the JPA properties to be passed to the persistence provider
 	 * @param persistenceUnitManager optional source of persistence unit information (can
 	 * be null)
+	 * @deprecated since 3.4.4 for removal in 3.6.0 in favor of
+	 * {@link #EntityManagerFactoryBuilder(JpaVendorAdapter, Function, PersistenceUnitManager)}
 	 */
+	@Deprecated(since = "3.4.4", forRemoval = true)
 	public EntityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter, Map<String, ?> jpaProperties,
 			PersistenceUnitManager persistenceUnitManager) {
-		this(jpaVendorAdapter, jpaProperties, persistenceUnitManager, null);
+		this(jpaVendorAdapter, (datasource) -> jpaProperties, persistenceUnitManager, null);
 	}
 
 	/**
@@ -85,15 +125,21 @@ public EntityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter, Map<String
 	 * @param persistenceUnitRootLocation the persistence unit root location to use as a
 	 * fallback or {@code null}
 	 * @since 1.4.1
+	 * @deprecated since 3.4.4 for removal in 3.6.0 in favor of
+	 * {@link #EntityManagerFactoryBuilder(JpaVendorAdapter, Function, PersistenceUnitManager, URL)}
 	 */
+	@Deprecated(since = "3.4.4", forRemoval = true)
 	public EntityManagerFactoryBuilder(JpaVendorAdapter jpaVendorAdapter, Map<String, ?> jpaProperties,
 			PersistenceUnitManager persistenceUnitManager, URL persistenceUnitRootLocation) {
-		this.jpaVendorAdapter = jpaVendorAdapter;
-		this.persistenceUnitManager = persistenceUnitManager;
-		this.jpaProperties = new LinkedHashMap<>(jpaProperties);
-		this.persistenceUnitRootLocation = persistenceUnitRootLocation;
+		this(jpaVendorAdapter, (datasource) -> jpaProperties, persistenceUnitManager, persistenceUnitRootLocation);
 	}
 
+	/**
+	 * Create a new {@link Builder} for a {@code EntityManagerFactory} using the settings
+	 * of the given instance, and the given {@link DataSource}.
+	 * @param dataSource the data source to use
+	 * @return a builder to create an {@code EntityManagerFactory}
+	 */
 	public Builder dataSource(DataSource dataSource) {
 		return new Builder(dataSource);
 	}
@@ -255,7 +301,8 @@ public LocalContainerEntityManagerFactoryBean build() {
 			else {
 				entityManagerFactoryBean.setPackagesToScan(this.packagesToScan);
 			}
-			entityManagerFactoryBean.getJpaPropertyMap().putAll(EntityManagerFactoryBuilder.this.jpaProperties);
+			Map<String, ?> jpaProperties = EntityManagerFactoryBuilder.this.jpaPropertiesFactory.apply(this.dataSource);
+			entityManagerFactoryBean.getJpaPropertyMap().putAll(new LinkedHashMap<>(jpaProperties));
 			entityManagerFactoryBean.getJpaPropertyMap().putAll(this.properties);
 			if (!ObjectUtils.isEmpty(this.mappingResources)) {
 				entityManagerFactoryBean.setMappingResources(this.mappingResources);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java
index db31096349f6..c021cfc339d5 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,8 +119,8 @@ static PemContent load(String content, ResourceLoader resourceLoader) throws IOE
 		if (isPresentInText(content)) {
 			return new PemContent(content);
 		}
-		try {
-			return load(resourceLoader.getResource(content).getInputStream());
+		try (InputStream in = resourceLoader.getResource(content).getInputStream()) {
+			return load(in);
 		}
 		catch (IOException | UncheckedIOException ex) {
 			throw new IOException("Error reading certificate or key from file '%s'".formatted(content), ex);
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
index f50f1d4ebf3d..5b449e69a1c8 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
 import org.apache.catalina.core.AprLifecycleListener;
 import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.Tomcat.FixContextListener;
 import org.apache.catalina.webresources.StandardRoot;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -83,8 +84,6 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
 
 	private List<LifecycleListener> contextLifecycleListeners = new ArrayList<>();
 
-	private final List<LifecycleListener> serverLifecycleListeners = getDefaultServerLifecycleListeners();
-
 	private Set<TomcatContextCustomizer> tomcatContextCustomizers = new LinkedHashSet<>();
 
 	private Set<TomcatConnectorCustomizer> tomcatConnectorCustomizers = new LinkedHashSet<>();
@@ -101,6 +100,8 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
 
 	private boolean disableMBeanRegistry = true;
 
+	private boolean useApr;
+
 	/**
 	 * Create a new {@link TomcatReactiveWebServerFactory} instance.
 	 */
@@ -116,10 +117,12 @@ public TomcatReactiveWebServerFactory(int port) {
 		super(port);
 	}
 
-	private static List<LifecycleListener> getDefaultServerLifecycleListeners() {
-		AprLifecycleListener aprLifecycleListener = new AprLifecycleListener();
-		return AprLifecycleListener.isAprAvailable() ? new ArrayList<>(Arrays.asList(aprLifecycleListener))
-				: new ArrayList<>();
+	private List<LifecycleListener> getDefaultServerLifecycleListeners() {
+		ArrayList<LifecycleListener> lifecycleListeners = new ArrayList<>();
+		if (this.useApr) {
+			lifecycleListeners.add(new AprLifecycleListener());
+		}
+		return lifecycleListeners;
 	}
 
 	@Override
@@ -130,7 +133,7 @@ public WebServer getWebServer(HttpHandler httpHandler) {
 		Tomcat tomcat = new Tomcat();
 		File baseDir = (this.baseDirectory != null) ? this.baseDirectory : createTempDir("tomcat");
 		tomcat.setBaseDir(baseDir.getAbsolutePath());
-		for (LifecycleListener listener : this.serverLifecycleListeners) {
+		for (LifecycleListener listener : getDefaultServerLifecycleListeners()) {
 			tomcat.getServer().addLifecycleListener(listener);
 		}
 		Connector connector = new Connector(this.protocol);
@@ -171,7 +174,7 @@ protected void prepareContext(Host host, TomcatHttpHandlerAdapter servlet) {
 		context.setResources(resourcesRoot);
 		context.setPath("");
 		context.setDocBase(docBase.getAbsolutePath());
-		context.addLifecycleListener(new Tomcat.FixContextListener());
+		context.addLifecycleListener(new FixContextListener());
 		ClassLoader parentClassLoader = ClassUtils.getDefaultClassLoader();
 		context.setParentClassLoader(parentClassLoader);
 		skipAllTldScanning(context);
@@ -476,4 +479,13 @@ public void setDisableMBeanRegistry(boolean disableMBeanRegistry) {
 		this.disableMBeanRegistry = disableMBeanRegistry;
 	}
 
+	/**
+	 * Whether to use APR.
+	 * @param useApr whether to use APR
+	 * @since 3.4.4
+	 */
+	public void setUseApr(boolean useApr) {
+		this.useApr = useApr;
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
index cf897544f9eb..3920748cf3c4 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,8 +135,6 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
 
 	private List<LifecycleListener> contextLifecycleListeners = new ArrayList<>();
 
-	private final List<LifecycleListener> serverLifecycleListeners = getDefaultServerLifecycleListeners();
-
 	private Set<TomcatContextCustomizer> tomcatContextCustomizers = new LinkedHashSet<>();
 
 	private Set<TomcatConnectorCustomizer> tomcatConnectorCustomizers = new LinkedHashSet<>();
@@ -159,6 +157,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
 
 	private boolean disableMBeanRegistry = true;
 
+	private boolean useApr;
+
 	/**
 	 * Create a new {@link TomcatServletWebServerFactory} instance.
 	 */
@@ -184,13 +184,10 @@ public TomcatServletWebServerFactory(String contextPath, int port) {
 		super(contextPath, port);
 	}
 
-	private static List<LifecycleListener> getDefaultServerLifecycleListeners() {
+	private List<LifecycleListener> getDefaultServerLifecycleListeners() {
 		ArrayList<LifecycleListener> lifecycleListeners = new ArrayList<>();
-		if (!NativeDetector.inNativeImage()) {
-			AprLifecycleListener aprLifecycleListener = new AprLifecycleListener();
-			if (AprLifecycleListener.isAprAvailable()) {
-				lifecycleListeners.add(aprLifecycleListener);
-			}
+		if (!NativeDetector.inNativeImage() && this.useApr) {
+			lifecycleListeners.add(new AprLifecycleListener());
 		}
 		return lifecycleListeners;
 	}
@@ -203,7 +200,7 @@ public WebServer getWebServer(ServletContextInitializer... initializers) {
 		Tomcat tomcat = new Tomcat();
 		File baseDir = (this.baseDirectory != null) ? this.baseDirectory : createTempDir("tomcat");
 		tomcat.setBaseDir(baseDir.getAbsolutePath());
-		for (LifecycleListener listener : this.serverLifecycleListeners) {
+		for (LifecycleListener listener : getDefaultServerLifecycleListeners()) {
 			tomcat.getServer().addLifecycleListener(listener);
 		}
 		Connector connector = new Connector(this.protocol);
@@ -784,6 +781,15 @@ public void setDisableMBeanRegistry(boolean disableMBeanRegistry) {
 		this.disableMBeanRegistry = disableMBeanRegistry;
 	}
 
+	/**
+	 * Whether to use APR.
+	 * @param useApr whether to use APR
+	 * @since 3.4.4
+	 */
+	public void setUseApr(boolean useApr) {
+		this.useApr = useApr;
+	}
+
 	/**
 	 * {@link LifecycleListener} to disable persistence in the {@link StandardManager}. A
 	 * {@link LifecycleListener} is used so not to interfere with Tomcat's default manager
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
index cc8e6a9650bc..45e3958d1d0b 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
@@ -146,15 +146,15 @@ public final void refresh() throws BeansException, IllegalStateException {
 			super.refresh();
 		}
 		catch (RuntimeException ex) {
-			try {
-				WebServer webServer = this.webServer;
-				if (webServer != null) {
+			WebServer webServer = this.webServer;
+			if (webServer != null) {
+				try {
 					webServer.stop();
 					webServer.destroy();
 				}
-			}
-			catch (RuntimeException stopOrDestroyEx) {
-				ex.addSuppressed(stopOrDestroyEx);
+				catch (RuntimeException stopOrDestroyEx) {
+					ex.addSuppressed(stopOrDestroyEx);
+				}
 			}
 			throw ex;
 		}
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
index 194863fb9e0f..b1feda37ed3c 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
@@ -1,8 +1,8 @@
 # Logging Systems
 org.springframework.boot.logging.LoggingSystemFactory=\
-org.springframework.boot.logging.logback.LogbackLoggingSystem.Factory,\
-org.springframework.boot.logging.log4j2.Log4J2LoggingSystem.Factory,\
-org.springframework.boot.logging.java.JavaLoggingSystem.Factory
+org.springframework.boot.logging.java.JavaLoggingSystem$Factory,\
+org.springframework.boot.logging.log4j2.Log4J2LoggingSystem$Factory,\
+org.springframework.boot.logging.logback.LogbackLoggingSystem$Factory
 
 # PropertySource Loaders
 org.springframework.boot.env.PropertySourceLoader=\
@@ -97,10 +97,10 @@ org.springframework.boot.r2dbc.init.R2dbcScriptDatabaseInitializerDetector
 
 # Depends On Database Initialization Detectors
 org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializationDetector=\
-org.springframework.boot.sql.init.dependency.AnnotationDependsOnDatabaseInitializationDetector,\
 org.springframework.boot.jdbc.SpringJdbcDependsOnDatabaseInitializationDetector,\
 org.springframework.boot.jooq.JooqDependsOnDatabaseInitializationDetector,\
-org.springframework.boot.orm.jpa.JpaDependsOnDatabaseInitializationDetector
+org.springframework.boot.orm.jpa.JpaDependsOnDatabaseInitializationDetector,\
+org.springframework.boot.sql.init.dependency.AnnotationDependsOnDatabaseInitializationDetector
 
 # Resource Locator Protocol Resolvers
 org.springframework.core.io.ProtocolResolver=\
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
index f78f261e659a..4942a751e2c4 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring/aot.factories
@@ -1,7 +1,7 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.boot.ApplicationProperties.ApplicationPropertiesRuntimeHints,\
-org.springframework.boot.SpringApplicationBannerPrinter.SpringApplicationBannerPrinterRuntimeHints,\
-org.springframework.boot.WebApplicationType.WebApplicationTypeRuntimeHints,\
+org.springframework.boot.ApplicationProperties$ApplicationPropertiesRuntimeHints,\
+org.springframework.boot.SpringApplicationBannerPrinter$SpringApplicationBannerPrinterRuntimeHints,\
+org.springframework.boot.WebApplicationType$WebApplicationTypeRuntimeHints,\
 org.springframework.boot.context.config.ConfigDataLocationRuntimeHints,\
 org.springframework.boot.context.config.ConfigDataPropertiesRuntimeHints,\
 org.springframework.boot.env.PropertySourceRuntimeHints,\
@@ -10,16 +10,16 @@ org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints,\
 org.springframework.boot.json.JacksonRuntimeHints,\
 org.springframework.boot.logging.java.JavaLoggingSystemRuntimeHints,\
 org.springframework.boot.logging.logback.LogbackRuntimeHints,\
-org.springframework.boot.logging.structured.ElasticCommonSchemaProperties.ElasticCommonSchemaPropertiesRuntimeHints,\
-org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties.GraylogExtendedLogFormatPropertiesRuntimeHints,\
-org.springframework.boot.logging.structured.StructuredLoggingJsonProperties.StructuredLoggingJsonPropertiesRuntimeHints,\
-org.springframework.boot.web.embedded.undertow.UndertowWebServer.UndertowWebServerRuntimeHints,\
-org.springframework.boot.web.server.MimeMappings.MimeMappingsRuntimeHints
+org.springframework.boot.logging.structured.ElasticCommonSchemaProperties$ElasticCommonSchemaPropertiesRuntimeHints,\
+org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties$GraylogExtendedLogFormatPropertiesRuntimeHints,\
+org.springframework.boot.logging.structured.StructuredLoggingJsonProperties$StructuredLoggingJsonPropertiesRuntimeHints,\
+org.springframework.boot.web.embedded.undertow.UndertowWebServer$UndertowWebServerRuntimeHints,\
+org.springframework.boot.web.server.MimeMappings$MimeMappingsRuntimeHints
 
 org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
 org.springframework.boot.context.properties.ConfigurationPropertiesBeanFactoryInitializationAotProcessor,\
-org.springframework.boot.env.EnvironmentPostProcessorApplicationListener.EnvironmentBeanFactoryInitializationAotProcessor,\
-org.springframework.boot.jackson.JsonComponentModule.JsonComponentBeanFactoryInitializationAotProcessor,\
+org.springframework.boot.env.EnvironmentPostProcessorApplicationListener$EnvironmentBeanFactoryInitializationAotProcessor,\
+org.springframework.boot.jackson.JsonComponentModule$JsonComponentBeanFactoryInitializationAotProcessor,\
 org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizerBeanFactoryInitializationAotProcessor
 
 org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BeanDefinitionLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BeanDefinitionLoaderTests.java
index 86c30311a7f9..e4de8e40ba37 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BeanDefinitionLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/BeanDefinitionLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import org.springframework.boot.sampleconfig.MyComponent;
 import org.springframework.boot.sampleconfig.MyNamedComponent;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
@@ -72,8 +73,9 @@ void loadJsr330Class() {
 	}
 
 	@Test
+	@WithSampleBeansXmlResource
 	void loadXmlResource() {
-		ClassPathResource resource = new ClassPathResource("sample-beans.xml", getClass());
+		ClassPathResource resource = new ClassPathResource("org/springframework/boot/sample-beans.xml");
 		BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry, resource);
 		assertThat(load(loader)).isOne();
 		assertThat(this.registry.containsBean("myXmlComponent")).isTrue();
@@ -81,8 +83,15 @@ void loadXmlResource() {
 	}
 
 	@Test
+	@WithResource(name = "org/springframework/boot/sample-beans.groovy", content = """
+			import org.springframework.boot.sampleconfig.MyComponent;
+
+			beans {
+				myGroovyComponent(MyComponent) {}
+			}
+			""")
 	void loadGroovyResource() {
-		ClassPathResource resource = new ClassPathResource("sample-beans.groovy", getClass());
+		ClassPathResource resource = new ClassPathResource("org/springframework/boot/sample-beans.groovy");
 		BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry, resource);
 		assertThat(load(loader)).isOne();
 		assertThat(this.registry.containsBean("myGroovyComponent")).isTrue();
@@ -90,8 +99,17 @@ void loadGroovyResource() {
 	}
 
 	@Test
+	@WithResource(name = "org/springframework/boot/sample-namespace.groovy", content = """
+			import org.springframework.boot.sampleconfig.MyComponent;
+
+			beans {
+				xmlns([ctx:'http://www.springframework.org/schema/context'])
+				ctx.'component-scan'('base-package':'nonexistent')
+				myGroovyComponent(MyComponent) {}
+			}
+			""")
 	void loadGroovyResourceWithNamespace() {
-		ClassPathResource resource = new ClassPathResource("sample-namespace.groovy", getClass());
+		ClassPathResource resource = new ClassPathResource("org/springframework/boot/sample-namespace.groovy");
 		BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry, resource);
 		assertThat(load(loader)).isOne();
 		assertThat(this.registry.containsBean("myGroovyComponent")).isTrue();
@@ -114,7 +132,8 @@ void loadClassName() {
 	}
 
 	@Test
-	void loadResourceName() {
+	@WithSampleBeansXmlResource
+	void loadXmlName() {
 		BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry,
 				"classpath:org/springframework/boot/sample-beans.xml");
 		assertThat(load(loader)).isOne();
@@ -122,6 +141,13 @@ void loadResourceName() {
 	}
 
 	@Test
+	@WithResource(name = "org/springframework/boot/sample-beans.groovy", content = """
+			import org.springframework.boot.sampleconfig.MyComponent;
+
+			beans {
+				myGroovyComponent(MyComponent) {}
+			}
+			""")
 	void loadGroovyName() {
 		BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry,
 				"classpath:org/springframework/boot/sample-beans.groovy");
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
index 24b9f9f73011..0935aaf56c10 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,12 +61,14 @@ void configClassContext(CapturedOutput output) throws Exception {
 	}
 
 	@Test
+	@WithSampleBeansXmlResource
 	void xmlContext(CapturedOutput output) throws Exception {
 		SpringApplication.main(getArgs("org/springframework/boot/sample-beans.xml"));
 		assertThat(output).contains(SPRING_STARTUP);
 	}
 
 	@Test
+	@WithSampleBeansXmlResource
 	void mixedContext(CapturedOutput output) throws Exception {
 		SpringApplication.main(getArgs(getClass().getName(), "org/springframework/boot/sample-beans.xml"));
 		assertThat(output).contains(SPRING_STARTUP);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java
index 50250c8c0c00..1335c0aa690e 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationBannerPrinterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -47,9 +48,10 @@ void shouldRegisterRuntimeHints() {
 	}
 
 	@Test
+	@WithResource(name = "banner.txt", content = "\uD83D\uDE0D Spring Boot! \uD83D\uDE0D")
 	void shouldUseUtf8() {
 		ResourceLoader resourceLoader = new GenericApplicationContext();
-		Resource resource = resourceLoader.getResource("classpath:/banner-utf8.txt");
+		Resource resource = resourceLoader.getResource("classpath:banner.txt");
 		SpringApplicationBannerPrinter printer = new SpringApplicationBannerPrinter(resourceLoader,
 				new ResourceBanner(resource));
 		Log log = mock(Log.class);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
index ccd17f15ae3d..fb6e689192ba 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@
 import org.springframework.aot.AotDetector;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanCurrentlyInCreationException;
+import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +73,7 @@
 import org.springframework.boot.context.event.SpringApplicationEvent;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.boot.testsupport.classpath.ForkedClassPath;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
@@ -219,25 +221,32 @@ void sourcesMustNotBeEmpty() {
 
 	@Test
 	void sourcesMustBeAccessible() {
-		assertThatIllegalArgumentException()
+		assertThatExceptionOfType(BeanDefinitionStoreException.class)
 			.isThrownBy(() -> new SpringApplication(InaccessibleConfiguration.class).run())
+			.havingRootCause()
+			.isInstanceOf(IllegalArgumentException.class)
 			.withMessageContaining("No visible constructors");
 	}
 
 	@Test
+	@WithResource(name = "banner.txt", content = "Running a Test!")
 	void customBanner(CapturedOutput output) {
 		SpringApplication application = spy(new SpringApplication(ExampleConfig.class));
 		application.setWebApplicationType(WebApplicationType.NONE);
-		this.context = application.run("--spring.banner.location=classpath:test-banner.txt");
+		this.context = application.run();
 		assertThat(output).startsWith("Running a Test!");
+
 	}
 
 	@Test
+	@WithResource(name = "banner.txt", content = """
+			Running a Test!
+
+			${test.property}""")
 	void customBannerWithProperties(CapturedOutput output) {
 		SpringApplication application = spy(new SpringApplication(ExampleConfig.class));
 		application.setWebApplicationType(WebApplicationType.NONE);
-		this.context = application.run("--spring.banner.location=classpath:test-banner-with-placeholder.txt",
-				"--test.property=123456");
+		this.context = application.run("--test.property=123456");
 		assertThat(output).containsPattern("Running a Test!\\s+123456");
 	}
 
@@ -288,6 +297,7 @@ void enableBannerInLogViaProperty(CapturedOutput output) {
 	}
 
 	@Test
+	@WithResource(name = "bindtoapplication.properties", content = "spring.main.banner-mode=off")
 	void triggersConfigFileApplicationListenerBeforeBinding() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
@@ -539,6 +549,7 @@ void commandLinePropertySourceEnhancesEnvironment() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "foo=bucket")
 	void propertiesFileEnhancesEnvironment() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
@@ -571,6 +582,8 @@ void additionalProfilesOrderedBeforeActiveProfiles() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "my.property=fromapplicationproperties")
+	@WithResource(name = "application-other.properties", content = "my.property=fromotherpropertiesfile")
 	void addProfilesOrderWithProperties() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
@@ -583,6 +596,7 @@ void addProfilesOrderWithProperties() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "foo=bucket")
 	void emptyCommandLinePropertySourceNotAdded() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
@@ -813,11 +827,13 @@ void loadSources() {
 	}
 
 	@Test
+	@WithSampleBeansXmlResource
+	@WithResource(name = "application.properties", content = "sample.app.test.prop=*")
 	void wildcardSources() {
 		TestSpringApplication application = new TestSpringApplication();
 		application.getSources().add("classpath*:org/springframework/boot/sample-${sample.app.test.prop}.xml");
 		application.setWebApplicationType(WebApplicationType.NONE);
-		this.context = application.run();
+		this.context = application.run("--spring.config.location=classpath:/");
 	}
 
 	@Test
@@ -1138,6 +1154,8 @@ void reactiveApplicationConfiguredViaAPropertyHasTheCorrectTypeOfContextAndEnvir
 	}
 
 	@Test
+	@WithResource(name = "application-withwebapplicationtype.yml",
+			content = "spring.main.web-application-type: reactive")
 	void environmentIsConvertedIfTypeDoesNotMatch() {
 		ConfigurableApplicationContext context = new SpringApplication(ExampleReactiveWebConfig.class)
 			.run("--spring.profiles.active=withwebapplicationtype");
@@ -1194,6 +1212,7 @@ void circularReferencesCanBeEnabled() {
 	}
 
 	@Test
+	@WithResource(name = "custom-config/application.yml", content = "hello: world")
 	void relaxedBindingShouldWorkBeforeEnvironmentIsPrepared() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
@@ -1328,6 +1347,8 @@ void bindsEnvironmentPrefixToSpringApplication() {
 	}
 
 	@Test
+	@WithResource(name = "spring-application-config-property-source.properties",
+			content = "test.name=spring-application-config-property-source")
 	void movesConfigClassPropertySourcesToEnd() {
 		SpringApplication application = new SpringApplication(PropertySourceConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
@@ -1588,6 +1609,11 @@ static class InaccessibleConfiguration {
 		private InaccessibleConfiguration() {
 		}
 
+		@Bean
+		String testMessage() {
+			return "test";
+		}
+
 	}
 
 	static class SpyApplicationContext extends AnnotationConfigApplicationContext {
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/WithSampleBeansXmlResource.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/WithSampleBeansXmlResource.java
new file mode 100644
index 000000000000..91359f63bcfb
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/WithSampleBeansXmlResource.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
+/**
+ * Makes an {@code org/springframework/boot/sample-beans.xml} resource available from the
+ * thread context classloader.
+ *
+ * @author Andy Wilkinson
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@WithResource(name = "org/springframework/boot/sample-beans.xml",
+		content = """
+				<?xml version="1.0" encoding="UTF-8"?>
+				<beans xmlns="http://www.springframework.org/schema/beans"
+					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+					xmlns:context="http://www.springframework.org/schema/context"
+					xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+								http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
+					<bean id="myXmlComponent" class="org.springframework.boot.sampleconfig.MyComponent"/>
+				</beans>
+				""")
+@interface WithSampleBeansXmlResource {
+
+}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
index c5341c8fd945..3f4b5a4ed9f5 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplicationShutdownHookInstance;
 import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -72,14 +73,21 @@ private void close(ApplicationContext context) {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			b=file
+			c=file
+			""")
+	@WithResource(name = "application-foo.properties", content = "b=profile-specific-file")
 	void profileAndProperties() {
 		SpringApplicationBuilder application = new SpringApplicationBuilder().sources(ExampleConfig.class)
 			.contextFactory(ApplicationContextFactory.ofContextClass(StaticApplicationContext.class))
 			.profiles("foo")
-			.properties("foo=bar");
+			.properties("a=default");
 		this.context = application.run();
 		assertThat(this.context).isInstanceOf(StaticApplicationContext.class);
-		assertThat(this.context.getEnvironment().getProperty("foo")).isEqualTo("bucket");
+		assertThat(this.context.getEnvironment().getProperty("a")).isEqualTo("default");
+		assertThat(this.context.getEnvironment().getProperty("b")).isEqualTo("profile-specific-file");
+		assertThat(this.context.getEnvironment().getProperty("c")).isEqualTo("file");
 		assertThat(this.context.getEnvironment().acceptsProfiles(Profiles.of("foo"))).isTrue();
 	}
 
@@ -194,6 +202,7 @@ void parentFirstCreation() {
 	}
 
 	@Test
+	@WithResource(name = "application-node.properties", content = "bar=spam")
 	void parentFirstCreationWithProfileAndDefaultArgs() {
 		SpringApplicationBuilder application = new SpringApplicationBuilder(ExampleConfig.class).profiles("node")
 			.properties("transport=redis")
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java
index 2d4551f00edf..b1056a860097 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -32,9 +34,21 @@
  */
 class ImportCandidatesTests {
 
+	private static final String IMPORTS_FILE = "META-INF/spring/org.springframework.boot.context.annotation.ImportCandidatesTests$TestAnnotation.imports";
+
 	@Test
+	@WithResource(name = IMPORTS_FILE, content = """
+			# A comment spanning a complete line
+			class1
+
+			class2 # with comment at the end
+			   # Comment with some whitespace in front
+			class3
+
+			""")
 	void loadReadsFromClasspathFile() {
-		ImportCandidates candidates = ImportCandidates.load(TestAnnotation.class, null);
+		ImportCandidates candidates = ImportCandidates.load(TestAnnotation.class,
+				Thread.currentThread().getContextClassLoader());
 		assertThat(candidates).containsExactly("class1", "class2", "class3");
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java
index 75c4b9bbcd67..cf198bf2c237 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,9 @@
 import org.springframework.boot.ansi.AnsiOutput;
 import org.springframework.boot.ansi.AnsiOutput.Enabled;
 import org.springframework.boot.ansi.AnsiOutputEnabledValue;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.StandardEnvironment;
-import org.springframework.test.context.support.TestPropertySourceUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -81,11 +79,9 @@ void disabled() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring.output.ansi.enabled=never")
 	void disabledViaApplicationProperties() {
-		ConfigurableEnvironment environment = new StandardEnvironment();
-		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(environment, "spring.config.name=ansi");
 		SpringApplication application = new SpringApplication(Config.class);
-		application.setEnvironment(environment);
 		application.setWebApplicationType(WebApplicationType.NONE);
 		this.context = application.run();
 		assertThat(AnsiOutputEnabledValue.get()).isEqualTo(Enabled.NEVER);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorBootstrapContextIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorBootstrapContextIntegrationTests.java
index 45d8eec77158..93a3d39efacc 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorBootstrapContextIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorBootstrapContextIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.context.config.TestConfigDataBootstrap.LoaderHelper;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 
@@ -45,9 +46,24 @@ void setup() {
 	}
 
 	@Test
+	@WithResource(name = "imported.properties", content = """
+			spring.config.import=testbootstrap:test
+			spring.profiles.active=test
+			myprop=igotbound
+			#---
+			spring.config.activate.on-profile=test
+			myprofileprop=igotprofilebound
+
+			""")
+	@WithResource(name = "META-INF/spring.factories", content = """
+			org.springframework.boot.context.config.ConfigDataLoader=\
+			org.springframework.boot.context.config.TestConfigDataBootstrap.Loader
+			org.springframework.boot.context.config.ConfigDataLocationResolver=\
+			org.springframework.boot.context.config.TestConfigDataBootstrap.LocationResolver
+			""")
 	void bootstrapsApplicationContext() {
 		try (ConfigurableApplicationContext context = this.application
-			.run("--spring.config.import=classpath:application-bootstrap-registry-integration-tests.properties")) {
+			.run("--spring.config.import=classpath:imported.properties")) {
 			LoaderHelper bean = context.getBean(TestConfigDataBootstrap.LoaderHelper.class);
 			assertThat(bean).isNotNull();
 			assertThat(bean.getBound()).isEqualTo("igotbound");
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.java
index 0b9f5e58c621..c4e28c206d59 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 import org.springframework.boot.context.config.ConfigData.Option;
 import org.springframework.boot.context.config.ConfigData.Options;
 import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorIntegrationTests.Config;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
@@ -45,6 +46,18 @@
  *
  * @author Phillip Webb
  */
+@WithResource(name = "application.properties", content = """
+		spring.config.import=icwps:
+		prop=fromfile
+		""")
+@WithResource(name = "application-prod.properties", content = "prop=fromprofilefile")
+@WithResource(name = "META-INF/spring.factories",
+		content = """
+				org.springframework.boot.context.config.ConfigDataLoader=\
+				org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.Loader
+				org.springframework.boot.context.config.ConfigDataLocationResolver=\
+				org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.LocationResolver
+				""")
 class ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests {
 
 	private SpringApplication application;
@@ -60,16 +73,14 @@ void setup() {
 
 	@Test
 	void testWithoutProfile() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.name=configimportwithprofilespecific");
+		ConfigurableApplicationContext context = this.application.run();
 		String value = context.getEnvironment().getProperty("prop");
 		assertThat(value).isEqualTo("fromicwps1");
 	}
 
 	@Test
 	void testWithProfile() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.name=configimportwithprofilespecific", "--spring.profiles.active=prod");
+		ConfigurableApplicationContext context = this.application.run("--spring.profiles.active=prod");
 		String value = context.getEnvironment().getProperty("prop");
 		assertThat(value).isEqualTo("fromicwps2");
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
index 940db092ec43..12005f44db17 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,17 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.UUID;
 
-import org.apache.logging.log4j.util.Strings;
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -46,6 +47,9 @@
 import org.springframework.boot.context.properties.source.ConfigurationProperty;
 import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
 import org.springframework.boot.origin.Origin;
+import org.springframework.boot.testsupport.BuildOutput;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+import org.springframework.boot.testsupport.classpath.resources.WithResourceDirectory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
@@ -59,6 +63,7 @@
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.FileCopyUtils;
+import org.springframework.util.FileSystemUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -115,6 +120,7 @@ public ClassLoader getClassLoader() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "foo=bucket")
 	void runLoadsApplicationPropertiesOnClasspath() {
 		ConfigurableApplicationContext context = this.application.run();
 		String property = context.getEnvironment().getProperty("foo");
@@ -122,13 +128,15 @@ void runLoadsApplicationPropertiesOnClasspath() {
 	}
 
 	@Test
+	@WithResource(name = "application.yaml", content = "yamlkey: yamlvalue")
 	void runLoadsApplicationYamlOnClasspath() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=customapplication");
+		ConfigurableApplicationContext context = this.application.run();
 		String property = context.getEnvironment().getProperty("yamlkey");
 		assertThat(property).isEqualTo("yamlvalue");
 	}
 
 	@Test
+	@WithResource(name = "testproperties.properties", content = "the.property=frompropertiesfile")
 	void runLoadsFileWithCustomName() {
 		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testproperties");
 		String property = context.getEnvironment().getProperty("the.property");
@@ -136,45 +144,84 @@ void runLoadsFileWithCustomName() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			duplicate=properties
+			only-properties = properties
+			""")
+	@WithResource(name = "application.yaml", content = """
+			duplicate: yaml
+			only-yaml: yaml
+			""")
 	void runWhenPropertiesAndYamlShouldPreferProperties() {
 		ConfigurableApplicationContext context = this.application.run();
-		String property = context.getEnvironment().getProperty("duplicate");
-		assertThat(property).isEqualTo("properties");
+		assertThat(context.getEnvironment().getProperty("duplicate")).isEqualTo("properties");
+		assertThat(context.getEnvironment().getProperty("only-properties")).isEqualTo("properties");
+		assertThat(context.getEnvironment().getProperty("only-yaml")).isEqualTo("yaml");
 	}
 
 	@Test
+	@WithResource(name = "moreproperties.properties", content = """
+			the.property=more
+			only.more=more
+			""")
+	@WithResource(name = "testproperties.properties", content = """
+			the.property=test
+			only.test=test
+			""")
 	void runWhenMultipleCustomNamesLoadsEachName() {
 		ConfigurableApplicationContext context = this.application
 			.run("--spring.config.name=moreproperties,testproperties");
-		String property = context.getEnvironment().getProperty("the.property");
-		assertThat(property).isEqualTo("frompropertiesfile");
+		assertThat(context.getEnvironment().getProperty("the.property")).isEqualTo("test");
+		assertThat(context.getEnvironment().getProperty("only.more")).isEqualTo("more");
+		assertThat(context.getEnvironment().getProperty("only.test")).isEqualTo("test");
 	}
 
 	@Test
+	@WithResource(name = "application-default.properties", content = "my.property=fromdefaultpropertiesfile")
 	void runWhenNoActiveProfilesLoadsDefaultProfileFile() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testprofiles");
+		ConfigurableApplicationContext context = this.application.run();
 		String property = context.getEnvironment().getProperty("my.property");
 		assertThat(property).isEqualTo("fromdefaultpropertiesfile");
 	}
 
 	@Test
+	@WithResource(name = "application.yaml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			other: notempty
+			---
+			spring.config.activate.on-profile: default
+			my:
+			  property: fromdefaultprofile
+			---
+			spring.config.activate.on-profile: other
+			my:
+			  property: fromotherprofile
+			""")
 	void runWhenActiveProfilesDoesNotLoadDefault() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testprofilesdocument",
-				"--spring.config.location=classpath:configdata/profiles/", "--spring.profiles.default=thedefault",
-				"--spring.profiles.active=other");
+		ConfigurableApplicationContext context = this.application.run("--spring.profiles.active=other");
 		String property = context.getEnvironment().getProperty("my.property");
 		assertThat(property).isEqualTo("fromotherprofile");
 	}
 
 	@Test
+	@WithResource(name = "application-thedefault.properties", content = "the.property=fromdefaultpropertiesfile")
 	void runWhenHasCustomDefaultProfileLoadsDefaultProfileFile() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testprofiles",
-				"--spring.profiles.default=thedefault");
+		ConfigurableApplicationContext context = this.application.run("--spring.profiles.default=thedefault");
 		String property = context.getEnvironment().getProperty("the.property");
 		assertThat(property).isEqualTo("fromdefaultpropertiesfile");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			foo=bucket
+			my.property=fromapplicationproperties
+			""")
+	@WithResource(name = "testproperties.properties", content = """
+			my.property=frompropertiesfile
+			the.property=frompropertiesfile
+			""")
 	void runWhenHasCustomSpringConfigLocationLoadsAllFromSpecifiedLocation() {
 		ConfigurableApplicationContext context = this.application
 			.run("--spring.config.location=classpath:application.properties,classpath:testproperties.properties");
@@ -187,29 +234,68 @@ void runWhenHasCustomSpringConfigLocationLoadsAllFromSpecifiedLocation() {
 	}
 
 	@Test
-	void runWhenOneCustomLocationDoesNotExistLoadsOthers() {
+	@WithResource(name = "application.properties", content = """
+			foo=bucket
+			my.property=fromapplicationproperties
+			""")
+	@WithResource(name = "testproperties.properties", content = """
+			my.property=frompropertiesfile
+			the.property=frompropertiesfile
+			""")
+	void runWhenOneCustomOptionalLocationDoesNotExistLoadsOthers() {
 		ConfigurableApplicationContext context = this.application.run(
 				"--spring.config.location=classpath:application.properties,classpath:testproperties.properties,optional:classpath:nonexistent.properties");
-		String property = context.getEnvironment().getProperty("the.property");
-		assertThat(property).isEqualTo("frompropertiesfile");
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("frompropertiesfile");
+		assertThat(context.getEnvironment().getProperty("foo")).isEqualTo("bucket");
 	}
 
 	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			---
+			spring.config.activate.on-profile: prod
+			spring.config.import: file:./non-existent.yml
+			""")
 	void runWhenProfileSpecificMandatoryLocationDoesNotExistShouldNotFail() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testprofiles",
-				"--spring.config.location=classpath:configdata/profiles/");
+		ConfigurableApplicationContext context = this.application.run();
 		String property = context.getEnvironment().getProperty("my.property");
 		assertThat(property).isEqualTo("fromyamlfile");
 	}
 
 	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			---
+			spring.config.activate.on-profile: prod
+			spring.config.import: file:./non-existent.yml
+			""")
 	void runWhenProfileSpecificMandatoryLocationDoesNotExistShouldFailWhenProfileActive() {
 		this.application.setAdditionalProfiles("prod");
-		assertThatExceptionOfType(ConfigDataResourceNotFoundException.class).isThrownBy(() -> this.application
-			.run("--spring.config.name=testprofiles", "--spring.config.location=classpath:configdata/profiles/"));
-	}
-
-	@Test
+		assertThatExceptionOfType(ConfigDataResourceNotFoundException.class).isThrownBy(() -> this.application.run())
+			.withMessageContaining("non-existent.yml");
+	}
+
+	@Test
+	@WithResource(name = "enableprofile.properties", content = """
+			spring.profiles.active=myprofile
+			my.property=frompropertiesfile
+			the.property=frompropertiesfile
+			one.more=${my.property}
+			""")
+	@WithResource(name = "enableother.properties", content = """
+			spring.profiles.active=other
+			my.property=fromenableotherpropertiesfile
+			one.more=${my.property}
+			""")
+	@WithResource(name = "enableprofile-other.properties", content = "other.property=fromotherpropertiesfile")
+	@WithResource(name = "enableprofile-myprofile.properties", content = """
+			my.property=fromprofilepropertiesfile
+			the.property=fromprofilepropertiesfile
+			""")
 	void runWhenHasActiveProfilesFromMultipleLocationsActivatesProfileFromOneLocation() {
 		ConfigurableApplicationContext context = this.application
 			.run("--spring.config.location=classpath:enableprofile.properties,classpath:enableother.properties");
@@ -220,13 +306,27 @@ void runWhenHasActiveProfilesFromMultipleLocationsActivatesProfileFromOneLocatio
 	}
 
 	@Test
+	@WithResource(name = "enableprofile.properties", content = """
+			spring.profiles.active=myprofile
+			my.property=frompropertiesfile
+			""")
+	@WithResource(name = "enabletwoprofiles.properties", content = """
+			spring.profiles.active=myprofile,another
+			my.property=fromtwopropertiesfile
+			""")
+	@WithResource(name = "enableprofile-myprofile.properties", content = """
+			my.property=frommyprofilepropertiesfile
+			""")
+	@WithResource(name = "enableprofile-another.properties", content = """
+			my.property=fromanotherprofilepropertiesfile
+			""")
 	void runWhenHasActiveProfilesFromMultipleAdditionalLocationsWithOneSwitchedOffLoadsExpectedProperties() {
 		ConfigurableApplicationContext context = this.application.run(
 				"--spring.config.additional-location=classpath:enabletwoprofiles.properties,classpath:enableprofile.properties");
 		ConfigurableEnvironment environment = context.getEnvironment();
 		assertThat(environment.getActiveProfiles()).containsExactly("myprofile");
 		String property = environment.getProperty("my.property");
-		assertThat(property).isEqualTo("fromprofilepropertiesfile");
+		assertThat(property).isEqualTo("frommyprofilepropertiesfile");
 	}
 
 	@Test
@@ -249,14 +349,18 @@ void runWhenHasLocalFileLoadsWithLocalFileTakingPrecedenceOverClasspath() throws
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			my.property=frompropertiesfile
+			the.property=frompropertiesfile
+			""")
 	void runWhenHasCommandLinePropertiesLoadsWithCommandLineTakingPrecedence() {
 		StandardEnvironment environment = new StandardEnvironment();
 		environment.getPropertySources()
 			.addFirst(new SimpleCommandLinePropertySource("--the.property=fromcommandline"));
 		this.application.setEnvironment(environment);
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testproperties");
-		String property = context.getEnvironment().getProperty("the.property");
-		assertThat(property).isEqualTo("fromcommandline");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("the.property")).isEqualTo("fromcommandline");
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("frompropertiesfile");
 	}
 
 	@Test
@@ -268,15 +372,17 @@ void runWhenHasSystemPropertyLoadsWithSystemPropertyTakingPrecedence() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "my.property=fromapplicationproperties")
 	void runWhenHasDefaultPropertiesIncludesDefaultPropertiesLast() {
-		this.application.setDefaultProperties(Collections.singletonMap("my.fallback", "foo"));
+		this.application.setDefaultProperties(Map.of("my.property", "fromdefaults", "my.fallback", "fromdefaults"));
 		ConfigurableApplicationContext context = this.application.run();
-		String property = context.getEnvironment().getProperty("my.fallback");
-		assertThat(property).isEqualTo("foo");
+		assertThat(context.getEnvironment().getProperty("my.fallback")).isEqualTo("fromdefaults");
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("fromapplicationproperties");
 	}
 
 	@Test
-	void runWhenHasDefaultPropertiesWithConfigLocationConfigurationLoadsExpectedProperties() {
+	@WithResource(name = "testproperties.properties", content = "the.property=frompropertiesfile")
+	void runWhenHasDefaultPropertiesWithConfigNameLoadsExpectedProperties() {
 		this.application.setDefaultProperties(Collections.singletonMap("spring.config.name", "testproperties"));
 		ConfigurableApplicationContext context = this.application.run();
 		String property = context.getEnvironment().getProperty("the.property");
@@ -284,13 +390,15 @@ void runWhenHasDefaultPropertiesWithConfigLocationConfigurationLoadsExpectedProp
 	}
 
 	@Test
-	void runWhenHasActiveProfilesFromDefaultPropertiesAndFileLoadsWithFileTakingPrecedence() {
+	@WithResource(name = "application.properties", content = "spring.profiles.active=myprofile")
+	void runWhenHasActiveProfilesFromDefaultPropertiesAndFileLoadsWithActiveProfilesFromFileTakingPrecedence() {
 		this.application.setDefaultProperties(Collections.singletonMap("spring.profiles.active", "dev"));
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=enableprofile");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("myprofile");
 	}
 
 	@Test
+	@WithResource(name = "application-other.properties", content = "my.property=fromotherpropertiesfile")
 	void runWhenProgrammaticallySetProfilesLoadsWithSetProfilesTakePrecedenceOverDefaultProfile() {
 		this.application.setAdditionalProfiles("other");
 		ConfigurableApplicationContext context = this.application.run();
@@ -299,6 +407,8 @@ void runWhenProgrammaticallySetProfilesLoadsWithSetProfilesTakePrecedenceOverDef
 	}
 
 	@Test
+	@WithResource(name = "application-dev.properties", content = "my.property=fromdevpropertiesfile")
+	@WithResource(name = "application-other.properties", content = "my.property=fromotherpropertiesfile")
 	void runWhenTwoProfilesSetProgrammaticallyLoadsWithPreservedProfileOrder() {
 		this.application.setAdditionalProfiles("other", "dev");
 		ConfigurableApplicationContext context = this.application.run();
@@ -307,9 +417,12 @@ void runWhenTwoProfilesSetProgrammaticallyLoadsWithPreservedProfileOrder() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring.profiles.active=myprofile")
+	@WithResource(name = "application-myprofile.properties", content = "the.property=fromprofilepropertiesfile")
+	@WithResource(name = "application-other.properties", content = "other.property=fromotherpropertiesfile")
 	void runWhenProfilesPresentBeforeConfigFileProcessingAugmentsProfileActivatedByConfigFile() {
 		this.application.setAdditionalProfiles("other");
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=enableprofile");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("other", "myprofile");
 		String property = context.getEnvironment().getProperty("other.property");
 		assertThat(property).isEqualTo("fromotherpropertiesfile");
@@ -318,13 +431,19 @@ void runWhenProfilesPresentBeforeConfigFileProcessingAugmentsProfileActivatedByC
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			spring.profiles.active=myprofile
+			one.more=${my.property}
+			""")
+	@WithResource(name = "application-myprofile.properties", content = "my.property=fromprofilepropertiesfile")
 	void runWhenProfilePropertiesUsedInPlaceholdersLoadsWithResolvedPlaceholders() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=enableprofile");
-		String property = context.getEnvironment().getProperty("one.more");
-		assertThat(property).isEqualTo("fromprofilepropertiesfile");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("one.more")).isEqualTo("fromprofilepropertiesfile");
 	}
 
 	@Test
+	@WithResource(name = "application-dev.properties", content = "my.property=fromdevpropertiesfile")
+	@WithResource(name = "application-other.properties", content = "my.property=fromotherpropertiesfile")
 	void runWhenDuplicateProfileSetProgrammaticallyAndViaPropertyLoadsWithProfiles() {
 		this.application.setAdditionalProfiles("dev");
 		ConfigurableApplicationContext context = this.application.run("--spring.profiles.active=dev,other");
@@ -333,6 +452,8 @@ void runWhenDuplicateProfileSetProgrammaticallyAndViaPropertyLoadsWithProfiles()
 	}
 
 	@Test
+	@WithResource(name = "application-dev.properties", content = "my.property=fromdevpropertiesfile")
+	@WithResource(name = "application-other.properties", content = "my.property=fromotherpropertiesfile")
 	void runWhenProfilesActivatedViaBracketNotationSetsProfiles() {
 		ConfigurableApplicationContext context = this.application.run("--spring.profiles.active[0]=dev",
 				"--spring.profiles.active[1]=other");
@@ -341,21 +462,43 @@ void runWhenProfilesActivatedViaBracketNotationSetsProfiles() {
 	}
 
 	@Test
+	@WithResource(name = "application.yaml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			  other: notempty
+			---
+			spring.config.activate.on-profile: dev
+			my:
+			  property: fromdevprofile
+			""")
 	void loadWhenProfileInMultiDocumentFilesLoadsExpectedProperties() {
 		this.application.setAdditionalProfiles("dev");
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testprofiles",
-				"--spring.config.location=classpath:configdata/profiles/");
-		String property = context.getEnvironment().getProperty("my.property");
-		assertThat(property).isEqualTo("fromdevprofile");
-		property = context.getEnvironment().getProperty("my.other");
-		assertThat(property).isEqualTo("notempty");
-	}
-
-	@Test
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("fromdevprofile");
+		assertThat(context.getEnvironment().getProperty("my.other")).isEqualTo("notempty");
+	}
+
+	@Test
+	@WithResource(name = "application.yaml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			  other: notempty
+			---
+			spring.config.activate.on-profile: dev
+			my:
+			  property: fromdevprofile
+			dev:
+			  property: devproperty
+			---
+			spring.config.activate.on-profile: other
+			my:
+			  property: fromotherprofile
+			""")
 	void runWhenMultipleActiveProfilesWithMultiDocumentFilesLoadsInOrderOfDocument() {
 		this.application.setAdditionalProfiles("other", "dev");
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testprofiles",
-				"--spring.config.location=classpath:configdata/profiles/");
+		ConfigurableApplicationContext context = this.application.run();
 		String property = context.getEnvironment().getProperty("my.property");
 		assertThat(property).isEqualTo("fromotherprofile");
 		property = context.getEnvironment().getProperty("my.other");
@@ -365,106 +508,223 @@ void runWhenMultipleActiveProfilesWithMultiDocumentFilesLoadsInOrderOfDocument()
 	}
 
 	@Test
+	@WithResource(name = "application.yaml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			---
+			spring.config.activate.on-profile: dev & other
+			my:
+			  property: devandother
+			---
+			spring.config.activate.on-profile: (dev | other) & another
+			my:
+			  property: devorotherandanother
+			""")
 	void runWhenHasAndProfileExpressionLoadsExpectedProperties() {
-		assertProfileExpression("devandother", "dev", "other");
-	}
-
-	@Test
+		this.application.setAdditionalProfiles("dev", "other");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("devandother");
+	}
+
+	@Test
+	@WithResource(name = "application.yaml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			---
+			spring.config.activate.on-profile: dev & other
+			my:
+			  property: devandother
+			---
+			spring.config.activate.on-profile: (dev | other) & another
+			my:
+			  property: devorotherandanother
+			""")
 	void runWhenHasComplexProfileExpressionsLoadsExpectedProperties() {
-		assertProfileExpression("devorotherandanother", "dev", "another");
-	}
-
-	@Test
+		this.application.setAdditionalProfiles("dev", "another");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("devorotherandanother");
+	}
+
+	@Test
+	@WithResource(name = "application.yaml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			---
+			spring.config.activate.on-profile: dev & other
+			my:
+			  property: devandother
+			---
+			spring.config.activate.on-profile: (dev | other) & another
+			my:
+			  property: devorotherandanother
+			""")
 	void runWhenProfileExpressionsDoNotMatchLoadsExpectedProperties() {
-		assertProfileExpression("fromyamlfile", "dev");
-	}
-
-	@Test
+		this.application.setAdditionalProfiles("dev");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("fromyamlfile");
+	}
+
+	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			  other: notempty
+			---
+			spring.config.activate.on-profile: other
+			my:
+			  property: fromotherprofile
+			---
+			spring.config.activate.on-profile: "!other"
+			my:
+			  property: fromnototherprofile
+			  notother: foo
+
+			""")
 	void runWhenHasNegatedProfilesLoadsExpectedProperties() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testnegatedprofiles",
-				"--spring.config.location=classpath:configdata/profiles/");
-		String property = context.getEnvironment().getProperty("my.property");
-		assertThat(property).isEqualTo("fromnototherprofile");
-		property = context.getEnvironment().getProperty("my.notother");
-		assertThat(property).isEqualTo("foo");
-	}
-
-	@Test
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("fromnototherprofile");
+		assertThat(context.getEnvironment().getProperty("my.notother")).isEqualTo("foo");
+	}
+
+	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			my:
+			  property: fromyamlfile
+			  other: notempty
+			---
+			spring.config.activate.on-profile: other
+			my:
+			  property: fromotherprofile
+			---
+			spring.config.activate.on-profile: "!other"
+			my:
+			  property: fromnototherprofile
+			  notother: foo
+
+			""")
 	void runWhenHasNegatedProfilesWithProfileActiveLoadsExpectedProperties() {
 		this.application.setAdditionalProfiles("other");
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testnegatedprofiles",
-				"--spring.config.location=classpath:configdata/profiles/");
-		String property = context.getEnvironment().getProperty("my.property");
-		assertThat(property).isEqualTo("fromotherprofile");
-		property = context.getEnvironment().getProperty("my.notother");
-		assertThat(property).isNull();
-	}
-
-	@Test
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("fromotherprofile");
+		assertThat(context.getEnvironment().getProperty("my.notother")).isNull();
+	}
+
+	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			spring:
+			  profiles:
+			    active: dev
+			my:
+			  property: fromyamlfile
+			---
+			spring.config.activate.on-profile: dev
+			my:
+			  property: fromdevprofile
+			""")
 	void runWhenHasActiveProfileConfigurationInMultiDocumentFileLoadsInExpectedOrder() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testsetprofiles",
-				"--spring.config.location=classpath:configdata/profiles/");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("dev");
 		String property = context.getEnvironment().getProperty("my.property");
 		assertThat(context.getEnvironment().getActiveProfiles()).contains("dev");
 		assertThat(property).isEqualTo("fromdevprofile");
 		assertThat(context.getEnvironment().getPropertySources()).extracting("name")
 			.contains(
-					"Config resource 'class path resource [configdata/profiles/testsetprofiles.yml]' via location 'classpath:configdata/profiles/' (document #0)",
-					"Config resource 'class path resource [configdata/profiles/testsetprofiles.yml]' via location 'classpath:configdata/profiles/' (document #1)");
+					"Config resource 'class path resource [application.yml]' via location 'optional:classpath:/' (document #0)",
+					"Config resource 'class path resource [application.yml]' via location 'optional:classpath:/' (document #1)");
 	}
 
 	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			spring:
+			  profiles:
+			    active: dev,healthcheck
+			""")
 	void runWhenHasYamlWithCommaSeparatedMultipleProfilesLoadsExpectedProperties() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testsetmultiprofiles");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("dev", "healthcheck");
 	}
 
 	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			spring:
+			  profiles:
+			    active:
+			      - dev
+			      - healthcheck
+			""")
 	void runWhenHasYamlWithListProfilesLoadsExpectedProperties() {
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testsetmultiprofileslist");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("dev", "healthcheck");
 	}
 
 	@Test
+	@WithResource(name = "application.yml", content = """
+			---
+			spring:
+			  profiles:
+			    active: dev  ,    healthcheck
+			""")
 	void loadWhenHasWhitespaceTrims() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.name=testsetmultiprofileswhitespace");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("dev", "healthcheck");
 	}
 
 	@Test
-	void loadWhenHasConfigLocationAsFile() {
-		String location = "file:src/test/resources/specificlocation.properties";
+	void loadWhenHasConfigLocationAsFile() throws IOException {
+		File properties = new File(this.temp, "specificlocation.properties");
+		Files.write(properties.toPath(),
+				List.of("my.property=fromspecificlocation", "the.property=fromspecificlocation"));
+		String location = properties.toURI().toURL().toString();
 		ConfigurableApplicationContext context = this.application.run("--spring.config.location=" + location);
-		assertThat(context.getEnvironment()).has(matchingPropertySource("Config resource 'file [" + Strings
-			.join(Arrays.asList("src", "test", "resources", "specificlocation.properties"), File.separatorChar)
-				+ "]' via location '" + location + "'"));
+		assertThat(context.getEnvironment())
+			.has(matchingPropertySource("Config resource 'file [" + properties + "]' via location '" + location + "'"));
 	}
 
 	@Test
-	void loadWhenHasRelativeConfigLocationUsesFileLocation() {
-		String location = "src/test/resources/specificlocation.properties";
-		ConfigurableApplicationContext context = this.application.run("--spring.config.location=" + location);
-		assertThat(context.getEnvironment()).has(matchingPropertySource("Config resource 'file [" + Strings
-			.join(Arrays.asList("src", "test", "resources", "specificlocation.properties"), File.separatorChar)
-				+ "]' via location '" + location + "'"));
+	void loadWhenHasRelativeConfigLocationUsesFileLocation() throws IOException {
+		File buildOutput = new BuildOutput(getClass()).getRootLocation();
+		File resources = new File(buildOutput, "resources-" + UUID.randomUUID());
+		try {
+			resources.mkdirs();
+			File properties = new File(resources, "specificlocation.properties").getAbsoluteFile();
+			Files.write(properties.toPath(),
+					List.of("my.property=fromspecificlocation", "the.property=fromspecificlocation"));
+			Path relative = new File("").getAbsoluteFile().toPath().relativize(properties.toPath());
+			ConfigurableApplicationContext context = this.application.run("--spring.config.location=" + relative);
+			assertThat(context.getEnvironment()).has(matchingPropertySource(
+					"Config resource 'file [" + relative + "]' via location '" + relative + "'"));
+		}
+		finally {
+			FileSystemUtils.deleteRecursively(resources);
+		}
 	}
 
 	@Test
+	@WithResource(name = "application-customdefault.properties", content = "customdefault=true")
+	@WithResource(name = "application-dev.properties", content = "my.property=fromdevpropertiesfile")
 	void loadWhenCustomDefaultProfileAndActiveFromPreviousSourceDoesNotActivateDefault() {
 		ConfigurableApplicationContext context = this.application.run("--spring.profiles.default=customdefault",
 				"--spring.profiles.active=dev");
-		String property = context.getEnvironment().getProperty("my.property");
-		assertThat(property).isEqualTo("fromdevpropertiesfile");
+		assertThat(context.getEnvironment().getProperty("my.property")).isEqualTo("fromdevpropertiesfile");
 		assertThat(context.getEnvironment().containsProperty("customdefault")).isFalse();
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			spring.profiles.active=customdefault
+			customprofile=true
+			""")
+	@WithResource(name = "application-customdefault.properties", content = "customprofile-customdefault=true")
 	void runWhenCustomDefaultProfileSameAsActiveFromFileActivatesProfile() {
-		ConfigurableApplicationContext context = this.application.run(
-				"--spring.config.location=classpath:configdata/profiles/", "--spring.profiles.default=customdefault",
-				"--spring.config.name=customprofile");
+		ConfigurableApplicationContext context = this.application.run("--spring.profiles.default=customdefault");
 		ConfigurableEnvironment environment = context.getEnvironment();
 		assertThat(environment.containsProperty("customprofile")).isTrue();
 		assertThat(environment.containsProperty("customprofile-customdefault")).isTrue();
@@ -472,13 +732,18 @@ void runWhenCustomDefaultProfileSameAsActiveFromFileActivatesProfile() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring.profiles.active=${activeProfile:propertiesfile}")
 	void runWhenActiveProfilesCanBeConfiguredUsingPlaceholdersResolvedAgainstTheEnvironmentLoadsExpectedProperties() {
-		ConfigurableApplicationContext context = this.application.run("--activeProfile=testPropertySource",
-				"--spring.config.name=testactiveprofiles");
+		ConfigurableApplicationContext context = this.application.run("--activeProfile=testPropertySource");
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactly("testPropertySource");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			foo=bucket
+			value=1234
+			""")
+	@WithResource(name = "override.properties", content = "foo=bar")
 	void runWhenHasAdditionalLocationLoadsWithAdditionalTakingPrecedenceOverDefaultLocation() {
 		ConfigurableApplicationContext context = this.application
 			.run("--spring.config.additional-location=classpath:override.properties");
@@ -487,6 +752,12 @@ void runWhenHasAdditionalLocationLoadsWithAdditionalTakingPrecedenceOverDefaultL
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			foo=bucket
+			value=1234
+			""")
+	@WithResource(name = "override.properties", content = "foo=bar")
+	@WithResource(name = "some.properties", content = "foo=spam")
 	void runWhenMultipleAdditionalLocationsLoadsWithLastWinning() {
 		ConfigurableApplicationContext context = this.application
 			.run("--spring.config.additional-location=classpath:override.properties,classpath:some.properties");
@@ -495,6 +766,9 @@ void runWhenMultipleAdditionalLocationsLoadsWithLastWinning() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "value=1234")
+	@WithResource(name = "override.properties", content = "foo=bar")
+	@WithResource(name = "some.properties", content = "foo=spam")
 	void runWhenAdditionalLocationAndLocationLoadsWithAdditionalTakingPrecedenceOverConfigured() {
 		ConfigurableApplicationContext context = this.application.run(
 				"--spring.config.location=classpath:some.properties",
@@ -504,12 +778,19 @@ void runWhenAdditionalLocationAndLocationLoadsWithAdditionalTakingPrecedenceOver
 	}
 
 	@Test
+	@WithResource(name = "application.custom", content = "")
+	@WithResource(name = "META-INF/spring.factories", content = """
+			org.springframework.boot.env.PropertySourceLoader=\
+			org.springframework.boot.context.config.TestPropertySourceLoader1,\
+			org.springframework.boot.context.config.TestPropertySourceLoader2
+			""")
 	void runWhenPropertiesFromCustomPropertySourceLoaderShouldLoadFromCustomSource() {
 		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getProperty("customloader1")).isEqualTo("true");
 	}
 
 	@Test
+	@WithResource(name = "gh17001.properties", content = "gh17001loaded=true")
 	void runWhenCustomDefaultPropertySourceLoadsWithoutReplacingCustomSource() {
 		// gh-17011
 		Map<String, Object> source = new HashMap<>();
@@ -581,75 +862,123 @@ void runWhenConfigLocationHasMandatoryDirectoryThatDoesntExistThrowsException()
 	void runWhenConfigLocationHasNonOptionalEmptyFileDoesNotThrowException() throws IOException {
 		File location = new File(this.temp, "application.properties");
 		FileCopyUtils.copy(new byte[0], location);
-		assertThatNoException()
-			.isThrownBy(() -> this.application.run("--spring.config.location=classpath:/application.properties,"
-					+ StringUtils.cleanPath(location.getAbsolutePath())));
+		assertThatNoException().isThrownBy(() -> this.application
+			.run("--spring.config.location=" + StringUtils.cleanPath(location.getAbsolutePath())));
 	}
 
 	@Test
+	@WithResource(name = "META-INF/spring.factories", content = """
+			org.springframework.boot.context.config.ConfigDataLocationResolver=\
+			org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorIntegrationTests$LocationResolver
+
+			org.springframework.boot.context.config.ConfigDataLoader=\
+			org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorIntegrationTests$Loader
+			""")
 	void runWhenResolvedIsOptionalDoesNotThrowException() {
 		ApplicationContext context = this.application.run("--spring.config.location=test:optionalresult");
 		assertThat(context.getEnvironment().containsProperty("spring")).isFalse();
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring.profiles=a")
 	void runWhenUsingInvalidPropertyThrowsException() {
-		assertThatExceptionOfType(InvalidConfigDataPropertyException.class)
-			.isThrownBy(() -> this.application.run("--spring.config.location=classpath:invalidproperty.properties"));
+		assertThatExceptionOfType(InvalidConfigDataPropertyException.class).isThrownBy(() -> this.application.run());
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			my.import=imported
+			spring.config.import=classpath:${my.import}.properties
+			""")
+	@WithResource(name = "imported.properties", content = "my.value=iwasimported")
 	void runWhenImportUsesPlaceholder() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.location=classpath:application-import-with-placeholder.properties");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getProperty("my.value")).isEqualTo("iwasimported");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			my.import=imported
+			#---
+			spring.config.import=classpath:${my.import}.properties
+			""")
+	@WithResource(name = "imported.properties", content = "my.value=iwasimported")
 	void runWhenImportFromEarlierDocumentUsesPlaceholder() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.location=classpath:application-import-with-placeholder-in-document.properties");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getProperty("my.value")).isEqualTo("iwasimported");
 	}
 
 	@Test // gh-26858
+	@WithResource(name = "application.properties", content = """
+			spring.config.import=classpath:imported.properties
+			my.value=application.properties
+			""")
+	@WithResource(name = "imported.properties", content = "my.value=imported.properties")
+	@WithResource(name = "application-dev.properties", content = "my.value=application-dev.properties")
 	void runWhenImportWithProfileVariantOrdersPropertySourcesCorrectly() {
 		this.application.setAdditionalProfiles("dev");
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.location=classpath:application-import-with-profile-variant.properties");
-		assertThat(context.getEnvironment().getProperty("my.value"))
-			.isEqualTo("application-import-with-profile-variant-imported-dev");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.value")).isEqualTo("application-dev.properties");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			spring.config.import=classpath:imported.properties
+			my.value=application.properties
+			""")
+	@WithResource(name = "imported.properties", content = "my.value=imported.properties")
+	@WithResource(name = "imported-dev.properties", content = "my.value=imported-dev.properties")
+	@WithResource(name = "application-dev.properties", content = """
+			spring.config.import=imported-dev.properties
+			my.value=application-dev.properties""")
 	void runWhenImportWithProfileVariantAndDirectProfileImportOrdersPropertySourcesCorrectly() {
 		this.application.setAdditionalProfiles("dev");
-		ConfigurableApplicationContext context = this.application.run(
-				"--spring.config.location=classpath:application-import-with-profile-variant-and-direct-profile-import.properties");
-		assertThat(context.getEnvironment().getProperty("my.value"))
-			.isEqualTo("application-import-with-profile-variant-imported-dev");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.value")).isEqualTo("imported-dev.properties");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			my.import=application-import-with-placeholder-imported
+			#---
+			spring.config.import=classpath:org/springframework/boot/context/config/${my.import}.properties
+			#---
+			my.import=badbadbad
+			spring.config.activate.on-profile=missing
+			""")
 	void runWhenHasPropertyInProfileDocumentThrowsException() {
-		assertThatExceptionOfType(BindException.class).isThrownBy(() -> this.application.run(
-				"--spring.config.location=classpath:application-import-with-placeholder-in-profile-document.properties"))
+		assertThatExceptionOfType(BindException.class).isThrownBy(() -> this.application.run())
 			.withCauseInstanceOf(InactiveConfigDataAccessException.class);
 	}
 
 	@Test // gh-29386
+	@WithResource(name = "application.properties", content = """
+			my.value=application
+			#---
+			my.import=imported
+			spring.config.activate.on-profile=missing
+			#---
+			spring.config.import=${my.import}.properties
+			""")
+	@WithResource(name = "imported.properties", content = "my.value=imported")
 	void runWhenHasPropertyInEarlierProfileDocumentThrowsException() {
-		assertThatExceptionOfType(BindException.class).isThrownBy(() -> this.application.run(
-				"--spring.config.location=classpath:application-import-with-placeholder-in-earlier-profile-document.properties"))
+		assertThatExceptionOfType(BindException.class).isThrownBy(() -> this.application.run())
 			.withCauseInstanceOf(InactiveConfigDataAccessException.class);
 	}
 
 	@Test // gh-29386
+	@WithResource(name = "application.properties", content = """
+			my.import=imported
+			#---
+			my.value=should-be-ignored
+			spring.config.activate.on-profile=missing
+			#---
+			spring.config.import=classpath:${my.import}.properties
+			""")
+	@WithResource(name = "imported.properties", content = "my.value=imported")
 	void runWhenHasPropertyInEarlierDocumentLoads() {
-		ConfigurableApplicationContext context = this.application.run(
-				"--spring.config.location=classpath:application-import-with-placeholder-in-earlier-document.properties");
-		assertThat(context.getEnvironment().getProperty("my.value"))
-			.isEqualTo("application-import-with-placeholder-in-earlier-document-imported");
+		ConfigurableApplicationContext context = this.application.run();
+		assertThat(context.getEnvironment().getProperty("my.value")).isEqualTo("imported");
 	}
 
 	@Test
@@ -665,38 +994,69 @@ void runWhenHasNonOptionalImportAndIgnoreNotFoundPropertyDoesNotThrowException()
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			spring.profiles.active=p1
+			spring.profiles.include=p2
+			#---
+			spring.profiles.include=p3,p4
+			#---
+			spring.profiles.include=p5
+			""")
 	void runWhenHasIncludedProfilesActivatesProfiles() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.location=classpath:application-include-profiles.properties");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactlyInAnyOrder("p1", "p2", "p3", "p4",
 				"p5");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			spring.profiles.active=p1
+			spring.profiles.include=p2
+			#---
+			myprofile=p4
+			spring.profiles.include=p3,${myprofile}
+			#---
+			myotherprofile=p5
+			spring.profiles.include=${myotherprofile}
+			""")
 	void runWhenHasIncludedProfilesWithPlaceholderActivatesProfiles() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.location=classpath:application-include-profiles-with-placeholder.properties");
+		ConfigurableApplicationContext context = this.application.run();
 		assertThat(context.getEnvironment().getActiveProfiles()).containsExactlyInAnyOrder("p1", "p2", "p3", "p4",
 				"p5");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			spring.profiles.active=p1
+			spring.profiles.include=p2
+			#---
+			spring.config.activate.on-profile=p2
+			spring.profiles.include=p3
+			""")
 	void runWhenHasIncludedProfilesWithProfileSpecificDocumentThrowsException() {
-		assertThatExceptionOfType(InactiveConfigDataAccessException.class).isThrownBy(() -> this.application.run(
-				"--spring.config.location=classpath:application-include-profiles-in-profile-specific-document.properties"));
+		assertThatExceptionOfType(InactiveConfigDataAccessException.class).isThrownBy(() -> this.application.run());
 	}
 
 	@Test
+	@WithResource(name = "application-test.yaml", content = """
+			spring:
+			  profiles:
+			    include:
+			      - p
+			""")
 	void runWhenHasIncludedProfilesWithListSyntaxWithProfileSpecificDocumentThrowsException() {
-		assertThatExceptionOfType(InvalidConfigDataPropertyException.class).isThrownBy(() -> this.application.run(
-				"--spring.config.name=application-include-profiles-list-in-profile-specific-file",
-				"--spring.profiles.active=test"));
+		assertThatExceptionOfType(InvalidConfigDataPropertyException.class)
+			.isThrownBy(() -> this.application.run("--spring.profiles.active=test"));
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = """
+			my.import=imported
+			spring.config.import=classpath:${my.import}.properties
+			""")
+	@WithResource(name = "imported.properties", content = "my.value=imported")
 	void runWhenImportingIncludesParentOrigin() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.location=classpath:application-import-with-placeholder.properties");
+		ConfigurableApplicationContext context = this.application.run();
 		Binder binder = Binder.get(context.getEnvironment());
 		List<ConfigurationProperty> properties = new ArrayList<>();
 		BindHandler bindHandler = new BindHandler() {
@@ -712,107 +1072,158 @@ public Object onSuccess(ConfigurationPropertyName name, Bindable<?> target, Bind
 		binder.bind("my.value", Bindable.of(String.class), bindHandler);
 		assertThat(properties).hasSize(1);
 		Origin origin = properties.get(0).getOrigin();
-		assertThat(origin.toString()).contains("application-import-with-placeholder-imported");
-		assertThat(origin.getParent().toString()).contains("application-import-with-placeholder");
+		assertThat(origin.toString()).contains("imported.properties");
+		assertThat(origin.getParent().toString()).contains("application.properties");
 	}
 
 	@Test
+	@WithResource(name = "config/first/application.properties", content = "first.property=apple")
+	@WithResource(name = "config/second/application.properties", content = "second.property=ball")
+	@WithResource(name = "config/third/nested/application.properties", content = "third.property=three")
 	void runWhenHasWildcardLocationLoadsFromAllMatchingLocations() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.location=file:src/test/resources/config/*/", "--spring.config.name=testproperties");
+		ConfigurableApplicationContext context = this.application.run("--spring.config.location=classpath:config/*/");
 		ConfigurableEnvironment environment = context.getEnvironment();
 		assertThat(environment.getProperty("first.property")).isEqualTo("apple");
 		assertThat(environment.getProperty("second.property")).isEqualTo("ball");
+		assertThat(environment.getProperty("third.property")).isNull();
 	}
 
 	@Test
-	void runWhenOptionalWildcardLocationDoesNotExistDoesNotThrowException() {
+	void runWhenOptionalWildcardFileDoesNotExistDoesNotThrowException() {
 		assertThatNoException().isThrownBy(() -> this.application
-			.run("--spring.config.location=optional:file:src/test/resources/nonexistent/*/testproperties.properties"));
+			.run("--spring.config.location=optional:classpath:nonexistent/*/testproperties.properties"));
 	}
 
 	@Test
-	void runWhenMandatoryWildcardLocationDoesNotExistThrowsException() {
+	void runWhenMandatoryWildcardFileDoesNotExistThrowsException() {
 		assertThatExceptionOfType(ConfigDataLocationNotFoundException.class).isThrownBy(() -> this.application
-			.run("--spring.config.location=file:src/test/resources/nonexistent/*/testproperties.properties"));
+			.run("--spring.config.location=classpath:nonexistent/*/testproperties.properties"));
 	}
 
 	@Test
-	void runWhenMandatoryWildcardLocationHasEmptyFileDirectory() {
-		assertThatNoException()
-			.isThrownBy(() -> this.application.run("--spring.config.location=file:src/test/resources/config/*/"));
+	@WithResourceDirectory("config/empty")
+	void runWhenMandatoryWildcardDirectoryHasEmptyDirectoryDoesNotThrowException() {
+		assertThatNoException().isThrownBy(() -> this.application.run("--spring.config.location=classpath:config/*/"));
 	}
 
 	@Test
-	void runWhenMandatoryWildcardLocationHasNoSubdirectories() {
-		assertThatExceptionOfType(ConfigDataLocationNotFoundException.class)
-			.isThrownBy(
-					() -> this.application.run("--spring.config.location=file:src/test/resources/config/0-empty/*/"))
-			.withMessage("Config data location 'file:src/test/resources/config/0-empty/*/' contains no subdirectories");
+	@WithResourceDirectory("config/empty")
+	void runWhenOptionalWildcardDirectoryHasNoSubdirectoriesDoesNotThrow() {
+		assertThatNoException()
+			.isThrownBy(() -> this.application.run("--spring.config.location=optional:classpath:config/*/"));
 	}
 
 	@Test
-	void runWhenHasMandatoryWildcardLocationThatDoesNotExist() {
+	@WithResourceDirectory("config")
+	void runWhenMandatoryWildcardDirectoryHasNoSubdirectoriesThrows() {
 		assertThatExceptionOfType(ConfigDataLocationNotFoundException.class)
-			.isThrownBy(() -> this.application.run("--spring.config.location=file:invalid/*/"));
+			.isThrownBy(() -> this.application.run("--spring.config.location=classpath:config/*/"))
+			.withMessage("Config data location 'classpath:config/*/' contains no subdirectories");
 	}
 
 	@Test
-	void runWhenHasOptionalWildcardLocationThatDoesNotExistDoesNotThrow() {
+	void runWhenOptionalWildcardDirectoryDoesNotExistDoesNotThrowException() {
 		assertThatNoException()
 			.isThrownBy(() -> this.application.run("--spring.config.location=optional:file:invalid/*/"));
 	}
 
-	@Test
-	void runWhenOptionalWildcardLocationHasNoSubdirectoriesDoesNotThrow() {
-		assertThatNoException().isThrownBy(() -> this.application
-			.run("--spring.config.location=optional:file:src/test/resources/config/0-empty/*/"));
-	}
-
 	@Test // gh-24990
+	@WithResource(name = "application.properties", content = "spring.profiles.active=test,other")
+	@WithResource(name = "application-test.properties", content = """
+			test1=test1
+			#---
+			spring.config.activate.on-profile=other
+			test2=test2
+			""")
 	void runWhenHasProfileSpecificFileWithActiveOnProfileProperty() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.name=application-activate-on-profile-in-profile-specific-file");
+		ConfigurableApplicationContext context = this.application.run();
 		ConfigurableEnvironment environment = context.getEnvironment();
 		assertThat(environment.getProperty("test1")).isEqualTo("test1");
 		assertThat(environment.getProperty("test2")).isEqualTo("test2");
 	}
 
 	@Test // gh-26960
+	@WithResource(name = "application.properties", content = """
+			spring.profiles.active=p1,p2
+			application=true
+			""")
+	@WithResource(name = "application-p1.properties", content = """
+			application-p1=true
+			spring.config.import=import.properties
+			""")
+	@WithResource(name = "import.properties", content = "import=true")
+	@WithResource(name = "import-p1.properties", content = "import-p1=true")
+	@WithResource(name = "import-p2.properties", content = "import-p2=true")
 	void runWhenHasProfileSpecificImportWithImportImportsSecondProfileSpecificFile() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.name=application-profile-specific-import-with-import");
+		ConfigurableApplicationContext context = this.application.run();
 		ConfigurableEnvironment environment = context.getEnvironment();
-		assertThat(environment.containsProperty("application-profile-specific-import-with-import")).isTrue();
-		assertThat(environment.containsProperty("application-profile-specific-import-with-import-p1")).isTrue();
-		assertThat(environment.containsProperty("application-profile-specific-import-with-import-p2")).isFalse();
-		assertThat(environment.containsProperty("application-profile-specific-import-with-import-import")).isTrue();
-		assertThat(environment.containsProperty("application-profile-specific-import-with-import-import-p1")).isTrue();
-		assertThat(environment.containsProperty("application-profile-specific-import-with-import-import-p2")).isTrue();
+		assertThat(environment.containsProperty("application")).isTrue();
+		assertThat(environment.containsProperty("application-p1")).isTrue();
+		assertThat(environment.containsProperty("application-p2")).isFalse();
+		assertThat(environment.containsProperty("import")).isTrue();
+		assertThat(environment.containsProperty("import-p1")).isTrue();
+		assertThat(environment.containsProperty("import-p2")).isTrue();
 	}
 
 	@Test // gh-26960
+	@WithResource(name = "application.properties", content = "spring.profiles.active=p1,p2")
+	@WithResource(name = "application-p1.properties", content = "spring.config.import:test:boot")
+	@WithResource(name = "META-INF/spring.factories", content = """
+			org.springframework.boot.context.config.ConfigDataLocationResolver=\
+			org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorIntegrationTests$LocationResolver
+
+			org.springframework.boot.context.config.ConfigDataLoader=\
+			org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorIntegrationTests$Loader
+			""")
 	void runWhenHasProfileSpecificImportWithCustomImportResolvesProfileSpecific() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.name=application-profile-specific-import-with-custom-import");
+		ConfigurableApplicationContext context = this.application.run();
 		ConfigurableEnvironment environment = context.getEnvironment();
 		assertThat(environment.containsProperty("test:boot")).isTrue();
 		assertThat(environment.containsProperty("test:boot:ps")).isTrue();
 	}
 
 	@Test // gh-26593
+	@WithResource(name = "application.properties", content = """
+			root=true
+			v1=root
+			v2=root
+			""")
+	@WithResource(name = "application-p1.properties", content = """
+			root-p1=true
+			v1=root-p1
+			v2=root-p1
+			""")
+	@WithResource(name = "application-p2.properties", content = """
+			root-p2=true
+			v1=root-p2
+			v2=root-p2
+			""")
+	@WithResource(name = "config/application.properties", content = """
+			config=true
+			v1=config
+			v2=config
+			""")
+	@WithResource(name = "config/application-p1.properties", content = """
+			config-p1=true
+			v1=config-p1
+			#v2 intentionally missing
+			""")
+	@WithResource(name = "config/application-p2.properties", content = """
+			config-p2=true
+			v1=config-p2
+			#v2 intentionally missing
+			""")
 	void runWhenHasFilesInRootAndConfigWithProfiles() {
-		ConfigurableApplicationContext context = this.application
-			.run("--spring.config.name=file-in-root-and-config-with-profile", "--spring.profiles.active=p1,p2");
+		ConfigurableApplicationContext context = this.application.run("--spring.profiles.active=p1,p2");
 		ConfigurableEnvironment environment = context.getEnvironment();
-		assertThat(environment.containsProperty("file-in-root-and-config-with-profile")).isTrue();
-		assertThat(environment.containsProperty("file-in-root-and-config-with-profile-p1")).isTrue();
-		assertThat(environment.containsProperty("file-in-root-and-config-with-profile-p2")).isTrue();
-		assertThat(environment.containsProperty("config-file-in-root-and-config-with-profile")).isTrue();
-		assertThat(environment.containsProperty("config-file-in-root-and-config-with-profile-p1")).isTrue();
-		assertThat(environment.containsProperty("config-file-in-root-and-config-with-profile-p2")).isTrue();
-		assertThat(environment.getProperty("v1")).isEqualTo("config-file-in-root-and-config-with-profile-p2");
-		assertThat(environment.getProperty("v2")).isEqualTo("file-in-root-and-config-with-profile-p2");
+		assertThat(environment.containsProperty("root")).isTrue();
+		assertThat(environment.containsProperty("root-p1")).isTrue();
+		assertThat(environment.containsProperty("root-p2")).isTrue();
+		assertThat(environment.containsProperty("config")).isTrue();
+		assertThat(environment.containsProperty("config-p1")).isTrue();
+		assertThat(environment.containsProperty("config-p2")).isTrue();
+		assertThat(environment.getProperty("v1")).isEqualTo("config-p2");
+		assertThat(environment.getProperty("v2")).isEqualTo("root-p2");
 	}
 
 	private Condition<ConfigurableEnvironment> matchingPropertySource(final String sourceName) {
@@ -820,21 +1231,12 @@ private Condition<ConfigurableEnvironment> matchingPropertySource(final String s
 
 			@Override
 			public boolean matches(ConfigurableEnvironment value) {
-				value.getPropertySources().forEach((ps) -> System.out.println(ps.getName()));
 				return value.getPropertySources().contains(sourceName);
 			}
 
 		};
 	}
 
-	private void assertProfileExpression(String value, String... activeProfiles) {
-		this.application.setAdditionalProfiles(activeProfiles);
-		ConfigurableApplicationContext context = this.application.run("--spring.config.name=testprofileexpression",
-				"--spring.config.location=classpath:configdata/profiles/");
-		String property = context.getEnvironment().getProperty("my.property");
-		assertThat(property).isEqualTo(value);
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorTests.java
index f7139ad750ad..283b3be3a87d 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 
 import org.springframework.boot.DefaultBootstrapContext;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
@@ -103,6 +104,8 @@ void postProcessEnvironmentWhenNoActiveProfiles() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "property=value")
+	@WithResource(name = "application-dev.properties", content = "property=dev-value")
 	void applyToAppliesPostProcessing() {
 		int before = this.environment.getPropertySources().size();
 		TestConfigDataEnvironmentUpdateListener listener = new TestConfigDataEnvironmentUpdateListener();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentTests.java
index d602bf215444..656e93c2670b 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.context.config;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collection;
@@ -28,7 +27,6 @@
 import java.util.function.Supplier;
 
 import org.assertj.core.api.InstanceOfAssertFactories;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -42,6 +40,7 @@
 import org.springframework.boot.context.config.TestConfigDataEnvironmentUpdateListener.AddedPropertySource;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.logging.DeferredLogFactory;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -149,8 +148,8 @@ void createCreatesInitialImportContributorsInCorrectOrder() {
 	}
 
 	@Test
-	void processAndApplyAddsImportedSourceToEnvironment(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
+	@WithResource(name = "application.properties", content = "spring=boot")
+	void processAndApplyAddsImportedSourceToEnvironment() {
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null);
 		configDataEnvironment.processAndApply();
@@ -158,8 +157,14 @@ void processAndApplyAddsImportedSourceToEnvironment(TestInfo info) {
 	}
 
 	@Test
-	void processAndApplyOnlyAddsActiveContributors(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
+	@WithResource(name = "application.properties", content = """
+			spring=boot
+			#---
+			spring.config.activate.on-profile=missing
+			other=value
+			No newline at end of file
+			""")
+	void processAndApplyOnlyAddsActiveContributors() {
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null);
 		configDataEnvironment.processAndApply();
@@ -180,8 +185,8 @@ void processAndApplyMovesDefaultPropertySourceToLast(TestInfo info) {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring.profiles.default=one,two,three")
 	void processAndApplySetsDefaultProfiles(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null);
 		configDataEnvironment.processAndApply();
@@ -189,8 +194,8 @@ void processAndApplySetsDefaultProfiles(TestInfo info) {
 	}
 
 	@Test
-	void processAndApplySetsActiveProfiles(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
+	@WithResource(name = "application.properties", content = "spring.profiles.active=one,two,three")
+	void processAndApplySetsActiveProfiles() {
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null);
 		configDataEnvironment.processAndApply();
@@ -198,8 +203,11 @@ void processAndApplySetsActiveProfiles(TestInfo info) {
 	}
 
 	@Test
-	void processAndApplySetsActiveProfilesAndProfileGroups(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
+	@WithResource(name = "application.properties", content = """
+			spring.profiles.active=one,two,three
+			spring.profiles.group.one=four,five
+			""")
+	void processAndApplySetsActiveProfilesAndProfileGroups() {
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null);
 		configDataEnvironment.processAndApply();
@@ -207,8 +215,8 @@ void processAndApplySetsActiveProfilesAndProfileGroups(TestInfo info) {
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring.profiles.active=test")
 	void processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributors(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null) {
 
@@ -281,8 +289,8 @@ protected ConfigDataEnvironmentContributors createContributors(
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring=boot")
 	void processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributorsWhenNoProfilesActive(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null) {
 
@@ -307,9 +315,8 @@ protected ConfigDataEnvironmentContributors createContributors(
 	}
 
 	@Test
-	@Disabled("Disabled until spring.profiles support is dropped")
 	void processAndApplyWhenHasInvalidPropertyThrowsException() {
-		this.environment.setProperty("spring.profile", "a");
+		this.environment.setProperty("spring.profiles", "a");
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, null);
 		assertThatExceptionOfType(InvalidConfigDataPropertyException.class)
@@ -317,8 +324,9 @@ void processAndApplyWhenHasInvalidPropertyThrowsException() {
 	}
 
 	@Test
+	@WithResource(name = "custom/config.properties", content = "spring=boot")
 	void processAndApplyWhenHasListenerCallsOnPropertySourceAdded(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
+		this.environment.setProperty("spring.config.location", "classpath:custom/config.properties");
 		TestConfigDataEnvironmentUpdateListener listener = new TestConfigDataEnvironmentUpdateListener();
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, listener);
@@ -326,14 +334,14 @@ void processAndApplyWhenHasListenerCallsOnPropertySourceAdded(TestInfo info) {
 		assertThat(listener.getAddedPropertySources()).hasSize(1);
 		AddedPropertySource addedPropertySource = listener.getAddedPropertySources().get(0);
 		assertThat(addedPropertySource.getPropertySource().getProperty("spring")).isEqualTo("boot");
-		assertThat(addedPropertySource.getLocation()).hasToString(getConfigLocation(info));
+		assertThat(addedPropertySource.getLocation()).hasToString("classpath:custom/config.properties");
 		assertThat(addedPropertySource.getResource().toString()).contains("class path resource")
-			.contains(info.getTestMethod().get().getName());
+			.contains("custom/config.properties");
 	}
 
 	@Test
+	@WithResource(name = "application.properties", content = "spring.profiles.active=one,two,three")
 	void processAndApplyWhenHasListenerCallsOnSetProfiles(TestInfo info) {
-		this.environment.setProperty("spring.config.location", getConfigLocation(info));
 		TestConfigDataEnvironmentUpdateListener listener = new TestConfigDataEnvironmentUpdateListener();
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
 				this.environment, this.resourceLoader, this.additionalProfiles, listener);
@@ -343,17 +351,18 @@ void processAndApplyWhenHasListenerCallsOnSetProfiles(TestInfo info) {
 
 	@Test
 	@SuppressWarnings("rawtypes")
+	@WithResource(name = "separate-class-loader-spring.factories", content = """
+			org.springframework.boot.context.config.ConfigDataLoader=\
+			org.springframework.boot.context.config.ConfigDataEnvironmentTests$SeparateClassLoaderConfigDataLoader
+			""")
 	void configDataLoadersAreLoadedUsingClassLoaderFromResourceLoader() {
 		ResourceLoader resourceLoader = mock(ResourceLoader.class);
-		ClassLoader classLoader = new ClassLoader() {
+		ClassLoader classLoader = new ClassLoader(Thread.currentThread().getContextClassLoader()) {
 
 			@Override
 			public Enumeration<URL> getResources(String name) throws IOException {
 				if (SpringFactoriesLoader.FACTORIES_RESOURCE_LOCATION.equals(name)) {
-					return Collections.enumeration(List.of(new File(
-							"src/test/resources/org/springframework/boot/context/config/separate-class-loader-spring.factories")
-						.toURI()
-						.toURL()));
+					return super.getResources("separate-class-loader-spring.factories");
 				}
 				return super.getResources(name);
 			}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java
index e4a822bd4db0..7db561f8198d 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 import org.springframework.boot.env.PropertiesPropertySourceLoader;
 import org.springframework.boot.env.PropertySourceLoader;
 import org.springframework.boot.env.YamlPropertySourceLoader;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.core.test.io.support.MockSpringFactoriesLoader;
 
@@ -41,9 +42,11 @@
 class ConfigDataLocationRuntimeHintsTests {
 
 	@Test
+	@WithResource(name = "application.properties", content = "")
+	@WithResource(name = "config/application.properties", content = "")
 	void registerWithDefaultSettings() {
 		RuntimeHints hints = new RuntimeHints();
-		new TestConfigDataLocationRuntimeHints().registerHints(hints, null);
+		new TestConfigDataLocationRuntimeHints().registerHints(hints, Thread.currentThread().getContextClassLoader());
 		assertThat(hints.resources().resourcePatternHints()).singleElement()
 			.satisfies(includes("application*.properties", "application*.xml", "application*.yaml", "application*.yml",
 					"config/application*.properties", "config/application*.xml", "config/application*.yaml",
@@ -51,6 +54,8 @@ void registerWithDefaultSettings() {
 	}
 
 	@Test
+	@WithResource(name = "test.properties")
+	@WithResource(name = "config/test.properties")
 	void registerWithCustomName() {
 		RuntimeHints hints = new RuntimeHints();
 		new TestConfigDataLocationRuntimeHints() {
@@ -59,13 +64,15 @@ protected List<String> getFileNames(ClassLoader classLoader) {
 				return List.of("test");
 			}
 
-		}.registerHints(hints, null);
+		}.registerHints(hints, Thread.currentThread().getContextClassLoader());
 		assertThat(hints.resources().resourcePatternHints()).singleElement()
 			.satisfies(includes("test*.properties", "test*.xml", "test*.yaml", "test*.yml", "config/test*.properties",
 					"config/test*.xml", "config/test*.yaml", "config/test*.yml"));
 	}
 
 	@Test
+	@WithResource(name = "application.properties")
+	@WithResource(name = "config/application.properties")
 	void registerWithCustomLocation() {
 		RuntimeHints hints = new RuntimeHints();
 		new TestConfigDataLocationRuntimeHints() {
@@ -73,13 +80,15 @@ void registerWithCustomLocation() {
 			protected List<String> getLocations(ClassLoader classLoader) {
 				return List.of("config/");
 			}
-		}.registerHints(hints, null);
+		}.registerHints(hints, Thread.currentThread().getContextClassLoader());
 		assertThat(hints.resources().resourcePatternHints()).singleElement()
 			.satisfies(includes("config/application*.properties", "config/application*.xml", "config/application*.yaml",
 					"config/application*.yml"));
 	}
 
 	@Test
+	@WithResource(name = "application.conf")
+	@WithResource(name = "config/application.conf")
 	void registerWithCustomExtension() {
 		RuntimeHints hints = new RuntimeHints();
 		new ConfigDataLocationRuntimeHints() {
@@ -87,7 +96,7 @@ void registerWithCustomExtension() {
 			protected List<String> getExtensions(ClassLoader classLoader) {
 				return List.of(".conf");
 			}
-		}.registerHints(hints, null);
+		}.registerHints(hints, Thread.currentThread().getContextClassLoader());
 		assertThat(hints.resources().resourcePatternHints()).singleElement()
 			.satisfies(includes("application*.conf", "config/application*.conf"));
 	}
@@ -100,7 +109,7 @@ void registerWithUnknownLocationDoesNotAddHint() {
 			protected List<String> getLocations(ClassLoader classLoader) {
 				return List.of(UUID.randomUUID().toString());
 			}
-		}.registerHints(hints, null);
+		}.registerHints(hints, Thread.currentThread().getContextClassLoader());
 		assertThat(hints.resources().resourcePatternHints()).isEmpty();
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLoaderTests.java
index 908c4a29c0f5..ad06f8e77cbc 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 import org.springframework.boot.env.PropertiesPropertySourceLoader;
 import org.springframework.boot.env.YamlPropertySourceLoader;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.ClassPathResource;
 
@@ -41,32 +42,36 @@ class StandardConfigDataLoaderTests {
 	private final ConfigDataLoaderContext loaderContext = mock(ConfigDataLoaderContext.class);
 
 	@Test
+	@WithResource(name = "application.yml", content = """
+			foo: bar
+			---
+			hello: world
+			""")
 	void loadWhenLocationResultsInMultiplePropertySourcesAddsAllToConfigData() throws IOException {
-		ClassPathResource resource = new ClassPathResource("configdata/yaml/application.yml");
+		ClassPathResource resource = new ClassPathResource("application.yml");
 		StandardConfigDataReference reference = new StandardConfigDataReference(
-				ConfigDataLocation.of("classpath:configdata/yaml/application.yml"), null,
-				"classpath:configdata/yaml/application", null, "yml", new YamlPropertySourceLoader());
+				ConfigDataLocation.of("classpath:application.yml"), null, "classpath:application", null, "yml",
+				new YamlPropertySourceLoader());
 		StandardConfigDataResource location = new StandardConfigDataResource(reference, resource);
 		ConfigData configData = this.loader.load(this.loaderContext, location);
 		assertThat(configData.getPropertySources()).hasSize(2);
 		PropertySource<?> source1 = configData.getPropertySources().get(0);
 		PropertySource<?> source2 = configData.getPropertySources().get(1);
-		assertThat(source1.getName())
-			.isEqualTo("Config resource 'class path resource [configdata/yaml/application.yml]' "
-					+ "via location 'classpath:configdata/yaml/application.yml' (document #0)");
+		assertThat(source1.getName()).isEqualTo("Config resource 'class path resource [application.yml]' "
+				+ "via location 'classpath:application.yml' (document #0)");
 		assertThat(source1.getProperty("foo")).isEqualTo("bar");
-		assertThat(source2.getName())
-			.isEqualTo("Config resource 'class path resource [configdata/yaml/application.yml]' "
-					+ "via location 'classpath:configdata/yaml/application.yml' (document #1)");
+		assertThat(source2.getName()).isEqualTo("Config resource 'class path resource [application.yml]' "
+				+ "via location 'classpath:application.yml' (document #1)");
 		assertThat(source2.getProperty("hello")).isEqualTo("world");
 	}
 
 	@Test
+	@WithResource(name = "empty.properties")
 	void loadWhenPropertySourceIsEmptyAddsNothingToConfigData() throws IOException {
-		ClassPathResource resource = new ClassPathResource("config/0-empty/testproperties.properties");
+		ClassPathResource resource = new ClassPathResource("empty.properties");
 		StandardConfigDataReference reference = new StandardConfigDataReference(
-				ConfigDataLocation.of("classpath:config/0-empty/testproperties.properties"), null,
-				"config/0-empty/testproperties", null, "properties", new PropertiesPropertySourceLoader());
+				ConfigDataLocation.of("empty.properties"), null, "empty", null, "properties",
+				new PropertiesPropertySourceLoader());
 		StandardConfigDataResource location = new StandardConfigDataResource(reference, resource);
 		ConfigData configData = this.loader.load(this.loaderContext, location);
 		assertThat(configData.getPropertySources()).isEmpty();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLocationResolverTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLocationResolverTests.java
index 6b221e15f2b7..83291ff7f07c 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLocationResolverTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataLocationResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.boot.context.config;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 
@@ -26,6 +27,8 @@
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.env.PropertiesPropertySourceLoader;
 import org.springframework.boot.logging.DeferredLogs;
+import org.springframework.boot.testsupport.classpath.resources.ResourcesRoot;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -71,23 +74,22 @@ void isResolvableAlwaysReturnsTrue() {
 	}
 
 	@Test
+	@WithResource(name = "configdata/application.properties")
 	void resolveWhenLocationIsDirectoryResolvesAllMatchingFilesInDirectory() {
-		ConfigDataLocation location = ConfigDataLocation.of("classpath:/configdata/properties/");
+		ConfigDataLocation location = ConfigDataLocation.of("classpath:/configdata/");
 		List<StandardConfigDataResource> locations = this.resolver.resolve(this.context, location);
 		assertThat(locations).hasSize(1);
 		assertThat(locations).extracting(Object::toString)
-			.containsExactly("class path resource [configdata/properties/application.properties]");
+			.containsExactly("class path resource [configdata/application.properties]");
 	}
 
 	@Test
 	void resolveWhenLocationIsFileResolvesFile() {
-		ConfigDataLocation location = ConfigDataLocation
-			.of("file:src/test/resources/configdata/properties/application.properties");
+		ConfigDataLocation location = ConfigDataLocation.of("file:configdata/application.properties");
 		List<StandardConfigDataResource> locations = this.resolver.resolve(this.context, location);
 		assertThat(locations).hasSize(1);
 		assertThat(locations).extracting(Object::toString)
-			.containsExactly(
-					filePath("src", "test", "resources", "configdata", "properties", "application.properties"));
+			.containsExactly(filePath("configdata", "application.properties"));
 	}
 
 	@Test
@@ -143,49 +145,55 @@ void resolveWhenLocationHasMultipleWildcardsThrowsException() {
 	}
 
 	@Test
-	void resolveWhenLocationIsWildcardDirectoriesRestrictsToOneLevelDeep() {
-		ConfigDataLocation location = ConfigDataLocation.of("file:src/test/resources/config/*/");
+	@WithResource(name = "config/0-empty/testproperties.properties")
+	@WithResource(name = "config/1-first/testproperties.properties", content = "first.property=apple")
+	@WithResource(name = "config/2-second/testproperties.properties", content = "second.property=ball")
+	@WithResource(name = "config/nested/3-third/testproperties.properties", content = "third.property=shouldnotbefound")
+	void resolveWhenLocationIsWildcardDirectoriesRestrictsToOneLevelDeep(@ResourcesRoot Path resourcesRoot) {
+		ConfigDataLocation location = ConfigDataLocation.of("file:" + resourcesRoot + "/config/*/");
 		this.environment.setProperty("spring.config.name", "testproperties");
 		this.resolver = new StandardConfigDataLocationResolver(new DeferredLogs(), this.environmentBinder,
 				this.resourceLoader);
 		List<StandardConfigDataResource> locations = this.resolver.resolve(this.context, location);
 		assertThat(locations).hasSize(3);
 		assertThat(locations).extracting(Object::toString)
-			.contains(filePath("src", "test", "resources", "config", "1-first", "testproperties.properties"))
-			.contains(filePath("src", "test", "resources", "config", "2-second", "testproperties.properties"))
-			.doesNotContain(filePath("src", "test", "resources", "config", "3-third", "testproperties.properties"));
+			.contains(filePath(resourcesRoot.resolve("config/1-first/testproperties.properties")))
+			.contains(filePath(resourcesRoot.resolve("config/2-second/testproperties.properties")))
+			.doesNotContain(filePath(resourcesRoot.resolve("config/nested/3-third/testproperties.properties")));
 	}
 
 	@Test
-	void resolveWhenLocationIsWildcardDirectoriesSortsAlphabeticallyBasedOnAbsolutePath() {
-		ConfigDataLocation location = ConfigDataLocation.of("file:src/test/resources/config/*/");
+	@WithResource(name = "config/0-empty/testproperties.properties")
+	@WithResource(name = "config/1-first/testproperties.properties", content = "first.property=apple")
+	@WithResource(name = "config/2-second/testproperties.properties", content = "second.property=ball")
+	@WithResource(name = "config/nested/3-third/testproperties.properties", content = "third.property=shouldnotbefound")
+	void resolveWhenLocationIsWildcardDirectoriesSortsAlphabeticallyBasedOnAbsolutePath(
+			@ResourcesRoot Path resourcesRoot) {
+		ConfigDataLocation location = ConfigDataLocation.of("file:" + resourcesRoot + "/config/*/");
 		this.environment.setProperty("spring.config.name", "testproperties");
 		this.resolver = new StandardConfigDataLocationResolver(new DeferredLogs(), this.environmentBinder,
 				this.resourceLoader);
 		List<StandardConfigDataResource> locations = this.resolver.resolve(this.context, location);
 		assertThat(locations).extracting(Object::toString)
-			.containsExactly(filePath("src", "test", "resources", "config", "0-empty", "testproperties.properties"),
-					filePath("src", "test", "resources", "config", "1-first", "testproperties.properties"),
-					filePath("src", "test", "resources", "config", "2-second", "testproperties.properties"));
+			.containsExactly(filePath(resourcesRoot.resolve("config/0-empty/testproperties.properties")),
+					filePath(resourcesRoot.resolve("config/1-first/testproperties.properties")),
+					filePath(resourcesRoot.resolve("config/2-second/testproperties.properties")));
 	}
 
 	@Test
-	void resolveWhenLocationIsWildcardAndMatchingFilePresentShouldNotFail() {
-		ConfigDataLocation location = ConfigDataLocation.of("optional:file:src/test/resources/a-file/*/");
-		assertThatNoException().isThrownBy(() -> this.resolver.resolve(this.context, location));
-	}
-
-	@Test
-	void resolveWhenLocationIsWildcardFilesLoadsAllFilesThatMatch() {
+	@WithResource(name = "config/0-empty/testproperties.properties")
+	@WithResource(name = "config/1-first/testproperties.properties", content = "first.property=apple")
+	@WithResource(name = "config/2-second/testproperties.properties", content = "second.property=ball")
+	@WithResource(name = "config/nested/3-third/testproperties.properties", content = "third.property=shouldnotbefound")
+	void resolveWhenLocationIsWildcardFilesLoadsAllFilesThatMatch(@ResourcesRoot Path resourcesRoot) {
 		ConfigDataLocation location = ConfigDataLocation
-			.of("file:src/test/resources/config/*/testproperties.properties");
+			.of("file:" + resourcesRoot + "/config/*/testproperties.properties");
 		List<StandardConfigDataResource> locations = this.resolver.resolve(this.context, location);
 		assertThat(locations).hasSize(3);
 		assertThat(locations).extracting(Object::toString)
-			.contains(filePath("src", "test", "resources", "config", "1-first", "testproperties.properties"))
-			.contains(filePath("src", "test", "resources", "config", "2-second", "testproperties.properties"))
-			.doesNotContain(
-					filePath("src", "test", "resources", "config", "nested", "3-third", "testproperties.properties"));
+			.contains(filePath(resourcesRoot.resolve("config/1-first/testproperties.properties")))
+			.contains(filePath(resourcesRoot.resolve("config/2-second/testproperties.properties")))
+			.doesNotContain(filePath(resourcesRoot.resolve("config/nested/3-third/testproperties.properties")));
 	}
 
 	@Test
@@ -208,6 +216,8 @@ void resolveWhenLocationIsRelativeAndFileResolves() {
 	}
 
 	@Test
+	@WithResource(name = "config/specific.properties")
+	@WithResource(name = "config/nested/3-third/testproperties.properties")
 	void resolveWhenLocationIsRelativeAndDirectoryResolves() {
 		this.environment.setProperty("spring.config.name", "testproperties");
 		ConfigDataLocation location = ConfigDataLocation.of("nested/3-third/");
@@ -240,6 +250,7 @@ void resolveWhenLocationIsRelativeAndNoMatchingLoaderThrowsException() {
 	}
 
 	@Test
+	@WithResource(name = "application-props-no-extension", content = "withnoextension=test")
 	void resolveWhenLocationUsesOptionalExtensionSyntaxResolves() throws Exception {
 		ConfigDataLocation location = ConfigDataLocation.of("classpath:/application-props-no-extension[.properties]");
 		List<StandardConfigDataResource> locations = this.resolver.resolve(this.context, location);
@@ -248,19 +259,20 @@ void resolveWhenLocationUsesOptionalExtensionSyntaxResolves() throws Exception {
 		assertThat(resolved.getResource().getFilename()).endsWith("application-props-no-extension");
 		ConfigData loaded = new StandardConfigDataLoader().load(null, resolved);
 		PropertySource<?> propertySource = loaded.getPropertySources().get(0);
-		assertThat(propertySource.getProperty("withnotext")).isEqualTo("test");
+		assertThat(propertySource.getProperty("withnoextension")).isEqualTo("test");
 	}
 
 	@Test
+	@WithResource(name = "application-dev.properties")
 	void resolveProfileSpecificReturnsProfileSpecificFiles() {
-		ConfigDataLocation location = ConfigDataLocation.of("classpath:/configdata/properties/");
+		ConfigDataLocation location = ConfigDataLocation.of("classpath:/");
 		Profiles profiles = mock(Profiles.class);
 		given(profiles.iterator()).willReturn(Collections.singletonList("dev").iterator());
 		List<StandardConfigDataResource> locations = this.resolver.resolveProfileSpecific(this.context, location,
 				profiles);
 		assertThat(locations).hasSize(1);
 		assertThat(locations).extracting(Object::toString)
-			.containsExactly("class path resource [configdata/properties/application-dev.properties]");
+			.containsExactly("class path resource [application-dev.properties]");
 	}
 
 	@Test
@@ -297,4 +309,8 @@ private String filePath(String... components) {
 		return "file [" + String.join(File.separator, components) + "]";
 	}
 
+	private String filePath(Path path) {
+		return "file [%s]".formatted(path);
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java
index 1d8c729d22e6..44191581879a 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java
@@ -18,6 +18,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
@@ -62,6 +66,7 @@
 import org.springframework.boot.logging.java.JavaLoggingSystem;
 import org.springframework.boot.system.ApplicationPid;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.context.ApplicationEvent;
@@ -160,8 +165,9 @@ void baseConfigLocation() {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void overrideConfigLocation() {
-		addPropertiesToEnvironment(this.context, "logging.config=classpath:logback-nondefault.xml");
+		addPropertiesToEnvironment(this.context, "logging.config=classpath:nondefault.xml");
 		this.listener.initialize(this.context.getEnvironment(), this.context.getClassLoader());
 		this.logger.info("Hello world");
 		assertThat(this.output).contains("Hello world").doesNotContain("???").startsWith("null ").endsWith("BOOTBOOT");
@@ -178,8 +184,9 @@ void throwableFromInitializeResultsInGracefulFailure(CapturedOutput output) {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void trailingWhitespaceInLoggingConfigShouldBeTrimmed() {
-		addPropertiesToEnvironment(this.context, "logging.config=classpath:logback-nondefault.xml ");
+		addPropertiesToEnvironment(this.context, "logging.config=classpath:nondefault.xml ");
 		this.listener.initialize(this.context.getEnvironment(), this.context.getClassLoader());
 		this.logger.info("Hello world");
 		assertThat(this.output).contains("Hello world").doesNotContain("???").startsWith("null ").endsWith("BOOTBOOT");
@@ -226,8 +233,9 @@ void overrideConfigBroken() {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void addLogFileProperty() {
-		addPropertiesToEnvironment(this.context, "logging.config=classpath:logback-nondefault.xml",
+		addPropertiesToEnvironment(this.context, "logging.config=classpath:nondefault.xml",
 				"logging.file.name=" + this.logFile);
 		this.listener.initialize(this.context.getEnvironment(), this.context.getClassLoader());
 		Log logger = LogFactory.getLog(LoggingApplicationListenerTests.class);
@@ -248,8 +256,9 @@ void addLogFilePropertyWithDefault() {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void addLogPathProperty() {
-		addPropertiesToEnvironment(this.context, "logging.config=classpath:logback-nondefault.xml",
+		addPropertiesToEnvironment(this.context, "logging.config=classpath:nondefault.xml",
 				"logging.file.path=" + this.tempDir);
 		this.listener.initialize(this.context.getEnvironment(), this.context.getClassLoader());
 		Log logger = LogFactory.getLog(LoggingApplicationListenerTests.class);
@@ -779,4 +788,22 @@ public int getPhase() {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "nondefault.xml", content = """
+			<configuration>
+				<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+					<encoder>
+						<pattern>%property{LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n BOOTBOOT</pattern>
+					</encoder>
+				</appender>
+				<root level="INFO">
+					<appender-ref ref="CONSOLE"/>
+				</root>
+			</configuration>
+			""")
+	private @interface WithNonDefaultXmlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
index 26539664f11b..0a3195c86c13 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@
 import org.springframework.boot.convert.PeriodStyle;
 import org.springframework.boot.convert.PeriodUnit;
 import org.springframework.boot.env.RandomValuePropertySource;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -262,6 +263,21 @@ void loadWhenBindingWithoutAnnotationValueShouldBind() {
 	}
 
 	@Test
+	@WithResource(name = "testProperties.xml",
+			content = """
+					<?xml version="1.0" encoding="UTF-8"?>
+					<beans xmlns="http://www.springframework.org/schema/beans"
+						xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+						xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+						<bean
+							id="org.springframework.boot.context.properties.ConfigurationPropertiesTests$BasicProperties"
+							class="org.springframework.boot.context.properties.ConfigurationPropertiesTests$BasicProperties">
+							<property name="name" value="bar"/>
+						</bean>
+
+					</beans>
+					""")
 	void loadWhenBindingWithDefaultsInXmlShouldBind() {
 		removeSystemProperties();
 		load(new Class<?>[] { DefaultsInXmlConfiguration.class });
@@ -654,6 +670,7 @@ void customProtocolResolverIsInvoked() {
 	}
 
 	@Test
+	@WithResource(name = "application.properties")
 	void customProtocolResolver() {
 		this.context = new AnnotationConfigApplicationContext();
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
@@ -1377,7 +1394,7 @@ static class WithoutAnnotationValueConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
-	@ImportResource("org/springframework/boot/context/properties/testProperties.xml")
+	@ImportResource("testProperties.xml")
 	static class DefaultsInXmlConfiguration {
 
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ValueObjectBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ValueObjectBinderTests.java
index 4b843c7d62c7..2d9ad1a058d2 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ValueObjectBinderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/ValueObjectBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,14 +36,11 @@
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.test.tools.SourceFile;
-import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.Assert;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.fail;
 
 /**
  * Tests for {@link ValueObjectBinder}.
@@ -51,6 +48,7 @@
  * @author Madhura Bhave
  * @author Phillip Webb
  * @author Pavel Anisimov
+ * @author Yanming Zhou
  */
 class ValueObjectBinderTests {
 
@@ -390,25 +388,12 @@ void bindToAnnotationNamedRecordComponent() {
 	@Test
 	void bindToRecordWithDefaultValue() {
 		MockConfigurationPropertySource source = new MockConfigurationPropertySource();
-		source.put("test.record.property1", "value-from-config-1");
+		source.put("test.property1", "value-from-config-1");
 		this.sources.add(source);
-		String recordProperties = """
-				public record RecordProperties(
-					@org.springframework.boot.context.properties.bind.DefaultValue("default-value-1") String property1,
-					@org.springframework.boot.context.properties.bind.DefaultValue("default-value-2") String property2) {
-				}
-				""";
-		TestCompiler.forSystem().withSources(SourceFile.of(recordProperties)).compile((compiled) -> {
-			try {
-				ClassLoader cl = compiled.getClassLoader();
-				Object bean = this.binder.bind("test.record", Class.forName("RecordProperties", true, cl)).get();
-				assertThat(bean).hasFieldOrPropertyWithValue("property1", "value-from-config-1")
-					.hasFieldOrPropertyWithValue("property2", "default-value-2");
-			}
-			catch (ClassNotFoundException ex) {
-				fail("Expected generated class 'RecordProperties' not found", ex);
-			}
-		});
+		Bindable<RecordProperties> target = Bindable.of(RecordProperties.class);
+		RecordProperties bound = this.binder.bindOrCreate("test", target);
+		assertThat(bound.property1()).isEqualTo("value-from-config-1");
+		assertThat(bound.property2()).isEqualTo("default-value-2");
 	}
 
 	@Test // gh-38201
@@ -912,6 +897,10 @@ String getImportName() {
 	record NamedRecordComponent(@Name("import") String importName) {
 	}
 
+	record RecordProperties(@DefaultValue("default-value-1") String property1,
+			@DefaultValue("default-value-2") String property2) {
+	}
+
 	static class NonExtractableParameterName {
 
 		private String value;
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToFileConverterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToFileConverterTests.java
index a3cb2b37af07..015e6ab1cfad 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToFileConverterTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/StringToFileConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.provider.Arguments;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.io.ClassPathResource;
 
@@ -52,9 +53,10 @@ void convertWhenFilePrefixedReturnsFile(ConversionService conversionService) {
 	}
 
 	@ConversionServiceTest
+	@WithResource(name = "com/example/test-file.txt", content = "test content")
 	void convertWhenClasspathPrefixedReturnsFile(ConversionService conversionService) throws IOException {
-		String resource = new ClassPathResource("test-banner.txt", this.getClass().getClassLoader()).getURL().getFile();
-		assertThat(convert(conversionService, "classpath:test-banner.txt").getAbsoluteFile())
+		String resource = new ClassPathResource("com/example/test-file.txt").getURL().getFile();
+		assertThat(convert(conversionService, "classpath:com/example/test-file.txt").getAbsoluteFile())
 			.isEqualTo(new File(resource).getAbsoluteFile());
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java
index e67fc5240628..ba440e31827e 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoUniqueBeanDefinitionFailureAnalyzerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.springframework.boot.diagnostics.FailureAnalysis;
 import org.springframework.boot.diagnostics.analyzer.nounique.TestBean;
 import org.springframework.boot.diagnostics.analyzer.nounique.TestBeanConsumer;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -39,6 +40,17 @@
  * @author Andy Wilkinson
  * @author Scott Frederick
  */
+@WithResource(name = "producer.xml",
+		content = """
+				<?xml version="1.0" encoding="UTF-8"?>
+				<beans xmlns="http://www.springframework.org/schema/beans"
+					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+					xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+					<bean class="org.springframework.boot.diagnostics.analyzer.nounique.TestBean" name="xmlTestBean"/>
+
+				</beans>
+				""")
 class NoUniqueBeanDefinitionFailureAnalyzerTests {
 
 	private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -79,6 +91,17 @@ void failureAnalysisForObjectProviderMethodConsumer() {
 	}
 
 	@Test
+	@WithResource(name = "consumer.xml",
+			content = """
+					<?xml version="1.0" encoding="UTF-8"?>
+					<beans xmlns="http://www.springframework.org/schema/beans"
+						xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+						xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+						<bean class="org.springframework.boot.diagnostics.analyzer.nounique.TestBeanConsumer"/>
+
+					</beans>
+					""")
 	void failureAnalysisForXmlConsumer() {
 		FailureAnalysis failureAnalysis = analyzeFailure(createFailure(XmlConsumer.class));
 		assertThat(failureAnalysis.getDescription()).startsWith("Parameter 0 of constructor in "
@@ -147,7 +170,7 @@ private void assertFoundBeans(FailureAnalysis analysis) {
 
 	@Configuration(proxyBeanMethods = false)
 	@ComponentScan(basePackageClasses = TestBean.class)
-	@ImportResource("/org/springframework/boot/diagnostics/analyzer/nounique/producer.xml")
+	@ImportResource("classpath:producer.xml")
 	static class DuplicateBeansProducer {
 
 		@Bean
@@ -216,7 +239,7 @@ String consumer(ObjectProvider<TestBean> testBeanProvider) {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportResource("/org/springframework/boot/diagnostics/analyzer/nounique/consumer.xml")
+	@ImportResource("classpath:consumer.xml")
 	static class XmlConsumer {
 
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java
index 6fdb3e743bb4..e5f3e7d399e1 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import org.springframework.boot.env.OriginTrackedPropertiesLoader.Document;
 import org.springframework.boot.origin.OriginTrackedValue;
 import org.springframework.boot.origin.TextResourceOrigin;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
@@ -92,9 +93,10 @@ void getUnicodeProperty() {
 	}
 
 	@Test
+	@WithResource(name = "malformed-unicode.properties", content = "test-malformed-unicode=properties\\u(026test")
 	void getMalformedUnicodeProperty() {
 		// gh-12716
-		ClassPathResource resource = new ClassPathResource("test-properties-malformed-unicode.properties", getClass());
+		ClassPathResource resource = new ClassPathResource("malformed-unicode.properties");
 		assertThatIllegalStateException().isThrownBy(() -> new OriginTrackedPropertiesLoader(resource).load())
 			.withMessageContaining("Malformed \\uxxxx encoding");
 	}
@@ -326,8 +328,43 @@ void getPropertyWithEscapedTrailingSpace() {
 	}
 
 	@Test
+	@WithResource(name = "existing-non-multi-document.properties", content = """
+			#---
+			# Test
+			#---
+
+			spring=boot
+
+			#---
+			# Test
+
+			boot=bar
+
+
+			# Test
+			#---
+
+			bar=ok
+
+			!---
+			! Test
+			!---
+
+			ok=well
+
+			!---
+			! Test
+
+			well=hello
+
+			! Test
+			!---
+
+			hello=world
+
+			""")
 	void existingCommentsAreNotTreatedAsMultiDoc() throws Exception {
-		this.resource = new ClassPathResource("existing-non-multi-document.properties", getClass());
+		this.resource = new ClassPathResource("existing-non-multi-document.properties");
 		this.documents = new OriginTrackedPropertiesLoader(this.resource).load();
 		assertThat(this.documents).hasSize(1);
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
index 58720b002351..86cc0e9de17d 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedYamlLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.env;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +30,7 @@
 
 import org.springframework.boot.origin.OriginTrackedValue;
 import org.springframework.boot.origin.TextResourceOrigin;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -47,11 +52,12 @@ class OriginTrackedYamlLoaderTests {
 
 	@BeforeEach
 	void setUp() {
-		Resource resource = new ClassPathResource("test-yaml.yml", getClass());
+		Resource resource = new ClassPathResource("test-yaml.yml");
 		this.loader = new OriginTrackedYamlLoader(resource);
 	}
 
 	@Test
+	@WithTestYamlResource
 	void processSimpleKey() {
 		OriginTrackedValue value = getValue("name");
 		assertThat(value).hasToString("Martin D'vloper");
@@ -59,6 +65,7 @@ void processSimpleKey() {
 	}
 
 	@Test
+	@WithTestYamlResource
 	void processMap() {
 		OriginTrackedValue perl = getValue("languages.perl");
 		OriginTrackedValue python = getValue("languages.python");
@@ -72,6 +79,7 @@ void processMap() {
 	}
 
 	@Test
+	@WithTestYamlResource
 	void processCollection() {
 		OriginTrackedValue apple = getValue("foods[0]");
 		OriginTrackedValue orange = getValue("foods[1]");
@@ -88,6 +96,7 @@ void processCollection() {
 	}
 
 	@Test
+	@WithTestYamlResource
 	void processMultiline() {
 		OriginTrackedValue education = getValue("education");
 		assertThat(education).hasToString("4 GCSEs\n3 A-Levels\nBSc in the Internet of Things\n");
@@ -95,6 +104,7 @@ void processMultiline() {
 	}
 
 	@Test
+	@WithTestYamlResource
 	void processListOfMaps() {
 		OriginTrackedValue name = getValue("example.foo[0].name");
 		OriginTrackedValue url = getValue("example.foo[0].url");
@@ -111,6 +121,7 @@ void processListOfMaps() {
 	}
 
 	@Test
+	@WithTestYamlResource
 	void processEmptyAndNullValues() {
 		OriginTrackedValue empty = getValue("empty");
 		OriginTrackedValue nullValue = getValue("null-value");
@@ -124,6 +135,7 @@ void processEmptyAndNullValues() {
 	}
 
 	@Test
+	@WithTestYamlResource
 	void emptyMapsAreDropped() {
 		Object emptyMap = getValue("emptymap");
 		assertThat(emptyMap).isNull();
@@ -138,8 +150,15 @@ void unsupportedType() {
 	}
 
 	@Test
+	@WithResource(name = "test-empty-yaml.yml", content = """
+			---
+			---
+
+			---
+			---
+			""")
 	void emptyDocuments() {
-		this.loader = new OriginTrackedYamlLoader(new ClassPathResource("test-empty-yaml.yml", getClass()));
+		this.loader = new OriginTrackedYamlLoader(new ClassPathResource("test-empty-yaml.yml"));
 		List<Map<String, Object>> loaded = this.loader.load();
 		assertThat(loaded).isEmpty();
 	}
@@ -165,8 +184,17 @@ void loadWhenLargeNumberOfNodesLoadsYaml() {
 	}
 
 	@Test
+	@WithResource(name = "recursive.yml", content = """
+			&def1
+			*def1: a
+			test:
+			  a:
+			    spring: 'a'
+			  b:
+			    boot: 'b'
+			""")
 	void loadWhenRecursiveLoadsYaml() {
-		Resource resource = new ClassPathResource("recursive.yml", getClass());
+		Resource resource = new ClassPathResource("recursive.yml");
 		this.loader = new OriginTrackedYamlLoader(resource);
 		Map<String, Object> loaded = this.loader.load().get(0);
 		assertThat(loaded.get("test.a.spring")).hasToString("a");
@@ -174,8 +202,16 @@ void loadWhenRecursiveLoadsYaml() {
 	}
 
 	@Test
+	@WithResource(name = "anchors.yml", content = """
+			some:
+			  path: &anchor
+			    config:
+			      key: value
+			  anotherpath:
+			    <<: *anchor
+			""")
 	void loadWhenUsingAnchors() {
-		Resource resource = new ClassPathResource("anchors.yml", getClass());
+		Resource resource = new ClassPathResource("anchors.yml");
 		this.loader = new OriginTrackedYamlLoader(resource);
 		Map<String, Object> loaded = this.loader.load().get(0);
 		assertThat(loaded.get("some.path.config.key")).hasToString("value");
@@ -206,4 +242,49 @@ private String getLocation(OriginTrackedValue value) {
 		return ((TextResourceOrigin) value.getOrigin()).getLocation().toString();
 	}
 
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	@WithResource(name = "test-yaml.yml", content = """
+			# https://docs.ansible.com/ansible/latest/reference_appendices/YAMLSyntax.html
+
+			name: Martin D'vloper
+			job: Developer
+			skill: Elite
+			employed: True
+			foods:
+			    - Apple
+			    - Orange
+			    - Strawberry
+			    - Mango
+			languages:
+			    perl: Elite
+			    python: Elite
+			    pascal: Lame
+			education: |
+			    4 GCSEs
+			    3 A-Levels
+			    BSc in the Internet of Things
+			example:
+			    foo:
+			      - name: springboot
+			        url: https://springboot.example.com/
+			        bar:
+			          - bar1: baz
+			          - bar2: bling
+			empty: ""
+			null-value: null
+			emptylist: []
+			emptymap: {}
+			---
+
+			spring:
+			  profiles: development
+			name: Test Name
+
+			---
+			""")
+	private @interface WithTestYamlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java
index 67b24310faba..f38cafabbe14 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.ClassPathResource;
 
@@ -41,17 +42,28 @@ void getFileExtensions() {
 	}
 
 	@Test
+	@WithResource(name = "test.properties", content = "test=properties")
 	void loadProperties() throws Exception {
-		List<PropertySource<?>> loaded = this.loader.load("test.properties",
-				new ClassPathResource("test-properties.properties", getClass()));
+		List<PropertySource<?>> loaded = this.loader.load("test.properties", new ClassPathResource("test.properties"));
 		PropertySource<?> source = loaded.get(0);
 		assertThat(source.getProperty("test")).isEqualTo("properties");
 	}
 
 	@Test
+	@WithResource(name = "test.properties", content = """
+			#---
+			#test
+			blah=hello world
+			bar=baz
+			hello=world
+			#---
+			foo=bar
+			bling=biz
+			#comment1
+			#comment2
+			""")
 	void loadMultiDocumentPropertiesWithSeparatorAtTheBeginningOfFile() throws Exception {
-		List<PropertySource<?>> loaded = this.loader.load("test.properties",
-				new ClassPathResource("multi-document-properties-2.properties", getClass()));
+		List<PropertySource<?>> loaded = this.loader.load("test.properties", new ClassPathResource("test.properties"));
 		assertThat(loaded).hasSize(2);
 		PropertySource<?> source1 = loaded.get(0);
 		PropertySource<?> source2 = loaded.get(1);
@@ -60,9 +72,20 @@ void loadMultiDocumentPropertiesWithSeparatorAtTheBeginningOfFile() throws Excep
 	}
 
 	@Test
+	@WithResource(name = "test.properties", content = """
+			#test
+			blah=hello world
+			bar=baz
+			hello=world
+			#---
+			foo=bar
+			bling=biz
+			#comment1
+			#comment2
+			#---
+			""")
 	void loadMultiDocumentProperties() throws Exception {
-		List<PropertySource<?>> loaded = this.loader.load("test.properties",
-				new ClassPathResource("multi-document-properties.properties", getClass()));
+		List<PropertySource<?>> loaded = this.loader.load("test.properties", new ClassPathResource("test.properties"));
 		assertThat(loaded).hasSize(2);
 		PropertySource<?> source1 = loaded.get(0);
 		PropertySource<?> source2 = loaded.get(1);
@@ -71,9 +94,22 @@ void loadMultiDocumentProperties() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "test.properties", content = """
+
+			#---
+			#test
+			blah=hello world
+			bar=baz
+			hello=world
+			#---
+			#---
+			foo=bar
+			bling=biz
+			#comment1
+			#comment2
+			""")
 	void loadMultiDocumentPropertiesWithEmptyDocument() throws Exception {
-		List<PropertySource<?>> loaded = this.loader.load("test.properties",
-				new ClassPathResource("multi-document-properties-empty.properties", getClass()));
+		List<PropertySource<?>> loaded = this.loader.load("test.properties", new ClassPathResource("test.properties"));
 		assertThat(loaded).hasSize(2);
 		PropertySource<?> source1 = loaded.get(0);
 		PropertySource<?> source2 = loaded.get(1);
@@ -82,9 +118,15 @@ void loadMultiDocumentPropertiesWithEmptyDocument() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "test.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+			<properties>
+				<entry key="test">xml</entry>
+			</properties>
+			""")
 	void loadXml() throws Exception {
-		List<PropertySource<?>> loaded = this.loader.load("test.xml",
-				new ClassPathResource("test-xml.xml", getClass()));
+		List<PropertySource<?>> loaded = this.loader.load("test.xml", new ClassPathResource("test.xml"));
 		PropertySource<?> source = loaded.get(0);
 		assertThat(source.getProperty("test")).isEqualTo("xml");
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
index c5d076a55dee..029c2b18585d 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.ByteArrayResource;
@@ -86,8 +87,14 @@ void timestampLikeItemsDoNotBecomeDates() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "test-yaml.yml", content = """
+			a: b
+			---
+			c: d
+			e: f
+			""")
 	void loadOriginAware() throws Exception {
-		Resource resource = new ClassPathResource("test-yaml.yml", getClass());
+		Resource resource = new ClassPathResource("test-yaml.yml");
 		List<PropertySource<?>> loaded = this.loader.load("resource", resource);
 		for (PropertySource<?> source : loaded) {
 			EnumerablePropertySource<?> enumerableSource = (EnumerablePropertySource<?>) source;
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java
index bb9b9c2c2ad4..64d9682864c4 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@
 import org.springframework.boot.ssl.SslOptions;
 import org.springframework.boot.ssl.jks.JksSslStoreBundle;
 import org.springframework.boot.ssl.jks.JksSslStoreDetails;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.Ssl;
@@ -100,6 +101,7 @@ void buildWhenHadReadTimeout() {
 	}
 
 	@ParameterizedTest
+	@WithPackageResources("test.jks")
 	@ValueSource(strings = { "GET", "POST" })
 	void connectWithSslBundle(String httpMethod) throws Exception {
 		TomcatServletWebServerFactory webServerFactory = new TomcatServletWebServerFactory(0);
@@ -126,6 +128,7 @@ void connectWithSslBundle(String httpMethod) throws Exception {
 	}
 
 	@ParameterizedTest
+	@WithPackageResources("test.jks")
 	@ValueSource(strings = { "GET", "POST" })
 	void connectWithSslBundleAndOptionsMismatch(String httpMethod) throws Exception {
 		TomcatServletWebServerFactory webServerFactory = new TomcatServletWebServerFactory(0);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
index bcdb86f7985d..930586724343 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/http/client/HttpComponentsClientHttpRequestFactoryBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.ssl.SslBundle;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -77,6 +78,7 @@ void withCustomizers() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void withTlsSocketStrategyFactory() {
 		ClientHttpRequestFactorySettings settings = ClientHttpRequestFactorySettings.ofSslBundle(sslBundle());
 		List<SslBundle> bundles = new ArrayList<>();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/SslInfoTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/SslInfoTests.java
index 316c05d1dc28..04d817b021ae 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/SslInfoTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/SslInfoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,7 @@
 import org.springframework.boot.ssl.SslStoreBundle;
 import org.springframework.boot.ssl.jks.JksSslStoreBundle;
 import org.springframework.boot.ssl.jks.JksSslStoreDetails;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -49,6 +50,7 @@
 class SslInfoTests {
 
 	@Test
+	@WithPackageResources("test.p12")
 	void validCertificatesShouldProvideSslInfo() {
 		SslInfo sslInfo = createSslInfo("classpath:test.p12");
 		assertThat(sslInfo.getBundles()).hasSize(1);
@@ -88,6 +90,7 @@ void validCertificatesShouldProvideSslInfo() {
 	}
 
 	@Test
+	@WithPackageResources("test-not-yet-valid.p12")
 	void notYetValidCertificateShouldProvideSslInfo() {
 		SslInfo sslInfo = createSslInfo("classpath:test-not-yet-valid.p12");
 		assertThat(sslInfo.getBundles()).hasSize(1);
@@ -112,6 +115,7 @@ void notYetValidCertificateShouldProvideSslInfo() {
 	}
 
 	@Test
+	@WithPackageResources("test-expired.p12")
 	void expiredCertificateShouldProvideSslInfo() {
 		SslInfo sslInfo = createSslInfo("classpath:test-expired.p12");
 		assertThat(sslInfo.getBundles()).hasSize(1);
@@ -162,6 +166,7 @@ void soonToBeExpiredCertificateShouldProvideSslInfo(@TempDir Path tempDir)
 	}
 
 	@Test
+	@WithPackageResources({ "test.p12", "test-not-yet-valid.p12", "test-expired.p12" })
 	void multipleBundlesShouldProvideSslInfo(@TempDir Path tempDir) throws IOException, InterruptedException {
 		Path keyStore = createKeyStore(tempDir);
 		SslInfo sslInfo = createSslInfo("classpath:test.p12", "classpath:test-not-yet-valid.p12",
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java
index 124147329512..6da80ecfa923 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@
 import jakarta.servlet.ServletContext;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -62,6 +64,8 @@ void getIncludesProtocolResolvers() throws IOException {
 	}
 
 	@Test
+	@WithResource(name = TEST_PROTOCOL_RESOLVERS_FACTORIES,
+			content = "org.springframework.core.io.ProtocolResolver=org.springframework.boot.io.ReverseStringProtocolResolver")
 	void getWithClassPathIncludesProtocolResolvers() throws IOException {
 		ClassLoader classLoader = new TestClassLoader(this::useTestProtocolResolversFactories);
 		ResourceLoader loader = ApplicationResourceLoader.get(classLoader);
@@ -77,9 +81,11 @@ void getWithClassPathWhenClassPathIsNullIncludesProtocolResolvers() throws IOExc
 	}
 
 	@Test
+	@WithResource(name = TEST_PROTOCOL_RESOLVERS_FACTORIES,
+			content = "org.springframework.core.io.ProtocolResolver=org.springframework.boot.io.ReverseStringProtocolResolver")
 	void getWithClassPathAndSpringFactoriesLoaderIncludesProtocolResolvers() throws IOException {
 		SpringFactoriesLoader springFactoriesLoader = SpringFactoriesLoader
-			.forResourceLocation(TEST_PROTOCOL_RESOLVERS_FACTORIES);
+			.forResourceLocation(TEST_PROTOCOL_RESOLVERS_FACTORIES, Thread.currentThread().getContextClassLoader());
 		ResourceLoader loader = ApplicationResourceLoader.get((ClassLoader) null, springFactoriesLoader);
 		Resource resource = loader.getResource("reverse:test");
 		assertThat(contentAsString(resource)).isEqualTo("tset");
@@ -138,14 +144,17 @@ void getWithResourceLoaderAndSpringFactoriesLoaderWhenSpringFactoriesLoaderIsNul
 	@Test
 	void getResourceWhenPathIsRelative() throws IOException {
 		ResourceLoader loader = ApplicationResourceLoader.get();
-		String name = "src/test/resources/" + TEST_PROTOCOL_RESOLVERS_FACTORIES;
+		String name = "relative/path/file.txt";
 		Resource resource = loader.getResource(name);
-		assertThat(resource.getFile()).isEqualTo(new File(name));
+		File resourceFile = resource.getFile();
+		assertThat(resourceFile).isRelative();
+		assertThat(resourceFile).isEqualTo(new File(name));
 	}
 
 	@Test
-	void getResourceWhenPathIsAbsolute() throws IOException {
-		File file = new File("src/test/resources/" + TEST_PROTOCOL_RESOLVERS_FACTORIES);
+	@WithResource(name = TEST_PROTOCOL_RESOLVERS_FACTORIES,
+			content = "org.springframework.core.io.ProtocolResolver=org.springframework.boot.io.ReverseStringProtocolResolver")
+	void getResourceWhenPathIsAbsolute(@ResourcePath(TEST_PROTOCOL_RESOLVERS_FACTORIES) File file) throws IOException {
 		ResourceLoader loader = ApplicationResourceLoader.get();
 		Resource resource = loader.getResource(file.getAbsolutePath());
 		assertThat(resource.getFile()).hasSameBinaryContentAs(file);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
index a723a3de5186..508b9cbd05dd 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/init/DataSourceScriptDatabaseInitializerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@ void whenDatabaseIsInaccessibleThenItIsAssumedNotToBeEmbedded() {
 	}
 
 	@Test
+	@WithDataSqlResource
 	void whenCustomizeIsOverriddenThenDatabasePopulatorIsConfiguredAccordingly() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setContinueOnError(true);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java
index fed13ff2b31c..0fbef469064e 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,14 @@
 
 package org.springframework.boot.json;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.util.StreamUtils;
+import org.springframework.boot.testsupport.classpath.resources.ResourceContent;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -192,26 +191,22 @@ void mapWithKeyAndNoValue() {
 	}
 
 	@Test // gh-31868
-	void listWithRepeatedOpenArray() throws IOException {
-		String input = StreamUtils.copyToString(
-				AbstractJsonParserTests.class.getResourceAsStream("repeated-open-array.txt"), StandardCharsets.UTF_8);
+	@WithPackageResources("repeated-open-array.txt")
+	void listWithRepeatedOpenArray(@ResourceContent("repeated-open-array.txt") String input) {
 		assertThatExceptionOfType(JsonParseException.class).isThrownBy(() -> this.parser.parseList(input))
 			.havingCause()
 			.withMessageContaining("too deeply nested");
 	}
 
 	@Test // gh-31869
-	void largeMalformed() throws IOException {
-		String input = StreamUtils.copyToString(
-				AbstractJsonParserTests.class.getResourceAsStream("large-malformed-json.txt"), StandardCharsets.UTF_8);
+	@WithPackageResources("large-malformed-json.txt")
+	void largeMalformed(@ResourceContent("large-malformed-json.txt") String input) {
 		assertThatExceptionOfType(JsonParseException.class).isThrownBy(() -> this.parser.parseList(input));
 	}
 
 	@Test // gh-32029
-	void deeplyNestedMap() throws IOException {
-		String input = StreamUtils.copyToString(
-				AbstractJsonParserTests.class.getResourceAsStream("deeply-nested-map-json.txt"),
-				StandardCharsets.UTF_8);
+	@WithPackageResources("deeply-nested-map-json.txt")
+	void deeplyNestedMap(@ResourceContent("deeply-nested-map-json.txt") String input) {
 		assertThatExceptionOfType(JsonParseException.class).isThrownBy(() -> this.parser.parseList(input));
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java
index 3a7b7f04aa84..f597fd1902ce 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/GsonJsonParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.json;
 
-import java.io.IOException;
-
 /**
  * Tests for {@link GsonJsonParser}.
  *
@@ -31,7 +29,7 @@ protected JsonParser getParser() {
 	}
 
 	@Override
-	void listWithRepeatedOpenArray() throws IOException {
+	void listWithRepeatedOpenArray(String input) {
 		// Gson does not protect against deeply nested JSON
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JacksonJsonParserTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JacksonJsonParserTests.java
index 4e79ac568614..57f445c64dd6 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JacksonJsonParserTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/json/JacksonJsonParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ void instanceWithSpecificObjectMapper() throws IOException {
 	@Override
 	@Disabled("Jackson's array handling is no longer stack bound so protection has been removed.")
 	// https://github.com/FasterXML/jackson-databind/commit/8238ab41d0350fb915797c89d46777b4496b74fd
-	void listWithRepeatedOpenArray() throws IOException {
+	void listWithRepeatedOpenArray(String input) {
 
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemTests.java
index 644f7c9c556b..ec327a077416 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,10 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.logging.LoggingSystem.NoOpLoggingSystem;
+import org.springframework.boot.logging.java.JavaLoggingSystem;
+import org.springframework.boot.logging.log4j2.Log4J2LoggingSystem;
 import org.springframework.boot.logging.logback.LogbackLoggingSystem;
+import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -42,6 +45,18 @@ void logbackIsTheDefaultLoggingSystem() {
 		assertThat(LoggingSystem.get(getClass().getClassLoader())).isInstanceOf(LogbackLoggingSystem.class);
 	}
 
+	@Test
+	@ClassPathExclusions("logback-*.jar")
+	void log4j2IsUsedInTheAbsenceOfLogback() {
+		assertThat(LoggingSystem.get(getClass().getClassLoader())).isInstanceOf(Log4J2LoggingSystem.class);
+	}
+
+	@Test
+	@ClassPathExclusions({ "logback-*.jar", "log4j-*.jar" })
+	void julIsUsedInTheAbsenceOfLogbackAndLog4j2() {
+		assertThat(LoggingSystem.get(getClass().getClassLoader())).isInstanceOf(JavaLoggingSystem.class);
+	}
+
 	@Test
 	void loggingSystemCanBeDisabled() {
 		System.setProperty(LoggingSystem.SYSTEM_PROPERTY, LoggingSystem.NONE);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java
index 495193de4bb2..eccdef167ae0 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
 import org.springframework.boot.logging.LoggerConfiguration;
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.boot.logging.LoggingSystemProperty;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.util.ClassUtils;
@@ -123,6 +124,10 @@ void testSystemPropertyInitializesFormat(CapturedOutput output) {
 	}
 
 	@Test
+	@WithResource(name = "logging-nondefault.properties", content = """
+			handlers = java.util.logging.ConsoleHandler
+			.level = INFO
+			""")
 	void testNonDefaultConfigLocation(CapturedOutput output) {
 		this.loggingSystem.beforeInitialize();
 		this.loggingSystem.initialize(null, "classpath:logging-nondefault.properties", null);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
index 24d4bfaaed4f..2eb022235a6e 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
@@ -19,6 +19,10 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.net.ProtocolException;
 import java.util.EnumSet;
 import java.util.LinkedHashMap;
@@ -59,6 +63,7 @@
 import org.springframework.boot.logging.LoggingSystemProperties;
 import org.springframework.boot.logging.LoggingSystemProperty;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.logging.ConfigureClasspathToPreferLog4j2;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
@@ -146,16 +151,16 @@ void withFile(CapturedOutput output) {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void testNonDefaultConfigLocation(CapturedOutput output) {
 		this.loggingSystem.beforeInitialize();
-		this.loggingSystem.initialize(this.initializationContext, "classpath:log4j2-nondefault.xml",
+		this.loggingSystem.initialize(this.initializationContext, "classpath:nondefault.xml",
 				getLogFile(tmpDir() + "/tmp.log", null));
 		this.logger.info("Hello world");
 		Configuration configuration = this.loggingSystem.getConfiguration();
 		assertThat(output).contains("Hello world").contains(tmpDir() + "/tmp.log");
 		assertThat(new File(tmpDir() + "/tmp.log")).doesNotExist();
-		assertThat(configuration.getConfigurationSource().getFile().getAbsolutePath())
-			.contains("log4j2-nondefault.xml");
+		assertThat(configuration.getConfigurationSource().getFile().getAbsolutePath()).contains("nondefault.xml");
 		assertThat(configuration.getWatchManager().getIntervalSeconds()).isEqualTo(30);
 	}
 
@@ -449,15 +454,18 @@ void shutdownHookIsDisabled() {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
+	@WithOverrideXmlResource
 	void compositeConfigurationWithCustomBaseConfiguration() {
-		this.environment.setProperty("logging.log4j2.config.override", "src/test/resources/log4j2-override.xml");
-		this.loggingSystem.initialize(this.initializationContext, "src/test/resources/log4j2-nondefault.xml", null);
+		this.environment.setProperty("logging.log4j2.config.override", "classpath:override.xml");
+		this.loggingSystem.initialize(this.initializationContext, "classpath:nondefault.xml", null);
 		assertThat(this.loggingSystem.getConfiguration()).isInstanceOf(CompositeConfiguration.class);
 	}
 
 	@Test
+	@WithOverrideXmlResource
 	void compositeConfigurationWithStandardConfigLocationConfiguration() {
-		this.environment.setProperty("logging.log4j2.config.override", "src/test/resources/log4j2-override.xml");
+		this.environment.setProperty("logging.log4j2.config.override", "classpath:override.xml");
 		this.loggingSystem.initialize(this.initializationContext, null, null);
 		assertThat(this.loggingSystem.getConfiguration()).isInstanceOf(CompositeConfiguration.class);
 	}
@@ -777,4 +785,45 @@ static class Nested {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "nondefault.xml",
+			content = """
+					<Configuration status="WARN" monitorInterval="30">
+						<Properties>
+							<Property name="PID">????</Property>
+							<Property name="LOG_PATTERN">${sys:LOG_FILE} %d{yyyy-MM-dd HH:mm:ss.SSS}] service%X{context} - ${sys:PID} %5p [%t] --- %c{1}: %m%n</Property>
+						</Properties>
+						<Appenders>
+							<Console name="Console" target="SYSTEM_OUT" follow="true">
+								<PatternLayout pattern="${LOG_PATTERN}"/>
+							</Console>
+						</Appenders>
+						<Loggers>
+							<Root level="info">
+								<AppenderRef ref="Console"/>
+							</Root>
+						</Loggers>
+					</Configuration>
+					""")
+	private @interface WithNonDefaultXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "override.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<Configuration status="WARN" monitorInterval="30">
+				<Appenders>
+					<Console name="Console" target="SYSTEM_OUT" follow="true">
+						<PatternLayout pattern="${LOG_PATTERN}"/>
+					</Console>
+				</Appenders>
+			</Configuration>
+			""")
+	private @interface WithOverrideXmlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/SpringProfileArbiterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/SpringProfileArbiterTests.java
index e27a1e4cdb89..f410ca55c548 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/SpringProfileArbiterTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/SpringProfileArbiterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,10 @@
 
 package org.springframework.boot.logging.log4j2;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Set;
 
 import org.apache.logging.log4j.LogManager;
@@ -32,12 +36,12 @@
 
 import org.springframework.boot.logging.LoggingInitializationContext;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.logging.ConfigureClasspathToPreferLog4j2;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -93,6 +97,7 @@ private void cleanUpPropertySources() { // https://issues.apache.org/jira/browse
 	}
 
 	@Test
+	@WithProductionProfileXmlResource
 	void profileActive() {
 		this.environment.setActiveProfiles("production");
 		initialize("production-profile.xml");
@@ -101,6 +106,7 @@ void profileActive() {
 	}
 
 	@Test
+	@WithMultiProfileNamesXmlResource
 	void multipleNamesFirstProfileActive() {
 		this.environment.setActiveProfiles("production");
 		initialize("multi-profile-names.xml");
@@ -109,6 +115,7 @@ void multipleNamesFirstProfileActive() {
 	}
 
 	@Test
+	@WithMultiProfileNamesXmlResource
 	void multipleNamesSecondProfileActive() {
 		this.environment.setActiveProfiles("test");
 		initialize("multi-profile-names.xml");
@@ -117,6 +124,7 @@ void multipleNamesSecondProfileActive() {
 	}
 
 	@Test
+	@WithProductionProfileXmlResource
 	void profileNotActive() {
 		initialize("production-profile.xml");
 		this.logger.trace("Hello");
@@ -124,6 +132,7 @@ void profileNotActive() {
 	}
 
 	@Test
+	@WithProfileExpressionXmlResource
 	void profileExpressionMatchFirst() {
 		this.environment.setActiveProfiles("production");
 		initialize("profile-expression.xml");
@@ -132,6 +141,7 @@ void profileExpressionMatchFirst() {
 	}
 
 	@Test
+	@WithProfileExpressionXmlResource
 	void profileExpressionMatchSecond() {
 		this.environment.setActiveProfiles("test");
 		initialize("profile-expression.xml");
@@ -140,6 +150,7 @@ void profileExpressionMatchSecond() {
 	}
 
 	@Test
+	@WithProfileExpressionXmlResource
 	void profileExpressionNoMatch() {
 		this.environment.setActiveProfiles("development");
 		initialize("profile-expression.xml");
@@ -148,13 +159,56 @@ void profileExpressionNoMatch() {
 	}
 
 	private void initialize(String config) {
-		this.environment.setProperty("logging.log4j2.config.override", getPackageResource(config));
+		this.environment.setProperty("logging.log4j2.config.override", "classpath:" + config);
 		this.loggingSystem.initialize(this.initializationContext, null, null);
 	}
 
-	private String getPackageResource(String fileName) {
-		String path = ClassUtils.getPackageName(getClass());
-		return "src/test/resources/" + path.replace('.', '/') + "/" + fileName;
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "multi-profile-names.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<Configuration>
+				<SpringProfile name="production, test">
+					<Loggers>
+						<Logger name="org.springframework.boot.logging.log4j2" level="TRACE" />
+					</Loggers>
+				</SpringProfile>
+			</Configuration>
+			""")
+	private @interface WithMultiProfileNamesXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "profile-expression.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<Configuration>
+				<SpringProfile name="production | test">
+					<Loggers>
+						<Logger name="org.springframework.boot.logging.log4j2" level="TRACE" />
+					</Loggers>
+				</SpringProfile>
+			</Configuration>
+			""")
+	private @interface WithProfileExpressionXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "production-profile.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<Configuration>
+				<SpringProfile name="production">
+					<Loggers>
+						<Logger name="org.springframework.boot.logging.log4j2" level="TRACE" />
+					</Loggers>
+				</SpringProfile>
+			</Configuration>
+			""")
+	private @interface WithProductionProfileXmlResource {
+
 	}
 
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java
index 0e6ad7bd18c2..37382c9350b5 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,9 @@
 import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.ResourcesRoot;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -43,11 +46,17 @@
 class LogbackConfigurationTests {
 
 	@Test
-	void consolePatternCanBeOverridden() throws JoranException {
+	@WithResource(name = "custom-console-log-pattern.xml", content = """
+			<configuration>
+				<property name="CONSOLE_LOG_PATTERN" value="foo" />
+				<include resource="org/springframework/boot/logging/logback/base.xml" />
+			</configuration>
+			""")
+	void consolePatternCanBeOverridden(@ResourcesRoot File resourcesRoot) throws JoranException {
 		JoranConfigurator configurator = new JoranConfigurator();
 		LoggerContext context = new LoggerContext();
 		configurator.setContext(context);
-		configurator.doConfigure(new File("src/test/resources/custom-console-log-pattern.xml"));
+		configurator.doConfigure(new File(resourcesRoot, "custom-console-log-pattern.xml"));
 		Appender<ILoggingEvent> appender = context.getLogger("ROOT").getAppender("CONSOLE");
 		assertThat(appender).isInstanceOf(ConsoleAppender.class);
 		Encoder<?> encoder = ((ConsoleAppender<?>) appender).getEncoder();
@@ -56,11 +65,17 @@ void consolePatternCanBeOverridden() throws JoranException {
 	}
 
 	@Test
-	void filePatternCanBeOverridden() throws JoranException {
+	@WithResource(name = "custom-file-log-pattern.xml", content = """
+			<configuration>
+				<property name="FILE_LOG_PATTERN" value="bar" />
+				<include resource="org/springframework/boot/logging/logback/base.xml" />
+			</configuration>
+			""")
+	void filePatternCanBeOverridden(@ResourcesRoot File resourcesRoot) throws JoranException {
 		JoranConfigurator configurator = new JoranConfigurator();
 		LoggerContext context = new LoggerContext();
 		configurator.setContext(context);
-		configurator.doConfigure(new File("src/test/resources/custom-file-log-pattern.xml"));
+		configurator.doConfigure(new File(resourcesRoot, "custom-file-log-pattern.xml"));
 		Appender<ILoggingEvent> appender = context.getLogger("ROOT").getAppender("FILE");
 		assertThat(appender).isInstanceOf(FileAppender.class);
 		Encoder<?> encoder = ((FileAppender<?>) appender).getEncoder();
@@ -69,11 +84,17 @@ void filePatternCanBeOverridden() throws JoranException {
 	}
 
 	@Test
-	void defaultRollingFileNamePattern() throws JoranException {
+	@WithResource(name = "custom-file-log-pattern.xml", content = """
+			<configuration>
+				<property name="FILE_LOG_PATTERN" value="bar" />
+				<include resource="org/springframework/boot/logging/logback/base.xml" />
+			</configuration>
+			""")
+	void defaultRollingFileNamePattern(@ResourcesRoot File resourcesRoot) throws JoranException {
 		JoranConfigurator configurator = new JoranConfigurator();
 		LoggerContext context = new LoggerContext();
 		configurator.setContext(context);
-		configurator.doConfigure(new File("src/test/resources/custom-file-log-pattern.xml"));
+		configurator.doConfigure(new File(resourcesRoot, "custom-file-log-pattern.xml"));
 		Appender<ILoggingEvent> appender = context.getLogger("ROOT").getAppender("FILE");
 		assertThat(appender).isInstanceOf(RollingFileAppender.class);
 		RollingPolicy rollingPolicy = ((RollingFileAppender<?>) appender).getRollingPolicy();
@@ -82,11 +103,17 @@ void defaultRollingFileNamePattern() throws JoranException {
 	}
 
 	@Test
-	void customRollingFileNamePattern() throws JoranException {
+	@WithResource(name = "custom-file-log-pattern-with-fileNamePattern.xml", content = """
+			<configuration>
+				<property name="LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN" value="my.log.%d{yyyyMMdd}.%i.gz"/>
+				<include resource="org/springframework/boot/logging/logback/base.xml" />
+			</configuration>
+			""")
+	void customRollingFileNamePattern(@ResourcesRoot File resourcesRoot) throws JoranException {
 		JoranConfigurator configurator = new JoranConfigurator();
 		LoggerContext context = new LoggerContext();
 		configurator.setContext(context);
-		configurator.doConfigure(new File("src/test/resources/custom-file-log-pattern-with-fileNamePattern.xml"));
+		configurator.doConfigure(new File(resourcesRoot, "custom-file-log-pattern-with-fileNamePattern.xml"));
 		Appender<ILoggingEvent> appender = context.getLogger("ROOT").getAppender("FILE");
 		assertThat(appender).isInstanceOf(RollingFileAppender.class);
 		RollingPolicy rollingPolicy = ((RollingFileAppender<?>) appender).getRollingPolicy();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
index 6152cfb3fdff..ab10dc78dfcb 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,10 @@
 package org.springframework.boot.logging.logback;
 
 import java.io.File;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
@@ -60,6 +64,7 @@
 import org.springframework.boot.logging.LoggingSystemProperty;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
 import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.core.convert.ConversionService;
@@ -130,16 +135,30 @@ void cleanUp() {
 	}
 
 	@Test
+	@WithResource(name = "include-defaults.xml", content = """
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+				<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+					<encoder>
+						<pattern>[%p] - %m%n</pattern>
+					</encoder>
+				</appender>
+				<root level="INFO">
+					<appender-ref ref="CONSOLE"/>
+				</root>
+			</configuration>
+			""")
 	void logbackDefaultsConfigurationDoesNotTriggerDeprecation(CapturedOutput output) {
-		initialize(this.initializationContext, "classpath:logback-include-defaults.xml", null);
+		initialize(this.initializationContext, "classpath:include-defaults.xml", null);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(output, "Hello world")).isEqualTo("[INFO] - Hello world");
 		assertThat(output.toString()).doesNotContain("WARN").doesNotContain("deprecated");
 	}
 
 	@Test
+	@WithIncludeBaseXmlResource
 	void logbackBaseConfigurationDoesNotTriggerDeprecation(CapturedOutput output) {
-		initialize(this.initializationContext, "classpath:logback-include-base.xml", null);
+		initialize(this.initializationContext, "classpath:include-base.xml", null);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(output, "Hello world")).contains(" INFO ").endsWith(": Hello world");
 		assertThat(output.toString()).doesNotContain("WARN").doesNotContain("deprecated");
@@ -197,10 +216,10 @@ void defaultConfigConfiguresAConsoleAppender() {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void testNonDefaultConfigLocation(CapturedOutput output) {
 		this.loggingSystem.beforeInitialize();
-		initialize(this.initializationContext, "classpath:logback-nondefault.xml",
-				getLogFile(tmpDir() + "/tmp.log", null));
+		initialize(this.initializationContext, "classpath:nondefault.xml", getLogFile(tmpDir() + "/tmp.log", null));
 		this.logger.info("Hello world");
 		assertThat(output).doesNotContain("DEBUG")
 			.contains("Hello world")
@@ -404,12 +423,13 @@ void testCleanHistoryOnStartProperty() {
 	}
 
 	@Test
+	@WithIncludeBaseXmlResource
 	void testCleanHistoryOnStartPropertyWithXmlConfiguration() {
 		this.environment.setProperty("logging.file.clean-history-on-start", "true");
 		LoggingInitializationContext loggingInitializationContext = new LoggingInitializationContext(this.environment);
 		File file = new File(tmpDir(), "logback-test.log");
 		LogFile logFile = getLogFile(file.getPath(), null);
-		initialize(loggingInitializationContext, "classpath:logback-include-base.xml", logFile);
+		initialize(loggingInitializationContext, "classpath:include-base.xml", logFile);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(file, "Hello world")).contains("INFO");
 		assertThat(getRollingPolicy().isCleanHistoryOnStart()).isTrue();
@@ -442,12 +462,13 @@ private void testMaxFileSizeProperty(String sizeValue, String expectedFileSize)
 	}
 
 	@Test
+	@WithIncludeBaseXmlResource
 	void testMaxFileSizePropertyWithXmlConfiguration() {
 		this.environment.setProperty("logging.file.max-size", "100MB");
 		LoggingInitializationContext loggingInitializationContext = new LoggingInitializationContext(this.environment);
 		File file = new File(tmpDir(), "logback-test.log");
 		LogFile logFile = getLogFile(file.getPath(), null);
-		initialize(loggingInitializationContext, "classpath:logback-include-base.xml", logFile);
+		initialize(loggingInitializationContext, "classpath:include-base.xml", logFile);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(file, "Hello world")).contains("INFO");
 		assertThat(ReflectionTestUtils.getField(getRollingPolicy(), "maxFileSize")).hasToString("100 MB");
@@ -466,12 +487,13 @@ void testMaxHistoryProperty() {
 	}
 
 	@Test
+	@WithIncludeBaseXmlResource
 	void testMaxHistoryPropertyWithXmlConfiguration() {
 		this.environment.setProperty("logging.file.max-history", "30");
 		LoggingInitializationContext loggingInitializationContext = new LoggingInitializationContext(this.environment);
 		File file = new File(tmpDir(), "logback-test.log");
 		LogFile logFile = getLogFile(file.getPath(), null);
-		initialize(loggingInitializationContext, "classpath:logback-include-base.xml", logFile);
+		initialize(loggingInitializationContext, "classpath:include-base.xml", logFile);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(file, "Hello world")).contains("INFO");
 		assertThat(getRollingPolicy().getMaxHistory()).isEqualTo(30);
@@ -504,13 +526,14 @@ private void testTotalSizeCapProperty(String sizeValue, String expectedFileSize)
 	}
 
 	@Test
+	@WithIncludeBaseXmlResource
 	void testTotalSizeCapPropertyWithXmlConfiguration() {
 		String expectedSize = "101 MB";
 		this.environment.setProperty("logging.file.total-size-cap", expectedSize);
 		LoggingInitializationContext loggingInitializationContext = new LoggingInitializationContext(this.environment);
 		File file = new File(tmpDir(), "logback-test.log");
 		LogFile logFile = getLogFile(file.getPath(), null);
-		initialize(loggingInitializationContext, "classpath:logback-include-base.xml", logFile);
+		initialize(loggingInitializationContext, "classpath:include-base.xml", logFile);
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(file, "Hello world")).contains("INFO");
 		assertThat(ReflectionTestUtils.getField(getRollingPolicy(), "totalSizeCap")).hasToString(expectedSize);
@@ -544,12 +567,13 @@ void customExceptionConversionWord(CapturedOutput output) {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void initializeShouldSetSystemProperty() {
 		// gh-5491
 		this.loggingSystem.beforeInitialize();
 		this.logger.info("Hidden");
 		LogFile logFile = getLogFile(tmpDir() + "/example.log", null, false);
-		initialize(this.initializationContext, "classpath:logback-nondefault.xml", logFile);
+		initialize(this.initializationContext, "classpath:nondefault.xml", logFile);
 		assertThat(System.getProperty(LoggingSystemProperty.LOG_FILE.getEnvironmentVariableName()))
 			.endsWith("example.log");
 	}
@@ -697,9 +721,23 @@ void whenContextHasAotContributionThenProcessAheadOfTimeClearsAndReturnsIt() {
 	}
 
 	@Test // gh-33610
+	@WithResource(name = "springprofile-in-root.xml", content = """
+			<configuration>
+				<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+					<encoder>
+						<pattern>%property{LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n BOOTBOOT</pattern>
+					</encoder>
+				</appender>
+				<root level="INFO">
+					<springProfile name="profile">
+						<appender-ref ref="CONSOLE"/>
+					</springProfile>
+				</root>
+			</configuration>
+			""")
 	void springProfileIfNestedWithinSecondPhaseElementSanityChecker(CapturedOutput output) {
 		this.loggingSystem.beforeInitialize();
-		initialize(this.initializationContext, "classpath:logback-springprofile-in-root.xml", null);
+		initialize(this.initializationContext, "classpath:springprofile-in-root.xml", null);
 		this.logger.info("Hello world");
 		assertThat(output).contains("<springProfile> elements cannot be nested within an");
 	}
@@ -755,9 +793,10 @@ void correlationLoggingToConsoleWhenHasCorrelationPattern(CapturedOutput output)
 	}
 
 	@Test
+	@WithIncludeBaseXmlResource
 	void correlationLoggingToConsoleWhenUsingXmlConfiguration(CapturedOutput output) {
 		this.environment.setProperty(LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY, "true");
-		initialize(this.initializationContext, "classpath:logback-include-base.xml", null);
+		initialize(this.initializationContext, "classpath:include-base.xml", null);
 		MDC.setContextMap(Map.of("traceId", "01234567890123456789012345678901", "spanId", "0123456789012345"));
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(output, "Hello world"))
@@ -765,11 +804,12 @@ void correlationLoggingToConsoleWhenUsingXmlConfiguration(CapturedOutput output)
 	}
 
 	@Test
+	@WithIncludeBaseXmlResource
 	void correlationLoggingToFileWhenUsingFileConfiguration() {
 		this.environment.setProperty(LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY, "true");
 		File file = new File(tmpDir(), "logback-test.log");
 		LogFile logFile = getLogFile(file.getPath(), null);
-		initialize(this.initializationContext, "classpath:logback-include-base.xml", logFile);
+		initialize(this.initializationContext, "classpath:include-base.xml", logFile);
 		MDC.setContextMap(Map.of("traceId", "01234567890123456789012345678901", "spanId", "0123456789012345"));
 		this.logger.info("Hello world");
 		assertThat(getLineWithText(file, "Hello world"))
@@ -833,30 +873,55 @@ void applicationNameLoggingToFileWhenDisabled() {
 	}
 
 	@Test
+	@WithResource(name = "broken.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<appender name="CONSOLE" class="ch.qos.logback.core.ConsolAppender">
+					<encoder>
+						<pattern>${LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n BOOTBOOT</pattern>
+					</encoder>
+				</appender>
+				<root level="INFO">
+					<appender-ref ref="CONSOLE"/>
+				</root>
+			</configuration>
+			""")
 	void whenConfigurationErrorIsDetectedUnderlyingCausesAreIncludedAsSuppressedExceptions() {
 		this.loggingSystem.beforeInitialize();
 		assertThatIllegalStateException()
-			.isThrownBy(() -> initialize(this.initializationContext, "classpath:logback-broken.xml",
+			.isThrownBy(() -> initialize(this.initializationContext, "classpath:broken.xml",
 					getLogFile(tmpDir() + "/tmp.log", null)))
 			.satisfies((ex) -> assertThat(ex.getSuppressed())
 				.hasAtLeastOneElementOfType(DynamicClassLoadingException.class));
 	}
 
 	@Test
+	@WithResource(name = "invalid-format.txt", content = "Not XML")
 	void whenConfigLocationIsNotXmlThenIllegalArgumentExceptionShouldBeThrown() {
 		this.loggingSystem.beforeInitialize();
 		assertThatIllegalStateException()
-			.isThrownBy(() -> initialize(this.initializationContext, "classpath:logback-invalid-format.txt",
+			.isThrownBy(() -> initialize(this.initializationContext, "classpath:invalid-format.txt",
 					getLogFile(tmpDir() + "/tmp.log", null)))
 			.satisfies((ex) -> assertThat(ex.getCause()).isInstanceOf(JoranException.class)
 				.hasMessageStartingWith("Problem parsing XML document. See previously reported errors"));
 	}
 
 	@Test
+	@WithResource(name = "without-extension", content = """
+			<configuration>
+			<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+				<encoder>
+					<pattern>%msg</pattern>
+				</encoder>
+			</appender>
+			<root level="INFO">
+				<appender-ref ref="CONSOLE"/>
+			</root>
+			</configuration>
+			""")
 	void whenConfigLocationIsXmlFileWithoutExtensionShouldWork(CapturedOutput output) {
 		this.loggingSystem.beforeInitialize();
-		initialize(this.initializationContext, "classpath:logback-without-extension",
-				getLogFile(tmpDir() + "/tmp.log", null));
+		initialize(this.initializationContext, "classpath:without-extension", getLogFile(tmpDir() + "/tmp.log", null));
 		this.logger.info("No extension and works!");
 		assertThat(output.toString()).contains("No extension and works!");
 	}
@@ -894,11 +959,12 @@ void shouldRespectFileThreshold() {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void applyingSystemPropertiesDoesNotCauseUnwantedStatusWarnings(CapturedOutput output) {
 		this.loggingSystem.beforeInitialize();
 		this.environment.getPropertySources()
 			.addFirst(new MapPropertySource("test", Map.of("logging.pattern.console", "[CONSOLE]%m")));
-		this.loggingSystem.initialize(this.initializationContext, "classpath:logback-nondefault.xml", null);
+		this.loggingSystem.initialize(this.initializationContext, "classpath:nondefault.xml", null);
 		assertThat(output).doesNotContain("WARN");
 	}
 
@@ -974,10 +1040,11 @@ void getEnvironment() {
 	}
 
 	@Test
+	@WithNonDefaultXmlResource
 	void getEnvironmentWhenUsingFile() {
 		this.loggingSystem.beforeInitialize();
 		LogFile logFile = getLogFile(tmpDir() + "/example.log", null, false);
-		initialize(this.initializationContext, "classpath:logback-nondefault.xml", logFile);
+		initialize(this.initializationContext, "classpath:nondefault.xml", logFile);
 		assertThat(this.logger.getLoggerContext().getObject(Environment.class.getName())).isSameAs(this.environment);
 	}
 
@@ -1005,4 +1072,33 @@ private static SizeAndTimeBasedRollingPolicy<?> getRollingPolicy() {
 		return (SizeAndTimeBasedRollingPolicy<?>) getFileAppender().getRollingPolicy();
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "include-base.xml", content = """
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+			</configuration>
+			""")
+	private @interface WithIncludeBaseXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "nondefault.xml", content = """
+			<configuration>
+				<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+					<encoder>
+						<pattern>%property{LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n BOOTBOOT</pattern>
+					</encoder>
+				</appender>
+				<root level="INFO">
+					<appender-ref ref="CONSOLE"/>
+				</root>
+			</configuration>
+			""")
+	private @interface WithNonDefaultXmlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
index 22a6584b343f..cf8b7cbda66f 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,11 @@
 
 package org.springframework.boot.logging.logback;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 import ch.qos.logback.classic.BasicConfigurator;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
@@ -30,6 +35,8 @@
 import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
 import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
 import org.springframework.boot.logging.LoggingInitializationContext;
+import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.context.aot.AbstractAotProcessor;
@@ -78,6 +85,7 @@ void reset() {
 	}
 
 	@Test
+	@WithProductionProfileXmlResource
 	void profileActive() throws Exception {
 		this.environment.setActiveProfiles("production");
 		initialize("production-profile.xml");
@@ -86,6 +94,20 @@ void profileActive() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "profile-in-include.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<include file="${resourceRoot}/include-with-profile.xml"/>
+			</configuration>
+			""")
+	@WithResource(name = "include-with-profile.xml", content = """
+			<included>
+				<springProfile name="production">
+					<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
+				</springProfile>
+			</included>
+			""")
 	void profileInIncludeActive() throws Exception {
 		this.environment.setActiveProfiles("production");
 		initialize("profile-in-include.xml");
@@ -94,6 +116,7 @@ void profileInIncludeActive() throws Exception {
 	}
 
 	@Test
+	@WithMultiProfileNamesXmlResource
 	void multipleNamesFirstProfileActive() throws Exception {
 		this.environment.setActiveProfiles("production");
 		initialize("multi-profile-names.xml");
@@ -102,6 +125,7 @@ void multipleNamesFirstProfileActive() throws Exception {
 	}
 
 	@Test
+	@WithMultiProfileNamesXmlResource
 	void multipleNamesSecondProfileActive() throws Exception {
 		this.environment.setActiveProfiles("test");
 		initialize("multi-profile-names.xml");
@@ -110,6 +134,7 @@ void multipleNamesSecondProfileActive() throws Exception {
 	}
 
 	@Test
+	@WithProductionProfileXmlResource
 	void profileNotActive() throws Exception {
 		initialize("production-profile.xml");
 		this.logger.trace("Hello");
@@ -117,6 +142,7 @@ void profileNotActive() throws Exception {
 	}
 
 	@Test
+	@WithProfileExpressionXmlResource
 	void profileExpressionMatchFirst() throws Exception {
 		this.environment.setActiveProfiles("production");
 		initialize("profile-expression.xml");
@@ -125,6 +151,7 @@ void profileExpressionMatchFirst() throws Exception {
 	}
 
 	@Test
+	@WithProfileExpressionXmlResource
 	void profileExpressionMatchSecond() throws Exception {
 		this.environment.setActiveProfiles("test");
 		initialize("profile-expression.xml");
@@ -133,6 +160,7 @@ void profileExpressionMatchSecond() throws Exception {
 	}
 
 	@Test
+	@WithProfileExpressionXmlResource
 	void profileExpressionNoMatch() throws Exception {
 		this.environment.setActiveProfiles("development");
 		initialize("profile-expression.xml");
@@ -141,26 +169,31 @@ void profileExpressionNoMatch() throws Exception {
 	}
 
 	@Test
+	@WithNestedXmlResource
 	void profileNestedActiveActive() throws Exception {
 		doTestNestedProfile(true, "outer", "inner");
 	}
 
 	@Test
+	@WithNestedXmlResource
 	void profileNestedActiveNotActive() throws Exception {
 		doTestNestedProfile(false, "outer");
 	}
 
 	@Test
+	@WithNestedXmlResource
 	void profileNestedNotActiveActive() throws Exception {
 		doTestNestedProfile(false, "inner");
 	}
 
 	@Test
+	@WithNestedXmlResource
 	void profileNestedNotActiveNotActive() throws Exception {
 		doTestNestedProfile(false);
 	}
 
 	@Test
+	@WithPropertyXmlResource
 	void springProperty() throws Exception {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "my.example-property=test");
 		initialize("property.xml");
@@ -168,6 +201,7 @@ void springProperty() throws Exception {
 	}
 
 	@Test
+	@WithPropertyXmlResource
 	void relaxedSpringProperty() throws Exception {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "my.EXAMPLE_PROPERTY=test");
 		ConfigurationPropertySources.attach(this.environment);
@@ -176,30 +210,35 @@ void relaxedSpringProperty() throws Exception {
 	}
 
 	@Test
+	@WithPropertyXmlResource
 	void springPropertyNoValue() throws Exception {
 		initialize("property.xml");
 		assertThat(this.context.getProperty("SIMPLE")).isNull();
 	}
 
 	@Test
+	@WithPropertyXmlResource
 	void relaxedSpringPropertyNoValue() throws Exception {
 		initialize("property.xml");
 		assertThat(this.context.getProperty("MINE")).isNull();
 	}
 
 	@Test
+	@WithPropertyDefaultValueXmlResource
 	void springPropertyWithDefaultValue() throws Exception {
 		initialize("property-default-value.xml");
 		assertThat(this.context.getProperty("SIMPLE")).isEqualTo("foo");
 	}
 
 	@Test
+	@WithPropertyDefaultValueXmlResource
 	void relaxedSpringPropertyWithDefaultValue() throws Exception {
 		initialize("property-default-value.xml");
 		assertThat(this.context.getProperty("MINE")).isEqualTo("bar");
 	}
 
 	@Test
+	@WithPropertyInIfXmlResource
 	void springPropertyInIfWhenTrue() throws Exception {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "my.example-property=true");
 		initialize("property-in-if.xml");
@@ -207,6 +246,7 @@ void springPropertyInIfWhenTrue() throws Exception {
 	}
 
 	@Test
+	@WithPropertyInIfXmlResource
 	void springPropertyInIfWhenFalse() throws Exception {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "my.example-property=false");
 		initialize("property-in-if.xml");
@@ -214,6 +254,19 @@ void springPropertyInIfWhenFalse() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "property-in-include.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<include file="${resourceRoot}/include-with-property.xml"/>
+			</configuration>
+			""")
+	@WithResource(name = "include-with-property.xml", content = """
+			<included>
+				<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test"/>
+			</included>
+			""")
+	@ClassPathExclusions
 	void springPropertyInInclude() throws Exception {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "my.example-property=test");
 		initialize("property-in-include.xml");
@@ -221,6 +274,7 @@ void springPropertyInInclude() throws Exception {
 	}
 
 	@Test
+	@WithPropertyXmlResource
 	void addsAotContributionToContextDuringAotProcessing() throws Exception {
 		withSystemProperty(AbstractAotProcessor.AOT_PROCESSING, "true", () -> {
 			initialize("property.xml");
@@ -254,7 +308,8 @@ private void doTestNestedProfile(boolean expected, String... profiles) throws Jo
 
 	private void initialize(String config) throws JoranException {
 		this.configurator.setContext(this.context);
-		this.configurator.doConfigure(getClass().getResourceAsStream(config));
+		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+		this.configurator.doConfigure(contextClassLoader.getResource(config));
 	}
 
 	private interface Action {
@@ -263,4 +318,112 @@ private interface Action {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "property-default-value.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar" defaultValue="foo"/>
+				<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="bar"/>
+			</configuration>
+			""")
+	private @interface WithPropertyDefaultValueXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "property-in-if.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<springProperty scope="context" name="MINE" source="my.example-property"/>
+				<if condition='property("MINE").contains("true")'>
+					<then>
+						<variable scope="context" name="MYCHECK" value="i-was-included"/>
+					</then>
+				</if>
+			</configuration>
+			""")
+	private @interface WithPropertyInIfXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "property.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar"/>
+				<springProperty scope="context" name="MINE" source="my.example-property"/>
+			</configuration>
+			""")
+	private @interface WithPropertyXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "profile-expression.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<springProfile name="production | test">
+					<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
+				</springProfile>
+			</configuration>
+			""")
+	private @interface WithProfileExpressionXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "production-profile.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<springProfile name="production">
+					<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
+				</springProfile>
+			</configuration>
+			""")
+	private @interface WithProductionProfileXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "nested.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<springProfile name="outer">
+					<springProfile name="inner">
+						<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
+					</springProfile>
+				</springProfile>
+			</configuration>
+			""")
+	private @interface WithNestedXmlResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(name = "multi-profile-names.xml", content = """
+			<?xml version="1.0" encoding="UTF-8"?>
+			<configuration>
+				<include resource="org/springframework/boot/logging/logback/base.xml"/>
+				<springProfile name="production, test">
+					<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
+				</springProfile>
+			</configuration>
+			""")
+	private @interface WithMultiProfileNamesXmlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
index 424cfc4fabf7..625c314b25b5 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,8 @@
 import org.springframework.boot.ssl.jks.JksSslStoreDetails;
 import org.springframework.boot.ssl.pem.PemSslStoreBundle;
 import org.springframework.boot.ssl.pem.PemSslStoreDetails;
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.web.server.Ssl;
 import org.springframework.core.codec.CharSequenceEncoder;
 import org.springframework.core.codec.StringDecoder;
@@ -157,91 +159,107 @@ void serverCustomizers() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void tcpTransportBasicSslFromClassPath() {
 		testBasicSslWithKeyStore("classpath:test.jks", "password", Transport.TCP);
 	}
 
 	@Test
-	void tcpTransportBasicSslFromFileSystem() {
-		testBasicSslWithKeyStore("src/test/resources/test.jks", "password", Transport.TCP);
+	@WithPackageResources("test.jks")
+	void tcpTransportBasicSslFromFileSystem(@ResourcePath("test.jks") String keyStore) {
+		testBasicSslWithKeyStore(keyStore, "password", Transport.TCP);
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void websocketTransportBasicSslFromClassPath() {
 		testBasicSslWithKeyStore("classpath:test.jks", "password", Transport.WEBSOCKET);
 	}
 
 	@Test
-	void websocketTransportBasicSslFromFileSystem() {
-		testBasicSslWithKeyStore("src/test/resources/test.jks", "password", Transport.WEBSOCKET);
+	@WithPackageResources("test.jks")
+	void websocketTransportBasicSslFromFileSystem(@ResourcePath("test.jks") String keyStore) {
+		testBasicSslWithKeyStore(keyStore, "password", Transport.WEBSOCKET);
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void tcpTransportBasicSslCertificateFromClassPath() {
 		testBasicSslWithPemCertificate("classpath:test-cert.pem", "classpath:test-key.pem", "classpath:test-cert.pem",
 				Transport.TCP);
 	}
 
 	@Test
-	void tcpTransportBasicSslCertificateFromFileSystem() {
-		testBasicSslWithPemCertificate("src/test/resources/test-cert.pem", "src/test/resources/test-key.pem",
-				"src/test/resources/test-cert.pem", Transport.TCP);
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
+	void tcpTransportBasicSslCertificateFromFileSystem(@ResourcePath("test-cert.pem") String testCert,
+			@ResourcePath("test-key.pem") String testKey) {
+		testBasicSslWithPemCertificate(testCert, testKey, testCert, Transport.TCP);
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void websocketTransportBasicSslCertificateFromClassPath() {
 		testBasicSslWithPemCertificate("classpath:test-cert.pem", "classpath:test-key.pem", "classpath:test-cert.pem",
 				Transport.WEBSOCKET);
 	}
 
 	@Test
-	void websocketTransportBasicSslCertificateFromFileSystem() {
-		testBasicSslWithPemCertificate("src/test/resources/test-cert.pem", "src/test/resources/test-key.pem",
-				"src/test/resources/test-cert.pem", Transport.WEBSOCKET);
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
+	void websocketTransportBasicSslCertificateFromFileSystem(@ResourcePath("test-cert.pem") String testCert,
+			@ResourcePath("test-key.pem") String testKey) {
+		testBasicSslWithPemCertificate(testCert, testKey, testCert, Transport.WEBSOCKET);
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void tcpTransportBasicSslFromClassPathWithBundle() {
 		testBasicSslWithKeyStoreFromBundle("classpath:test.jks", "password", Transport.TCP);
 	}
 
 	@Test
-	void tcpTransportBasicSslFromFileSystemWithBundle() {
-		testBasicSslWithKeyStoreFromBundle("src/test/resources/test.jks", "password", Transport.TCP);
+	@WithPackageResources("test.jks")
+	void tcpTransportBasicSslFromFileSystemWithBundle(@ResourcePath("test.jks") String keyStore) {
+		testBasicSslWithKeyStoreFromBundle(keyStore, "password", Transport.TCP);
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void websocketTransportBasicSslFromClassPathWithBundle() {
 		testBasicSslWithKeyStoreFromBundle("classpath:test.jks", "password", Transport.WEBSOCKET);
 	}
 
 	@Test
-	void websocketTransportBasicSslFromFileSystemWithBundle() {
-		testBasicSslWithKeyStoreFromBundle("src/test/resources/test.jks", "password", Transport.WEBSOCKET);
+	@WithPackageResources("test.jks")
+	void websocketTransportBasicSslFromFileSystemWithBundle(@ResourcePath("test.jks") String keyStore) {
+		testBasicSslWithKeyStoreFromBundle(keyStore, "password", Transport.WEBSOCKET);
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void tcpTransportBasicSslCertificateFromClassPathWithBundle() {
 		testBasicSslWithPemCertificateFromBundle("classpath:test-cert.pem", "classpath:test-key.pem",
 				"classpath:test-cert.pem", Transport.TCP);
 	}
 
 	@Test
-	void tcpTransportBasicSslCertificateFromFileSystemWithBundle() {
-		testBasicSslWithPemCertificateFromBundle("src/test/resources/test-cert.pem", "src/test/resources/test-key.pem",
-				"src/test/resources/test-cert.pem", Transport.TCP);
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
+	void tcpTransportBasicSslCertificateFromFileSystemWithBundle(@ResourcePath("test-cert.pem") String testCert,
+			@ResourcePath("test-key.pem") String testKey) {
+		testBasicSslWithPemCertificateFromBundle(testCert, testKey, testCert, Transport.TCP);
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void websocketTransportBasicSslCertificateFromClassPathWithBundle() {
 		testBasicSslWithPemCertificateFromBundle("classpath:test-cert.pem", "classpath:test-key.pem",
 				"classpath:test-cert.pem", Transport.WEBSOCKET);
 	}
 
 	@Test
-	void websocketTransportBasicSslCertificateFromFileSystemWithBundle() {
-		testBasicSslWithPemCertificateFromBundle("src/test/resources/test-cert.pem", "src/test/resources/test-key.pem",
-				"src/test/resources/test-cert.pem", Transport.WEBSOCKET);
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
+	void websocketTransportBasicSslCertificateFromFileSystemWithBundle(@ResourcePath("test-cert.pem") String testCert,
+			@ResourcePath("test-key.pem") String testKey) {
+		testBasicSslWithPemCertificateFromBundle(testCert, testKey, testCert, Transport.WEBSOCKET);
 	}
 
 	private void checkEchoRequest() {
@@ -319,7 +337,7 @@ void tcpTransportSslRejectsInsecureClient() {
 		NettyRSocketServerFactory factory = getFactory();
 		factory.setTransport(Transport.TCP);
 		Ssl ssl = new Ssl();
-		ssl.setKeyStore("classpath:test.jks");
+		ssl.setKeyStore("classpath:org/springframework/boot/rsocket/netty/test.jks");
 		ssl.setKeyPassword("password");
 		factory.setSsl(ssl);
 		this.server = factory.create(new EchoRequestResponseAcceptor());
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
index 84b250e45616..efd5886d77f6 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,15 @@
 
 package org.springframework.boot.sql.init;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.dao.DataAccessException;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,6 +40,8 @@
 public abstract class AbstractScriptDatabaseInitializerTests<T extends AbstractScriptDatabaseInitializer> {
 
 	@Test
+	@WithSchemaSqlResource
+	@WithDataSqlResource
 	void whenDatabaseIsInitializedThenSchemaAndDataScriptsAreApplied() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setSchemaLocations(Arrays.asList("schema.sql"));
@@ -55,6 +62,7 @@ void whenDatabaseIsInitializedWithDirectoryLocationsThenFailureIsHelpful() {
 	}
 
 	@Test
+	@WithDataSqlResource
 	void whenContinueOnErrorIsFalseThenInitializationFailsOnError() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setDataLocations(Arrays.asList("data.sql"));
@@ -64,6 +72,7 @@ void whenContinueOnErrorIsFalseThenInitializationFailsOnError() {
 	}
 
 	@Test
+	@WithDataSqlResource
 	void whenContinueOnErrorIsTrueThenInitializationDoesNotFailOnError() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setContinueOnError(true);
@@ -112,6 +121,8 @@ void whenNoScriptsExistAtAnOptionalDataLocationThenDatabaseIsNotAccessed() {
 	}
 
 	@Test
+	@WithSchemaSqlResource
+	@WithDataSqlResource
 	void whenModeIsNeverThenEmbeddedDatabaseIsNotInitialized() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setSchemaLocations(Arrays.asList("schema.sql"));
@@ -123,6 +134,8 @@ void whenModeIsNeverThenEmbeddedDatabaseIsNotInitialized() {
 	}
 
 	@Test
+	@WithSchemaSqlResource
+	@WithDataSqlResource
 	void whenModeIsNeverThenStandaloneDatabaseIsNotInitialized() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setSchemaLocations(Arrays.asList("schema.sql"));
@@ -134,6 +147,8 @@ void whenModeIsNeverThenStandaloneDatabaseIsNotInitialized() {
 	}
 
 	@Test
+	@WithSchemaSqlResource
+	@WithDataSqlResource
 	void whenModeIsEmbeddedThenEmbeddedDatabaseIsInitialized() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setSchemaLocations(Arrays.asList("schema.sql"));
@@ -145,6 +160,8 @@ void whenModeIsEmbeddedThenEmbeddedDatabaseIsInitialized() {
 	}
 
 	@Test
+	@WithSchemaSqlResource
+	@WithDataSqlResource
 	void whenModeIsEmbeddedThenStandaloneDatabaseIsNotInitialized() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setSchemaLocations(Arrays.asList("schema.sql"));
@@ -156,6 +173,8 @@ void whenModeIsEmbeddedThenStandaloneDatabaseIsNotInitialized() {
 	}
 
 	@Test
+	@WithSchemaSqlResource
+	@WithDataSqlResource
 	void whenModeIsAlwaysThenEmbeddedDatabaseIsInitialized() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setSchemaLocations(Arrays.asList("schema.sql"));
@@ -167,6 +186,8 @@ void whenModeIsAlwaysThenEmbeddedDatabaseIsInitialized() {
 	}
 
 	@Test
+	@WithSchemaSqlResource
+	@WithDataSqlResource
 	void whenModeIsAlwaysThenStandaloneDatabaseIsInitialized() {
 		DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
 		settings.setSchemaLocations(Arrays.asList("schema.sql"));
@@ -195,4 +216,23 @@ private void assertThatDatabaseWasNotAccessed(T initializer) {
 
 	protected abstract void assertDatabaseAccessed(boolean accessed, T initializer);
 
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	@WithResource(name = "schema.sql", content = """
+			CREATE TABLE EXAMPLE (
+				id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+				name VARCHAR(30)
+			);
+			""")
+	protected @interface WithSchemaSqlResource {
+
+	}
+
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.METHOD)
+	@WithResource(name = "data.sql", content = "INSERT INTO EXAMPLE VALUES (1, 'Andy');")
+	protected @interface WithDataSqlResource {
+
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/jks/JksSslStoreBundleTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/jks/JksSslStoreBundleTests.java
index fe10414642ea..3bc2efb0bbba 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/jks/JksSslStoreBundleTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/jks/JksSslStoreBundleTests.java
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.io.ApplicationResourceLoader;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.ssl.MockPkcs11Security;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
@@ -77,6 +78,7 @@ void whenTypePKCS11AndLocationGetKeyStoreThrowsException() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void whenHasKeyStoreLocation() {
 		JksSslStoreDetails keyStoreDetails = JksSslStoreDetails.forLocation("classpath:test.jks")
 			.withPassword("secret");
@@ -86,6 +88,7 @@ void whenHasKeyStoreLocation() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void getTrustStoreWithLocations() {
 		JksSslStoreDetails keyStoreDetails = null;
 		JksSslStoreDetails trustStoreDetails = JksSslStoreDetails.forLocation("classpath:test.jks")
@@ -95,6 +98,7 @@ void getTrustStoreWithLocations() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void whenHasKeyStoreType() {
 		JksSslStoreDetails keyStoreDetails = new JksSslStoreDetails("jks", null, "classpath:test.jks", "secret");
 		JksSslStoreDetails trustStoreDetails = null;
@@ -103,6 +107,7 @@ void whenHasKeyStoreType() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void whenHasTrustStoreType() {
 		JksSslStoreDetails keyStoreDetails = null;
 		JksSslStoreDetails trustStoreDetails = new JksSslStoreDetails("jks", null, "classpath:test.jks", "secret");
@@ -111,6 +116,7 @@ void whenHasTrustStoreType() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void whenHasKeyStoreProvider() {
 		JksSslStoreDetails keyStoreDetails = new JksSslStoreDetails(null, "com.example.KeyStoreProvider",
 				"classpath:test.jks", "secret");
@@ -120,6 +126,7 @@ void whenHasKeyStoreProvider() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void whenHasTrustStoreProvider() {
 		JksSslStoreDetails trustStoreDetails = new JksSslStoreDetails(null, "com.example.KeyStoreProvider",
 				"classpath:test.jks", "secret");
@@ -137,6 +144,7 @@ void storeCreationIsLazy() {
 	}
 
 	@Test
+	@WithPackageResources({ "test.p12", "test.jks" })
 	void whenLocationsAreBase64Encoded() throws IOException {
 		JksSslStoreDetails keyStoreDetails = JksSslStoreDetails.forLocation(encodeFileContent("classpath:test.p12"))
 			.withPassword("secret");
@@ -169,6 +177,7 @@ void invalidLocationThrowsException() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void usesResourceLoader() {
 		JksSslStoreDetails keyStoreDetails = null;
 		JksSslStoreDetails trustStoreDetails = new JksSslStoreDetails("jks", null, "classpath:test.jks", "secret");
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/LoadedPemSslStoreTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/LoadedPemSslStoreTests.java
index a188092a7489..93636326dab9 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/LoadedPemSslStoreTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/LoadedPemSslStoreTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.io.ApplicationResourceLoader;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 
@@ -37,6 +38,7 @@
 class LoadedPemSslStoreTests {
 
 	@Test
+	@WithPackageResources("test-key.pem")
 	void certificatesAreLoadedLazily() {
 		PemSslStoreDetails details = PemSslStoreDetails.forCertificate("classpath:missing-test-cert.pem")
 			.withPrivateKey("classpath:test-key.pem");
@@ -45,6 +47,7 @@ void certificatesAreLoadedLazily() {
 	}
 
 	@Test
+	@WithPackageResources("test-cert.pem")
 	void privateKeyIsLoadedLazily() {
 		PemSslStoreDetails details = PemSslStoreDetails.forCertificate("classpath:test-cert.pem")
 			.withPrivateKey("classpath:missing-test-key.pem");
@@ -53,6 +56,7 @@ void privateKeyIsLoadedLazily() {
 	}
 
 	@Test
+	@WithPackageResources("test-key.pem")
 	void withAliasIsLazy() {
 		PemSslStoreDetails details = PemSslStoreDetails.forCertificate("classpath:missing-test-cert.pem")
 			.withPrivateKey("classpath:test-key.pem");
@@ -61,6 +65,7 @@ void withAliasIsLazy() {
 	}
 
 	@Test
+	@WithPackageResources("test-key.pem")
 	void withPasswordIsLazy() {
 		PemSslStoreDetails details = PemSslStoreDetails.forCertificate("classpath:missing-test-cert.pem")
 			.withPrivateKey("classpath:test-key.pem");
@@ -69,6 +74,7 @@ void withPasswordIsLazy() {
 	}
 
 	@Test
+	@WithPackageResources("test-cert.pem")
 	void usesResourceLoader() {
 		PemSslStoreDetails details = PemSslStoreDetails.forCertificate("classpath:test-cert.pem");
 		ResourceLoader resourceLoader = spy(new DefaultResourceLoader());
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemCertificateParserTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemCertificateParserTests.java
index db8f71f6b744..b15136fbecba 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemCertificateParserTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemCertificateParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,6 +36,7 @@
 class PemCertificateParserTests {
 
 	@Test
+	@WithPackageResources("test-cert.pem")
 	void parseCertificate() throws Exception {
 		List<X509Certificate> certificates = PemCertificateParser.parse(read("test-cert.pem"));
 		assertThat(certificates).isNotNull();
@@ -43,6 +45,7 @@ void parseCertificate() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test-cert-chain.pem")
 	void parseCertificateChain() throws Exception {
 		List<X509Certificate> certificates = PemCertificateParser.parse(read("test-cert-chain.pem"));
 		assertThat(certificates).isNotNull();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java
index f4894165dfe4..567f559d5113 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,8 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.io.ApplicationResourceLoader;
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
@@ -51,6 +53,7 @@ void getCertificateWhenNoCertificatesThrowsException() {
 	}
 
 	@Test
+	@WithPackageResources("test-cert-chain.pem")
 	void getCertificateReturnsCertificates() throws Exception {
 		PemContent content = PemContent.load(contentFromClasspath("/test-cert-chain.pem"),
 				ApplicationResourceLoader.get());
@@ -69,9 +72,9 @@ void getPrivateKeyWhenNoKeyThrowsException() {
 	}
 
 	@Test
+	@WithPackageResources("dsa.key")
 	void getPrivateKeyReturnsPrivateKey() throws Exception {
-		PemContent content = PemContent.load(contentFromClasspath("/org/springframework/boot/web/server/pkcs8/dsa.key"),
-				ApplicationResourceLoader.get());
+		PemContent content = PemContent.load(contentFromClasspath("dsa.key"), ApplicationResourceLoader.get());
 		PrivateKey privateKey = content.getPrivateKey();
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
@@ -186,6 +189,7 @@ void isPresentInTextWithUntrimmedContent() {
 	}
 
 	@Test
+	@WithPackageResources("test-cert.pem")
 	void loadWithStringWhenClasspathLocationReturnsContent() throws IOException {
 		String actual = PemContent.load("classpath:test-cert.pem", ApplicationResourceLoader.get()).toString();
 		String expected = contentFromClasspath("test-cert.pem");
@@ -193,21 +197,24 @@ void loadWithStringWhenClasspathLocationReturnsContent() throws IOException {
 	}
 
 	@Test
-	void loadWithStringWhenFileLocationReturnsContent() throws IOException {
-		String actual = PemContent.load("src/test/resources/test-cert.pem", ApplicationResourceLoader.get()).toString();
+	@WithPackageResources("test-cert.pem")
+	void loadWithStringWhenFileLocationReturnsContent(@ResourcePath("test-cert.pem") String testCert)
+			throws IOException {
+		String actual = PemContent.load(testCert, ApplicationResourceLoader.get()).toString();
 		String expected = contentFromClasspath("test-cert.pem");
 		assertThat(actual).isEqualTo(expected);
 	}
 
 	@Test
-	void loadWithPathReturnsContent() throws IOException {
-		Path path = Path.of("src/test/resources/test-cert.pem");
-		String actual = PemContent.load(path).toString();
+	@WithPackageResources("test-cert.pem")
+	void loadWithPathReturnsContent(@ResourcePath("test-cert.pem") Path testCert) throws IOException {
+		String actual = PemContent.load(testCert).toString();
 		String expected = contentFromClasspath("test-cert.pem");
 		assertThat(actual).isEqualTo(expected);
 	}
 
 	@Test
+	@WithPackageResources("test-cert.pem")
 	void loadWithResourceLoaderUsesResourceLoader() throws IOException {
 		ResourceLoader resourceLoader = spy(new DefaultResourceLoader());
 		PemContent.load("classpath:test-cert.pem", resourceLoader);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java
index 22ceb5455b43..b337dfb28c30 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemPrivateKeyParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,36 +47,25 @@ class PemPrivateKeyParserTests {
 			"rsa.key,		RSA",
 			"rsa-pss.key,	RSASSA-PSS"
 	})
-		// @formatter:on
+	// @formatter:on
 	void shouldParseTraditionalPkcs8(String file, String algorithm) throws IOException {
-		PrivateKey privateKey = PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file));
+		PrivateKey privateKey = PemPrivateKeyParser.parse(read("pkcs8/" + file));
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
 		assertThat(privateKey.getAlgorithm()).isEqualTo(algorithm);
 	}
 
-	@ParameterizedTest
-	// @formatter:off
-	@CsvSource({
-			"rsa.key,	RSA"
-	})
-		// @formatter:on
-	void shouldParseTraditionalPkcs1(String file, String algorithm) throws IOException {
-		PrivateKey privateKey = PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs1/" + file));
+	@Test
+	void shouldParseTraditionalPkcs1() throws IOException {
+		PrivateKey privateKey = PemPrivateKeyParser.parse(read("pkcs1/rsa.key"));
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
-		assertThat(privateKey.getAlgorithm()).isEqualTo(algorithm);
+		assertThat(privateKey.getAlgorithm()).isEqualTo("RSA");
 	}
 
-	@ParameterizedTest
-	// @formatter:off
-	@ValueSource(strings = {
-			"dsa.key"
-	})
-		// @formatter:on
-	void shouldNotParseUnsupportedTraditionalPkcs1(String file) {
-		assertThatIllegalStateException()
-			.isThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs1/" + file)))
+	@Test
+	void shouldNotParseUnsupportedTraditionalPkcs1() {
+		assertThatIllegalStateException().isThrownBy(() -> PemPrivateKeyParser.parse(read("pkcs1/dsa.key")))
 			.withMessageContaining("Missing private key or unrecognized format");
 	}
 
@@ -94,9 +83,9 @@ void shouldNotParseUnsupportedTraditionalPkcs1(String file) {
 			"secp384r1.key,			secp384r1,			1.3.132.0.34",
 			"secp521r1.key,			secp521r1,			1.3.132.0.35"
 	})
-		// @formatter:on
+	// @formatter:on
 	void shouldParseEcPkcs8(String file, String curveName, String oid) throws IOException {
-		PrivateKey privateKey = PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file));
+		PrivateKey privateKey = PemPrivateKeyParser.parse(read("pkcs8/" + file));
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
 		assertThat(privateKey.getAlgorithm()).isEqualTo("EC");
@@ -115,8 +104,7 @@ void shouldParseEcPkcs8(String file, String curveName, String oid) throws IOExce
 	})
 		// @formatter:on
 	void shouldNotParseUnsupportedEcPkcs8(String file) {
-		assertThatIllegalStateException()
-			.isThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file)))
+		assertThatIllegalStateException().isThrownBy(() -> PemPrivateKeyParser.parse(read("pkcs8/" + file)))
 			.withMessageContaining("Missing private key or unrecognized format");
 	}
 
@@ -128,7 +116,7 @@ void shouldNotParseUnsupportedEcPkcs8(String file) {
 	})
 		// @formatter:on
 	void shouldParseEdDsaPkcs8(String file) throws IOException {
-		PrivateKey privateKey = PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file));
+		PrivateKey privateKey = PemPrivateKeyParser.parse(read("pkcs8/" + file));
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
 		assertThat(privateKey.getAlgorithm()).isEqualTo("EdDSA");
@@ -142,7 +130,7 @@ void shouldParseEdDsaPkcs8(String file) throws IOException {
 	})
 		// @formatter:on
 	void shouldParseXdhPkcs8(String file) throws IOException {
-		PrivateKey privateKey = PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file));
+		PrivateKey privateKey = PemPrivateKeyParser.parse(read("pkcs8/" + file));
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
 		assertThat(privateKey.getAlgorithm()).isEqualTo("XDH");
@@ -164,7 +152,7 @@ void shouldParseXdhPkcs8(String file) throws IOException {
 	})
 		// @formatter:on
 	void shouldParseEcSec1(String file, String curveName, String oid) throws IOException {
-		PrivateKey privateKey = PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/sec1/" + file));
+		PrivateKey privateKey = PemPrivateKeyParser.parse(read("sec1/" + file));
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
 		assertThat(privateKey.getAlgorithm()).isEqualTo("EC");
@@ -183,14 +171,13 @@ void shouldParseEcSec1(String file, String curveName, String oid) throws IOExcep
 	})
 		// @formatter:on
 	void shouldNotParseUnsupportedEcSec1(String file) {
-		assertThatIllegalStateException()
-			.isThrownBy(() -> PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/sec1/" + file)))
+		assertThatIllegalStateException().isThrownBy(() -> PemPrivateKeyParser.parse(read("sec1/" + file)))
 			.withMessageContaining("Missing private key or unrecognized format");
 	}
 
 	@Test
 	void parseWithNonKeyTextWillThrowException() {
-		assertThatIllegalStateException().isThrownBy(() -> PemPrivateKeyParser.parse(read("test-banner.txt")));
+		assertThatIllegalStateException().isThrownBy(() -> PemPrivateKeyParser.parse(read("file.txt")));
 	}
 
 	@ParameterizedTest
@@ -208,8 +195,7 @@ void shouldParseEncryptedPkcs8(String file, String algorithm) throws IOException
 		// openssl pkcs8 -topk8 -in <input file> -out <output file> -v2 <algorithm>
 		// -passout pass:test
 		// where <algorithm> is aes128 or aes256
-		PrivateKey privateKey = PemPrivateKeyParser.parse(read("org/springframework/boot/web/server/pkcs8/" + file),
-				"test");
+		PrivateKey privateKey = PemPrivateKeyParser.parse(read("pkcs8/" + file), "test");
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
 		assertThat(privateKey.getAlgorithm()).isEqualTo(algorithm);
@@ -221,8 +207,7 @@ void shouldNotParseEncryptedPkcs8NotUsingAes() {
 		// openssl pkcs8 -topk8 -in rsa.key -out rsa-des-ede3-cbc.key -v2 des3 -passout
 		// pass:test
 		assertThatIllegalStateException()
-			.isThrownBy(() -> PemPrivateKeyParser
-				.parse(read("org/springframework/boot/web/server/pkcs8/rsa-des-ede3-cbc.key"), "test"))
+			.isThrownBy(() -> PemPrivateKeyParser.parse(read("pkcs8/rsa-des-ede3-cbc.key"), "test"))
 			.isInstanceOf(IllegalStateException.class)
 			.withMessageContaining("Error decrypting private key");
 	}
@@ -233,8 +218,7 @@ void shouldNotParseEncryptedPkcs8NotUsingPbkdf2() {
 		// openssl pkcs8 -topk8 -in rsa.key -out rsa-des-ede3-cbc.key -scrypt -passout
 		// pass:test
 		assertThatIllegalStateException()
-			.isThrownBy(() -> PemPrivateKeyParser
-				.parse(read("org/springframework/boot/web/server/pkcs8/rsa-scrypt.key"), "test"))
+			.isThrownBy(() -> PemPrivateKeyParser.parse(read("pkcs8/rsa-scrypt.key"), "test"))
 			.withMessageContaining("Error decrypting private key");
 	}
 
@@ -244,8 +228,7 @@ void shouldNotParseEncryptedSec1() {
 		// openssl ecparam -genkey -name prime256v1 | openssl ec -aes-128-cbc -out
 		// prime256v1-aes-128-cbc.key
 		assertThatIllegalStateException()
-			.isThrownBy(() -> PemPrivateKeyParser
-				.parse(read("org/springframework/boot/web/server/sec1/prime256v1-aes-128-cbc.key"), "test"))
+			.isThrownBy(() -> PemPrivateKeyParser.parse(read("sec1/prime256v1-aes-128-cbc.key"), "test"))
 			.withMessageContaining("Missing private key or unrecognized format");
 	}
 
@@ -254,13 +237,13 @@ void shouldNotParseEncryptedPkcs1() {
 		// created with:
 		// openssl genrsa -aes-256-cbc -out rsa-aes-256-cbc.key
 		assertThatIllegalStateException()
-			.isThrownBy(() -> PemPrivateKeyParser
-				.parse(read("org/springframework/boot/web/server/pkcs1/rsa-aes-256-cbc.key"), "test"))
+			.isThrownBy(() -> PemPrivateKeyParser.parse(read("pkcs1/rsa-aes-256-cbc.key"), "test"))
 			.withMessageContaining("Missing private key or unrecognized format");
 	}
 
 	private String read(String path) throws IOException {
-		return new ClassPathResource(path).getContentAsString(StandardCharsets.UTF_8);
+		return new ClassPathResource("org/springframework/boot/ssl/pem/" + path)
+			.getContentAsString(StandardCharsets.UTF_8);
 	}
 
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemSslStoreBundleTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemSslStoreBundleTests.java
index 52d7a63cdecb..10ae67f6af2c 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemSslStoreBundleTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemSslStoreBundleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.util.function.ThrowingConsumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -120,6 +121,7 @@ void createWithDetailsWhenStoresHaveNoValues() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void createWithDetailsWhenHasKeyStoreDetailsCertAndKey() {
 		PemSslStoreDetails keyStoreDetails = PemSslStoreDetails.forCertificate("classpath:test-cert.pem")
 			.withPrivateKey("classpath:test-key.pem");
@@ -130,9 +132,10 @@ void createWithDetailsWhenHasKeyStoreDetailsCertAndKey() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "pkcs8/key-rsa-encrypted.pem" })
 	void createWithDetailsWhenHasKeyStoreDetailsCertAndEncryptedKey() {
 		PemSslStoreDetails keyStoreDetails = PemSslStoreDetails.forCertificate("classpath:test-cert.pem")
-			.withPrivateKey("classpath:ssl/pkcs8/key-rsa-encrypted.pem")
+			.withPrivateKey("classpath:pkcs8/key-rsa-encrypted.pem")
 			.withPrivateKeyPassword("test");
 		PemSslStoreDetails trustStoreDetails = null;
 		PemSslStoreBundle bundle = new PemSslStoreBundle(keyStoreDetails, trustStoreDetails);
@@ -141,6 +144,7 @@ void createWithDetailsWhenHasKeyStoreDetailsCertAndEncryptedKey() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void createWithDetailsWhenHasKeyStoreDetailsAndTrustStoreDetailsWithoutKey() {
 		PemSslStoreDetails keyStoreDetails = PemSslStoreDetails.forCertificate("classpath:test-cert.pem")
 			.withPrivateKey("classpath:test-key.pem");
@@ -151,6 +155,7 @@ void createWithDetailsWhenHasKeyStoreDetailsAndTrustStoreDetailsWithoutKey() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void createWithDetailsWhenHasKeyStoreDetailsAndTrustStoreDetails() {
 		PemSslStoreDetails keyStoreDetails = PemSslStoreDetails.forCertificate("classpath:test-cert.pem")
 			.withPrivateKey("classpath:test-key.pem");
@@ -172,6 +177,7 @@ void createWithDetailsWhenHasEmbeddedKeyStoreDetailsAndTrustStoreDetails() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void createWithDetailsWhenHasStoreType() {
 		PemSslStoreDetails keyStoreDetails = new PemSslStoreDetails("PKCS12", "classpath:test-cert.pem",
 				"classpath:test-key.pem");
@@ -183,6 +189,7 @@ void createWithDetailsWhenHasStoreType() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem" })
 	void createWithDetailsWhenHasKeyStoreDetailsAndTrustStoreDetailsAndKeyPassword() {
 		PemSslStoreDetails keyStoreDetails = PemSslStoreDetails.forCertificate("classpath:test-cert.pem")
 			.withPrivateKey("classpath:test-key.pem")
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java
index 0c913c31353a..af7e9c66f6e7 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
 import org.springframework.boot.ssl.SslBundleKey;
 import org.springframework.boot.ssl.jks.JksSslStoreBundle;
 import org.springframework.boot.ssl.jks.JksSslStoreDetails;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.Ssl;
@@ -131,6 +132,7 @@ void shouldSetReadTimeoutsWhenUsingReflective() {
 	@ParameterizedTest
 	@SuppressWarnings("deprecation")
 	@ValueSource(strings = { "GET", "POST" })
+	@WithPackageResources("test.jks")
 	void connectWithSslBundle(String httpMethod) throws Exception {
 		TomcatServletWebServerFactory webServerFactory = new TomcatServletWebServerFactory(0);
 		Ssl ssl = new Ssl();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
index 3bd6529897ee..681e5d8d5cf8 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.web.server.Compression;
 import org.springframework.boot.web.server.GracefulShutdownResult;
@@ -230,9 +232,10 @@ void sessionTimeoutInMinutes() {
 	}
 
 	@Test
-	void sslCiphersConfiguration() {
+	@WithPackageResources("test.jks")
+	void sslCiphersConfiguration(@ResourcePath("test.jks") String keyStore) {
 		Ssl ssl = new Ssl();
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore(keyStore);
 		ssl.setKeyStorePassword("secret");
 		ssl.setKeyPassword("password");
 		ssl.setCiphers(new String[] { "ALPHA", "BRAVO", "CHARLIE" });
@@ -261,9 +264,10 @@ void destroyCalledWithoutStart() {
 	}
 
 	@Test
-	void sslEnabledMultiProtocolsConfiguration() {
+	@WithPackageResources("test.jks")
+	void sslEnabledMultiProtocolsConfiguration(@ResourcePath("test.jks") String keyStore) {
 		JettyServletWebServerFactory factory = getFactory();
-		factory.setSsl(getSslSettings("TLSv1.1", "TLSv1.2"));
+		factory.setSsl(getSslSettings(keyStore, "TLSv1.1", "TLSv1.2"));
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		JettyWebServer jettyWebServer = (JettyWebServer) this.webServer;
@@ -274,9 +278,10 @@ void sslEnabledMultiProtocolsConfiguration() {
 	}
 
 	@Test
-	void sslEnabledProtocolsConfiguration() {
+	@WithPackageResources("test.jks")
+	void sslEnabledProtocolsConfiguration(@ResourcePath("test.jks") String keyStore) {
 		JettyServletWebServerFactory factory = getFactory();
-		factory.setSsl(getSslSettings("TLSv1.1"));
+		factory.setSsl(getSslSettings(keyStore, "TLSv1.1"));
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		JettyWebServer jettyWebServer = (JettyWebServer) this.webServer;
@@ -393,9 +398,9 @@ void whenARequestCompletesAfterGracefulShutdownHasBegunThenItHasAConnectionClose
 		assertThat(((HttpResponse) requestResult).getFirstHeader("Connection").getValue()).isEqualTo("close");
 	}
 
-	private Ssl getSslSettings(String... enabledProtocols) {
+	private Ssl getSslSettings(String keyStore, String... enabledProtocols) {
 		Ssl ssl = new Ssl();
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore(keyStore);
 		ssl.setKeyStorePassword("secret");
 		ssl.setKeyPassword("password");
 		ssl.setCiphers(new String[] { "ALPHA", "BRAVO", "CHARLIE" });
@@ -426,6 +431,7 @@ void wrappedHandlers() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void basicSslClasspathKeyStore() throws Exception {
 		testBasicSslWithKeyStore("classpath:test.jks");
 	}
@@ -479,12 +485,13 @@ void specificIPAddressNotReverseResolved() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void specificIPAddressWithSslIsNotReverseResolved() throws Exception {
 		JettyServletWebServerFactory factory = getFactory();
 		InetAddress localhost = InetAddress.getLocalHost();
 		factory.setAddress(InetAddress.getByAddress(localhost.getAddress()));
 		Ssl ssl = new Ssl();
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore("classpath:test.jks");
 		ssl.setKeyStorePassword("secret");
 		ssl.setKeyPassword("password");
 		factory.setSsl(ssl);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java
index aa8ec85690ab..43f2dfb8561c 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java
@@ -30,6 +30,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.OS;
 
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.junit.DisabledOnOs;
 import org.springframework.boot.testsupport.ssl.MockPkcs11Security;
 import org.springframework.boot.testsupport.ssl.MockPkcs11SecurityProvider;
@@ -53,6 +54,7 @@ class SslServerCustomizerTests {
 
 	@Test
 	@SuppressWarnings("rawtypes")
+	@WithPackageResources("test.jks")
 	void whenHttp2IsNotEnabledServerConnectorHasSslAndHttpConnectionFactories() {
 		Server server = createCustomizedServer();
 		assertThat(server.getConnectors()).hasSize(1);
@@ -63,6 +65,7 @@ void whenHttp2IsNotEnabledServerConnectorHasSslAndHttpConnectionFactories() {
 
 	@Test
 	@SuppressWarnings("rawtypes")
+	@WithPackageResources("test.jks")
 	@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
 			disabledReason = "conscrypt doesn't support Linux/macOS aarch64, see https://github.com/google/conscrypt/issues/1051")
 	void whenHttp2IsEnabledServerConnectorsHasSslAlpnH2AndHttpConnectionFactories() {
@@ -77,6 +80,7 @@ void whenHttp2IsEnabledServerConnectorsHasSslAlpnH2AndHttpConnectionFactories()
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
 			disabledReason = "conscrypt doesn't support Linux/macOS aarch64, see https://github.com/google/conscrypt/issues/1051")
 	void alpnConnectionFactoryHasNullDefaultProtocolToAllowNegotiationToHttp11() {
@@ -98,11 +102,12 @@ void configureSslWhenSslIsEnabledWithNoKeyStoreAndNotPkcs11ThrowsException() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void configureSslWhenSslIsEnabledWithPkcs11AndKeyStoreThrowsException() {
 		Ssl ssl = new Ssl();
 		ssl.setKeyStoreType("PKCS11");
 		ssl.setKeyStoreProvider(MockPkcs11SecurityProvider.NAME);
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore("classpath:test.jks");
 		ssl.setKeyPassword("password");
 		assertThatIllegalStateException().isThrownBy(() -> {
 			SslServerCustomizer customizer = new SslServerCustomizer(null, null, null, WebServerSslBundle.get(ssl));
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java
index d67008187107..fdd41b0f9af7 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.boot.ssl.pem.PemSslStoreBundle;
 import org.springframework.boot.ssl.pem.PemSslStoreDetails;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactoryTests;
 import org.springframework.boot.web.server.PortInUseException;
@@ -133,12 +134,14 @@ void useForwardedHeaders() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void whenSslIsConfiguredWithAValidAliasARequestSucceeds() {
 		Mono<String> result = testSslWithAlias("test-alias");
 		StepVerifier.create(result).expectNext("Hello World").expectComplete().verify(Duration.ofSeconds(30));
 	}
 
 	@Test
+	@WithPackageResources({ "1.key", "1.crt", "2.key", "2.crt" })
 	void whenSslBundleIsUpdatedThenSslIsReloaded() {
 		DefaultSslBundleRegistry bundles = new DefaultSslBundleRegistry("bundle1", createSslBundle("1.key", "1.crt"));
 		Mono<String> result = testSslWithBundle(bundles, "bundle1");
@@ -231,9 +234,7 @@ protected void addConnector(int port, AbstractReactiveWebServerFactory factory)
 
 	private static SslBundle createSslBundle(String key, String certificate) {
 		return SslBundle.of(new PemSslStoreBundle(
-				new PemSslStoreDetails(null, "classpath:org/springframework/boot/web/embedded/netty/" + certificate,
-						"classpath:org/springframework/boot/web/embedded/netty/" + key),
-				null));
+				new PemSslStoreDetails(null, "classpath:" + certificate, "classpath:" + key), null));
 	}
 
 	static class NoPortNettyReactiveWebServerFactory extends NettyReactiveWebServerFactory {
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java
index 09444ef595c6..f8ff57396d4b 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java
@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.ssl.MockPkcs11Security;
 import org.springframework.boot.testsupport.ssl.MockPkcs11SecurityProvider;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
@@ -71,6 +72,7 @@ void stop() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslCiphersConfiguration() throws Exception {
 		Ssl ssl = new Ssl();
 		ssl.setKeyStore("classpath:test.jks");
@@ -85,10 +87,11 @@ void sslCiphersConfiguration() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslEnabledMultipleProtocolsConfiguration() throws Exception {
 		Ssl ssl = new Ssl();
 		ssl.setKeyPassword("password");
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore("classpath:test.jks");
 		ssl.setEnabledProtocols(new String[] { "TLSv1.1", "TLSv1.2" });
 		ssl.setCiphers(new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "BRAVO" });
 		Connector connector = this.tomcat.getConnector();
@@ -101,10 +104,11 @@ void sslEnabledMultipleProtocolsConfiguration() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslEnabledProtocolsConfiguration() throws Exception {
 		Ssl ssl = new Ssl();
 		ssl.setKeyPassword("password");
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore("classpath:test.jks");
 		ssl.setEnabledProtocols(new String[] { "TLSv1.2" });
 		ssl.setCiphers(new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", "BRAVO" });
 		Connector connector = this.tomcat.getConnector();
@@ -126,11 +130,12 @@ void customizeWhenSslIsEnabledWithNoKeyStoreAndNotPkcs11ThrowsException() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void customizeWhenSslIsEnabledWithPkcs11AndKeyStoreThrowsException() {
 		Ssl ssl = new Ssl();
 		ssl.setKeyStoreType("PKCS11");
 		ssl.setKeyStoreProvider(MockPkcs11SecurityProvider.NAME);
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore("classpath:test.jks");
 		ssl.setKeyPassword("password");
 		assertThatIllegalStateException().isThrownBy(() -> {
 			SslConnectorCustomizer customizer = new SslConnectorCustomizer(this.logger, this.tomcat.getConnector(),
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
index aaa1170c62ff..cdd83d00876a 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,12 +95,20 @@ void contextIsAddedToHostBeforeCustomizersAreCalled() {
 	@Test
 	void defaultTomcatListeners() {
 		TomcatReactiveWebServerFactory factory = getFactory();
-		if (AprLifecycleListener.isAprAvailable()) {
-			assertThat(factory.getContextLifecycleListeners()).singleElement().isInstanceOf(AprLifecycleListener.class);
-		}
-		else {
-			assertThat(factory.getContextLifecycleListeners()).isEmpty();
-		}
+		assertThat(factory.getContextLifecycleListeners()).isEmpty();
+		TomcatWebServer tomcatWebServer = (TomcatWebServer) factory.getWebServer(mock(HttpHandler.class));
+		this.webServer = tomcatWebServer;
+		assertThat(tomcatWebServer.getTomcat().getServer().findLifecycleListeners()).isEmpty();
+	}
+
+	@Test
+	void aprShouldBeOptIn() {
+		TomcatReactiveWebServerFactory factory = getFactory();
+		factory.setUseApr(true);
+		TomcatWebServer tomcatWebServer = (TomcatWebServer) factory.getWebServer(mock(HttpHandler.class));
+		this.webServer = tomcatWebServer;
+		assertThat(tomcatWebServer.getTomcat().getServer().findLifecycleListeners()).singleElement()
+			.isInstanceOf(AprLifecycleListener.class);
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
index 7595f052d69b..39812cee4e44 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,6 +82,7 @@
 import org.mockito.InOrder;
 
 import org.springframework.boot.ssl.DefaultSslBundleRegistry;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.web.server.PortInUseException;
 import org.springframework.boot.web.server.Shutdown;
@@ -149,12 +150,20 @@ void tomcatEngineNames() {
 	@Test
 	void defaultTomcatListeners() {
 		TomcatServletWebServerFactory factory = getFactory();
-		if (AprLifecycleListener.isAprAvailable()) {
-			assertThat(factory.getContextLifecycleListeners()).singleElement().isInstanceOf(AprLifecycleListener.class);
-		}
-		else {
-			assertThat(factory.getContextLifecycleListeners()).isEmpty();
-		}
+		assertThat(factory.getContextLifecycleListeners()).isEmpty();
+		TomcatWebServer tomcatWebServer = (TomcatWebServer) factory.getWebServer();
+		this.webServer = tomcatWebServer;
+		assertThat(tomcatWebServer.getTomcat().getServer().findLifecycleListeners()).isEmpty();
+	}
+
+	@Test
+	void aprShouldBeOptIn() {
+		TomcatServletWebServerFactory factory = getFactory();
+		factory.setUseApr(true);
+		TomcatWebServer tomcatWebServer = (TomcatWebServer) factory.getWebServer();
+		this.webServer = tomcatWebServer;
+		assertThat(tomcatWebServer.getTomcat().getServer().findLifecycleListeners()).singleElement()
+			.isInstanceOf(AprLifecycleListener.class);
 	}
 
 	@Test
@@ -661,12 +670,12 @@ void whenServerIsShuttingDownARequestOnAnIdleConnectionResultsInConnectionReset(
 	}
 
 	@Test
+	@WithPackageResources({ "1.crt", "1.key", "2.crt", "2.key" })
 	void shouldUpdateSslWhenReloadingSslBundles() throws Exception {
 		TomcatServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
 		DefaultSslBundleRegistry bundles = new DefaultSslBundleRegistry("test",
-				createPemSslBundle("classpath:org/springframework/boot/web/embedded/tomcat/1.crt",
-						"classpath:org/springframework/boot/web/embedded/tomcat/1.key"));
+				createPemSslBundle("classpath:1.crt", "classpath:1.key"));
 		factory.setSslBundles(bundles);
 		factory.setSsl(Ssl.forBundle("test"));
 		this.webServer = factory.getWebServer();
@@ -678,18 +687,18 @@ void shouldUpdateSslWhenReloadingSslBundles() throws Exception {
 		assertThat(getResponse(getLocalUrl("https", "/test.txt"), requestFactory)).isEqualTo("test");
 		assertThat(verifier.getLastPrincipal()).isEqualTo("CN=1");
 		requestFactory = createHttpComponentsRequestFactory(tlsSocketStrategy);
-		bundles.updateBundle("test", createPemSslBundle("classpath:org/springframework/boot/web/embedded/tomcat/2.crt",
-				"classpath:org/springframework/boot/web/embedded/tomcat/2.key"));
+		bundles.updateBundle("test", createPemSslBundle("classpath:2.crt", "classpath:2.key"));
 		assertThat(getResponse(getLocalUrl("https", "/test.txt"), requestFactory)).isEqualTo("test");
 		assertThat(verifier.getLastPrincipal()).isEqualTo("CN=2");
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslWithHttp11Nio2Protocol() throws Exception {
 		TomcatServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
 		factory.setProtocol(Http11Nio2Protocol.class.getName());
-		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks"));
+		factory.setSsl(getSsl(null, "password", "classpath:test.jks"));
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		HttpComponentsClientHttpRequestFactory requestFactory = createHttpComponentsRequestFactory(
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
index e74c4a742dcd..9e6ee42be138 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
@@ -48,6 +48,7 @@
 import org.junit.jupiter.api.condition.JRE;
 import org.mockito.InOrder;
 
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.web.servlet.ExampleServlet;
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.GracefulShutdownResult;
@@ -57,6 +58,7 @@
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactoryTests;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -156,6 +158,7 @@ void deploymentInfo() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void basicSslClasspathKeyStore() throws Exception {
 		testBasicSslWithKeyStore("classpath:test.jks");
 	}
@@ -288,6 +291,7 @@ protected void addConnector(int port, AbstractServletWebServerFactory factory) {
 	}
 
 	@Test
+	@WithPackageResources("restricted.jks")
 	void sslRestrictedProtocolsEmptyCipherFailure() {
 		assertThatIOException()
 			.isThrownBy(() -> testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.2" },
@@ -296,6 +300,7 @@ void sslRestrictedProtocolsEmptyCipherFailure() {
 	}
 
 	@Test
+	@WithPackageResources("restricted.jks")
 	void sslRestrictedProtocolsECDHETLS1Failure() {
 		assertThatIOException()
 			.isThrownBy(() -> testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1" },
@@ -304,12 +309,14 @@ void sslRestrictedProtocolsECDHETLS1Failure() {
 	}
 
 	@Test
+	@WithPackageResources("restricted.jks")
 	void sslRestrictedProtocolsECDHESuccess() throws Exception {
 		testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.2" },
 				new String[] { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" });
 	}
 
 	@Test
+	@WithPackageResources("restricted.jks")
 	@DisabledForJreRange(min = JRE.JAVA_24)
 	void sslRestrictedProtocolsRSATLS12Success() throws Exception {
 		testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.2" },
@@ -317,6 +324,7 @@ void sslRestrictedProtocolsRSATLS12Success() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("restricted.jks")
 	void sslRestrictedProtocolsRSATLS11Failure() {
 		assertThatIOException()
 			.isThrownBy(() -> testRestrictedSSLProtocolsAndCipherSuites(new String[] { "TLSv1.1" },
@@ -377,4 +385,14 @@ protected String startedLogMessage() {
 		return ((UndertowServletWebServer) this.webServer).getStartLogMessage();
 	}
 
+	private void testRestrictedSSLProtocolsAndCipherSuites(String[] protocols, String[] ciphers) throws Exception {
+		AbstractServletWebServerFactory factory = getFactory();
+		factory.setSsl(getSsl(null, "password", "classpath:restricted.jks", null, protocols, ciphers));
+		this.webServer = factory.getWebServer(new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
+		this.webServer.start();
+		HttpComponentsClientHttpRequestFactory requestFactory = createHttpComponentsRequestFactory(
+				createTrustSelfSignedTlsSocketStrategy());
+		assertThat(getResponse(getLocalUrl("https", "/hello"), requestFactory)).contains("scheme=https");
+	}
+
 }
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java
index 1c91af3fe14b..01809b3bfb01 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContextTests.java
@@ -44,6 +44,7 @@
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.BDDMockito.then;
 import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 
 /**
@@ -148,7 +149,7 @@ void whenContextRefreshFailedThenWebServerStopFailedCatchStopException() {
 			.withStackTraceContaining("WebServer has failed to stop");
 		WebServer webServer = this.context.getWebServer();
 		then(webServer).should().stop();
-		then(webServer).should(times(0)).destroy();
+		then(webServer).should(never()).destroy();
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java
index a64f17b00149..0868b81a33be 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.support.GenericApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,8 +33,6 @@
  */
 class MustacheViewResolverTests {
 
-	private final String prefix = "classpath:/" + getClass().getPackage().getName().replace(".", "/") + "/";
-
 	private final MustacheViewResolver resolver = new MustacheViewResolver();
 
 	@BeforeEach
@@ -41,7 +40,7 @@ void init() {
 		GenericApplicationContext applicationContext = new GenericApplicationContext();
 		applicationContext.refresh();
 		this.resolver.setApplicationContext(applicationContext);
-		this.resolver.setPrefix(this.prefix);
+		this.resolver.setPrefix("classpath:");
 		this.resolver.setSuffix(".html");
 	}
 
@@ -51,6 +50,7 @@ void resolveNonExistent() {
 	}
 
 	@Test
+	@WithResource(name = "template.html", content = "Hello {{World}}")
 	void resolveExisting() {
 		assertThat(this.resolver.resolveViewName("template", null).block(Duration.ofSeconds(30))).isNotNull();
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
index 2431bf79bc39..485f2403fca9 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.junit.jupiter.api.Test;
 import reactor.test.StepVerifier;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
@@ -38,17 +39,15 @@
  */
 class MustacheViewTests {
 
-	private final String templateUrl = "classpath:/" + getClass().getPackage().getName().replace(".", "/")
-			+ "/template.html";
-
 	private final StaticApplicationContext context = new StaticApplicationContext();
 
 	@Test
+	@WithResource(name = "template.html", content = "Hello {{World}}")
 	void viewResolvesHandlebars() {
 		MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get("/test").build());
 		MustacheView view = new MustacheView();
 		view.setCompiler(Mustache.compiler());
-		view.setUrl(this.templateUrl);
+		view.setUrl("classpath:template.html");
 		view.setCharset(StandardCharsets.UTF_8.displayName());
 		view.setApplicationContext(this.context);
 		view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML, exchange)
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
index 7a0f48fd229f..96be488e3242 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.web.reactive.server;
 
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -55,12 +54,15 @@
 import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
 import reactor.test.StepVerifier;
 
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.web.server.Compression;
 import org.springframework.boot.web.server.GracefulShutdownResult;
 import org.springframework.boot.web.server.Http2;
 import org.springframework.boot.web.server.Shutdown;
 import org.springframework.boot.web.server.Ssl;
 import org.springframework.boot.web.server.WebServer;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
@@ -166,13 +168,15 @@ void portIsMinusOneWhenConnectionIsClosed() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void basicSslFromClassPath() {
 		testBasicSslWithKeyStore("classpath:test.jks", "password");
 	}
 
 	@Test
-	void basicSslFromFileSystem() {
-		testBasicSslWithKeyStore("src/test/resources/test.jks", "password");
+	@WithPackageResources("test.jks")
+	void basicSslFromFileSystem(@ResourcePath("test.jks") String keyStore) {
+		testBasicSslWithKeyStore(keyStore, "password");
 
 	}
 
@@ -200,6 +204,7 @@ protected final void testBasicSslWithKeyStore(String keyStore, String keyPasswor
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslWithValidAlias() {
 		String keyStore = "classpath:test.jks";
 		String keyPassword = "password";
@@ -229,6 +234,7 @@ void sslWithValidAlias() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslWithInvalidAliasFailsDuringStartup() {
 		String keyStore = "classpath:test.jks";
 		String keyPassword = "password";
@@ -255,6 +261,7 @@ protected ReactorClientHttpConnector buildTrustAllSslConnector() {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslWantsClientAuthenticationSucceedsWithClientCertificate() throws Exception {
 		Ssl ssl = new Ssl();
 		ssl.setClientAuth(Ssl.ClientAuth.WANT);
@@ -266,6 +273,7 @@ void sslWantsClientAuthenticationSucceedsWithClientCertificate() throws Exceptio
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslWantsClientAuthenticationSucceedsWithoutClientCertificate() {
 		Ssl ssl = new Ssl();
 		ssl.setClientAuth(Ssl.ClientAuth.WANT);
@@ -276,10 +284,10 @@ void sslWantsClientAuthenticationSucceedsWithoutClientCertificate() {
 		testClientAuthSuccess(ssl, buildTrustAllSslConnector());
 	}
 
-	protected ReactorClientHttpConnector buildTrustAllSslWithClientKeyConnector(String keyStoreFile,
+	protected ReactorClientHttpConnector buildTrustAllSslWithClientKeyConnector(String keyStore,
 			String keyStorePassword) throws Exception {
 		KeyStore clientKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-		try (InputStream stream = new FileInputStream("src/test/resources/" + keyStoreFile)) {
+		try (InputStream stream = new ClassPathResource(keyStore).getInputStream()) {
 			clientKeyStore.load(stream, "secret".toCharArray());
 		}
 		KeyManagerFactory clientKeyManagerFactory = KeyManagerFactory
@@ -313,6 +321,7 @@ protected void testClientAuthSuccess(Ssl sslConfiguration, ReactorClientHttpConn
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslNeedsClientAuthenticationSucceedsWithClientCertificate() throws Exception {
 		Ssl ssl = new Ssl();
 		ssl.setClientAuth(Ssl.ClientAuth.NEED);
@@ -324,6 +333,7 @@ void sslNeedsClientAuthenticationSucceedsWithClientCertificate() throws Exceptio
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslNeedsClientAuthenticationFailsWithoutClientCertificate() {
 		Ssl ssl = new Ssl();
 		ssl.setClientAuth(Ssl.ClientAuth.NEED);
@@ -335,6 +345,7 @@ void sslNeedsClientAuthenticationFailsWithoutClientCertificate() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem", "test.p12" })
 	void sslWithPemCertificates() throws Exception {
 		Ssl ssl = new Ssl();
 		ssl.setClientAuth(Ssl.ClientAuth.NEED);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/WebServerSslBundleTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/WebServerSslBundleTests.java
index 5ed64b09109d..d8efdb30f849 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/WebServerSslBundleTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/WebServerSslBundleTests.java
@@ -22,6 +22,8 @@
 import org.springframework.boot.ssl.SslBundleKey;
 import org.springframework.boot.ssl.SslOptions;
 import org.springframework.boot.ssl.SslStoreBundle;
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.ssl.MockPkcs11Security;
 import org.springframework.boot.testsupport.ssl.MockPkcs11SecurityProvider;
 
@@ -47,6 +49,7 @@ void whenSslDisabledThrowsException() {
 	}
 
 	@Test
+	@WithPackageResources("test.p12")
 	void whenFromJksProperties() {
 		Ssl ssl = new Ssl();
 		ssl.setKeyStore("classpath:test.p12");
@@ -77,11 +80,12 @@ void whenFromJksProperties() {
 	}
 
 	@Test
-	void whenFromJksPropertiesWithPkcs11StoreType() {
+	@WithPackageResources("test.jks")
+	void whenFromJksPropertiesWithPkcs11StoreType(@ResourcePath("test.jks") String keyStorePath) {
 		Ssl ssl = new Ssl();
 		ssl.setKeyStoreType("PKCS11");
 		ssl.setKeyStoreProvider(MockPkcs11SecurityProvider.NAME);
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore(keyStorePath);
 		ssl.setKeyPassword("password");
 		ssl.setClientAuth(Ssl.ClientAuth.NONE);
 		assertThatIllegalStateException().isThrownBy(() -> WebServerSslBundle.get(ssl))
@@ -108,6 +112,7 @@ void whenFromPkcs11Properties() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem", "test-cert-chain.pem" })
 	void whenFromPemProperties() {
 		Ssl ssl = new Ssl();
 		ssl.setCertificate("classpath:test-cert.pem");
@@ -135,6 +140,7 @@ void whenFromPemProperties() {
 	}
 
 	@Test
+	@WithPackageResources({ "test-cert.pem", "test-key.pem", "test.p12" })
 	void whenPemKeyStoreAndJksTrustStoreProperties() {
 		Ssl ssl = new Ssl();
 		ssl.setCertificate("classpath:test-cert.pem");
@@ -163,6 +169,7 @@ void whenPemKeyStoreAndJksTrustStoreProperties() {
 	}
 
 	@Test
+	@WithPackageResources({ "test.p12", "test-cert-chain.pem" })
 	void whenJksKeyStoreAndPemTrustStoreProperties() {
 		Ssl ssl = new Ssl();
 		ssl.setKeyStore("classpath:test.p12");
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java
index d474256bf607..9b78cc1fe64b 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java
@@ -86,6 +86,7 @@
 import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.withSettings;
 
@@ -236,7 +237,7 @@ void whenContextRefreshFailedThenWebServerStopFailedCatchStopException() {
 			.withStackTraceContaining("WebServer has failed to stop");
 		WebServer webServer = this.context.getWebServer();
 		then(webServer).should().stop();
-		then(webServer).should(times(0)).destroy();
+		then(webServer).should(never()).destroy();
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
index 24d04bdb3be1..ac717b24fa8b 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
 import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -86,6 +87,7 @@ void undertow() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "conf.properties", content = "context=/example")
 	void advancedConfig() throws Exception {
 		this.context = new AnnotationConfigServletWebServerApplicationContext(AdvancedConfig.class);
 		doTest(this.context, "/example/spring/hello");
@@ -161,7 +163,7 @@ HelloWorldController helloWorldController() {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableWebMvc
-	@PropertySource("classpath:/org/springframework/boot/web/servlet/context/conf.properties")
+	@PropertySource("classpath:conf.properties")
 	static class AdvancedConfig {
 
 		private final Environment env;
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
index 6bf32b920832..49b1340069b2 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -124,6 +124,8 @@
 import org.springframework.boot.ssl.pem.PemSslStoreDetails;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.boot.system.ApplicationTemp;
+import org.springframework.boot.testsupport.classpath.resources.ResourcePath;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.boot.testsupport.system.CapturedOutput;
 import org.springframework.boot.testsupport.system.OutputCaptureExtension;
 import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
@@ -167,7 +169,7 @@
 import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.never;
 
 /**
  * Base for testing classes that extends {@link AbstractServletWebServerFactory}.
@@ -429,16 +431,19 @@ void errorPageFromPutRequest() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void basicSslFromClassPath() throws Exception {
 		testBasicSslWithKeyStore("classpath:test.jks");
 	}
 
 	@Test
-	void basicSslFromFileSystem() throws Exception {
-		testBasicSslWithKeyStore("src/test/resources/test.jks");
+	@WithPackageResources("test.jks")
+	void basicSslFromFileSystem(@ResourcePath("test.jks") String keyStore) throws Exception {
+		testBasicSslWithKeyStore(keyStore);
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslDisabled() throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		Ssl ssl = getSsl(null, "password", "classpath:test.jks");
@@ -453,9 +458,10 @@ void sslDisabled() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslGetScheme() throws Exception { // gh-2232
 		AbstractServletWebServerFactory factory = getFactory();
-		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks"));
+		factory.setSsl(getSsl(null, "password", "classpath:test.jks"));
 		this.webServer = factory.getWebServer(new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.webServer.start();
 		HttpComponentsClientHttpRequestFactory requestFactory = createHttpComponentsRequestFactory(
@@ -464,9 +470,10 @@ void sslGetScheme() throws Exception { // gh-2232
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslKeyAlias() throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
-		Ssl ssl = getSsl(null, "password", "test-alias", "src/test/resources/test.jks");
+		Ssl ssl = getSsl(null, "password", "test-alias", "classpath:test.jks");
 		factory.setSsl(ssl);
 		ServletRegistrationBean<ExampleServlet> registration = new ServletRegistrationBean<>(
 				new ExampleServlet(true, false), "/hello");
@@ -484,9 +491,10 @@ void sslKeyAlias() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslWithInvalidAliasFailsDuringStartup() {
 		AbstractServletWebServerFactory factory = getFactory();
-		Ssl ssl = getSsl(null, "password", "test-alias-404", "src/test/resources/test.jks");
+		Ssl ssl = getSsl(null, "password", "test-alias-404", "classpath:test.jks");
 		factory.setSsl(ssl);
 		ServletRegistrationBean<ExampleServlet> registration = new ServletRegistrationBean<>(
 				new ExampleServlet(true, false), "/hello");
@@ -500,9 +508,10 @@ protected void assertThatSslWithInvalidAliasCallFails(ThrowingCallable call) {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void serverHeaderIsDisabledByDefaultWhenUsingSsl() throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
-		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks"));
+		factory.setSsl(getSsl(null, "password", "classpath:test.jks"));
 		this.webServer = factory.getWebServer(new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.webServer.start();
 		PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
@@ -515,10 +524,11 @@ void serverHeaderIsDisabledByDefaultWhenUsingSsl() throws Exception {
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void serverHeaderCanBeCustomizedWhenUsingSsl() throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		factory.setServerHeader("MyServer");
-		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks"));
+		factory.setSsl(getSsl(null, "password", "classpath:test.jks"));
 		this.webServer = factory.getWebServer(new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.webServer.start();
 		PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
@@ -542,14 +552,15 @@ protected final void testBasicSslWithKeyStore(String keyStore) throws Exception
 	}
 
 	@Test
-	void pkcs12KeyStoreAndTrustStore() throws Exception {
+	@WithPackageResources("test.p12")
+	void pkcs12KeyStoreAndTrustStore(@ResourcePath("test.p12") File keyStoreFile) throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
 		factory.setSsl(getSsl(ClientAuth.NEED, null, "classpath:test.p12", "classpath:test.p12", null, null));
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		KeyStore keyStore = KeyStore.getInstance("pkcs12");
-		loadStore(keyStore, new FileSystemResource("src/test/resources/test.p12"));
+		loadStore(keyStore, new FileSystemResource(keyStoreFile));
 		SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustSelfSignedStrategy())
 			.loadKeyMaterial(keyStore, "secret".toCharArray())
 			.build();
@@ -559,14 +570,15 @@ void pkcs12KeyStoreAndTrustStore() throws Exception {
 	}
 
 	@Test
-	void pemKeyStoreAndTrustStore() throws Exception {
+	@WithPackageResources({ "test.p12", "test-cert.pem", "test-key.pem" })
+	void pemKeyStoreAndTrustStore(@ResourcePath("test.p12") File keyStoreFile) throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
 		factory.setSsl(getSsl("classpath:test-cert.pem", "classpath:test-key.pem"));
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		KeyStore keyStore = KeyStore.getInstance("pkcs12");
-		loadStore(keyStore, new FileSystemResource("src/test/resources/test.p12"));
+		loadStore(keyStore, new FileSystemResource(keyStoreFile));
 		SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustSelfSignedStrategy())
 			.loadKeyMaterial(keyStore, "secret".toCharArray())
 			.build();
@@ -576,7 +588,8 @@ void pemKeyStoreAndTrustStore() throws Exception {
 	}
 
 	@Test
-	void pkcs12KeyStoreAndTrustStoreFromBundle() throws Exception {
+	@WithPackageResources("test.p12")
+	void pkcs12KeyStoreAndTrustStoreFromBundle(@ResourcePath("test.p12") File keyStoreFile) throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
 		factory.setSsl(Ssl.forBundle("test"));
@@ -585,7 +598,7 @@ void pkcs12KeyStoreAndTrustStoreFromBundle() throws Exception {
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		KeyStore keyStore = KeyStore.getInstance("pkcs12");
-		loadStore(keyStore, new FileSystemResource("src/test/resources/test.p12"));
+		loadStore(keyStore, new FileSystemResource(keyStoreFile));
 		SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustSelfSignedStrategy())
 			.loadKeyMaterial(keyStore, "secret".toCharArray())
 			.build();
@@ -595,7 +608,8 @@ void pkcs12KeyStoreAndTrustStoreFromBundle() throws Exception {
 	}
 
 	@Test
-	void pemKeyStoreAndTrustStoreFromBundle() throws Exception {
+	@WithPackageResources({ "test.p12", "test-cert.pem", "test-key.pem" })
+	void pemKeyStoreAndTrustStoreFromBundle(@ResourcePath("test.p12") File keyStoreFile) throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
 		factory.setSsl(Ssl.forBundle("test"));
@@ -604,7 +618,7 @@ void pemKeyStoreAndTrustStoreFromBundle() throws Exception {
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		KeyStore keyStore = KeyStore.getInstance("pkcs12");
-		loadStore(keyStore, new FileSystemResource("src/test/resources/test.p12"));
+		loadStore(keyStore, new FileSystemResource(keyStoreFile));
 		SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustSelfSignedStrategy())
 			.loadKeyMaterial(keyStore, "secret".toCharArray())
 			.build();
@@ -614,7 +628,9 @@ void pemKeyStoreAndTrustStoreFromBundle() throws Exception {
 	}
 
 	@Test
-	void sslNeedsClientAuthenticationSucceedsWithClientCertificate() throws Exception {
+	@WithPackageResources("test.jks")
+	void sslNeedsClientAuthenticationSucceedsWithClientCertificate(@ResourcePath("test.jks") File keyStoreFile)
+			throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		factory.setRegisterDefaultServlet(true);
 		addTestTxtFile(factory);
@@ -622,7 +638,7 @@ void sslNeedsClientAuthenticationSucceedsWithClientCertificate() throws Exceptio
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-		loadStore(keyStore, new FileSystemResource("src/test/resources/test.jks"));
+		loadStore(keyStore, new FileSystemResource(keyStoreFile));
 		SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustSelfSignedStrategy())
 			.loadKeyMaterial(keyStore, "password".toCharArray())
 			.build();
@@ -632,6 +648,7 @@ void sslNeedsClientAuthenticationSucceedsWithClientCertificate() throws Exceptio
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslNeedsClientAuthenticationFailsWithoutClientCertificate() throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
@@ -645,7 +662,9 @@ void sslNeedsClientAuthenticationFailsWithoutClientCertificate() throws Exceptio
 	}
 
 	@Test
-	void sslWantsClientAuthenticationSucceedsWithClientCertificate() throws Exception {
+	@WithPackageResources("test.jks")
+	void sslWantsClientAuthenticationSucceedsWithClientCertificate(@ResourcePath("test.jks") File keyStoreFile)
+			throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
 		factory
@@ -653,7 +672,7 @@ void sslWantsClientAuthenticationSucceedsWithClientCertificate() throws Exceptio
 		this.webServer = factory.getWebServer();
 		this.webServer.start();
 		KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-		loadStore(keyStore, new FileSystemResource("src/test/resources/test.jks"));
+		loadStore(keyStore, new FileSystemResource(keyStoreFile));
 		SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustSelfSignedStrategy())
 			.loadKeyMaterial(keyStore, "password".toCharArray())
 			.build();
@@ -663,6 +682,7 @@ void sslWantsClientAuthenticationSucceedsWithClientCertificate() throws Exceptio
 	}
 
 	@Test
+	@WithPackageResources("test.jks")
 	void sslWantsClientAuthenticationSucceedsWithoutClientCertificate() throws Exception {
 		AbstractServletWebServerFactory factory = getFactory();
 		addTestTxtFile(factory);
@@ -700,7 +720,7 @@ protected Ssl getSsl(ClientAuth clientAuth, String keyPassword, String keyAlias,
 		return getSsl(clientAuth, keyPassword, keyAlias, keyStore, null, null, null);
 	}
 
-	private Ssl getSsl(ClientAuth clientAuth, String keyPassword, String keyStore, String trustStore,
+	protected Ssl getSsl(ClientAuth clientAuth, String keyPassword, String keyStore, String trustStore,
 			String[] supportedProtocols, String[] ciphers) {
 		return getSsl(clientAuth, keyPassword, null, keyStore, trustStore, supportedProtocols, ciphers);
 	}
@@ -761,16 +781,6 @@ protected SslBundle createPemSslBundle(String cert, String privateKey) {
 		return SslBundle.of(stores);
 	}
 
-	protected void testRestrictedSSLProtocolsAndCipherSuites(String[] protocols, String[] ciphers) throws Exception {
-		AbstractServletWebServerFactory factory = getFactory();
-		factory.setSsl(getSsl(null, "password", "src/test/resources/restricted.jks", null, protocols, ciphers));
-		this.webServer = factory.getWebServer(new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
-		this.webServer.start();
-		HttpComponentsClientHttpRequestFactory requestFactory = createHttpComponentsRequestFactory(
-				createTrustSelfSignedTlsSocketStrategy());
-		assertThat(getResponse(getLocalUrl("https", "/hello"), requestFactory)).contains("scheme=https");
-	}
-
 	protected HttpComponentsClientHttpRequestFactory createHttpComponentsRequestFactory(
 			TlsSocketStrategy tlsSocketStrategy) {
 		PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
@@ -944,7 +954,7 @@ protected void sslSessionTracking() {
 		AbstractServletWebServerFactory factory = getFactory();
 		Ssl ssl = new Ssl();
 		ssl.setEnabled(true);
-		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setKeyStore("src/test/resources/org/springframework/boot/web/server/test.jks");
 		ssl.setKeyPassword("password");
 		factory.setSsl(ssl);
 		factory.getSession().setTrackingModes(EnumSet.of(SessionTrackingMode.SSL));
@@ -1183,7 +1193,7 @@ protected void servletContextListenerContextDestroyedIsNotCalledWhenContainerIsS
 		this.webServer = getFactory().getWebServer((servletContext) -> servletContext.addListener(listener));
 		this.webServer.start();
 		this.webServer.stop();
-		then(listener).should(times(0)).contextDestroyed(any(ServletContextEvent.class));
+		then(listener).should(never()).contextDestroyed(any(ServletContextEvent.class));
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java
index ba3e9c8d40ff..050de81ad363 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.servlet.View;
@@ -33,8 +34,6 @@
  */
 class MustacheViewResolverTests {
 
-	private final String prefix = "classpath:/" + getClass().getPackage().getName().replace(".", "/") + "/";
-
 	private final MustacheViewResolver resolver = new MustacheViewResolver();
 
 	@BeforeEach
@@ -43,7 +42,7 @@ void init() {
 		applicationContext.refresh();
 		this.resolver.setApplicationContext(applicationContext);
 		this.resolver.setServletContext(new MockServletContext());
-		this.resolver.setPrefix(this.prefix);
+		this.resolver.setPrefix("classpath:");
 		this.resolver.setSuffix(".html");
 	}
 
@@ -53,11 +52,13 @@ void resolveNonExistent() throws Exception {
 	}
 
 	@Test
+	@WithResource(name = "template.html", content = "Hello {{World}}")
 	void resolveExisting() throws Exception {
 		assertThat(this.resolver.resolveViewName("template", null)).isNotNull();
 	}
 
 	@Test
+	@WithResource(name = "template.html", content = "Hello {{World}}")
 	void setsContentType() throws Exception {
 		this.resolver.setContentType("application/octet-stream");
 		View view = this.resolver.resolveViewName("template", null);
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
index ee266a60f84c..e5acdd254a5c 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -37,9 +38,6 @@
  */
 class MustacheViewTests {
 
-	private final String templateUrl = "classpath:/" + getClass().getPackage().getName().replace(".", "/")
-			+ "/template.html";
-
 	private final MockHttpServletRequest request = new MockHttpServletRequest();
 
 	private final MockHttpServletResponse response = new MockHttpServletResponse();
@@ -55,10 +53,11 @@ void init() {
 	}
 
 	@Test
+	@WithResource(name = "template.html", content = "Hello {{World}}")
 	void viewResolvesHandlebars() throws Exception {
 		MustacheView view = new MustacheView();
 		view.setCompiler(Mustache.compiler());
-		view.setUrl(this.templateUrl);
+		view.setUrl("classpath:template.html");
 		view.setApplicationContext(this.context);
 		view.render(Collections.singletonMap("World", "Spring"), this.request, this.response);
 		assertThat(this.response.getContentAsString().trim()).isEqualTo("Hello Spring");
diff --git a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring-test-protocol-resolvers.factories b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring-test-protocol-resolvers.factories
deleted file mode 100644
index 79239c637bff..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring-test-protocol-resolvers.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.core.io.ProtocolResolver=\
-org.springframework.boot.io.ReverseStringProtocolResolver
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories
deleted file mode 100644
index 0ab92a3d7b83..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,13 +0,0 @@
-org.springframework.boot.env.PropertySourceLoader=\
-org.springframework.boot.context.config.TestPropertySourceLoader1,\
-org.springframework.boot.context.config.TestPropertySourceLoader2
-
-org.springframework.boot.context.config.ConfigDataLocationResolver=\
-org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorIntegrationTests.LocationResolver,\
-org.springframework.boot.context.config.TestConfigDataBootstrap.LocationResolver,\
-org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.LocationResolver
-
-org.springframework.boot.context.config.ConfigDataLoader=\
-org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorIntegrationTests.Loader,\
-org.springframework.boot.context.config.TestConfigDataBootstrap.Loader,\
-org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessorImportCombinedWithProfileSpecificIntegrationTests.Loader
diff --git a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring/org.springframework.boot.context.annotation.ImportCandidatesTests$TestAnnotation.imports b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring/org.springframework.boot.context.annotation.ImportCandidatesTests$TestAnnotation.imports
deleted file mode 100644
index 8274f7c72c5c..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring/org.springframework.boot.context.annotation.ImportCandidatesTests$TestAnnotation.imports
+++ /dev/null
@@ -1,6 +0,0 @@
-# A comment spanning a complete line
-class1
-
-class2 # with comment at the end
-  # Comment with some whitespace in front
-class3
diff --git a/spring-boot-project/spring-boot/src/test/resources/a-file b/spring-boot-project/spring-boot/src/test/resources/a-file
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot/src/test/resources/ansi.properties b/spring-boot-project/spring-boot/src/test/resources/ansi.properties
deleted file mode 100644
index d99e75a60b97..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/ansi.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.output.ansi.enabled=never
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-activate-on-profile-in-profile-specific-file-test.properties b/spring-boot-project/spring-boot/src/test/resources/application-activate-on-profile-in-profile-specific-file-test.properties
deleted file mode 100644
index 36e382cb6cdf..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-activate-on-profile-in-profile-specific-file-test.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-test1=test1
-#---
-spring.config.activate.on-profile=other
-test2=test2
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-activate-on-profile-in-profile-specific-file.properties b/spring-boot-project/spring-boot/src/test/resources/application-activate-on-profile-in-profile-specific-file.properties
deleted file mode 100644
index d7ec8875c8cd..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-activate-on-profile-in-profile-specific-file.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.active=test,other
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-bootstrap-registry-integration-tests.properties b/spring-boot-project/spring-boot/src/test/resources/application-bootstrap-registry-integration-tests.properties
deleted file mode 100644
index 6fe0d5673ad2..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-bootstrap-registry-integration-tests.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-spring.config.import=testbootstrap:test
-spring.profiles.active=test
-myprop=igotbound
-#---
-spring.config.activate.on-profile=test
-myprofileprop=igotprofilebound
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-customdefault.properties b/spring-boot-project/spring-boot/src/test/resources/application-customdefault.properties
deleted file mode 100644
index 899e25633bb5..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-customdefault.properties
+++ /dev/null
@@ -1 +0,0 @@
-customdefault=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-dev.properties b/spring-boot-project/spring-boot/src/test/resources/application-dev.properties
deleted file mode 100644
index 14634a49e75e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-dev.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.property=fromdevpropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-imported.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-imported.properties
deleted file mode 100644
index e80c76a43997..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-imported.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.value=iwasimported
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-document.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-document.properties
deleted file mode 100644
index 556143a77205..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-document.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-my.import=application-import-with-placeholder-imported
-#---
-spring.config.import=classpath:${my.import}.properties
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-document-imported.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-document-imported.properties
deleted file mode 100644
index 3864e4a45335..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-document-imported.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.value=application-import-with-placeholder-in-earlier-document-imported
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-document.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-document.properties
deleted file mode 100644
index feee42ed7202..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-document.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-my.import=application-import-with-placeholder-in-earlier-document-imported
-#---
-my.value=should-be-ignored
-spring.config.activate.on-profile=missing
-#---
-spring.config.import=classpath:${my.import}.properties
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-profile-document-imported.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-profile-document-imported.properties
deleted file mode 100644
index 96b8574a861b..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-profile-document-imported.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.value=application-import-with-placeholder-in-earlier-profile-document-imported
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-profile-document.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-profile-document.properties
deleted file mode 100644
index ced93c8d9f7e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-earlier-profile-document.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-my.value=application-import-with-placeholder-in-earlier-profile-document
-#---
-my.import=application-import-with-placeholder-in-earlier-profile-document-imported
-spring.config.activate.on-profile=missing
-#---
-spring.config.import=classpath:${my.import}.properties
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-profile-document.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-profile-document.properties
deleted file mode 100644
index 890f961e5f16..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder-in-profile-document.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-my.import=application-import-with-placeholder-imported
-#---
-spring.config.import=classpath:${my.import}.properties
-#---
-my.import=badbadbad
-spring.config.activate.on-profile=missing
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder.properties
deleted file mode 100644
index de35cff62404..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-placeholder.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-my.import=application-import-with-placeholder-imported
-spring.config.import=classpath:${my.import}.properties
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-and-direct-profile-import-dev.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-and-direct-profile-import-dev.properties
deleted file mode 100644
index 0ee51673facf..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-and-direct-profile-import-dev.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.config.import=classpath:application-import-with-profile-variant-imported-dev.properties
-my.value=application-import-with-profile-variant-and-direct-profile-import-dev
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-and-direct-profile-import.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-and-direct-profile-import.properties
deleted file mode 100644
index 3bde4a37706a..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-and-direct-profile-import.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.config.import=classpath:application-import-with-profile-variant-imported.properties
-my.value=application-import-with-profile-variant-and-direct-profile-import
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-dev.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-dev.properties
deleted file mode 100644
index 2fab0529571c..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-dev.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.value=application-import-with-profile-variant-dev
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-imported-dev.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-imported-dev.properties
deleted file mode 100644
index 358d119e620a..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-imported-dev.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.value=application-import-with-profile-variant-imported-dev
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-imported.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-imported.properties
deleted file mode 100644
index 7627d37b4b5e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant-imported.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.value=application-import-with-profile-variant-imported
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant.properties b/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant.properties
deleted file mode 100644
index d2354c3974ed..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-import-with-profile-variant.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.config.import=classpath:application-import-with-profile-variant-imported.properties
-my.value=application-import-with-profile-variant
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties
deleted file mode 100644
index 646513a9ce6f..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-spring.profiles.active=p1
-spring.profiles.include=p2
-#---
-spring.config.activate.on-profile=p2
-spring.profiles.include=p3
-
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties
deleted file mode 100644
index 70251f9e7f05..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.include=p2
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties
deleted file mode 100644
index f841722a2f15..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.active=test
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-list-in-profile-specific-file-test.yml b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-list-in-profile-specific-file-test.yml
deleted file mode 100644
index b6f2fc555807..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-list-in-profile-specific-file-test.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
-  profiles:
-    include:
-    - p
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-with-placeholder.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-with-placeholder.properties
deleted file mode 100644
index e1baa5d408a4..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-with-placeholder.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-spring.profiles.active=p1
-spring.profiles.include=p2
-#---
-myprofile=p4
-spring.profiles.include=p3,${myprofile}
-#---
-myotherprofile=p5
-spring.profiles.include=${myotherprofile}
-
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles.properties
deleted file mode 100644
index c20ed9ad301e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-spring.profiles.active=p1
-spring.profiles.include=p2
-#---
-spring.profiles.include=p3,p4
-#---
-spring.profiles.include=p5
-
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-includeprofile.properties b/spring-boot-project/spring-boot/src/test/resources/application-includeprofile.properties
deleted file mode 100644
index 213a72823c17..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-includeprofile.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.include=specific
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-node.properties b/spring-boot-project/spring-boot/src/test/resources/application-node.properties
deleted file mode 100644
index 292bb08658cb..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-node.properties
+++ /dev/null
@@ -1 +0,0 @@
-bar: spam
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-other.properties b/spring-boot-project/spring-boot/src/test/resources/application-other.properties
deleted file mode 100644
index 34cfee2a78b7..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-other.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.property=fromotherpropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-custom-import-p1.properties b/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-custom-import-p1.properties
deleted file mode 100644
index 0457702de8db..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-custom-import-p1.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.config.import:test:boot
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-custom-import.properties b/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-custom-import.properties
deleted file mode 100644
index 692617a8946d..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-custom-import.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.active=p1,p2
-
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import-p1.properties b/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import-p1.properties
deleted file mode 100644
index c9ad018fd9f4..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import-p1.properties
+++ /dev/null
@@ -1 +0,0 @@
-application-profile-specific-import-with-import-import-p1=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import-p2.properties b/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import-p2.properties
deleted file mode 100644
index e72f2f191d51..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import-p2.properties
+++ /dev/null
@@ -1 +0,0 @@
-application-profile-specific-import-with-import-import-p2=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import.properties b/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import.properties
deleted file mode 100644
index e92241ad1edd..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-import.properties
+++ /dev/null
@@ -1 +0,0 @@
-application-profile-specific-import-with-import-import=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-p1.properties b/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-p1.properties
deleted file mode 100644
index 836dcc3f5eee..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import-p1.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-application-profile-specific-import-with-import-p1=true
-spring.config.import=application-profile-specific-import-with-import-import.properties
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import.properties b/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import.properties
deleted file mode 100644
index 4b94ad9212ab..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-profile-specific-import-with-import.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.active=p1,p2
-application-profile-specific-import-with-import=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-props-no-extension b/spring-boot-project/spring-boot/src/test/resources/application-props-no-extension
deleted file mode 100644
index b3efe414930f..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-props-no-extension
+++ /dev/null
@@ -1 +0,0 @@
-withnotext=test
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml b/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml
deleted file mode 100644
index 1556b9eca165..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml
+++ /dev/null
@@ -1 +0,0 @@
-spring.main.web-application-type: reactive
diff --git a/spring-boot-project/spring-boot/src/test/resources/application.custom b/spring-boot-project/spring-boot/src/test/resources/application.custom
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot/src/test/resources/application.properties b/spring-boot-project/spring-boot/src/test/resources/application.properties
deleted file mode 100644
index 2325ace12061..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-foo: bucket
-value: 1234
-my.property: fromapplicationproperties
-sample.app.test.prop: *
-my.placeholder: ${my.fallback}
-duplicate=properties
diff --git a/spring-boot-project/spring-boot/src/test/resources/application.yml b/spring-boot-project/spring-boot/src/test/resources/application.yml
deleted file mode 100644
index 74fe76ca7cea..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/application.yml
+++ /dev/null
@@ -1 +0,0 @@
-duplicate: yaml
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/banner-utf8.txt b/spring-boot-project/spring-boot/src/test/resources/banner-utf8.txt
deleted file mode 100644
index f3077be2fc5e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/banner-utf8.txt
+++ /dev/null
@@ -1 +0,0 @@
-😍 Spring Boot! 😍
diff --git a/spring-boot-project/spring-boot/src/test/resources/bindtoapplication.properties b/spring-boot-project/spring-boot/src/test/resources/bindtoapplication.properties
deleted file mode 100644
index 33406d213f83..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/bindtoapplication.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.main.banner-mode=off
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/..hidden/testproperties.properties b/spring-boot-project/spring-boot/src/test/resources/config/..hidden/testproperties.properties
deleted file mode 100644
index 1537a17cf26f..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/..hidden/testproperties.properties
+++ /dev/null
@@ -1 +0,0 @@
-fourth.property=shouldbehidden
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/0-empty/testproperties.properties b/spring-boot-project/spring-boot/src/test/resources/config/0-empty/testproperties.properties
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/1-first/testproperties.properties b/spring-boot-project/spring-boot/src/test/resources/config/1-first/testproperties.properties
deleted file mode 100644
index 1c97e4c41267..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/1-first/testproperties.properties
+++ /dev/null
@@ -1 +0,0 @@
-first.property=apple
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/2-second/testproperties.properties b/spring-boot-project/spring-boot/src/test/resources/config/2-second/testproperties.properties
deleted file mode 100644
index a568eac54e05..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/2-second/testproperties.properties
+++ /dev/null
@@ -1 +0,0 @@
-second.property=ball
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile-p1.properties b/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile-p1.properties
deleted file mode 100644
index ffbd719314e1..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile-p1.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-config-file-in-root-and-config-with-profile-p1=true
-v1=config-file-in-root-and-config-with-profile-p1
-#v2 intentionally missing
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile-p2.properties b/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile-p2.properties
deleted file mode 100644
index 5ead8d0cd908..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile-p2.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-config-file-in-root-and-config-with-profile-p2=true
-v1=config-file-in-root-and-config-with-profile-p2
-#v2 intentionally missing
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile.properties b/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile.properties
deleted file mode 100644
index 556c851a5f22..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/file-in-root-and-config-with-profile.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-config-file-in-root-and-config-with-profile=true
-v1=config-file-in-root-and-config-with-profile
-v2=config-file-in-root-and-config-with-profile
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/nested/3-third/testproperties.properties b/spring-boot-project/spring-boot/src/test/resources/config/nested/3-third/testproperties.properties
deleted file mode 100644
index d00e7f0a62f7..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/nested/3-third/testproperties.properties
+++ /dev/null
@@ -1 +0,0 @@
-third.property=shouldnotbefound
diff --git a/spring-boot-project/spring-boot/src/test/resources/config/specific.properties b/spring-boot-project/spring-boot/src/test/resources/config/specific.properties
deleted file mode 100644
index 744e563a5af2..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/config/specific.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.property=specific
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/customprofile-customdefault.properties b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/customprofile-customdefault.properties
deleted file mode 100644
index 0888bcc45919..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/customprofile-customdefault.properties
+++ /dev/null
@@ -1 +0,0 @@
-customprofile-customdefault=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/customprofile.properties b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/customprofile.properties
deleted file mode 100644
index 4e2652099958..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/customprofile.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.active=customdefault
-customprofile=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testnegatedprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testnegatedprofiles.yml
deleted file mode 100644
index bf25b22a21f0..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testnegatedprofiles.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-my:
-  property: fromyamlfile
-  other: notempty
----
-spring.config.activate.on-profile: dev
-my:
-  property: fromdevprofile
----
-spring.config.activate.on-profile: other
-my:
-  property: fromotherprofile
----
-spring.config.activate.on-profile: "!other"
-my:
-  property: fromnototherprofile
-  notother: foo
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofileexpression.yml b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofileexpression.yml
deleted file mode 100644
index c212cc0c9b5b..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofileexpression.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-my:
-  property: fromyamlfile
----
-spring.config.activate.on-profile: dev & other
-my:
-  property: devandother
----
-spring.config.activate.on-profile: (dev | other) & another
-my:
-  property: devorotherandanother
----
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofiles.yml
deleted file mode 100644
index 98a993ef7659..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofiles.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-my:
-  property: fromyamlfile
-  other: notempty
----
-spring.config.activate.on-profile: dev
-my:
-  property: fromdevprofile
-dev:
-  property: devproperty
----
-spring.config.activate.on-profile: other
-my:
-  property: fromotherprofile
----
-spring.config.activate.on-profile: prod
-spring.config.import: file:./non-existent.yml
-
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofilesdocument.yml b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofilesdocument.yml
deleted file mode 100644
index 159f728f9b30..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofilesdocument.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-my:
-  property: fromyamlfile
-  other: notempty
----
-spring.config.activate.on-profile: thedefault
-my:
-  property: fromdefaultprofile
----
-spring.config.activate.on-profile: other
-my:
-  property: fromotherprofile
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofilesempty.yml b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofilesempty.yml
deleted file mode 100644
index be357f780e76..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testprofilesempty.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-my:
-  property: fromyamlfile
-  other: notempty
----
-spring.config.activate.on-profile:
-my:
-  property: fromemptyprofile
----
-spring.config.activate.on-profile: other
-my:
-  property: fromotherprofile
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testsetprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testsetprofiles.yml
deleted file mode 100644
index 260670becfe6..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/profiles/testsetprofiles.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-spring:
-  profiles:
-    active: dev
-my:
-  property: fromyamlfile
----
-spring.config.activate.on-profile: dev
-my:
-  property: fromdevprofile
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/properties/application-dev.properties b/spring-boot-project/spring-boot/src/test/resources/configdata/properties/application-dev.properties
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/properties/application.other b/spring-boot-project/spring-boot/src/test/resources/configdata/properties/application.other
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/properties/application.properties b/spring-boot-project/spring-boot/src/test/resources/configdata/properties/application.properties
deleted file mode 100644
index c9f0304f65e5..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/properties/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-foo=bar
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/properties/other.properties b/spring-boot-project/spring-boot/src/test/resources/configdata/properties/other.properties
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot/src/test/resources/configdata/yaml/application.yml b/spring-boot-project/spring-boot/src/test/resources/configdata/yaml/application.yml
deleted file mode 100644
index b93638efd6c5..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configdata/yaml/application.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-foo: bar
----
-hello: world
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/configimportwithprofilespecific-prod.properties b/spring-boot-project/spring-boot/src/test/resources/configimportwithprofilespecific-prod.properties
deleted file mode 100644
index 6b16e80391cb..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configimportwithprofilespecific-prod.properties
+++ /dev/null
@@ -1 +0,0 @@
-prop=fromprofilefile
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/configimportwithprofilespecific.properties b/spring-boot-project/spring-boot/src/test/resources/configimportwithprofilespecific.properties
deleted file mode 100644
index de523ae42dd5..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/configimportwithprofilespecific.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.config.import=icwps:
-prop=fromfile
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/custom-config/application.yml b/spring-boot-project/spring-boot/src/test/resources/custom-config/application.yml
deleted file mode 100644
index bb56b055142c..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/custom-config/application.yml
+++ /dev/null
@@ -1 +0,0 @@
-hello: world
diff --git a/spring-boot-project/spring-boot/src/test/resources/custom-console-log-pattern.xml b/spring-boot-project/spring-boot/src/test/resources/custom-console-log-pattern.xml
deleted file mode 100644
index 60fd81a46466..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/custom-console-log-pattern.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
-	<property name="CONSOLE_LOG_PATTERN" value="foo" />
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/custom-file-log-pattern-with-fileNamePattern.xml b/spring-boot-project/spring-boot/src/test/resources/custom-file-log-pattern-with-fileNamePattern.xml
deleted file mode 100644
index 1ae820bc92de..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/custom-file-log-pattern-with-fileNamePattern.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
-	<property name="LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN" value="my.log.%d{yyyyMMdd}.%i.gz"/>
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/custom-file-log-pattern.xml b/spring-boot-project/spring-boot/src/test/resources/custom-file-log-pattern.xml
deleted file mode 100644
index b94a60abfdf5..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/custom-file-log-pattern.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
-	<property name="FILE_LOG_PATTERN" value="bar" />
-	<include resource="org/springframework/boot/logging/logback/base.xml" />
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/custom-location.yml b/spring-boot-project/spring-boot/src/test/resources/custom-location.yml
deleted file mode 100644
index 69a696159948..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/custom-location.yml
+++ /dev/null
@@ -1 +0,0 @@
-foo: ${fooValue}
diff --git a/spring-boot-project/spring-boot/src/test/resources/customapplication.yml b/spring-boot-project/spring-boot/src/test/resources/customapplication.yml
deleted file mode 100644
index 9bda1a4411aa..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/customapplication.yml
+++ /dev/null
@@ -1 +0,0 @@
-yamlkey: yamlvalue
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/customprofile-customdefault.properties b/spring-boot-project/spring-boot/src/test/resources/customprofile-customdefault.properties
deleted file mode 100644
index 4770be45e42f..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/customprofile-customdefault.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.include=specific
-customprofile-customdefault=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/customprofile-specific.properties b/spring-boot-project/spring-boot/src/test/resources/customprofile-specific.properties
deleted file mode 100644
index cc4c955469b3..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/customprofile-specific.properties
+++ /dev/null
@@ -1 +0,0 @@
-customprofile-specific=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/customprofile.properties b/spring-boot-project/spring-boot/src/test/resources/customprofile.properties
deleted file mode 100644
index 4e2652099958..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/customprofile.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.active=customdefault
-customprofile=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/data.sql b/spring-boot-project/spring-boot/src/test/resources/data.sql
deleted file mode 100644
index 06acad8464bd..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/data.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO EXAMPLE VALUES (1, 'Andy');
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/dispatcher.properties b/spring-boot-project/spring-boot/src/test/resources/dispatcher.properties
deleted file mode 100644
index 0ffbf1791fa3..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/dispatcher.properties
+++ /dev/null
@@ -1 +0,0 @@
-main.sources: org.springframework.boot.main.DispatcherMainTests
diff --git a/spring-boot-project/spring-boot/src/test/resources/enableother.properties b/spring-boot-project/spring-boot/src/test/resources/enableother.properties
deleted file mode 100644
index f21b4e998982..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/enableother.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-spring.profiles.active=other
-my.property=fromenableotherpropertiesfile
-one.more=${my.property}
diff --git a/spring-boot-project/spring-boot/src/test/resources/enableprofile-myprofile.properties b/spring-boot-project/spring-boot/src/test/resources/enableprofile-myprofile.properties
deleted file mode 100644
index 88ee464f6753..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/enableprofile-myprofile.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-my.property=fromprofilepropertiesfile
-the.property=fromprofilepropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/enableprofile-other.properties b/spring-boot-project/spring-boot/src/test/resources/enableprofile-other.properties
deleted file mode 100644
index 04e2d9608b52..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/enableprofile-other.properties
+++ /dev/null
@@ -1 +0,0 @@
-other.property=fromotherpropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/enableprofile.properties b/spring-boot-project/spring-boot/src/test/resources/enableprofile.properties
deleted file mode 100644
index 885285226242..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/enableprofile.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-spring.profiles.active=myprofile
-my.property=frompropertiesfile
-the.property=frompropertiesfile
-one.more=${my.property}
diff --git a/spring-boot-project/spring-boot/src/test/resources/enabletwoprofiles.properties b/spring-boot-project/spring-boot/src/test/resources/enabletwoprofiles.properties
deleted file mode 100644
index 90d74d0f4170..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/enabletwoprofiles.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.active=myprofile,another
-my.property=fromtwopropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile-p1.properties b/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile-p1.properties
deleted file mode 100644
index c4de4d2a978d..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile-p1.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-file-in-root-and-config-with-profile-p1=true
-v1=file-in-root-and-config-with-profile-p1
-v2=file-in-root-and-config-with-profile-p1
diff --git a/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile-p2.properties b/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile-p2.properties
deleted file mode 100644
index c60d2dafc39b..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile-p2.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-file-in-root-and-config-with-profile-p2=true
-v1=file-in-root-and-config-with-profile-p2
-v2=file-in-root-and-config-with-profile-p2
diff --git a/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile.properties b/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile.properties
deleted file mode 100644
index b34ddf5169ba..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/file-in-root-and-config-with-profile.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-file-in-root-and-config-with-profile=true
-v1=file-in-root-and-config-with-profile
-v2=file-in-root-and-config-with-profile
diff --git a/spring-boot-project/spring-boot/src/test/resources/gh17001.properties b/spring-boot-project/spring-boot/src/test/resources/gh17001.properties
deleted file mode 100644
index b61799d2cdee..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/gh17001.properties
+++ /dev/null
@@ -1 +0,0 @@
-gh17001loaded=true
diff --git a/spring-boot-project/spring-boot/src/test/resources/invalidproperty.properties b/spring-boot-project/spring-boot/src/test/resources/invalidproperty.properties
deleted file mode 100644
index 4729d6f015ff..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/invalidproperty.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles=a
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/log4j2-nondefault.xml b/spring-boot-project/spring-boot/src/test/resources/log4j2-nondefault.xml
deleted file mode 100644
index ecaa4dc5effc..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/log4j2-nondefault.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-	<Properties>
-		<Property name="PID">????</Property>
-		<Property name="LOG_PATTERN">${sys:LOG_FILE} %d{yyyy-MM-dd HH:mm:ss.SSS}] service%X{context} - ${sys:PID} %5p [%t] --- %c{1}: %m%n</Property>
-	</Properties>
-	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="${LOG_PATTERN}"/>
-		</Console>
-	</Appenders>
-	<Loggers>
-		<Root level="info">
-			<AppenderRef ref="Console"/>
-		</Root>
-	</Loggers>
-</Configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/log4j2-override.xml b/spring-boot-project/spring-boot/src/test/resources/log4j2-override.xml
deleted file mode 100644
index f0cdfa02d2bc..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/log4j2-override.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT" follow="true">
-			<PatternLayout pattern="${LOG_PATTERN}"/>
-		</Console>
-	</Appenders>
-</Configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-broken.xml b/spring-boot-project/spring-boot/src/test/resources/logback-broken.xml
deleted file mode 100644
index 7f8454941cff..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/logback-broken.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<appender name="CONSOLE" class="ch.qos.logback.core.ConsolAppender">
-		<encoder>
-			<pattern>${LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n BOOTBOOT</pattern>
-		</encoder>
-	</appender>
-	<root level="INFO">
-		<appender-ref ref="CONSOLE"/>
-	</root>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-include-base.xml b/spring-boot-project/spring-boot/src/test/resources/logback-include-base.xml
deleted file mode 100644
index b8a41480d7d6..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/logback-include-base.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml b/spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml
deleted file mode 100644
index 0124d8a7e357..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/logback-include-defaults.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>[%p] - %m%n</pattern>
-		</encoder>
-	</appender>
-	<root level="INFO">
-		<appender-ref ref="CONSOLE"/>
-	</root>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-invalid-format.txt b/spring-boot-project/spring-boot/src/test/resources/logback-invalid-format.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml b/spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml
deleted file mode 100644
index 5d1622c51841..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/logback-nondefault.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%property{LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n BOOTBOOT</pattern>
-		</encoder>
-	</appender>
-	<root level="INFO">
-		<appender-ref ref="CONSOLE"/>
-	</root>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml b/spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml
deleted file mode 100644
index 284c547a0b32..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/logback-springprofile-in-root.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%property{LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n BOOTBOOT</pattern>
-		</encoder>
-	</appender>
-	<root level="INFO">
-		<springProfile name="profile">
-			<appender-ref ref="CONSOLE"/>
-		</springProfile>
-	</root>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logback-without-extension b/spring-boot-project/spring-boot/src/test/resources/logback-without-extension
deleted file mode 100644
index 1d55bbaf83fb..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/logback-without-extension
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%msg</pattern>
-		</encoder>
-	</appender>
-	<root level="INFO">
-		<appender-ref ref="CONSOLE"/>
-	</root>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/logging-nondefault.properties b/spring-boot-project/spring-boot/src/test/resources/logging-nondefault.properties
deleted file mode 100644
index d4f6d6970b5e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/logging-nondefault.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-handlers = java.util.logging.ConsoleHandler
-.level = INFO
diff --git a/spring-boot-project/spring-boot/src/test/resources/moreproperties.properties b/spring-boot-project/spring-boot/src/test/resources/moreproperties.properties
deleted file mode 100644
index d72233548bda..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/moreproperties.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-my.property=frommorepropertiesfile
-the.property=frommorepropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/animated.gif b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/animated.gif
deleted file mode 100644
index 104a96af5168..000000000000
Binary files a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/animated.gif and /dev/null differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/black-and-white.gif b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/black-and-white.gif
deleted file mode 100644
index 745fd2538481..000000000000
Binary files a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/black-and-white.gif and /dev/null differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/colors.gif b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/colors.gif
deleted file mode 100644
index d6e00226bfbb..000000000000
Binary files a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/colors.gif and /dev/null differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyAddsImportedSourceToEnvironment.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyAddsImportedSourceToEnvironment.properties
deleted file mode 100644
index d5578cf52922..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyAddsImportedSourceToEnvironment.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring=boot
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributors.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributors.properties
deleted file mode 100644
index f841722a2f15..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributors.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.active=test
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributorsWhenNoProfilesActive.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributorsWhenNoProfilesActive.properties
deleted file mode 100644
index 74bc31f180a7..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyDoesNotSetProfilesFromIgnoreProfilesContributorsWhenNoProfilesActive.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring=boot
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyMovesDefaultProperySourceToLast.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyMovesDefaultProperySourceToLast.properties
deleted file mode 100644
index 74bc31f180a7..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyMovesDefaultProperySourceToLast.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring=boot
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyOnlyAddsActiveContributors.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyOnlyAddsActiveContributors.properties
deleted file mode 100644
index 149c06dae63b..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyOnlyAddsActiveContributors.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-spring=boot
-#---
-spring.config.activate.on-profile=missing
-other=value
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsActiveProfiles.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsActiveProfiles.properties
deleted file mode 100644
index d0e7d24f2372..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsActiveProfiles.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.active=one,two,three
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsActiveProfilesAndProfileGroups.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsActiveProfilesAndProfileGroups.properties
deleted file mode 100644
index 74de2859947d..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsActiveProfilesAndProfileGroups.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-spring.profiles.active=one,two,three
-spring.profiles.group.one=four,five
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsDefaultProfiles.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsDefaultProfiles.properties
deleted file mode 100644
index 5aee84d320eb..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplySetsDefaultProfiles.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.default=one,two,three
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyWhenHasListenerCallsOnPropertySourceAdded.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyWhenHasListenerCallsOnPropertySourceAdded.properties
deleted file mode 100644
index 74bc31f180a7..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyWhenHasListenerCallsOnPropertySourceAdded.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring=boot
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyWhenHasListenerCallsOnSetProfiles.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyWhenHasListenerCallsOnSetProfiles.properties
deleted file mode 100644
index d0e7d24f2372..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/ConfigDataEnvironmentTests-processAndApplyWhenHasListenerCallsOnSetProfiles.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.active=one,two,three
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/separate-class-loader-spring.factories b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/separate-class-loader-spring.factories
deleted file mode 100644
index b2d2d3181f3b..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/config/separate-class-loader-spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.context.config.ConfigDataLoader=\
-org.springframework.boot.context.config.ConfigDataEnvironmentTests.SeparateClassLoaderConfigDataLoader
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/properties/bind/convert/resource.txt b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/properties/bind/convert/resource.txt
deleted file mode 100644
index 9daeafb9864c..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/properties/bind/convert/resource.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/properties/testProperties.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/properties/testProperties.xml
deleted file mode 100644
index b7dc32185af7..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/context/properties/testProperties.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean
-		id="org.springframework.boot.context.properties.ConfigurationPropertiesTests$BasicProperties"
-		class="org.springframework.boot.context.properties.ConfigurationPropertiesTests$BasicProperties">
-		<property name="name" value="bar"/>
-	</bean>
-
-</beans>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/diagnostics/analyzer/nounique/consumer.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/diagnostics/analyzer/nounique/consumer.xml
deleted file mode 100644
index cf74f72245c0..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/diagnostics/analyzer/nounique/consumer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean class="org.springframework.boot.diagnostics.analyzer.nounique.TestBeanConsumer"/>
-
-</beans>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/diagnostics/analyzer/nounique/producer.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/diagnostics/analyzer/nounique/producer.xml
deleted file mode 100644
index f1f3de4abb6a..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/diagnostics/analyzer/nounique/producer.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean class="org.springframework.boot.diagnostics.analyzer.nounique.TestBean" name="xmlTestBean"/>
-
-</beans>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/anchors.yml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/anchors.yml
deleted file mode 100644
index 302131220c7e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/anchors.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-some:
-  path: &anchor
-    config:
-      key: value
-  anotherpath:
-    <<: *anchor
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/existing-non-multi-document.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/existing-non-multi-document.properties
deleted file mode 100644
index faab368e3723..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/existing-non-multi-document.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#---
-# Test
-#---
-
-spring=boot
-
-#---
-# Test
-
-boot=bar
-
-
-# Test
-#---
-
-bar=ok
-
-!---
-! Test
-!---
-
-ok=well
-
-!---
-! Test
-
-well=hello
-
-! Test
-!---
-
-hello=world
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties-2.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties-2.properties
deleted file mode 100644
index 5f49e461d1c5..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties-2.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#---
-#test
-blah=hello world
-bar=baz
-hello=world
-#---
-foo=bar
-bling=biz
-#comment1
-#comment2
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties-empty.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties-empty.properties
deleted file mode 100644
index 4605cdfbe6c0..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties-empty.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#---
-#test
-blah=hello world
-bar=baz
-hello=world
-#---
-#---
-foo=bar
-bling=biz
-#comment1
-#comment2
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties.properties
deleted file mode 100644
index 9f2d4f84ee0f..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/multi-document-properties.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#test
-blah=hello world
-bar=baz
-hello=world
-#---
-foo=bar
-bling=biz
-#comment1
-#comment2
-#---
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/recursive.yml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/recursive.yml
deleted file mode 100644
index 3d4ca7d18268..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/recursive.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-&def1
-*def1: a
-test:
-  a: 
-    spring: 'a'
-  b: 
-    boot: 'b'
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-empty-yaml.yml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-empty-yaml.yml
deleted file mode 100644
index 783019e76188..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-empty-yaml.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
----
- 
----
----
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties-malformed-unicode.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties-malformed-unicode.properties
deleted file mode 100644
index 8a9e59229936..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties-malformed-unicode.properties
+++ /dev/null
@@ -1 +0,0 @@
-test-malformed-unicode=properties\u(026test
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml
deleted file mode 100644
index 5d3350e81fbe..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-xml.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-	<entry key="test">xml</entry>
-</properties>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml
deleted file mode 100644
index 61c902e2becb..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-yaml.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# https://docs.ansible.com/ansible/latest/reference_appendices/YAMLSyntax.html
-
-name: Martin D'vloper
-job: Developer
-skill: Elite
-employed: True
-foods:
-    - Apple
-    - Orange
-    - Strawberry
-    - Mango
-languages:
-    perl: Elite
-    python: Elite
-    pascal: Lame
-education: |
-    4 GCSEs
-    3 A-Levels
-    BSc in the Internet of Things
-example:
-    foo:
-      - name: springboot
-        url: https://springboot.example.com/
-        bar:
-          - bar1: baz
-          - bar2: bling
-empty: ""
-null-value: null
-emptylist: []
-emptymap: {}
----
-
-spring:
-  profiles: development
-name: Test Name
-
----
-
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/foobar.txt b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/foobar.txt
deleted file mode 100644
index 67d8e4dbe09d..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/foobar.txt
+++ /dev/null
@@ -1 +0,0 @@
-Foo Bar
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/gradient.gif b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/gradient.gif
deleted file mode 100644
index 607269f21f9b..000000000000
Binary files a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/gradient.gif and /dev/null differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/http/client/test.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/test.jks
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/http/client/test.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/test-expired.p12 b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/info/test-expired.p12
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/test-expired.p12
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/info/test-expired.p12
diff --git a/spring-boot-project/spring-boot/src/test/resources/test-not-yet-valid.p12 b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/info/test-not-yet-valid.p12
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/test-not-yet-valid.p12
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/info/test-not-yet-valid.p12
diff --git a/spring-boot-project/spring-boot/src/test/resources/test.p12 b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/info/test.p12
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/test.p12
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/info/test.p12
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/large.gif b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/large.gif
deleted file mode 100644
index e1ebd0c86ed5..000000000000
Binary files a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/large.gif and /dev/null differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/multi-profile-names.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/multi-profile-names.xml
deleted file mode 100644
index 535f4a7ae24b..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/multi-profile-names.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-	<SpringProfile name="production, test">
-		<Loggers>
-			<Logger name="org.springframework.boot.logging.log4j2" level="TRACE" />
-		</Loggers>
-	</SpringProfile>
-</Configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/production-profile.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/production-profile.xml
deleted file mode 100644
index f0c3309f875c..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/production-profile.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-	<SpringProfile name="production">
-		<Loggers>
-			<Logger name="org.springframework.boot.logging.log4j2" level="TRACE" />
-		</Loggers>
-	</SpringProfile>
-</Configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/profile-expression.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/profile-expression.xml
deleted file mode 100644
index 25d07059818d..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/log4j2/profile-expression.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-	<SpringProfile name="production | test">
-		<Loggers>
-			<Logger name="org.springframework.boot.logging.log4j2" level="TRACE" />
-		</Loggers>
-	</SpringProfile>
-</Configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml
deleted file mode 100644
index 231de8f580ae..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<included>
-	<springProfile name="production">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
-	</springProfile>
-</included>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml
deleted file mode 100644
index 74f08edcb49e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<included>
-	<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test"/>
-</included>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml
deleted file mode 100644
index 4f785c163a02..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/multi-profile-names.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<springProfile name="production, test">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
-	</springProfile>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml
deleted file mode 100644
index 247229cc0055..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/nested.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<springProfile name="outer">
-		<springProfile name="inner">
-			<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
-		</springProfile>
-	</springProfile>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/production-profile.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/production-profile.xml
deleted file mode 100644
index bb3c8aae3cba..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/production-profile.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<springProfile name="production">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
-	</springProfile>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-expression.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-expression.xml
deleted file mode 100644
index c11d7f9f6599..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-expression.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<springProfile name="production | test">
-		<logger name="org.springframework.boot.logging.logback" level="TRACE"/>
-	</springProfile>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml
deleted file mode 100644
index a03c5d926883..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<include resource="org/springframework/boot/logging/logback/include-with-profile.xml"/>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-default-value.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-default-value.xml
deleted file mode 100644
index 5fcf44025c48..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-default-value.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar" defaultValue="foo"/>
-	<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="bar"/>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-if.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-if.xml
deleted file mode 100644
index 92bb19cd9e7b..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-if.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<springProperty scope="context" name="MINE" source="my.example-property"/>
-	<if condition='property("MINE").contains("true")'>
-		<then>
-			<variable scope="context" name="MYCHECK" value="i-was-included"/>
-		</then>
-	</if>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml
deleted file mode 100644
index f367385c99e3..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<include resource="org/springframework/boot/logging/logback/include-with-property.xml"/>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml
deleted file mode 100644
index a574d13df7b2..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<include resource="org/springframework/boot/logging/logback/base.xml"/>
-	<springProperty scope="context" name="SIMPLE" source="testpropertyfoobar"/>
-	<springProperty scope="context" name="MINE" source="my.example-property"/>
-</configuration>
diff --git a/spring-boot-project/spring-boot/src/test/resources/test-cert.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-cert.pem
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/test-cert.pem
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-cert.pem
diff --git a/spring-boot-project/spring-boot/src/test/resources/test-key.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-key.pem
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/test-key.pem
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test-key.pem
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/rsocket/netty/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-beans.groovy b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-beans.groovy
deleted file mode 100644
index c867cc14b307..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-beans.groovy
+++ /dev/null
@@ -1,5 +0,0 @@
-import org.springframework.boot.sampleconfig.MyComponent;
-
-beans {
-	myGroovyComponent(MyComponent) {}
-}
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-beans.xml b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-beans.xml
deleted file mode 100644
index f66853848fe0..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-beans.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-				http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
-
-	<bean id="myXmlComponent" class="org.springframework.boot.sampleconfig.MyComponent"/>
-</beans>
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-namespace.groovy b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-namespace.groovy
deleted file mode 100644
index 5404d2f80ca7..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/sample-namespace.groovy
+++ /dev/null
@@ -1,7 +0,0 @@
-import org.springframework.boot.sampleconfig.MyComponent;
-
-beans {
-	xmlns([ctx:'http://www.springframework.org/schema/context'])
-	ctx.'component-scan'('base-package':'nonexistent')
-	myGroovyComponent(MyComponent) {}
-}
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/jks/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/jks/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/jks/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/jks/test.p12 b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/jks/test.p12
new file mode 100644
index 000000000000..e1255f26f665
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/jks/test.p12 differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/dsa.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/dsa.key
new file mode 100644
index 000000000000..93a9ee56e4f2
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/dsa.key
@@ -0,0 +1,21 @@
+-----BEGIN PRIVATE KEY-----
+MIIDXQIBADCCAzYGByqGSM44BAEwggMpAoIBgQC1d6MOqEDLxjfjz1v7Vg44bBBX
+VOoNdWhvJPl9NL2Js57UmYGrTqFit2VCLxbS5FVLyOZ25S0myQRsEtKyi4V9+ELI
+0q3oQplm+l3tZqKjtO69ZlbzYSl9IG1254/FCwBnBTuN7Vl6A2vryIhY7cL4E053
+Yy0xqfP7swPgMYNBqjc9c53hNHKiseQJ8Q2wFKZqm13xgqnBqmWbm7yNmzKJbjMW
+Zt3/WpJdjqfRnjSljFOkYPPBkGRUIKHcZ9fw4odVov2vblGzXwR+sFeE3lcF50WN
+uppjszMXlqR4y937CUSFbCabatRHEcPTq/FxioERCrCdx3AKOfwAquahtvWb9V7A
+47FlibDDeybh5jCH0j9HSjhjSiDZdadSgGKFynPNlVAlOETZKGqkeqAZZ+dsPkVO
+n8tx+VXZJF00YSe1HLKJUWXaT1tEGF6vw/dXhhQVir4j63fN2tZdhTOW1ao/J/iT
+VYEQQjYeMKKuZQveBKRBlpAjhmjOztbE8VL4O/cCHQCxPXlCpORbfOMEEGU0hbEE
+HsxFHMXHCnURCJxVAoIBgQCBqsk+z57UndC1Ut6u19wILXs7UBgLo0ivId2QHtm5
+kY77P9/lNOyCIQkBnULbJ36lHm6yxLZ8imyC5Lc7wlFJpJ6PpiTJ3nPi3fzhbftB
+2KCJVSwB3XfkjvyyS8bfwwqyrmce9el+AIFJuWPrFSkjNthq7U5vU5a+uNT9XZrs
+EaDbjkjVJXRX1oDS3IfWXWpb9i/LOE9HU+NfDKfydasWASvwNX1F5BKXD0AH9adj
+9Q7b0p4DVTh+UPWLBk9/e6gsA5HaRI1urAMNxs5Xnmd8UYF1I+AmjQ9Mi63Pa0YW
+QjpdH2hoOQGLemQ/72woFVzLaHWBcTuSwjREilaAA5M8CWq4rpuA79MrcHgzSp2C
+W1gtZa2/3SymcJ7Py2PHbncod8gR9dxHWVO07ccOXUG0iL9m4MzQ27uVvTh8Nrma
+M+JET778E2FaAkAIT34eNMC6Yk2IDrxU9L66FFx3+3n0cOeWaJxIWrIQ6uWk+uIH
+VzPsZAQU/V0/QBABlHuSj1cEHgIcYTbB5VrbIgust0jVvQCnlF4b1V0qz2iDJt6o
+sA==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/file.txt b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/file.txt
new file mode 100644
index 000000000000..cd13893fe1e5
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/file.txt
@@ -0,0 +1 @@
+Text file to test parsing failures with invalid input
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/dsa.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/dsa.key
new file mode 100644
index 000000000000..a30fec06f820
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/dsa.key
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBuwIBAAKBgQCDX+Ux7y7dkfCnQgRIXzAlFrG8uPxwFdC8J4FJNrAurnjL//PV
+8LEHBDVbyPjHaoNbH8Pfc2pJnOzndWZVf0nqBd4Q/Tz9w/pJ9g6E8HOh+rzU3eK5
+mF0rezcMbJsot2Vdx6XrTztDKi2GY0etKNV399DYtepIYA6v5ovuYAOjLwIVAPyb
+9zR+UjyCkBwESDm9dpzKsGp1AoGAS2vtTiO7/MT8cJwo4mxYtiJnV5R2mk1JJOTe
+4AFPgmnce/YbBzU2JwL9J9HGewDkmxudW0zoxZVeNw4dRua6oB5STV8XciW8vSo6
+mdDBJFoBW9/DUscRP4j2aRfkXGlYuiEF6ZT8g6pPHZG7pLviihMAWNRVLmBt38wa
+8FA9aZECgYADbfwh7OhSE1J0WRaEk/4Usos5Oi6fhUyqr2u34Ereug9Gt4tkhePa
+b3y31i2PQfsatpR+4VpBC6zpPgHQYpuqlqDRWJCd+Cxo9751nOiA3xYVxNoiwIn/
+WxoUkC8Jv8kYFAJRceXkF/auVh77MUoruAmoT2lGE6zP6ngP2q6jFwIVAJMF5kZ+
+AUZbUBUpZaPuZ15RL8GF
+-----END DSA PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/rsa-aes-256-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/rsa-aes-256-cbc.key
new file mode 100644
index 000000000000..4053ed5f6e98
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/rsa-aes-256-cbc.key
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,2036BA8802B364C6BE415A48E1AC9966
+
+0euP/daGIbl798XGc2Tc6u6NmnCl8C6hE0a2grO+wbvFEa13IT4hNVNTzqahfLb8
+STF9LXdvPbz9HybyWnG8KNm5sqsSY1omsHQI38khhwuhpHuWfjb62TqWobwrAmAU
+qh2+kjc7upzW48axJLRQ69vfE4zKczZ4Sqv8qImPz9SiXPeaXinHf/wKfgXZZOvr
+6A8nCykLglVrFbrZWydqKrTM9w/LTXsn0gNpDmrfZERDgWnabKnjYidHkXdgAoFy
+ulsBjKvj2hJFtnJHTkCPXj6XAj18cwUWsN7inFJR5wqjIWXuLqfv/fNbK9lPzjAk
+vMTEVWwynekvXFsSvnHAyEJfmRCNF6DOE+5VwjEROCFq8xceK4fz4T3BHC7XSgis
+2ofBZwjCAJ0pP6SdRpbbZ0wlXH09wqDDTZ2vWD6bEG7hO9VuP/aO76MIWydLa78z
+bDb2R6MnYKmYEInPzwfU4H66Z3/cz8orfYLlnF55DRd4rO+fJm6Y/XY14ac3x0S+
+P67s5e0WbdImagUsOxGNBjgOr84lwmtk/LoVd5nKho8JyQw3V7tiyrsKsM1lAXdS
+TaJXKRnN6LbgC8d+Tgfjc/qMUdVqLlN8zATIa6E4sc861DDiJsneXuFm43pHc/ja
+0sxSifBKgLGenj8xY5ANEfrYnXKrzaQemUnMzd+zan6OS02I+e8WTQevESt1j0D8
+7mgLJ9W2SfNNfiEd5OKar21lLNOc3POaFn7M73zL/gyhTROipPR3fpV+08k27UKl
+nzGhFtRwQieXl34QjM0JrHokKKfv8FsAJsbrGnz2/wcm6jJGmrj5VVsogMKc90v4
+ZTM44NAKymM0UTuIp/rKb/UUVYDpl9VWDegWh2+XKX8io31ENrDMcvQTJ/mzNCuZ
+SINrAeMbVD6W5L0i7THEt32YsDmbFsBaEJBlNXlUNBa/NCK0pjwAn5AYOFUvEqBC
+oZUEleUMU6Q3TKI287o37euw3No6jo5VdPULlrwHsZAjmq9EUvRCgMoIEPdxv5XG
+a4PljE7DQLlk6G9d+gjRzClLFfkadSTbtH9o2011RtWUKP4dcRuSOcBm64xVIO6J
+rhe38sE3yzHvLUM/mvLsEM8B0AHl85nrEstlbBzftXMo2CAJ2Gs9c61PYfft+xiT
+pRdHx4HB1P+kfHa96ayvAytOexHih2iVKVG5CchOr5tbWmkhXVE5cZAKzvczDYFd
+YvniHNiqt6LO8EbJOzz+Yxessmd0zBXj/rjxTMdGwaRjiFI0BIguYpvmGoMS8+bp
+spRj2DMtqjNZz68BEEfgKQwDHPCTblYSR+3Uw4sja608sflqQ8rTmOwbfta3SNS8
+Kq/zzWfYzarQ8hAk5n/H1Jm6AQdvcptyMjuF8FAiMnvt8xDCBRMD3xY2BHb/tcs9
+dBWBxhb76CKIrV3pzm9gGhhZ32Ndq9KmmE+bWCYyvrLxvPJxODfM7X5XamPmG5SH
+wEKSbp0wPF0b6vyxt5M72OYnU8UnxYWu6PlbVvczfWEu9fIw/oIN/kDT/QUojTyt
+wBgzVSTSNFaDtVXJw10IWQgsgWdNY5XueHKH060P5g+14woxU8i3TboNd+tC3hRl
+-----END RSA PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/rsa.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/rsa.key
new file mode 100644
index 000000000000..cf847bcbac64
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs1/rsa.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKAIBAAKCAgEA1zZsVLbl+bOl2QlFZ5R5hbJrR5u+G3Ddd/f25JWwno9tfRik
++39KrIHJKwxq/TH1d0WjfOuvFBz5Ucnh86NOSnffz7kxLgP8QcjQkwuVTjDj4lTp
+sJpi/U1npAZ6Eu1/KeC3R2u8qqvYG3U3G6cQYw5Y+0wHf5EYlIvKfx5oVEEf67pz
+7q2TffqoOV7PQHyHt+/BKFJI1ehj8W/2uQJJ9UTmGvixAYLZ6gHLmtEUj1cBZUb1
+5X/lVbbsiL8B2prbuPoJWYcppH8L2cqSq4JP43Y2VR3CtrQH9MBbLxBfPVnzuD1j
+X1J++xMMN7NCRpBNI/xoJNxvxO+3RgNbkhz4f8WhJbuCwaoNJStytq2fcqOfT3t7
+lW10Gj67joMJZtIsW7JPquFGW6RNq7YqMCJ9ML8Vv9B9UJcUEeE+a+IX6epJBQK6
+1KC6TIe4SB+xl1Vu1xosuAyvni2H7QDjbiZvE8WX2apKk7fv81Epi+9J5Dn4zMpk
+Z5GG1/itA+rZSCWCs8c3lbGq0olZMsXNNhbNZOqiih3yeaMw/B/3v/XMn98rliMl
+C8VOX92eKKBJTX/CjMuSU48mxNE8lQJaDcfld9JE6ndmiZWe7BpXEF8wYtL/NObI
+xZXfcLDsEHopPpU9gaRDZmtL2aUweliF3WIIUmoo/C3kR7ZOSJ5fC66a+yECAwEA
+AQKCAgAhLFxqen7cjJqF5+3w12wb9bKfqRwWssEQmwJNnd1Js6YW4FOeCLMEAEV4
+A0QCn07NAcj/mny0RvsPZmUT3xpUVEIFjPBNvYOGyGOOJvzuvo6B9sDG3iVgEixl
+ljH+9OjjFaZqteqxDCgVo23JL2lRO4bvxXpqaX02eI3QJmnCgv9eoLD6G3teseJ4
+ZWrg79EjwystAfIENvwg3TdUsUuhKOunQKpYJ0lbzscJqCzZI3otmFCS/bHmEnpH
+YdnxTmmMC86hJDqBBqxW9+i/0yhpUXFykVHQQ9PuIDBuAsILfPAaeCv3J4o3PWpm
+s5UFt3yMjX2oIOqBmsnPWvkkfp63Gr2rGfAMftXSA0l9VcyMPZx78jihZx43f8bK
+MVu4Rd/V1Yxc0n7fr/TTOl5m3Fb4rdOuPOoLEDUQeO4SplStxbjIAEwa1oFFSD8x
+xtsBhSP63+dwflkeuV7OgRP8Fsuu2MDnn5AHeHaM81J4smLjpZ9j6BdhWMVmimvH
+L0Y/MiScC9ngTXpop5ph1VzOXVM1R05jnt53P3UNNTubkndOnuBoa71Zbcjz1HkZ
+APWbETt/1CgJ7aCN9CV7FYNA8/z9t4R/VObquwHE3qfzIOAzSb+rehoBr3nrtzAZ
+A4uUOcvgnHzbm9FG0ysdqhri830KxnYfzeQ+bXeZDGU8PZcuIQKCAQEA/BS0oeP0
+5HAPSFVtNrSMNHTUvprHyfxp959Q8gAHD8MmQctoEUcABARUeDNNZbP/pNF2lCWB
+rJfDLod8VZsViBj3coF0w4VinuC1hphEiu+He7UhOdS/PlpEr6Ci0gTsIIhqboVa
+vKdvaEYaEHVp1//P8yC+M9CtF/fSCNlRElqgWzwkcFxMB4ErTWnIU0+ni+GtcKMs
+4DrpAuSf4LXUBxoP6MBuTbRMcurEFE7Vwbslup/AZphXCF++2E5viOvXn3/uBPkh
+L/wVTAgjb9Vdd/zTQKYp8Ol769OosrQcfb6Aa6OBuGhpkUVVSdNiSqZrclVfSWOR
+5WoHHjiDiZ9a/QKCAQEA2o763dX7lKVTSXTAB7jTBMONrOX7g1gY8Dt2RvCzZY6R
+zLQ/mQOcU8r1PdJc3WEdHP6YYzWy+7buMp/vsMsu17UnVW3ac22vISOLwStbZ0XJ
+Dvm7rPQvaBG7/EDJvSGv654MCPGyM/JEgispK1I4yTAKltBFQ2NebUtg8NBPqK0q
+KrRUiMB1H2QhoRIW47yFTTm3snosu1nnQ/qGDgWWUW2iGZtftN40HzXQPy2bMv2x
+/ATRjsWVJcdqytqlg0wYM+4Ekkz633cnR59qZ76o3DoNEJUoM5fBwTKNfxExKRSc
+WkqkXWoWGqkvXaW7jPec+8HQ/o15aLzCvhP3OIKz9QKCAQEA+n4I0SaY37eLODHL
+iST4fdfq4E0mY0z0cCBca14jpkIh7heWnjSTi2pSFe/E5V9slfefga+ToFJengn8
+P4UQbGGC4sJJqVEOoxpgyBLfacCEPSXMko8aS3ef8XYK1fAWRG3KdXEGrZkkV9Xx
+aJGEUCPgHJVY7Fxc5QhaKnjo2vg7iO3Gt/C/jGWLBi4r5r2snI/xrZA4s8lWao2N
+YdrNixEW5g7yjTyxCzDHD/cW6qBx6XV913ViZuvd1Ux8AO97IQAbIc3+cJRrBVbB
+AAxiCS2vLvrvino5ripx5MKd3UZEjrG34eu/m5/uFKJ9dfjRpJe5TFApVnN6B0nZ
+TBSScQKCAQAieroC8zYcTjSkewGsdjD8KGmaZDHYl7Zfd9ICAQkcNXC07Z624gXw
+hi1IUn6KAj8YiuW5iQgyg7pyTB8BMhyytQZ+iLUUzrH5NWVf1Ro3YaAFd8puz5sG
+/P0+H250IvNg5W8anh6x6T97lZmKFw+UVbrl7fdvWSbVcTXa59IZVzA2ynonlM0l
+ZaOUiIkJ5nzVIQzk4DdcWyOL6uLpJWKAeB5Bkex4WTG51sCCpww78B/7FTuGHY+Z
+BSvI0tOXshKDZsJb3j8Zr++HchPUSBTVoWbcPdu4v/E2LGZ8LFcoFvNPn0Ts48aW
+8CfjyziaVZnzcbEp52HG7zh9yiKPTLddAoIBAEpS/V+z3Vu1iMdQ9uoBIdcQbcLX
+GYBoyyLEgmBBAYfNHJ9YTt4HwvDr57vgAqnadXmQh9+IRdpF7rSizr3OBqnBJE0J
+nbGLKvJArMw4IcF29JOkpuR3GiuigfYgQ0JgYw7fZwc24eesKwopDWutUexo0Tlc
+ef2CmgR/+rymyEknpX8xT5ExYaNz8odguNjRqSohM63p2UXkdi5CLYpu0q28iY59
+0s+3LAwsLPeZirR8TZ0NgirMMAIrILsCYmP78OGV6stOEUj1oUPIu6Txa/Z20saA
+b6z079eXrl1voiiRyJ0h7tHL9VEQA62dICHY9BY1I7H9ZL+Fi1Af5jfXGSs=
+-----END RSA PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP256r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP256r1.key
new file mode 100644
index 000000000000..d17b664d739e
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP256r1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGIAgEAMBQGByqGSM49AgEGCSskAwMCCAEBBwRtMGsCAQEEIBfCkWEWyc2tHIvS
+Ao6hhcj09dnh8NOmtZeqGmcXHnIqoUQDQgAElux3elmSzb/WqEZXb1vdXx/tcIpC
+Yq2vewG8H1SikMoACeFVRcjuy31gJ4Q8M7UQmrR4+WXSptV/UQ6Gkt3XuQ==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP256t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP256t1.key
new file mode 100644
index 000000000000..25bca43c321f
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP256t1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGIAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCARtMGsCAQEEIILhgc3joEZDWMDm
+9TYgrENN7gbqtMpMw1e2MTLwlJhCoUQDQgAEiDN20JP8O9zSK46tP6MkXJPNAfyN
+IQ0hOgcQ//Fw5V0yiSU+BPGeDoIDsW8LnElS1hIZWq0JVQNZge5ei2bshQ==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP320r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP320r1.key
new file mode 100644
index 000000000000..e1bd06c2793b
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP320r1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGiAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCQSBhjCBgwIBAQQoNifTnb4a5dOR
+yr8QFVM7Zkw/f/AMm5T5PQ6iVTCzrnw/kZ8glwl+JKFUA1IABHSnWUC/tKXpNHGE
+P89QVKEgvetwCQWFoOENAgXORniLiaLdAdsR80ouTsZiFgHG9su0l5ESEnFWQr5x
+UMj/vPwwhSYm+YP5ucx5NezuBM4d
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP320t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP320t1.key
new file mode 100644
index 000000000000..5d89229f12f2
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP320t1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGiAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCgSBhjCBgwIBAQQotGnirBX69ezE
+7a9yIBQcqeCMm7hc5YAG8D4396ytBa/2/O/lonDlOqFUA1IABDQHDepa3l/S8Gt9
+WrNCNpCPZNBXvmkGPnVXZchZI5BtUySwYxHX1tpatGs3jY7drVYm+NyxZE81pecY
+TvXR8bu7e3BIp2SwZmXEDxdYp1fw
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP384r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP384r1.key
new file mode 100644
index 000000000000..c248a0f0d448
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP384r1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG6AgEAMBQGByqGSM49AgEGCSskAwMCCAEBCwSBnjCBmwIBAQQwK6y6NydLMTNm
+LhDNPyTDKEemTWTUuMGfBQxEz+lQKAqz/So4uA+fQzor/t8to+uioWQDYgAEaK8X
+3KCyRDMpbACw2xG4UUe9OxyuGWFaGKPxhKJDyW5Z56gT5P1Q2y4CblL/X9VcDIMX
+dcQqRNBkPQfy1+fJXwKO0ClfD6MIE3bv6PTZ55J6H2H1dpg38a2soRchz0FN
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP384t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP384t1.key
new file mode 100644
index 000000000000..13a4e0c7b032
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP384t1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG6AgEAMBQGByqGSM49AgEGCSskAwMCCAEBDASBnjCBmwIBAQQwBGUaEvTtnxm8
+fOWj2c2cX4991rvGmfGviuWWQRblSii/v9FG4nQ4Q2IrgBy+hgK9oWQDYgAEQL0d
+QoOTArIx70V/XxipoxxBeKT7zmIe7id5pQiw4O4nA2S2BFxQF9eW9ipnm6DaN6ja
+X/+2k+cC4qIfqzeLcLUFXxz0qdec8lNNtr9QmwoQlv11beeHmQu9C1GwHmvG
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP512r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP512r1.key
new file mode 100644
index 000000000000..790b619c365c
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP512r1.key
@@ -0,0 +1,7 @@
+-----BEGIN PRIVATE KEY-----
+MIHsAgEAMBQGByqGSM49AgEGCSskAwMCCAEBDQSB0DCBzQIBAQRAmEQNFMGIDLoj
+Ktdg8V71WdSs7FiBkE6Bft25+yY8ohugk/u8aKeIKNVtSirMgQhGFJy/BIBkvM6V
+1JfnrglkjqGBhQOBggAEYbjTnA0x42NdM7jVv7jAoZq0iOYopbwejlOEsx8/MqRa
+Yt4Ef83holIsgOHWSeW+kw1oMDmieoCrhnkM/3KgGzV+BxCeieAWGxABsj9YhAmb
+ATorRJ4q/pMxRq8gIUv05/dGuUttl1gdbKKnGQjxDBM4v5H+/4z00nzzj4Gbfx8=
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP512t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP512t1.key
new file mode 100644
index 000000000000..e4343646b3fc
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/brainpoolP512t1.key
@@ -0,0 +1,7 @@
+-----BEGIN PRIVATE KEY-----
+MIHsAgEAMBQGByqGSM49AgEGCSskAwMCCAEBDgSB0DCBzQIBAQRATamyZ088BsIP
+Scslwa0I1xfC0/6udycncr+i/QIFOXNr4OQiVb4KC/CS/2FPotVMFSHZfCS2bgi6
+Yvg3Mta5SKGBhQOBggAEm/uIqsytMZypsqCuL0jwZh8xCRVEkUd02YPXcOBhMzS9
+bhAao4CLAuXhWzplr5qk/7ttvczl7qFDOvBzNAIieZHwbFrouZ6Pew8pQXRcMDB+
+FnXwNgpljTNmz/f1ePjVKU1ZgbQ+xVf8Qt8OI9S0Pla8siTgbVweGMLtq0A8Wuo=
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/dsa-aes-128-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/dsa-aes-128-cbc.key
new file mode 100644
index 000000000000..5ab8a9217ef0
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/dsa-aes-128-cbc.key
@@ -0,0 +1,23 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIDzTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIJ2oQD0S0aMcCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBCNXluHkzV+EEdxlhmcIAWBBIID
+cAWJ20CCQlOCxxCddujc5gPPotUyKTbXA7xI3J9DdjrqBaHrNY/Yii4Zxk9lpzPL
+3x3M3O4C8nJjk4OEA0fiyBYOV1d+KZfa7UZojIe/e+7BuTH9WAvgVzORYYEFX6x7
+DTTmYH6VSej/RBdNTV1KeWA4+20Zn+vqCwcBG6R78cQDP3xGOmT6jOAQR/0kkqEv
+GN22UGpuMlHb7SDiYeDRqQPdRMkpu1RZS37MWEZ//yuwqEyaowK0JgTVGKyibf3E
+qXYV7TqEumdfrpZxPXkmJwswUSoFwE1wM0XU5WMg+lnNiroaVQjzqLEEqENpJ03c
+Y27l0m83GRVvISvwLGOKY0Sbcb2d6NnqBjbVjbJopjBrww3iiTUqGiQZTFjiJ3CD
+VNKdG3HPWEdjZG5xoF9BLF3ZVz/jrfLkK2RcZBs0U6SyENd3H1gOk3yv4Uw2VjXi
+h/PA27oFJ2I5DN9bcHhbKVMFykc9JZbisDO0TNx6gbVxZUdNEER0nsP4/sZCwXp+
+K7rGvrUk17vBesp0K/tTfdBM2xVkV6oCMKPeQpsdekwCSAdNamSpxZn5LqUaX+Gw
+bMf1FxTlIL0ujLiN6/U3VWxLuJuoJauFyM5wYlpqgBOQIszVREQqMOs/Zp1WT5uS
+VUA7tdcIpSE7aA3q2rg1BkaiLMSEBMY/XWAI6SCj7iQyRD6GDse/ayJrQ4rUPvD4
+iRLQN9B1BYwAplGX3Cmi++Yos7tOq8D2HfTDsI0bHAi+oSDTRUAsiezx5QRLgrp1
+pO2dyBlJ5HOlK4SA8h5CMlk2fVgCLGCZ61VcqF1DHu5NKuCnCR73QrwuZAPlo19L
+Jt1YAgcXBfFoSbjAvE+AXcxu2uw+t2kj6cjGRSRpBNSHCn3bJ2zu0qrPL3lOMhtt
+DYp0QNWJkW/6/fpmXXAYQQv6bFY0Bia8Ima9LATcCwpYcRox1pL2rvU1EWLDVy6N
+PdFdlzLM7UcrY9Vy40gEj1qz9epAXqzfPkmbyP3i41BjKlZfmmzpJEI6hIJMtT6T
+xWU1Kgg+mAED6STAJ6nem2bIEzMfsNM00VrHXoLU4IWPCe8NMYOaVox1xBWs1mer
+lu9dgGBAy4/gn6v55XzjQ4R16wyiiJn3ZQGrUD0AE6N2E/tfWiphVG1tYDjjWCLv
+bXG/U6P6DjClkBocb4DgKBc=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/dsa.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/dsa.key
new file mode 100644
index 000000000000..93a9ee56e4f2
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/dsa.key
@@ -0,0 +1,21 @@
+-----BEGIN PRIVATE KEY-----
+MIIDXQIBADCCAzYGByqGSM44BAEwggMpAoIBgQC1d6MOqEDLxjfjz1v7Vg44bBBX
+VOoNdWhvJPl9NL2Js57UmYGrTqFit2VCLxbS5FVLyOZ25S0myQRsEtKyi4V9+ELI
+0q3oQplm+l3tZqKjtO69ZlbzYSl9IG1254/FCwBnBTuN7Vl6A2vryIhY7cL4E053
+Yy0xqfP7swPgMYNBqjc9c53hNHKiseQJ8Q2wFKZqm13xgqnBqmWbm7yNmzKJbjMW
+Zt3/WpJdjqfRnjSljFOkYPPBkGRUIKHcZ9fw4odVov2vblGzXwR+sFeE3lcF50WN
+uppjszMXlqR4y937CUSFbCabatRHEcPTq/FxioERCrCdx3AKOfwAquahtvWb9V7A
+47FlibDDeybh5jCH0j9HSjhjSiDZdadSgGKFynPNlVAlOETZKGqkeqAZZ+dsPkVO
+n8tx+VXZJF00YSe1HLKJUWXaT1tEGF6vw/dXhhQVir4j63fN2tZdhTOW1ao/J/iT
+VYEQQjYeMKKuZQveBKRBlpAjhmjOztbE8VL4O/cCHQCxPXlCpORbfOMEEGU0hbEE
+HsxFHMXHCnURCJxVAoIBgQCBqsk+z57UndC1Ut6u19wILXs7UBgLo0ivId2QHtm5
+kY77P9/lNOyCIQkBnULbJ36lHm6yxLZ8imyC5Lc7wlFJpJ6PpiTJ3nPi3fzhbftB
+2KCJVSwB3XfkjvyyS8bfwwqyrmce9el+AIFJuWPrFSkjNthq7U5vU5a+uNT9XZrs
+EaDbjkjVJXRX1oDS3IfWXWpb9i/LOE9HU+NfDKfydasWASvwNX1F5BKXD0AH9adj
+9Q7b0p4DVTh+UPWLBk9/e6gsA5HaRI1urAMNxs5Xnmd8UYF1I+AmjQ9Mi63Pa0YW
+QjpdH2hoOQGLemQ/72woFVzLaHWBcTuSwjREilaAA5M8CWq4rpuA79MrcHgzSp2C
+W1gtZa2/3SymcJ7Py2PHbncod8gR9dxHWVO07ccOXUG0iL9m4MzQ27uVvTh8Nrma
+M+JET778E2FaAkAIT34eNMC6Yk2IDrxU9L66FFx3+3n0cOeWaJxIWrIQ6uWk+uIH
+VzPsZAQU/V0/QBABlHuSj1cEHgIcYTbB5VrbIgust0jVvQCnlF4b1V0qz2iDJt6o
+sA==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed25519-aes-256-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed25519-aes-256-cbc.key
new file mode 100644
index 000000000000..138b58e56f64
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed25519-aes-256-cbc.key
@@ -0,0 +1,6 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIGbMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAi1t9NlcmE8TwICCAAw
+DAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEJacGnDl5HIWWbv604Vp0CUEQDEx
+jZKBJnhmLTPMJbE1TgVe+9N8ZG1CVpSFz0xo9xCk15G4E9jgxXw/a8Sqy7NiDqRb
+FLJrSStMU+ygP7wXIFo=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed25519.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed25519.key
new file mode 100644
index 000000000000..a9bf1bfb8f98
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed25519.key
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIJ55hBE+FwS4M3k/c45ZJKPHtsklKrb6qJlER0cMJ2rn
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed448.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed448.key
new file mode 100644
index 000000000000..934617d4c1cd
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/ed448.key
@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MEcCAQAwBQYDK2VxBDsEOSSF8O0uKk5pRrjUNV+QgonwO+WeDRb/i1U7vM+TLzh7
+jAV58E6oglA53konKxGv+GC38dCb72gSeQ==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/ssl/pkcs8/key-rsa-encrypted.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/key-rsa-encrypted.pem
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/ssl/pkcs8/key-rsa-encrypted.pem
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/key-rsa-encrypted.pem
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/prime256v1-aes-256-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/prime256v1-aes-256-cbc.key
new file mode 100644
index 000000000000..ec364223094d
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/prime256v1-aes-256-cbc.key
@@ -0,0 +1,7 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIHsMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAjZ2eXtLFXLdgICCAAw
+DAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEIlOTfeoLwq9Bs9TFtw7VSMEgZAU
+RO9W+K3vvzRG4sACrcFaB7PMhv3+HUOcPFf09QHa7aSJMWsb8EXGFBK4xlFhkK0/
+N0C8sRtH2N1JdYj9hiwS7I8WyybaR2W0ZALNR57iLz3WsOGQ7nVECFprElboqnSW
+BtjkKTD9pz3xX/6cMkDV/2WqbS6Y/dzWJTH8yTTqjzTjbs4vguEK1Io6dlIRVqA=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/prime256v1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/prime256v1.key
new file mode 100644
index 000000000000..775a7a0fcacf
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/prime256v1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQguc9upTMQn8b+loAx
+6c8q20dHYBf3V9374I3kJIDmC1ShRANCAARnLuOxL7n7Gq12zd9vq2neAv6PYc1h
+W6M2gJKSbfFYGhte382jOJ2TgwaTQL/J5IPSfuJKkmAPBIl8CdJKWlwA
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-aes-256-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-aes-256-cbc.key
new file mode 100644
index 000000000000..638f6fd3fd43
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-aes-256-cbc.key
@@ -0,0 +1,54 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIJrTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIX1pl8K5MBZoCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDAZbI9gwQvuQp1MWqsGkJeBIIJ
+UIsFUQY5CFVcTqF2wNDdyA/5X4YvQ1wKPwYdSIHhGAe4UjljSqUBG5StfZmdA4aT
+DdrzdApbZxP8BUlIjrjfR1tsbgnvevEkWUTftA2jzOmKBmYQ44WmQV2JGz6rWcH1
+ZUc0ArKq1Jz2OU+JnE3Olrbf4QupcYCQ+qgB5Afkp78hMUWiGPXaW12Ankjk0qVU
+6zKiLP7cpignOlDTth+pYe/ltFQr1cLSgTsas/9X565usS333s8P7RQQsPRa5+De
+hsgZIGeJTX6RGG0ipxZjd97jle54T6UPnYQWmHHZuX0LNqThTeUHZxPaMLJ7jnFY
+NtqNvlXydkWRqdVmP2L2uk4mECrQrKqcqLIdlEL+sB00t+hjNtyCh6dIaQ5rbYDS
+1k7fNDx1m2k1u3ydtUUeN6/7OJ7X1Is8k3WDTxHguFDz1mmeCw0lgH9tWZ4peG0/
+hIP2p02icaoSx24K7b6yHShJ/+B6lp17tYe/FgVBzO75tB7ljH5bZjYcZ9iIGy9h
+T9Jq53M/lAnsAADLt1fiYRTWq9G5w/wzl0vqNTVpnpE7nXTs7d6Di812k8uyf2G+
+RU8Bsv50SJEZzW4liXhGxJXaI2TKKa8o27vPm/hK6cL2uoS6d22+/dUL1yP0ZXl7
+LOgqnNS3e6wT5xfdbXXclGUER8jP1QRPTm3evI13BRWHswLTeHWmdivZFrCHHw6o
+7f3LARYLkefwO/FsC9IJzpdgN3B4V/K0BIcVYwXYgrqUIei91b+3EHgqvB3cXLdG
+r91IBTvV15V9Hz8FUmTo+0uRdP7nrQ9+4451p6RP8FUuaAV03/a47YWemkZtqmzd
+zuWB/Eo1fzmxrbHyXZoN9D04ubOB9S/6jUy9N2IwQykeKy+go/FHltQr8l0JhkKs
+ipbaRc719n2Fj/hBkaIzLl/nxK2KWR2kCAiVXo8WHJOzzRlgEMUCbgoNbvf7X+ek
+7O2VXOR2ZrqDSXs0WsZsq2LeAXlN2rIS3TKVru1T+0YKe/z/qZFvdygkTGB0qX7n
+G+v03iRVSGingsl3UiW/S0wLDxdxnBgERggD+YSwQ/pFQTPn4AOe7xStW/2/d95W
+S6rA23ijN+U3O1yN1jCJjMZUFK4DDwKbIUyqcF+m8jvYLrvYxNuVh3pwwDbGARGF
+q3rzm4K0UUeCZa3sBlV9EkVhIxdibO9fPFP/9o+pGHacZ9/B0QtCXLfb3RnRX3AW
+uM5L3gMd14TeIaeTMyHz4H9epUNwph022TKV98au8diLNGtB8eNZuu4wAYTfwYfi
+kUcS+Yp/EqwO8/evdCvWSe5xJ1QuLcl+Fr6XGEs+QmcGNDSq9VaqNu5QndZSBR26
+Zv5vGpukqwxGXdHmETvLavam4io4Q/2XUQgZLdCTKxs4Sf3BiAyrW0DWEFQ0vLXt
+FFNQ6AXuVe7jvaGDox86RZ3bHDwWJePBAkQtOza/lFkvLd2h9bcjppeHxznr36Ha
+AnVfIJ57sjBlQA0bpUmTGDkcC1FmRnM5ADQdCENu6ZCkgkVwpFeYfJX/Vk3wMH41
+DQwSF7gP75DDLBnwyb8WooMWEkULBzBEa6N6koZejmgEaULv0aWN0BhE8G1XxVq+
++hOwgNMVm0d9UrceOUsyj4G7UpJbMO0jtLSt3PWE9xfCqDm7vVPf9sA3/Qa6YtXX
+EkNCfItqqbYBWsNKzNpZXDpiS26DFhpww9JrwEL2KBRp247ANxZxG7dhk5H12+Zv
+2c49np0/zAHAhREzuebnPZiWbEMPOM0y9WxIhbCN+u1E16nxZWDeNagDsOCkiNrR
+c02C3U+MZd6S5oYT2h9kc5qq9NyCkJQTFO4012sBYn9LZ0aFUXIPPCilrr2dRMJG
+CUMGrtMfbauEQ7iZYSCdg1PDNmtrv3sirJWZueMNQhEppdtYiV5gfCPVl0sa3fvP
+4yLiPiMMrTjspyXq66jTR116Sm0ZdffDZHGDFUSFowEJZ5JbigUsQDvRwcGjoZ//
+IKT3PPQ55tukuD2WmI2FT4j9SYr3YSBWcraY0povPanxwAIewZZW9BxrOgEDthkY
+7VPeShzcJ4z8O60ioJTtR7gZYhcy9NoTHM8sbXhHS8QloWa22cwXACtPtuh7ErQZ
+jPHIhb+KLFa7P7O6ceTYwZlqUnA+HFI9VHarrutxqRaUWa37JAEhd1bplmxBXDZo
+/8S4pNVlxT9xQmuYpN5JvWCeUadV5SwHCGVHcIDVsDVAWF6zLYwb6zWF1i3uRYTP
+FNwZx4DiskQhQu34QAnvvajZ1wZf3xJ6LS+exOoAZ8Z/qyxWmDwffSvf6Nx/Tw1r
+wLFmKTcMGxBUzGMJ4txp0tiJIHYE8IQMYWNOBeB/GjRWxTEBl5doFpXpDdFz+mfP
+k/wRUTkbuRg1KxXV2GPGB94m9elePD+Rf+m0Hl9rWPGsPR2JE6lr6k/kUYAWXuSh
+o/3w85skoGcAe51EVvtrtqbPTTcd/ndigKI7U4shQnZCm8nUISYlIukor2vNlIuw
+1MC94zP2sfWBreka5VAC3IsP67lkdJx6DLvv80GJ50O7u1oKjQCroEKGC22puTb9
+NZn0h8BepBrgY6eWA9eZyrJ+v0HfMKN0O4lBBhtcedHTGZmBhKffjS0KTqvztFyo
+vnx86mIoiskANpfTn1QWSHxVJm5fNlRNK3DdCDzsQ8OcweIGc/omcg1MYp3Qav17
+E6HoYWVrYUhVbzrOPiW3SorE5c0Xk1tTZQXH212mt3RhMTPmrqc6+PVIwFfU/lzi
+SABjj1Jws9QLbb74J8O5eP4+ZxAvkZtKaLTBibJhYOGtGIrsWzfmcsEzCH+YUPYz
+3vMT6E6wB/KazfI3TWc2g0eHklu7mx1HDlR1V6BOfJ3tOMOqqOOpvAp8A3J+TULB
+ZlQIOlMYH+fnQfRg2FcVHGCik32h7HdjeoZha/Qsogrg5j4LL0NkJf3k5E8I/c4L
+o7yY0rPMKt6qmmZe4msO9wFGomWCms5LBV9K3H4bEtNdPs5rdP8wO8C9NaGRuUgZ
+3pPm1AYRdxJNW3TGR+D7nTuDrRIKrxMkWyKOkwQteWAqI4OAiMezhpv8X0+pq5K8
+8rPROuQkq/znG8wktQ0V6P+JjL1oBayhrpadgYY/tc1+S8U/zeeCPnFtUXLLdk/K
+stzs8gsvZCWWn6M5mlSrsyLaB1sgbxbuOlaH4FlUAYZC
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-des-ede3-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-des-ede3-cbc.key
new file mode 100644
index 000000000000..a2144172fdda
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-des-ede3-cbc.key
@@ -0,0 +1,54 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIJnDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInDrn6GvZlw8CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNwtOc3eKItmBIIJSNZzJs9X5vLX
+1PNFSOjg2bDJFXWJ4X8vtnA8g0JsK0+kGmRxg+FlWXTqAGJbm0imoE4YSQ0NXkfj
+6eFtgebm2zdRRfbABJX/drZMSIDYl5Le7B/zqIeI9cO16GDEbyDam+MXD+mRt3Bk
+J4JyJPCin22nAtKb+D0zHs2F/9Iwi+3IYL1awvHspfOQVwARoj9Jc0K98qtGSa9M
+KikC+0LGr4zw0fOSMzrhijg5mqi8wTsYn/9u5+TkQ8cwg6cBKCGCjNOi7ml6uyC5
+LE4dYAcSkFbbRRNOuM/RYiKxFpGAFrfxUVfHI3dLjDe6DUAN18ZmLitij2WI5TcU
+azfFRYMnkmI12Tu6JeKrFrhQOt4gUq1W2h5KwvKvZAikRvc1pE+X8h08S/kAwsUb
+PuxgAN54myeHIGoaxG/C1ImaRoSPquKVoayJoIwDQ2kKJJ5EdXFJ56SyA1kYk4y4
+Ohv+kvk47ZAwFZnNz+Lt+22uFOnrMZobv/jKsTRfJsz0QhwmTIaB9C5QehkAeZJD
+6M/JVjRWoLALcNu/S7imzbzNBS4r1ctYLv2dkakzBhR4o5Yfn4sg48p1x5EBTTre
+6X3/qWH9z1vtpJsjC7vA4ACkLaz0Vb9Tb9No+Sjjp2xi6arJphMwjuZ0LPf0EuVd
+wzbkRHXzpYMACuaypNaTQrNCgpR19eV98SThrf8QkyyKD0qwtzwoTmGX45FnGFWy
+H8HL+lZzfpA9zzRCjqLGeTkgQJLIMP0orD9kkVYCHtUorUQPr8MIu/o45PKCZtNd
+++kaTm8x+wjXYNK+cyOnyda5rj3XsMYqPnMtdg42cHu4oODEV1JH2fl8sXpuGB4A
+7qsSBORrZJiPEdayT9Gsve0A6Vi7gGK+9a5WRxqS2Hlbgr6lgqUr8zX1YYi6Ace3
+d2GhEqNvyAX+6Cp9FYH7JauKtrMf40LxCNTpTmhhrhwS61nd+ka/5e8v6G05eSTA
+ESbBKo+QiE2Ek1xfrfKlsc8IcBXxmPF5QQ7Gb9eGI69myPRNTv/XN4mnvA8bZF8k
+KqLp3lO6Y5jGKHToooViTDX0WRApJF94oaefuUbDJpW9foaOfZpBz4yhLnY7syTd
+n8LNRYbMHbFbbe5eoGhb6goHD1R24/SeKumDpzyj1HewcoYGP00toDFxijY/AA96
++4HlKJX7JJEDvORgVEZ+tOGo1xplagrndpKnX+WsFzvuPJ3RNFifbkp7iRP1W6HJ
+Gq+oZ0ewj3z4MKi0s58BgTwQENRmLEdp0G1nyYY1nuRmaq+t1IlvR0bMYhTARqcY
+GAdHdwJN6MXQWFyqTQ8L9N0OuCpENposKBvdUcrSFAIALafX+vJrB0aS0ZVM5w37
+yiskAa1KMqo20XTiH9z3awnKAVZqjY0oE2BTehdK/NWgaLH82AsxFIMFmN7GCyY9
+QOIlzceqRlltJ7PsTmvDN+pRaO6KdcbtO/7hsvUgZWOs6x21JRQHUShDNB765dlE
+usuEl3T72TBlTdxQ1tj4fA0RUCAF1T6B/9aW/rBsPTQIBLyJEr/78m7lBKmgQ+2i
+REjuQC8NYkzLLa+fOiIO9LTjPqdSpzMCqMIbjiR1eYMJHFoP+8E2gAqKZBDOaNoI
+V5tfZk+/Uz5AIYQocd1aUEQCgyf2WJLp2B5boO2lS1qXBb4YML/D2L7Udz4JU3Qk
+fkSlDC4zx01XdmmbGedBCGG3npf/pCerrHcaPJUWOjMk+M1tR3Mpmmm+/yJm4Xyu
+bPcvV4pEqlfBsIjLCt6xyF18vuF458yB7djtZJ3wkx9lLbpLAh/z7ywoCF7B35nQ
++kUjFBsboV+1J+9sK4bULrtYOhjxAU1P7Mpq4BbWbRWBWK9/Kz8maeCrLEW/tpnk
+EureG7aZtwQz6vHyeDDQTpFVdeSFO4qFy7Pouf/VVzX/eph/6y3ZDsjYfxFiUD6z
+TV9aPs8WDDcWhd+voSQlBlBB4ttspQgZhefCScu6hhW5PNVFyNm/TSHleOEBXiEf
+0Ab4FeFkQ+c1GwhtvsmGLBP/2VzkkDSunO2QDbpNYGzR2Lsn56JQjeKwiTHblzRy
+AwSJ4DU/V7S2K4wu9QmP2SefrBJTlbLd8VFbwAGAHDeM5Xi/TnleaQvUPGz56F5l
+moaYsXbDQGlyA+PYs+CCa9rSfvppX4EwDIftDqxAzEAIbQJir4VEiPpE/CrJtUc0
+JMI6ug1Cpp1p2U38y+POyv42Awk8M3KOPUvXxQkfU7leSClLh2zCAkC1CeUGLrZU
+G/Fuob5ZjjJ6I6/+3jF91Y6bDvh9e71jys6eTnYNfXs23f7uwqv7G0VqhY3AjXKs
+9YS81sdBNbZIObMeXA9w2kG+RLWB5C4hpkqgoRJHDyE06Vzy7zzWLBS6AY6/f2lX
+lNVUETpf7j3PU2bGry865V5eGS43lTUnsMUDVQL1OuiWLg30JUH2AP8cqQqgN+O/
+mK44RfZIrGz7o3currsobXBMNaqFqVlCRtdqEVsiRprWiGlHtLEnAh/UNVp3h4ca
+s9nGo0wA9bpHqAYzyJoDKRgjj4V7vk6rDNdJeRow9v4byVOpEXBY2WX+oRWYruyR
++ArU/zAeK/6oUb4yegc25SGTZxEHlZvZs9U8Ft3SmzGDtuiS8tgMgfLe23fN8mUv
+pRwRqkRmPYRZpH23MTWVBGSAos9nlP5MxA7IgclRywpINOJpNsbPbihhcjd5oBhK
+ZK6eqdpYUdSWHpUdSUi3DhirYXWQA3bGjhJ/IuvGpqdXm2P9rpUArEjwuG7De7QS
+t65n15oECLzVg/3vZviKSC0RkW5p+pQEbVifxu3Azs8SrUlXsilcHMTnTVGK2wG2
+Fi4ReqftHwy1JIAsMEeAQAvuR86TFaHKasw2p+/IenHo/cTAyqEJjgGeTJWjUtCK
+dUavMKA5ZYIP1E5/F0/QBNVToghoDgMVV870p7QWjgLVtPVCDPx3I7JKh9GBmNR5
+0dd3JMpO9Gkk8cBGwurrr/Ak8ynRLv0MRdB/8HDp66XiHR6tBl8ZoZ4ZsnME56Bc
+F2+OmOuxVThpOxPlECU8XtI37ZlSxbG0X/s5eBy2mmrVDzGQDYXC3VuEp3lrk8QV
+k1KU6zxzFLXnKEhZraP78TIKhvV7tiggyTBmx1emLigMqmd7AnVseY1LRlFQgUB1
+wloOOrNW1gpIoUUMVuRjFA==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-pss.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-pss.key
new file mode 100644
index 000000000000..a0ecda8b2c11
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-pss.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADALBgkqhkiG9w0BAQoEggSoMIIEpAIBAAKCAQEApfv1BYcLTl09aBmW
+OnwUEKxByqBZeCXLp6Ck6/plp3GgC9gtFMfSk7mImkIt8BAFWK27A0/vOFDf7SDX
+tFYtlL6ZukxSgaltyEjMVMX/oqB3vMsqzDX96So4UauDlQexWORT0LcUp3IcjA8L
+JrrZS6j278y3ah/Xkex56IRpfFbdqPj/p4rJMw0WFtqvINV6C2xGxeoC1/LcHM/H
+WQLpeRD5PgnIwUw/dqMYtV7nfUDU5wCJLe6I0ogdgmCGrAeogldFilakPs47yU03
+/b6qWFHaj7OwGZRV51R/GChS1HdVN42nsXHiIz26KPIf8BS6O/iAZlUaS8xhw5XB
+je0uIQIDAQABAoIBAAh8WZn3Pfo7JRUJ3dbOmh4CGHj5+qj8Ua2XtmbEDediFTsV
+ybQ6xQa9YQD16jBQOV2/wARa1VGNPO18FNsI3tqwZd6S4VL0rQKkyiF5X+jaCFUU
+E/ONvRXrDScLvDXlx0jSn4BXo8wttszoRfssaUiHclxvHF9mEljI/LCI+HWdTAys
++3l/Yn1ewwA2iFFU+ZcwgvZHXjLjRLfImTfr7oQLeolpP9sxfwb2RdQ24ifgIh9N
+Yv9KzFfFJNl+2o3q6XBKqvjXYWmTam/hwXhGnFNb3LgrOwkSUIVpUJl52F/fu+BD
+AdJu0ELPUNIu2Ll0fBp3Efj80vcSZqtDSJ3Bl/sCgYEA6DZQm1L1Y2tPMcX+JLtV
+BKC19YRTJLI+CQsU5YnD4DN6O3a8PITfRf+SHWI9slGGs4QU0rv6NLMj4c0Vxsbk
+74LQArprdw768+hLH8z3r/fAZ0QrTJZSKMuGvs4To4dHvNSdc2lYDtadDysPxkKZ
+23aL3ApmCqZpHvIUndOGKV8CgYEAtvzWJd6faGWUEbQI2qI4/H2w/t4oxIgVDOeu
+qCjIfw3jj9QUQrzC/ckHEJrb9ILYuzxfe92qPf9qmqHyE3aKMCN4MFIz+PdfwM7F
+P3/QSriS+PdCnS0ysmHrUdJRXOsl6SYDVnCfyhU6HtL4GFO5expMesogpw2xXkYk
+gYOaWH8CgYAP0SNMcSoly3lpeoMFHX19AzVhs9G1/i4bj5WszOV6sAbzZfMMbECJ
+FA9v0PFC5Cq4r5Z7hDJWxJz9FGsXTxTo+5APn4MSaQLO+lOjpuJ4KfgBELOiU9rk
+zHgxJvhPezd3tUPESLimyheIoPZCGuc/+6MrKcopj4w5f2PIHFBXIQKBgQCN7qTn
+8LpyTj/AT4WCl8tdxNxRg93ZOrghL18gnamOKyaz+8rPTPxtvsyVC5jKGeejqxtg
+xzlyJzf3wt8yS4K5/fkOeeRIGxARTBBgxXG5U1rkc10e7tzg0eSlrV1glh/srIhw
+NqEqLLbNC9RVgjNfEbH6l+clzBAkUIGmV36TXwKBgQCI9r8ZYR7xGYYDTpMSbGdL
+XpWuNWwgZQsvBAH+pXaE3A/36tXdggA5nZH3SA+yIoJHGiXHeM8K9LOMAbAzHhsJ
+ia/yFcH7lat92/28mrxoAkHHk5oUdIcP6pcPny3cE874sh/UPG7BNKrS+h2ll21e
+OFsE0r+qLh68/S0HZM1/eA==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-scrypt.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-scrypt.key
new file mode 100644
index 000000000000..775fc9dc662c
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa-scrypt.key
@@ -0,0 +1,54 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIJpTBPBgkqhkiG9w0BBQ0wQjAhBgkrBgEEAdpHBAswFAQIXPgQcyUbFcgCAkAA
+AgEIAgEBMB0GCWCGSAFlAwQBKgQQAEM4E1Gom8Gno5BsBlIbbgSCCVBXC6unomo8
+RViDXg/JbarYH5GAj7PJfOHMtYVGWSuysLnoANxqBLsmxvfnzkoI6hBVkU+FJwyG
+4CZodJn/q7OxuK2VYtE2LV/2QgfBfhDpBSvcfoyfFy6QfBZaIP1rfp4cDucuHxn0
+5sab/On/lw2qALw5gS63uEJQ6GoTvTgkMiRVKLi/ozqg44mn7N/Rvbx58IUexcrm
+ZsFCzJBNPp8Z4fKCTi1CE+Z7BemhAzL6JvE2IHBjaGsZyr6rKOYv7u1QC2KTUyEm
+FLNthxOAqCTaWGYP9cstE38fL0zE24crfOJaRd+7oZu0LwwF2R8kewSKNze7+WbZ
+hbDWu4qWTdHszDeLnEJTCX/xQr5uj/c6Xp89FR8ovsTY/nnt9cEhX+x2tzjxIuR1
+pTGrJvgwL/3PS+4d/O5w7SBpSUSjU8/gPLSU+pZq87+1JRZQpiBUouwpwE96/PjO
+D4iQM7BcDLYaY+f4pP/K9N3fIBr5hDH+QeArfZ5/Fy96yXijlJIm18Z6xs+aoLbe
+iL3coTVUc3sF7beKDE7Y5qlVBw/pTazmcwnUxP509j/W/+WLXFf6WjucH94ZchrG
+5cgi8LGtP+jnrfyoIK7lLBsT66tK3cUxjhpiiHebEQ2RpHpvutoiC933oCZ3FLQf
+3TzuuhWiY3ufIZ67xXZ+i13Gwt/f1OEk0hIecGbLheHKFykA2t36c+/3WZb3niPW
+wdwAzhPaX+nvrk5vsHVgdFJNrXyYwEg/ygO/F/0yXbjYUX7tKyWbb4ikhJdxjgZv
+ieDC+9RIAMpcC7Ac7G4c2vNgiJlLs81apP0LGQ3n+eibCz2VJWzsWohbMXBTcDfc
+a8yJMRaiOSIQlEwes5k3vs993qL9nKSGHHGe2e7PMHuVinzEgkaDHlDfIuFn1KnA
+/aQGbgU8jwK8VpOkjNZllaE2bPZibgQAcgctq/yGRbxfJcmX2HBKUoca1Z0ntLDb
+L4Y/hZb7b577NlWsepxfZRlVqj0KXIzTc2XrMz2U+4D5fj4+KUkk1z75gE3o8wGa
+dkfRSA+LFRCyExtoMSSSxIvlaHRVsL84kkcClh0IjRViGo2708HObkPrBxk8lMaU
+x7lLB0IU1ENjcqrF4rfLwh2K/b9AcOv2zcZ/zgDYEeRXEHhw48+/PzdQ8GRsSanF
+GNjZC9tJ6uCP/uVOcoUoHycD21WjSjZ9naGI0nXWbIUYb6uaQtwPKmNqQElwaXaJ
+y/ncQkxYDrOEoUI8fZFnX1PXHEtP9LmB/MH11RguZn6ha0onFvSMqb9ZWPWZH9FL
+L7tf2jMSHOXjwCKKGugjcj+RYg21P68PUpkCeKnDTpWe62Nx0CHGuylM9UvOS9AG
+O9N7XW/nzPtgoAoWnZafiE4bFea1w65OszHDFuK+k5zrF79dxb8ajJ8XCbhh+Ywc
+DAhNM2jMsK0Tx2rQylFzdl+KcTMiczeTSBxV/g78uoJ2H6/pks4AHkTZ5ZSe1mkM
+qt8DIVhTyV0jUwSj12Fss0yAps51k9UjrQ0iQaeJ6VCCaePRHQ1YyBJT/UyDLlBD
+OPgsUnC5CeN4sFfORAAhUq3jNZ8TmQ8d4RJIaqTrI3ItMz9kiBluq6uDQMJ8a0gl
+JDv2aocsar1dri7TefouEkPUwbkfw+ahlerKiQcQHmaG4V/KWyu30N0axJKXLMHY
+ticksi9RzJGthbkHTCru/Rs+va5b7Tdxla8r9krRamkjxG7RtDet2czWNLJTCC0q
+VZAy4iMT9NeJTgvWkOhYzWPczkNiCDGSPJkyHezK6lYRbnkBR5KITiRsIjXHsH99
+LH/77bewFdyl2mNwy/0+6p+rLGnvPX1ZhxYYoKKKTmNsddVZh2xLSczvKi7Pd/9Q
+kALBSxMPdt7klPXh5BGte9WA/4DEsiyvmUwNsySCtgcMj9xiSJM3COhcs1uhmGch
+uv0Znl7VSE/1Y0yKQhW91QlA6JIGAh319t1VJYcbSiOt3FoCelu4ya/JmGLNtfKF
+AlMJrj1dqxO0pGwpfKHfLeC7G430TPd6ukjFwy+jrPn+LGw0Wzw5BS2fc6E2JaAd
+tfLM+AUlS7I/+O371e6V1g9+55KaGWsN1K99j7W9Md64BsqvGXeJwQtG+JLkPIiv
++ETwbPe4yrcJgslZ0CDocwfLIMfv7sU8PxFXdzYz96NDSYU5HN9l6XACfBkYc5DQ
+tYqdcqDXIRAOpMhviZXkNW6HnaYugHIOIfIVDo1ZoZSNnQKAHt7jvjjQ/Kb+JvMB
+KfCtyJvDl19S3XhslRViEc0LrvE3xZIP91QM1SyhnqagVY142QWyB6vd/yiMjndO
+Tk0bH7wWdk6DiQTBKO3QV2SWPkTy5+O4uHKPO2S2ebIEzi5btsgTkwsBtzS+bo4f
+54t1RvBqg9uHUHKg/PGBX+l/TNQnk8RBVXF3U/Tct2d2W14+YT/UbvxopFNizXHn
+G+kZvv3iOAACfYlGgqarZ5i/O5eiMtOBxE2iCwFq6h7LBH3R28L1pZ0U/pMBWG/n
+vadGNZQ5DGd82n15ieRqXeRNlFt9+jPW3T/eHDUEIqsCEkorGLzlyNWJrtn/0WyH
+yLeiKBSfyBrS/IbDCQ80kVYaFF3+m77kjpFxSN4ugyruPEXL+ofZQyzt/k9cprlr
+nPun523IiG+4bMWHQn8boYEWua28R9Cyn5q9C2HZskFAvEiglyEQTfrU6/lrhhei
+yZU88IL7vwc+8ajToqnNngPedRDkXlOVP/YLuoSry7oEV9Vb5PETypLEvdIwaOcZ
+iTp1EKt+ZD+ryJn+D4vrhNDAGYhEDEPiQY9nHC6/w1/O/oAmbhwiqChSxTXecw2m
+KWZflrm53t0S1NsEvmzWKo5QgJlLbeMO/o9HE4xy1gLINXQQYDUBV4IVjYxsIRYd
+3TERnB5bmL3Efsa+rKXmYy2zNg+RVl5iK56K3mSlCo4dD0yAYT/tD7lX8brCCahz
+O35C+rkwdCIRr6CgCTRStqxJjndC+uyn7/SxfNMc57Mdb87UjO2DHiLAr4OUoq0+
+uOmNwygqpe7kzCD1q2AdueMCII5aaqVpVtJ//r+0iswlRaciWj/VMfTqTQDweSvw
+w2gQo//1NRalhDYYWzr0PfggIIcEhQfXfPCk2kG/6mCBfXKRvBm9+WrQkKS6zdJ4
+oDEneepILtLCVoJewFPvdkpnL1xcdjveuw==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa.key
new file mode 100644
index 000000000000..fc4a4c7b8393
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/rsa.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCb/Jbg0D7zw7IF
+DBzn/KZ0kjPf+vkOaZOxNG/PosID2/+OKHK9oXgnZcVbEtvJgR4KKjc4nrSMFtFa
+BbwsvJWxUEqGjLQ5WahSe04R2yZ4LViGbFuBOHAWq9qtxRyDdkghrQvNy8cOr53K
+O8/UAOJCgkYr7x562QLEQ+FUvpGqID2xWI5TUxVezmHdU/sZF8bRyH7TtEZ5zMqZ
+Lt2hjD8CrzFt9aMv2eBldX8c2YTi1/3YPKi8mos21jsyRFa8gPeyi/TnKfA5mows
+DWxCN2dvOw3ynKapFQV1QZief7KRxw3FGnUOdUfw/FqfpddZK7TJ3/AoaM6oNHy5
+aAqcVMqPqb4ZC0eO1R6+xIA4SoZBD+ZTJC2khoVQRRwfRyKQJpp9eWJ9+SOGCkCY
+r+yZbcvGAuz7Y8SPp3kUWZwflofRCeE3p77U+icKkppkkmEJIb1iMm6qYoTjc5M/
+wTpI5qeQmGaftzz4dlWafTAbHT2jbwvSMgYFQQvW4RyV8Iu95PYl6aUg12mXwv6a
+pYf0QuOPGCMP4UzfLfFTYDniS+34aaWkl77Lzmw98BRHa2Xjmn+iGQcHYjKvh7FM
+bRBiFxcSEWjkh+mgDypV+8mqS6FOPC7WeCNvt1XGIRoKnlF4OarZjdI5KP9wKtV5
+hhx6GQpeuZSWyTBLKbVIsuUiGG2VxwIDAQABAoICAD24HM7JNw9mkCqVF17nRcl8
+C9CE0kTUm16TO+ZxJMk4JA7QjE3h9NPJ3ePiO1qonwUwnPbnPNLtOFqhSEp/N8+X
+0FUamTjT89jm9wXzq24DqzJM74vak+c0imsVQen2RCYm/TOpfJKgBBP/xITC8MOW
+HkPF8k5zTTfxD9hjKumgpihkvLPVfPAtQuW7E/BiywU4io4jl3sb/9HKjGEeR9Q9
+E5bJiY8mazZZ3jjBDGZhRgxoO++cSpcg/v0tsxAVC2z3GajZnDZ+oxXPHdW5bFDD
+kgo712mxap5xnPyh1DsAAr/JbyWQXC3K++SNTv72Xys9Ux36EkLVub/2nbQrjJXb
+Vc6eoJRpoeXwvfeqnJOaRUWqluSxqhxI7ngLtVxTAAM79H0GBdAEaB5DvU20zdu8
+7k3ggJ9Xoyu19KiCsC6L+Odix+vTyv+QmIQBGHB4Ts/4YrKMLF49HWpo2qjV9Zef
+bCKjjzz8VrFk5FyFWJQk8o0P9NLn6+epD7n/ndjeUWy04pLc9i3ya7wmojZZbWKE
+UpwcruX/el7A8t7cQjMKHO8/tzFVPsI7o2osqvfY/sZRBWuDe3iHgY40ROwvUvjr
+6k6qwIHPmJqgywmMbv0KD+nnjGqIYThxuvh1n9gp/JlI/QWOs26Mvwk+QFMbA+6g
+XfihMLpzLXWY+Z/7uT0ZAoIBAQDIFiDO/Z2VRS+vNlYOAAEYP0amVTH6Isza3bZe
+O3nvC47Gj4/vcxJQdrMHEtI2/geLXDv9jexox8YvcxQ6KeJVPSNRFVHGIEWLUK29
+pEzPZDUl3xYFl/WTHLn6gxV7uqxO+Xz5TTCaMRCssbz69QZPryfdIZZ1+WXtKX6s
+paRhwwizln9c7vHoN4lPO51Dk1iP6JqcJZdRzPXHSjYSBnuapWBy62+rkHQBbOFn
+yv7WzhnbOEYM8GlvteDNH4xG0gcT4G81dOtGw4frtfpphU8k0Vy3LypjlVQr1Smd
+dZdbC9TT8kC2hyB3saCp9vQUc1U48CHHW7BGBYTSyaRosndrAoIBAQDHk6IQuF1A
+OM/FNwD2nao8I2bOJEYyPgaPFv/lUytC5fmCUuU/FKBdyW+0wtIQDxp/zG2Mq9L0
+le0E/L4WI1Zz4jt0tef7qDLm4tadK9foU4vFuFpfwnvgP8uAgzxgK45CTQU09X3N
+PRfw4Jp6BK1giEqLhuxXrQvhTocswnIgB2s4LUv6g2LEGpyfXCLBoiyBNTYpxHYq
+3E4VtOycxniwUWnR+PQOt9GwIDpjKHzZMHfEOOrOyac85N1s1JDxC1s5XftPII79
+jNxTDeN7O/BP1eEQN1U5Qbw36cjrNzgxNzK3L8NqZP0YlSHpm1s816Am0+TM0oF6
+mKV0VCYYcd4VAoIBAEWPa9iKUz6RzwIa4c/8MGU9mlI5TCap8o4khkI8ayev3PMq
+9d9JIhTXL2ZGJM75gaXxaum7bXT//uaAG4gdB5KarqyBvOwkTAkjA0Pq2sk/DTsd
+U4qeScHbOszcxZs+SqkqE0iYjU0Nwb5IDGsyw/7v5ev6wVRCYC0TP/bFn2BdbakB
+qUWlzHPu2s2w6/uSPjfJpfajGvhVSRz/r8yUdGRPGjjZoPkEP1A/ih2LdQ04mcSc
+y72z1vP/RygIz7vPSKagYAk1nJX9ZEOOAICu19T09Ea7HwF/6MNUWCNlvjjo5BTL
+I7RRRfhWyIROVozFi9s/oH6uYZn2UTb24zGC2gECggEBALiIfECDh82a+hm7Cwv8
+qmwiu6r9hV5tVXk25fNv3D9mDzd+WHPkKYeuergjr0GkBXeHWP/J3CvE+Lw0yboE
+gKpz00/N5qsdUbuEoLYA1Qj/PuzZ0c5bMFkgA5VXQxsVCtupBZh7KQ/9XkaeFped
+/YWVX3/1iFBlM+fmyTwMqqOM2Im/8FG47Diw9oKvGX/66LWrsuIZwr1MqHKPsHwh
+U3SMQpEgZOG6+4qjsfj/dbkIhKUNj6cWc6jtYQOA5GfMfVPk3zrBuxUcCphM7jqD
+KGdZNlndH9LqQhNc+ibrDu0Kwbz5z/FvYUo6knnC6TCvm2hrYlI0jf4CaHHQYM0X
+dCUCggEACvTEoQ7gZMeaqr+j8fhsisLoRRCtslqoU27jqWTriISlnlvjNHqYOWb/
+JXinuvpiYZG5jih6KXxa26H+Q5Pb4amVNPq/d6qBu5yv9qpD3mCJaHNHPByLScZ9
+G+pBW+y5JXHCdFJjo6G4ipLLpPglAPte/TmEnoShGsxtgOmupYSliNteAz0ykvSv
+At+UfdzdSY2uHC7JLnJjB7SeOz8YeXyE8KCBOAokxCjs0CdBeZDK46sti9umMuIr
+cDVIk/azvt5ex5sXP944Ds7tUs/qS1bdm5DsG4XYBkSKRhNqlkdxLumMPnGcwsZC
+JSRSgO3qryi1B/PjFld2fmtKpkffCw==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp224r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp224r1.key
new file mode 100644
index 000000000000..8c74cd9783d8
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp224r1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBByDAgBh6UOQqYJSPoiNWrK0
+rA0rTMLw8JdCEveBoTwDOgAEABwjlgBV9PPpMfo8fo6yWRdT+sb1cUdEhobd+V/D
+/i58cWpDqd4CApevJWtkGbwhU4J9mN0aYrk=
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp256k1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp256k1.key
new file mode 100644
index 000000000000..05ab7d4dd065
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp256k1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgAjoYh3zy6gJciB7F/pHi
+fU+IfPBeEhgQBFT3zNvox5ihRANCAATTIv3AIcnOXMvnURBseRspHsowmPAxPgsx
+LH5+aU2mW06f2PsIe9F8gG/Nf2UOOuO+aqwEStIkfSBR+Fwpl2UR
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp256r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp256r1.key
new file mode 100644
index 000000000000..2ff386caba17
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp256r1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSFp08cP6os9Fxmky
+o5VFi6woYEqvbhVNYTp9NvwzBCChRANCAAQo6UQaiHkZr7lxrKDZyL9Qinr4Vy0Q
+W3K2EPFYbVIupvzW0RH8vBy+0/yoaNyUsw/IsmBO+A60mhBB4rTjmq6R
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp384r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp384r1.key
new file mode 100644
index 000000000000..f662e85f76c6
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp384r1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCqdZTmuPvhbOVI/Vkk
+yjowWmBb1+81m+ay2QF15TZns1iX4HQlaOZ1GzaqhJRS0R2hZANiAASYw9dep7R9
+IoC8Dzt6T0NYOOJE/TPdOXOH+M6uJvKAtmXGalFeLQX6HKlUDNPnBDTKp9p6Nu/o
+2k/p2C9m0DaX70sNuyfOmh738Bw2Hlz3If+903Jj+hKSR4kWDkKYb/s=
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp521r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp521r1.key
new file mode 100644
index 000000000000..e987b65b0e03
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/secp521r1.key
@@ -0,0 +1,8 @@
+-----BEGIN PRIVATE KEY-----
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAdO/4HyMRu7/QcjYn
+f8vynFJRVOKHVVmRFrAzZwkdusoqf9gkicCxcxhOpOGLezzTH4XBynbcmmMn4PNS
+ZriTYO6hgYkDgYYABAAp8YOO/QeQoVEdzsOwZt1ta0/b5r0ESM/QNkBVgrRdCsJ+
+y3p/xis4wFlhv7lsrtuDoeuMimnvl+fAfptCzMKHugGBvSE0SjLgydEmUjh/y/a4
+O3cGqwUXnnxiLKJ98NFaooGYY+AwH4h77oCbQR1lf8jhe1qsJkR9mXpYuGnkaJ7l
+qg==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x25519.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x25519.key
new file mode 100644
index 000000000000..affde0dce116
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x25519.key
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VuBCIEINAdGSXck38nDXMgbRKqKiBPVuxDirhOs9VDE+NaokZz
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x448-aes-256-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x448-aes-256-cbc.key
new file mode 100644
index 000000000000..bb6e86a68f58
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x448-aes-256-cbc.key
@@ -0,0 +1,6 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIGrMFcGCSqGSIb3DQEFDTBKMCkGCSqGSIb3DQEFDDAcBAjrmjUn6y1PFwICCAAw
+DAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEJuU2Lvx741TqKFa9X8bRGkEUPYI
+SNtLGe+fIcgz7rF8YaTnA0oeMsRp4RxBw/fsaEGrHUTM1ddjuyRzdKKNnghZIs0w
+zy/O8QNXDzrss5bnxZyHZA2XEvftHTH1Mw9jCtwA
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x448.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x448.key
new file mode 100644
index 000000000000..04b53654134e
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/pkcs8/x448.key
@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MEYCAQAwBQYDK2VvBDoEOFRfvQhj134qZjH0wDbmPc90BADiqrpGZSae/sd8GG84
+au0ISBY6I7BJJZdiLLED+0abd0hLYAyl
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP256r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP256r1.key
new file mode 100644
index 000000000000..d17b664d739e
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP256r1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGIAgEAMBQGByqGSM49AgEGCSskAwMCCAEBBwRtMGsCAQEEIBfCkWEWyc2tHIvS
+Ao6hhcj09dnh8NOmtZeqGmcXHnIqoUQDQgAElux3elmSzb/WqEZXb1vdXx/tcIpC
+Yq2vewG8H1SikMoACeFVRcjuy31gJ4Q8M7UQmrR4+WXSptV/UQ6Gkt3XuQ==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP256t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP256t1.key
new file mode 100644
index 000000000000..2ef7cc4194e7
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP256t1.key
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHgCAQEEIILhgc3joEZDWMDm9TYgrENN7gbqtMpMw1e2MTLwlJhCoAsGCSskAwMC
+CAEBCKFEA0IABIgzdtCT/Dvc0iuOrT+jJFyTzQH8jSENIToHEP/xcOVdMoklPgTx
+ng6CA7FvC5xJUtYSGVqtCVUDWYHuXotm7IU=
+-----END EC PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP320r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP320r1.key
new file mode 100644
index 000000000000..e1bd06c2793b
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP320r1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGiAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCQSBhjCBgwIBAQQoNifTnb4a5dOR
+yr8QFVM7Zkw/f/AMm5T5PQ6iVTCzrnw/kZ8glwl+JKFUA1IABHSnWUC/tKXpNHGE
+P89QVKEgvetwCQWFoOENAgXORniLiaLdAdsR80ouTsZiFgHG9su0l5ESEnFWQr5x
+UMj/vPwwhSYm+YP5ucx5NezuBM4d
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP320t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP320t1.key
new file mode 100644
index 000000000000..17e60c9549cd
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP320t1.key
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGQAgEBBCi0aeKsFfr17MTtr3IgFByp4IybuFzlgAbwPjf3rK0Fr/b87+WicOU6
+oAsGCSskAwMCCAEBCqFUA1IABDQHDepa3l/S8Gt9WrNCNpCPZNBXvmkGPnVXZchZ
+I5BtUySwYxHX1tpatGs3jY7drVYm+NyxZE81pecYTvXR8bu7e3BIp2SwZmXEDxdY
+p1fw
+-----END EC PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP384r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP384r1.key
new file mode 100644
index 000000000000..c248a0f0d448
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP384r1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG6AgEAMBQGByqGSM49AgEGCSskAwMCCAEBCwSBnjCBmwIBAQQwK6y6NydLMTNm
+LhDNPyTDKEemTWTUuMGfBQxEz+lQKAqz/So4uA+fQzor/t8to+uioWQDYgAEaK8X
+3KCyRDMpbACw2xG4UUe9OxyuGWFaGKPxhKJDyW5Z56gT5P1Q2y4CblL/X9VcDIMX
+dcQqRNBkPQfy1+fJXwKO0ClfD6MIE3bv6PTZ55J6H2H1dpg38a2soRchz0FN
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP384t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP384t1.key
new file mode 100644
index 000000000000..39a94e293b32
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP384t1.key
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGoAgEBBDAEZRoS9O2fGbx85aPZzZxfj33Wu8aZ8a+K5ZZBFuVKKL+/0UbidDhD
+YiuAHL6GAr2gCwYJKyQDAwIIAQEMoWQDYgAEQL0dQoOTArIx70V/XxipoxxBeKT7
+zmIe7id5pQiw4O4nA2S2BFxQF9eW9ipnm6DaN6jaX/+2k+cC4qIfqzeLcLUFXxz0
+qdec8lNNtr9QmwoQlv11beeHmQu9C1GwHmvG
+-----END EC PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP512r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP512r1.key
new file mode 100644
index 000000000000..790b619c365c
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP512r1.key
@@ -0,0 +1,7 @@
+-----BEGIN PRIVATE KEY-----
+MIHsAgEAMBQGByqGSM49AgEGCSskAwMCCAEBDQSB0DCBzQIBAQRAmEQNFMGIDLoj
+Ktdg8V71WdSs7FiBkE6Bft25+yY8ohugk/u8aKeIKNVtSirMgQhGFJy/BIBkvM6V
+1JfnrglkjqGBhQOBggAEYbjTnA0x42NdM7jVv7jAoZq0iOYopbwejlOEsx8/MqRa
+Yt4Ef83holIsgOHWSeW+kw1oMDmieoCrhnkM/3KgGzV+BxCeieAWGxABsj9YhAmb
+ATorRJ4q/pMxRq8gIUv05/dGuUttl1gdbKKnGQjxDBM4v5H+/4z00nzzj4Gbfx8=
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP512t1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP512t1.key
new file mode 100644
index 000000000000..eedbcdb4b81c
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/brainpoolP512t1.key
@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHaAgEBBEBNqbJnTzwGwg9JyyXBrQjXF8LT/q53Jydyv6L9AgU5c2vg5CJVvgoL
+8JL/YU+i1UwVIdl8JLZuCLpi+Dcy1rlIoAsGCSskAwMCCAEBDqGBhQOBggAEm/uI
+qsytMZypsqCuL0jwZh8xCRVEkUd02YPXcOBhMzS9bhAao4CLAuXhWzplr5qk/7tt
+vczl7qFDOvBzNAIieZHwbFrouZ6Pew8pQXRcMDB+FnXwNgpljTNmz/f1ePjVKU1Z
+gbQ+xVf8Qt8OI9S0Pla8siTgbVweGMLtq0A8Wuo=
+-----END EC PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/prime256v1-aes-128-cbc.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/prime256v1-aes-128-cbc.key
new file mode 100644
index 000000000000..ccecc24707e1
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/prime256v1-aes-128-cbc.key
@@ -0,0 +1,8 @@
+-----BEGIN EC PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,3F26BBC4C7A6F3B5B3A5C03C7CC59B33
+
+rp4qC+n+qIG+WKJp4BHQHk5z0oraaaLZvoVK5glESGx5IcR3mCsN7tdg2aZ7yEk+
+HnT4nQuM3R5pv248cmK0xDUje8N7FLe8lixVnEyQx3JdZfGdauowt9yaxL3AJypX
+idWxNrxz1xff5RSMI6+PFv2SQpG0l794EpOjZxOUABM=
+-----END EC PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/prime256v1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/prime256v1.key
new file mode 100644
index 000000000000..775a7a0fcacf
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/prime256v1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQguc9upTMQn8b+loAx
+6c8q20dHYBf3V9374I3kJIDmC1ShRANCAARnLuOxL7n7Gq12zd9vq2neAv6PYc1h
+W6M2gJKSbfFYGhte382jOJ2TgwaTQL/J5IPSfuJKkmAPBIl8CdJKWlwA
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp224r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp224r1.key
new file mode 100644
index 000000000000..8c74cd9783d8
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp224r1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBByDAgBh6UOQqYJSPoiNWrK0
+rA0rTMLw8JdCEveBoTwDOgAEABwjlgBV9PPpMfo8fo6yWRdT+sb1cUdEhobd+V/D
+/i58cWpDqd4CApevJWtkGbwhU4J9mN0aYrk=
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp256k1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp256k1.key
new file mode 100644
index 000000000000..05ab7d4dd065
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp256k1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgAjoYh3zy6gJciB7F/pHi
+fU+IfPBeEhgQBFT3zNvox5ihRANCAATTIv3AIcnOXMvnURBseRspHsowmPAxPgsx
+LH5+aU2mW06f2PsIe9F8gG/Nf2UOOuO+aqwEStIkfSBR+Fwpl2UR
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp256r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp256r1.key
new file mode 100644
index 000000000000..2ff386caba17
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp256r1.key
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSFp08cP6os9Fxmky
+o5VFi6woYEqvbhVNYTp9NvwzBCChRANCAAQo6UQaiHkZr7lxrKDZyL9Qinr4Vy0Q
+W3K2EPFYbVIupvzW0RH8vBy+0/yoaNyUsw/IsmBO+A60mhBB4rTjmq6R
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp384r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp384r1.key
new file mode 100644
index 000000000000..f662e85f76c6
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp384r1.key
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCqdZTmuPvhbOVI/Vkk
+yjowWmBb1+81m+ay2QF15TZns1iX4HQlaOZ1GzaqhJRS0R2hZANiAASYw9dep7R9
+IoC8Dzt6T0NYOOJE/TPdOXOH+M6uJvKAtmXGalFeLQX6HKlUDNPnBDTKp9p6Nu/o
+2k/p2C9m0DaX70sNuyfOmh738Bw2Hlz3If+903Jj+hKSR4kWDkKYb/s=
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp521r1.key b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp521r1.key
new file mode 100644
index 000000000000..e987b65b0e03
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/sec1/secp521r1.key
@@ -0,0 +1,8 @@
+-----BEGIN PRIVATE KEY-----
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAdO/4HyMRu7/QcjYn
+f8vynFJRVOKHVVmRFrAzZwkdusoqf9gkicCxcxhOpOGLezzTH4XBynbcmmMn4PNS
+ZriTYO6hgYkDgYYABAAp8YOO/QeQoVEdzsOwZt1ta0/b5r0ESM/QNkBVgrRdCsJ+
+y3p/xis4wFlhv7lsrtuDoeuMimnvl+fAfptCzMKHugGBvSE0SjLgydEmUjh/y/a4
+O3cGqwUXnnxiLKJ98NFaooGYY+AwH4h77oCbQR1lf8jhe1qsJkR9mXpYuGnkaJ7l
+qg==
+-----END PRIVATE KEY-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/test-cert-chain.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-cert-chain.pem
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/test-cert-chain.pem
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-cert-chain.pem
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-cert.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-cert.pem
new file mode 100644
index 000000000000..245cf8f8f86a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-cert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-key.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-key.pem
new file mode 100644
index 000000000000..ebdcf202f31a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/ssl/pem/test-key.pem
@@ -0,0 +1,59 @@
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD8B1saBN8Y0ZjX
+Q/pvnv2hZa+cBBkFHVkgw+tdzgdcO5Kjv2rnRKd3Oh8Qwdxj3BC9GpicF4GOgkDG
+LrMrYbmV/xGUnNh3YpUwbv+U/pm3VnuSZCk4aYgNEWHrnEHyrge87+MqYqGuMIke
+A5z7GV44PeThfKQs2BLLL/ME+Pb/jN6IVlIHxdBT5TBQkqNGFU7swdZoQ5Viqv44
+UNdVqU5pP3UF/perbOm2CHCbeLiLRvmuvGuBbrbko2XUwBNH+UjmEQaRh/epoy8B
+D31vGY87ym/YOEdpIrqD8bwg7NWP/Fdsryqi8p+U8fcfw4xZjotA0Sv04BC7zXHg
+m1AyZoVzAgMBAAECggEAfEqiZqANaF+BqXQIb4Dw42ZTJzWsIyYYnPySOGZRoe5t
+QJ03uwtULYv34xtANe1DQgd6SMyc46ugBzzjtprQ3ET5Jhn99U6kdcjf+dpf85dO
+hOEppP0CkDNI39nleinSfh6uIOqYgt/D143/nqQhn8oCdSOzkbwT9KnWh1bC9T7I
+vFjGfElvt1/xl88qYgrWgYLgXaencNGgiv/4/M0FNhiHEGsVC7SCu6kapC/WIQpE
+5IdV+HR+tiLoGZhXlhqorY7QC4xKC4wwafVSiFxqDOQAuK+SMD4TCEv0Aop+c+SE
+YBigVTmgVeJkjK7IkTEhKkAEFmRF5/5w+bZD9FhTNQKBgQD+4fNG1ChSU8RdizZT
+5dPlDyAxpETSCEXFFVGtPPh2j93HDWn7XugNyjn5FylTH507QlabC+5wZqltdIjK
+GRB5MIinQ9/nR2fuwGc9s+0BiSEwNOUB1MWm7wWL/JUIiKq6sTi6sJIfsYg79zco
+qxl5WE94aoINx9Utq1cdWhwJTQKBgQD9IjPksd4Jprz8zMrGLzR8k1gqHyhv24qY
+EJ7jiHKKAP6xllTUYwh1IBSL6w2j5lfZPpIkb4Jlk2KUoX6fN81pWkBC/fTBUSIB
+EHM9bL51+yKEYUbGIy/gANuRbHXsWg3sjUsFTNPN4hGTFk3w2xChCyl/f5us8Lo8
+Z633SNdpvwKBgQCGyDU9XzNzVZihXtx7wS0sE7OSjKtX5cf/UCbA1V0OVUWR3SYO
+J0HPCQFfF0BjFHSwwYPKuaR9C8zMdLNhK5/qdh/NU7czNi9fsZ7moh7SkRFbzJzN
+OxbKD9t/CzJEMQEXeF/nWTfsSpUgILqqZtAxuuFLbAcaAnJYlCKdAumQgQKBgQCK
+mqjJh68pn7gJwGUjoYNe1xtGbSsqHI9F9ovZ0MPO1v6e5M7sQJHH+Fnnxzv/y8e8
+d6tz8e73iX1IHymDKv35uuZHCGF1XOR+qrA/KQUc+vcKf21OXsP/JtkTRs1HLoRD
+S5aRf2DWcfvniyYARSNU2xTM8GWgi2ueWbMDHUp+ZwKBgA/swC+K+Jg5DEWm6Sau
+e6y+eC6S+SoXEKkI3wf7m9aKoZo0y+jh8Gas6gratlc181pSM8O3vZG0n19b493I
+apCFomMLE56zEzvyzfpsNhFhk5MBMCn0LPyzX6MiynRlGyWIj0c99fbHI3pOMufP
+WgmVLTZ8uDcSW1MbdUCwFSk5
+-----END PRIVATE KEY-----
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+subject=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+issuer=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/client/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/client/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/client/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/jetty/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/jetty/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/jetty/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/netty/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/netty/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/netty/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/tomcat/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/tomcat/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/tomcat/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/restricted.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/undertow/restricted.jks
similarity index 100%
rename from spring-boot-project/spring-boot/src/test/resources/restricted.jks
rename to spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/undertow/restricted.jks
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/undertow/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/undertow/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/embedded/undertow/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html
deleted file mode 100644
index fa22264e2356..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello {{World}}
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test-cert.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test-cert.pem
new file mode 100644
index 000000000000..245cf8f8f86a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test-cert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test-key.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test-key.pem
new file mode 100644
index 000000000000..ebdcf202f31a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test-key.pem
@@ -0,0 +1,59 @@
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD8B1saBN8Y0ZjX
+Q/pvnv2hZa+cBBkFHVkgw+tdzgdcO5Kjv2rnRKd3Oh8Qwdxj3BC9GpicF4GOgkDG
+LrMrYbmV/xGUnNh3YpUwbv+U/pm3VnuSZCk4aYgNEWHrnEHyrge87+MqYqGuMIke
+A5z7GV44PeThfKQs2BLLL/ME+Pb/jN6IVlIHxdBT5TBQkqNGFU7swdZoQ5Viqv44
+UNdVqU5pP3UF/perbOm2CHCbeLiLRvmuvGuBbrbko2XUwBNH+UjmEQaRh/epoy8B
+D31vGY87ym/YOEdpIrqD8bwg7NWP/Fdsryqi8p+U8fcfw4xZjotA0Sv04BC7zXHg
+m1AyZoVzAgMBAAECggEAfEqiZqANaF+BqXQIb4Dw42ZTJzWsIyYYnPySOGZRoe5t
+QJ03uwtULYv34xtANe1DQgd6SMyc46ugBzzjtprQ3ET5Jhn99U6kdcjf+dpf85dO
+hOEppP0CkDNI39nleinSfh6uIOqYgt/D143/nqQhn8oCdSOzkbwT9KnWh1bC9T7I
+vFjGfElvt1/xl88qYgrWgYLgXaencNGgiv/4/M0FNhiHEGsVC7SCu6kapC/WIQpE
+5IdV+HR+tiLoGZhXlhqorY7QC4xKC4wwafVSiFxqDOQAuK+SMD4TCEv0Aop+c+SE
+YBigVTmgVeJkjK7IkTEhKkAEFmRF5/5w+bZD9FhTNQKBgQD+4fNG1ChSU8RdizZT
+5dPlDyAxpETSCEXFFVGtPPh2j93HDWn7XugNyjn5FylTH507QlabC+5wZqltdIjK
+GRB5MIinQ9/nR2fuwGc9s+0BiSEwNOUB1MWm7wWL/JUIiKq6sTi6sJIfsYg79zco
+qxl5WE94aoINx9Utq1cdWhwJTQKBgQD9IjPksd4Jprz8zMrGLzR8k1gqHyhv24qY
+EJ7jiHKKAP6xllTUYwh1IBSL6w2j5lfZPpIkb4Jlk2KUoX6fN81pWkBC/fTBUSIB
+EHM9bL51+yKEYUbGIy/gANuRbHXsWg3sjUsFTNPN4hGTFk3w2xChCyl/f5us8Lo8
+Z633SNdpvwKBgQCGyDU9XzNzVZihXtx7wS0sE7OSjKtX5cf/UCbA1V0OVUWR3SYO
+J0HPCQFfF0BjFHSwwYPKuaR9C8zMdLNhK5/qdh/NU7czNi9fsZ7moh7SkRFbzJzN
+OxbKD9t/CzJEMQEXeF/nWTfsSpUgILqqZtAxuuFLbAcaAnJYlCKdAumQgQKBgQCK
+mqjJh68pn7gJwGUjoYNe1xtGbSsqHI9F9ovZ0MPO1v6e5M7sQJHH+Fnnxzv/y8e8
+d6tz8e73iX1IHymDKv35uuZHCGF1XOR+qrA/KQUc+vcKf21OXsP/JtkTRs1HLoRD
+S5aRf2DWcfvniyYARSNU2xTM8GWgi2ueWbMDHUp+ZwKBgA/swC+K+Jg5DEWm6Sau
+e6y+eC6S+SoXEKkI3wf7m9aKoZo0y+jh8Gas6gratlc181pSM8O3vZG0n19b493I
+apCFomMLE56zEzvyzfpsNhFhk5MBMCn0LPyzX6MiynRlGyWIj0c99fbHI3pOMufP
+WgmVLTZ8uDcSW1MbdUCwFSk5
+-----END PRIVATE KEY-----
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+subject=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+issuer=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test.p12 b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test.p12
new file mode 100644
index 000000000000..e1255f26f665
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/server/test.p12 differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-cert-chain.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-cert-chain.pem
new file mode 100644
index 000000000000..df103772cfe2
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-cert-chain.pem
@@ -0,0 +1,32 @@
+-----BEGIN TRUSTED CERTIFICATE-----
+MIIClzCCAgACCQCPbjkRoMVEQDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28x
+DTALBgNVBAoMBFRlc3QxDTALBgNVBAsMBFRlc3QxFDASBgNVBAMMC2V4YW1wbGUu
+Y29tMR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29tMB4XDTIwMDMyNzIx
+NTgwNFoXDTIxMDMyNzIxNTgwNFowgY8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApD
+YWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARUZXN0
+MQ0wCwYDVQQLDARUZXN0MRQwEgYDVQQDDAtleGFtcGxlLmNvbTEfMB0GCSqGSIb3
+DQEJARYQdGVzdEBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEA1YzixWEoyzrd20C2R1gjyPCoPfFLlG6UYTyT0tueNy6yjv6qbJ8lcZg7616O
+3I9LuOHhZh9U+fCDCgPfiDdyJfDEW/P+dsOMFyMUXPrJPze2yPpOnvV8iJ5DM93u
+fEVhCCyzLdYu0P2P3hU2W+T3/Im9DA7FOPA2vF1SrIJ2qtUCAwEAATANBgkqhkiG
+9w0BAQUFAAOBgQBdShkwUv78vkn1jAdtfbB+7mpV9tufVdo29j7pmotTCz3ny5fc
+zLEfeu6JPugAR71JYbc2CqGrMneSk1zT91EH6ohIz8OR5VNvzB7N7q65Ci7OFMPl
+ly6k3rHpMCBtHoyNFhNVfPLxGJ9VlWFKLgIAbCmL4OIQm1l6Fr1MSM38Zw==
+-----END TRUSTED CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICjzCCAfgCAQEwDQYJKoZIhvcNAQEFBQAwgY8xCzAJBgNVBAYTAlVTMRMwEQYD
+VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQK
+DARUZXN0MQ0wCwYDVQQLDARUZXN0MRQwEgYDVQQDDAtleGFtcGxlLmNvbTEfMB0G
+CSqGSIb3DQEJARYQdGVzdEBleGFtcGxlLmNvbTAeFw0yMDAzMjcyMjAxNDZaFw0y
+MTAzMjcyMjAxNDZaMIGPMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p
+YTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwEVGVzdDENMAsGA1UE
+CwwEVGVzdDEUMBIGA1UEAwwLZXhhbXBsZS5jb20xHzAdBgkqhkiG9w0BCQEWEHRl
+c3RAZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM7kd2cj
+F49wm1+OQ7Q5GE96cXueWNPr/Nwei71tf6G4BmE0B+suXHEvnLpHTj9pdX/ZzBIK
+8jIZ/x8RnSduK/Ky+zm1QMYUWZtWCAgCW8WzgB69Cn/hQG8KSX3S9bqODuQAvP54
+GQJD7+4kVuNBGjFb4DaD4nvMmPtALSZf8ZCZAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+gYEAOn6X8+0VVlDjF+TvTgI0KIasA6nDm+KXe7LVtfvqWqQZH4qyd2uiwcDM3Aux
+a/OsPdOw0j+NqFDBd3mSMhSVgfvXdK6j9WaxY1VGXyaidLARgvn63wfzgr857sQW
+c8eSxbwEQxwlMvVxW6Os4VhCfUQr8VrBrvPa2zs+6IlK+Ug=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-cert.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-cert.pem
new file mode 100644
index 000000000000..245cf8f8f86a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-cert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-key.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-key.pem
new file mode 100644
index 000000000000..ebdcf202f31a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test-key.pem
@@ -0,0 +1,59 @@
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD8B1saBN8Y0ZjX
+Q/pvnv2hZa+cBBkFHVkgw+tdzgdcO5Kjv2rnRKd3Oh8Qwdxj3BC9GpicF4GOgkDG
+LrMrYbmV/xGUnNh3YpUwbv+U/pm3VnuSZCk4aYgNEWHrnEHyrge87+MqYqGuMIke
+A5z7GV44PeThfKQs2BLLL/ME+Pb/jN6IVlIHxdBT5TBQkqNGFU7swdZoQ5Viqv44
+UNdVqU5pP3UF/perbOm2CHCbeLiLRvmuvGuBbrbko2XUwBNH+UjmEQaRh/epoy8B
+D31vGY87ym/YOEdpIrqD8bwg7NWP/Fdsryqi8p+U8fcfw4xZjotA0Sv04BC7zXHg
+m1AyZoVzAgMBAAECggEAfEqiZqANaF+BqXQIb4Dw42ZTJzWsIyYYnPySOGZRoe5t
+QJ03uwtULYv34xtANe1DQgd6SMyc46ugBzzjtprQ3ET5Jhn99U6kdcjf+dpf85dO
+hOEppP0CkDNI39nleinSfh6uIOqYgt/D143/nqQhn8oCdSOzkbwT9KnWh1bC9T7I
+vFjGfElvt1/xl88qYgrWgYLgXaencNGgiv/4/M0FNhiHEGsVC7SCu6kapC/WIQpE
+5IdV+HR+tiLoGZhXlhqorY7QC4xKC4wwafVSiFxqDOQAuK+SMD4TCEv0Aop+c+SE
+YBigVTmgVeJkjK7IkTEhKkAEFmRF5/5w+bZD9FhTNQKBgQD+4fNG1ChSU8RdizZT
+5dPlDyAxpETSCEXFFVGtPPh2j93HDWn7XugNyjn5FylTH507QlabC+5wZqltdIjK
+GRB5MIinQ9/nR2fuwGc9s+0BiSEwNOUB1MWm7wWL/JUIiKq6sTi6sJIfsYg79zco
+qxl5WE94aoINx9Utq1cdWhwJTQKBgQD9IjPksd4Jprz8zMrGLzR8k1gqHyhv24qY
+EJ7jiHKKAP6xllTUYwh1IBSL6w2j5lfZPpIkb4Jlk2KUoX6fN81pWkBC/fTBUSIB
+EHM9bL51+yKEYUbGIy/gANuRbHXsWg3sjUsFTNPN4hGTFk3w2xChCyl/f5us8Lo8
+Z633SNdpvwKBgQCGyDU9XzNzVZihXtx7wS0sE7OSjKtX5cf/UCbA1V0OVUWR3SYO
+J0HPCQFfF0BjFHSwwYPKuaR9C8zMdLNhK5/qdh/NU7czNi9fsZ7moh7SkRFbzJzN
+OxbKD9t/CzJEMQEXeF/nWTfsSpUgILqqZtAxuuFLbAcaAnJYlCKdAumQgQKBgQCK
+mqjJh68pn7gJwGUjoYNe1xtGbSsqHI9F9ovZ0MPO1v6e5M7sQJHH+Fnnxzv/y8e8
+d6tz8e73iX1IHymDKv35uuZHCGF1XOR+qrA/KQUc+vcKf21OXsP/JtkTRs1HLoRD
+S5aRf2DWcfvniyYARSNU2xTM8GWgi2ueWbMDHUp+ZwKBgA/swC+K+Jg5DEWm6Sau
+e6y+eC6S+SoXEKkI3wf7m9aKoZo0y+jh8Gas6gratlc181pSM8O3vZG0n19b493I
+apCFomMLE56zEzvyzfpsNhFhk5MBMCn0LPyzX6MiynRlGyWIj0c99fbHI3pOMufP
+WgmVLTZ8uDcSW1MbdUCwFSk5
+-----END PRIVATE KEY-----
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+subject=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+issuer=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test.p12 b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test.p12
new file mode 100644
index 000000000000..e1255f26f665
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/server/test.p12 differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/context/conf.properties b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/context/conf.properties
deleted file mode 100644
index 0eb014d0ff22..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/context/conf.properties
+++ /dev/null
@@ -1 +0,0 @@
-context=/example
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test-cert.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test-cert.pem
new file mode 100644
index 000000000000..245cf8f8f86a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test-cert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test-key.pem b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test-key.pem
new file mode 100644
index 000000000000..ebdcf202f31a
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test-key.pem
@@ -0,0 +1,59 @@
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD8B1saBN8Y0ZjX
+Q/pvnv2hZa+cBBkFHVkgw+tdzgdcO5Kjv2rnRKd3Oh8Qwdxj3BC9GpicF4GOgkDG
+LrMrYbmV/xGUnNh3YpUwbv+U/pm3VnuSZCk4aYgNEWHrnEHyrge87+MqYqGuMIke
+A5z7GV44PeThfKQs2BLLL/ME+Pb/jN6IVlIHxdBT5TBQkqNGFU7swdZoQ5Viqv44
+UNdVqU5pP3UF/perbOm2CHCbeLiLRvmuvGuBbrbko2XUwBNH+UjmEQaRh/epoy8B
+D31vGY87ym/YOEdpIrqD8bwg7NWP/Fdsryqi8p+U8fcfw4xZjotA0Sv04BC7zXHg
+m1AyZoVzAgMBAAECggEAfEqiZqANaF+BqXQIb4Dw42ZTJzWsIyYYnPySOGZRoe5t
+QJ03uwtULYv34xtANe1DQgd6SMyc46ugBzzjtprQ3ET5Jhn99U6kdcjf+dpf85dO
+hOEppP0CkDNI39nleinSfh6uIOqYgt/D143/nqQhn8oCdSOzkbwT9KnWh1bC9T7I
+vFjGfElvt1/xl88qYgrWgYLgXaencNGgiv/4/M0FNhiHEGsVC7SCu6kapC/WIQpE
+5IdV+HR+tiLoGZhXlhqorY7QC4xKC4wwafVSiFxqDOQAuK+SMD4TCEv0Aop+c+SE
+YBigVTmgVeJkjK7IkTEhKkAEFmRF5/5w+bZD9FhTNQKBgQD+4fNG1ChSU8RdizZT
+5dPlDyAxpETSCEXFFVGtPPh2j93HDWn7XugNyjn5FylTH507QlabC+5wZqltdIjK
+GRB5MIinQ9/nR2fuwGc9s+0BiSEwNOUB1MWm7wWL/JUIiKq6sTi6sJIfsYg79zco
+qxl5WE94aoINx9Utq1cdWhwJTQKBgQD9IjPksd4Jprz8zMrGLzR8k1gqHyhv24qY
+EJ7jiHKKAP6xllTUYwh1IBSL6w2j5lfZPpIkb4Jlk2KUoX6fN81pWkBC/fTBUSIB
+EHM9bL51+yKEYUbGIy/gANuRbHXsWg3sjUsFTNPN4hGTFk3w2xChCyl/f5us8Lo8
+Z633SNdpvwKBgQCGyDU9XzNzVZihXtx7wS0sE7OSjKtX5cf/UCbA1V0OVUWR3SYO
+J0HPCQFfF0BjFHSwwYPKuaR9C8zMdLNhK5/qdh/NU7czNi9fsZ7moh7SkRFbzJzN
+OxbKD9t/CzJEMQEXeF/nWTfsSpUgILqqZtAxuuFLbAcaAnJYlCKdAumQgQKBgQCK
+mqjJh68pn7gJwGUjoYNe1xtGbSsqHI9F9ovZ0MPO1v6e5M7sQJHH+Fnnxzv/y8e8
+d6tz8e73iX1IHymDKv35uuZHCGF1XOR+qrA/KQUc+vcKf21OXsP/JtkTRs1HLoRD
+S5aRf2DWcfvniyYARSNU2xTM8GWgi2ueWbMDHUp+ZwKBgA/swC+K+Jg5DEWm6Sau
+e6y+eC6S+SoXEKkI3wf7m9aKoZo0y+jh8Gas6gratlc181pSM8O3vZG0n19b493I
+apCFomMLE56zEzvyzfpsNhFhk5MBMCn0LPyzX6MiynRlGyWIj0c99fbHI3pOMufP
+WgmVLTZ8uDcSW1MbdUCwFSk5
+-----END PRIVATE KEY-----
+Bag Attributes
+    friendlyName: test-alias
+    localKeyID: 54 69 6D 65 20 31 36 38 33 32 38 36 31 31 34 30 37 31 
+subject=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+issuer=C = US, ST = California, L = Palo Alto, O = VMware, OU = Spring, CN = localhost
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIIFMqbpqvipw0wDQYJKoZIhvcNAQELBQAwbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDAgFw0yMzA1MDUxMTI2NThaGA8yMTIzMDQxMTExMjY1OFowbDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVBhbG8gQWx0bzEP
+MA0GA1UEChMGVk13YXJlMQ8wDQYDVQQLEwZTcHJpbmcxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwHWxoE3xjRmNdD
++m+e/aFlr5wEGQUdWSDD613OB1w7kqO/audEp3c6HxDB3GPcEL0amJwXgY6CQMYu
+sythuZX/EZSc2HdilTBu/5T+mbdWe5JkKThpiA0RYeucQfKuB7zv4ypioa4wiR4D
+nPsZXjg95OF8pCzYEssv8wT49v+M3ohWUgfF0FPlMFCSo0YVTuzB1mhDlWKq/jhQ
+11WpTmk/dQX+l6ts6bYIcJt4uItG+a68a4FutuSjZdTAE0f5SOYRBpGH96mjLwEP
+fW8ZjzvKb9g4R2kiuoPxvCDs1Y/8V2yvKqLyn5Tx9x/DjFmOi0DRK/TgELvNceCb
+UDJmhXMCAwEAAaNPME0wHQYDVR0OBBYEFMBIGU1nwix5RS3O5hGLLoMdR1+NMCwG
+A1UdEQQlMCOCCWxvY2FsaG9zdIcQAAAAAAAAAAAAAAAAAAAAAYcEfwAAATANBgkq
+hkiG9w0BAQsFAAOCAQEAhepfJgTFvqSccsT97XdAZfvB0noQx5NSynRV8NWmeOld
+hHP6Fzj6xCxHSYvlUfmX8fVP9EOAuChgcbbuTIVJBu60rnDT21oOOnp8FvNonCV6
+gJ89sCL7wZ77dw2RKIeUFjXXEV3QJhx2wCOVmLxnJspDoKFIEVjfLyiPXKxqe/6b
+dG8zzWDZ6z+M2JNCtVoOGpljpHqMPCmbDktncv6H3dDTZ83bmLj1nbpOU587gAJ8
+fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
+ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
+-----END CERTIFICATE-----
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test.jks b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test.jks
new file mode 100644
index 000000000000..74279d80fbac
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test.jks differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test.p12 b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test.p12
new file mode 100644
index 000000000000..e1255f26f665
Binary files /dev/null and b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/server/test.p12 differ
diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html
deleted file mode 100644
index fa22264e2356..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello {{World}}
diff --git a/spring-boot-project/spring-boot/src/test/resources/other.yml b/spring-boot-project/spring-boot/src/test/resources/other.yml
deleted file mode 100644
index b5bbd790764e..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/other.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-name: other
diff --git a/spring-boot-project/spring-boot/src/test/resources/override.properties b/spring-boot-project/spring-boot/src/test/resources/override.properties
deleted file mode 100644
index 6e30e3fc4dbb..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/override.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-foo=bar
-bar=override
-SPAM=BUCKET
-THE_NAME=NAME
diff --git a/spring-boot-project/spring-boot/src/test/resources/schema.sql b/spring-boot-project/spring-boot/src/test/resources/schema.sql
deleted file mode 100644
index 556b5e372a9f..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/schema.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE EXAMPLE (
-  id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-  name VARCHAR(30)
-);
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/some.properties b/spring-boot-project/spring-boot/src/test/resources/some.properties
deleted file mode 100644
index a1e02b448092..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/some.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-foo=spam
-bar=some
-spam=bucket
-the-name=name
diff --git a/spring-boot-project/spring-boot/src/test/resources/specific.properties b/spring-boot-project/spring-boot/src/test/resources/specific.properties
deleted file mode 100644
index 81ea94880041..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/specific.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.property=root
diff --git a/spring-boot-project/spring-boot/src/test/resources/specificlocation.properties b/spring-boot-project/spring-boot/src/test/resources/specificlocation.properties
deleted file mode 100644
index 25638d8453c6..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/specificlocation.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-my.property=fromspecificlocation
-the.property=fromspecificlocation
diff --git a/spring-boot-project/spring-boot/src/test/resources/spring-application-config-property-source.properties b/spring-boot-project/spring-boot/src/test/resources/spring-application-config-property-source.properties
deleted file mode 100644
index c1b09576e254..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/spring-application-config-property-source.properties
+++ /dev/null
@@ -1 +0,0 @@
-test.name=spring-application-config-property-source
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/test-banner-with-placeholder.txt b/spring-boot-project/spring-boot/src/test/resources/test-banner-with-placeholder.txt
deleted file mode 100644
index 96a027ca9fc2..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/test-banner-with-placeholder.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Running a Test!
-
-${test.property}
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/test-banner.txt b/spring-boot-project/spring-boot/src/test/resources/test-banner.txt
deleted file mode 100644
index d60fc28bdea9..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/test-banner.txt
+++ /dev/null
@@ -1 +0,0 @@
-Running a Test!
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot/src/test/resources/testactiveprofiles.properties b/spring-boot-project/spring-boot/src/test/resources/testactiveprofiles.properties
deleted file mode 100644
index 11cdae3b77e6..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testactiveprofiles.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.profiles.active=${activeProfile:propertiesfile}
diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofiles-default.properties b/spring-boot-project/spring-boot/src/test/resources/testprofiles-default.properties
deleted file mode 100644
index 841423aee6c2..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testprofiles-default.properties
+++ /dev/null
@@ -1 +0,0 @@
-my.property=fromdefaultpropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofiles-thedefault.properties b/spring-boot-project/spring-boot/src/test/resources/testprofiles-thedefault.properties
deleted file mode 100644
index bc81eb60a66c..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testprofiles-thedefault.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-my.property=fromdefaultpropertiesfile
-the.property=fromdefaultpropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testprofiles.yml
deleted file mode 100644
index dbe7c5f27205..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testprofiles.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-my:
-  property: fromyamlfile
-  other: notempty
----
-spring.config.activate.on-profile: dev
-my:
-  property: fromdevprofile
----
-spring.config.activate.on-profile: other
-my:
-  property: fromotherprofile
diff --git a/spring-boot-project/spring-boot/src/test/resources/testproperties.properties b/spring-boot-project/spring-boot/src/test/resources/testproperties.properties
deleted file mode 100644
index c523d5905871..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testproperties.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-my.property=frompropertiesfile
-the.property=frompropertiesfile
diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml
deleted file mode 100644
index 348c27211cd9..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-spring:
-  profiles:
-    active: dev,healthcheck
diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml
deleted file mode 100644
index f53736316044..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-spring:
-  profiles:
-    active:
-      - dev
-      - healthcheck
diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
deleted file mode 100644
index cbce97c51042..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-spring:
-  profiles:
-    active: dev, healthcheck
diff --git a/spring-boot-project/spring-boot/src/test/resources/testyaml.yml b/spring-boot-project/spring-boot/src/test/resources/testyaml.yml
deleted file mode 100644
index ffce1bd30924..000000000000
--- a/spring-boot-project/spring-boot/src/test/resources/testyaml.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-my:
-    property: fromyamlfile
-    array: [1,2,3]
diff --git a/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/reactive/server/MockReactiveWebServer.java b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/reactive/server/MockReactiveWebServer.java
new file mode 100644
index 000000000000..560a22f501fe
--- /dev/null
+++ b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/reactive/server/MockReactiveWebServer.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.web.reactive.server;
+
+import java.util.Map;
+
+import org.springframework.boot.web.server.WebServer;
+import org.springframework.http.server.reactive.HttpHandler;
+
+/**
+ * A mock reactive {@link WebServer}.
+ *
+ * @author Brian Clozel
+ */
+public class MockReactiveWebServer implements WebServer {
+
+	private final int port;
+
+	private HttpHandler httpHandler;
+
+	private Map<String, HttpHandler> httpHandlerMap;
+
+	MockReactiveWebServer(HttpHandler httpHandler, int port) {
+		this.httpHandler = httpHandler;
+		this.port = port;
+	}
+
+	MockReactiveWebServer(Map<String, HttpHandler> httpHandlerMap, int port) {
+		this.httpHandlerMap = httpHandlerMap;
+		this.port = port;
+	}
+
+	public HttpHandler getHttpHandler() {
+		return this.httpHandler;
+	}
+
+	public Map<String, HttpHandler> getHttpHandlerMap() {
+		return this.httpHandlerMap;
+	}
+
+	@Override
+	public void start() {
+
+	}
+
+	@Override
+	public void stop() {
+
+	}
+
+	@Override
+	public int getPort() {
+		return this.port;
+	}
+
+}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/MockReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/reactive/server/MockReactiveWebServerFactory.java
similarity index 59%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/MockReactiveWebServerFactory.java
rename to spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/reactive/server/MockReactiveWebServerFactory.java
index a2c672eb59f6..1566c3383e73 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/MockReactiveWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/reactive/server/MockReactiveWebServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.web.reactive.server;
 
-import java.util.Map;
-
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.http.server.reactive.HttpHandler;
 
@@ -42,47 +40,4 @@ public MockReactiveWebServer getWebServer() {
 		return this.webServer;
 	}
 
-	public static class MockReactiveWebServer implements WebServer {
-
-		private final int port;
-
-		private HttpHandler httpHandler;
-
-		private Map<String, HttpHandler> httpHandlerMap;
-
-		MockReactiveWebServer(HttpHandler httpHandler, int port) {
-			this.httpHandler = httpHandler;
-			this.port = port;
-		}
-
-		MockReactiveWebServer(Map<String, HttpHandler> httpHandlerMap, int port) {
-			this.httpHandlerMap = httpHandlerMap;
-			this.port = port;
-		}
-
-		public HttpHandler getHttpHandler() {
-			return this.httpHandler;
-		}
-
-		public Map<String, HttpHandler> getHttpHandlerMap() {
-			return this.httpHandlerMap;
-		}
-
-		@Override
-		public void start() {
-
-		}
-
-		@Override
-		public void stop() {
-
-		}
-
-		@Override
-		public int getPort() {
-			return this.port;
-		}
-
-	}
-
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServer.java b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/servlet/server/MockServletWebServer.java
similarity index 86%
rename from spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServer.java
rename to spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/servlet/server/MockServletWebServer.java
index 9f5886ab852a..6338acd3a1a7 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServer.java
+++ b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/servlet/server/MockServletWebServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testsupport.web.servlet;
+package org.springframework.boot.web.servlet.server;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,6 +31,9 @@
 import jakarta.servlet.ServletRegistration;
 import jakarta.servlet.SessionCookieConfig;
 
+import org.springframework.boot.web.server.WebServer;
+import org.springframework.boot.web.server.WebServerException;
+import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.mock.web.MockSessionCookieConfig;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -40,14 +43,12 @@
 import static org.mockito.Mockito.mock;
 
 /**
- * Base class for Mock {@code ServletWebServer} implementations. Reduces the amount of
- * code that would otherwise be duplicated in {@code spring-boot},
- * {@code spring-boot-autoconfigure} and {@code spring-boot-actuator}.
+ * A mock servlet {@link WebServer}.
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
  */
-public abstract class MockServletWebServer {
+public class MockServletWebServer implements WebServer {
 
 	private ServletContext servletContext;
 
@@ -59,7 +60,13 @@ public abstract class MockServletWebServer {
 
 	private final int port;
 
-	public MockServletWebServer(Initializer[] initializers, int port) {
+	MockServletWebServer(ServletContextInitializer[] initializers, int port) {
+		this(Arrays.stream(initializers)
+			.map((initializer) -> (Initializer) initializer::onStartup)
+			.toArray(Initializer[]::new), port);
+	}
+
+	MockServletWebServer(Initializer[] initializers, int port) {
 		this.initializers = initializers;
 		this.port = port;
 		initialize();
@@ -100,6 +107,11 @@ private void initialize() {
 		}
 	}
 
+	@Override
+	public void start() throws WebServerException {
+	}
+
+	@Override
 	public void stop() {
 		this.servletContext = null;
 		this.registeredServlets.clear();
@@ -131,6 +143,7 @@ public List<RegisteredFilter> getRegisteredFilters() {
 		return this.registeredFilters;
 	}
 
+	@Override
 	public int getPort() {
 		return this.port;
 	}
@@ -184,7 +197,7 @@ public Filter getFilter() {
 	}
 
 	/**
-	 * Initializer (usually implement by adapting {@code Initializer}).
+	 * Initializer (usually implement by adapting {@code ServletContextInitializer}).
 	 */
 	@FunctionalInterface
 	protected interface Initializer {
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/MockServletWebServerFactory.java b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/servlet/server/MockServletWebServerFactory.java
similarity index 72%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/MockServletWebServerFactory.java
rename to spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/servlet/server/MockServletWebServerFactory.java
index 502af7db9059..59151d615e83 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/MockServletWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/testFixtures/java/org/springframework/boot/web/servlet/server/MockServletWebServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,12 @@
 
 package org.springframework.boot.web.servlet.server;
 
-import java.util.Arrays;
-
 import jakarta.servlet.ServletContext;
 
-import org.springframework.boot.testsupport.web.servlet.MockServletWebServer.RegisteredFilter;
-import org.springframework.boot.testsupport.web.servlet.MockServletWebServer.RegisteredServlet;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.boot.web.servlet.server.MockServletWebServer.RegisteredFilter;
+import org.springframework.boot.web.servlet.server.MockServletWebServer.RegisteredServlet;
 
 import static org.mockito.Mockito.spy;
 
@@ -59,19 +57,4 @@ public RegisteredFilter getRegisteredFilter(int index) {
 		return (getWebServer() != null) ? getWebServer().getRegisteredFilters(index) : null;
 	}
 
-	public static class MockServletWebServer
-			extends org.springframework.boot.testsupport.web.servlet.MockServletWebServer implements WebServer {
-
-		MockServletWebServer(ServletContextInitializer[] initializers, int port) {
-			super(Arrays.stream(initializers)
-				.map((initializer) -> (Initializer) initializer::onStartup)
-				.toArray(Initializer[]::new), port);
-		}
-
-		@Override
-		public void start() {
-		}
-
-	}
-
 }
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
index 99683fa4dd00..a77127dbb41d 100644
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
@@ -67,15 +67,12 @@ private GenericContainer<?> createContainer(JavaRuntime javaRuntime) {
 			.withLogConsumer(this.output)
 			.withCopyFileToContainer(MountableFile.forHostPath(findApplication().toPath()), "/app.jar")
 			.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
-			.withCommand(command(javaRuntime));
+			.withCommand(command());
 	}
 
-	private String[] command(JavaRuntime javaRuntime) {
+	private String[] command() {
 		List<String> command = new ArrayList<>();
 		command.add("java");
-		if (javaRuntime.version == JavaVersion.TWENTY_FOUR) {
-			command.add("--enable-native-access=ALL-UNNAMED");
-		}
 		command.add("-jar");
 		command.add("app.jar");
 		return command.toArray(new String[0]);
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
index de3876bb69eb..f71d1579f8de 100644
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
@@ -90,15 +90,12 @@ private GenericContainer<?> createContainer(JavaRuntime javaRuntime, String name
 			.withLogConsumer(this.output)
 			.withCopyFileToContainer(findApplication(name, classifier), "/app.jar")
 			.withStartupCheckStrategy(new OneShotStartupCheckStrategy().withTimeout(Duration.ofMinutes(5)))
-			.withCommand(command(javaRuntime));
+			.withCommand(command());
 	}
 
-	private String[] command(JavaRuntime javaRuntime) {
+	private String[] command() {
 		List<String> command = new ArrayList<>();
 		command.add("java");
-		if (javaRuntime.version == JavaVersion.TWENTY_FOUR) {
-			command.add("--enable-native-access=ALL-UNNAMED");
-		}
 		command.add("-jar");
 		command.add("app.jar");
 		return command.toArray(new String[0]);
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle
index 5cb1a660ffd7..ba1be8239765 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/build.gradle
@@ -10,9 +10,7 @@ dependencies {
 
 	runtimeOnly("jaxen:jaxen")
 	runtimeOnly("wsdl4j:wsdl4j")
-	runtimeOnly("jakarta.activation:jakarta.activation-api")
-	runtimeOnly("org.glassfish.jaxb:jaxb-runtime")
-
+	
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	testImplementation("org.springframework.ws:spring-ws-test")
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java
index bc8c10a625f7..6afec44695a7 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/WebServiceConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,22 @@
 
 package smoketest.webservices;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.ws.config.annotation.WsConfigurerAdapter;
 import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition;
 import org.springframework.xml.xsd.XsdSchema;
 
 @Configuration(proxyBeanMethods = false)
-public class WebServiceConfig extends WsConfigurerAdapter {
+class WebServiceConfig {
 
 	@Bean(name = "holiday")
-	public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema countriesSchema) {
+	DefaultWsdl11Definition defaultWsdl11Definition(@Qualifier("hr") XsdSchema hrSchema) {
 		DefaultWsdl11Definition wsdl = new DefaultWsdl11Definition();
 		wsdl.setPortTypeName("HumanResource");
 		wsdl.setLocationUri("/holidayService/");
 		wsdl.setTargetNamespace("https://company.example.com/hr/definitions");
-		wsdl.setSchema(countriesSchema);
+		wsdl.setSchema(hrSchema);
 		return wsdl;
 	}
 
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java
index b7454aa84e8e..d6bbb7d15191 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/endpoint/HolidayEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 
 package smoketest.webservices.endpoint;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
 
 import org.jdom2.Element;
 import org.jdom2.Namespace;
@@ -54,10 +53,9 @@ public HolidayEndpoint(HumanResourceService humanResourceService) {
 	}
 
 	@PayloadRoot(namespace = NAMESPACE_URI, localPart = "HolidayRequest")
-	public void handleHolidayRequest(@RequestPayload Element holidayRequest) throws Exception {
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		Date startDate = dateFormat.parse(this.startDateExpression.evaluateFirst(holidayRequest).getText());
-		Date endDate = dateFormat.parse(this.endDateExpression.evaluateFirst(holidayRequest).getText());
+	public void handleHolidayRequest(@RequestPayload Element holidayRequest) {
+		LocalDate startDate = LocalDate.parse(this.startDateExpression.evaluateFirst(holidayRequest).getText());
+		LocalDate endDate = LocalDate.parse(this.endDateExpression.evaluateFirst(holidayRequest).getText());
 		String name = this.nameExpression.evaluateFirst(holidayRequest);
 		this.humanResourceService.bookHoliday(startDate, endDate, name);
 	}
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java
index fb529c26d280..8b5dc756ab5a 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/HumanResourceService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 
 package smoketest.webservices.service;
 
-import java.util.Date;
+import java.time.LocalDate;
 
 public interface HumanResourceService {
 
-	void bookHoliday(Date startDate, Date endDate, String name);
+	void bookHoliday(LocalDate startDate, LocalDate endDate, String name);
 
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java
index ee8cc8e3be8e..cb3158314fbf 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/main/java/smoketest/webservices/service/StubHumanResourceService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package smoketest.webservices.service;
 
-import java.util.Date;
+import java.time.LocalDate;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,13 +24,13 @@
 import org.springframework.stereotype.Service;
 
 @Service
-public class StubHumanResourceService implements HumanResourceService {
+class StubHumanResourceService implements HumanResourceService {
 
-	private final Log logger = LogFactory.getLog(StubHumanResourceService.class);
+	private static final Log logger = LogFactory.getLog(StubHumanResourceService.class);
 
 	@Override
-	public void bookHoliday(Date startDate, Date endDate, String name) {
-		this.logger.info("Booking holiday for [" + startDate + " - " + endDate + "] for [" + name + "]");
+	public void bookHoliday(LocalDate startDate, LocalDate endDate, String name) {
+		logger.info("Booking holiday for [" + startDate + " - " + endDate + "] for [" + name + "]");
 	}
 
 }
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java
index f653974b6f71..a3962d1558eb 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/SampleWsApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,11 +50,18 @@ void setUp() {
 
 	@Test
 	void testSendingHolidayRequest(CapturedOutput output) {
-		final String request = "<hr:HolidayRequest xmlns:hr=\"https://company.example.com/hr/schemas\">"
-				+ "   <hr:Holiday>      <hr:StartDate>2013-10-20</hr:StartDate>"
-				+ "      <hr:EndDate>2013-11-22</hr:EndDate>   </hr:Holiday>   <hr:Employee>"
-				+ "      <hr:Number>1</hr:Number>      <hr:FirstName>John</hr:FirstName>"
-				+ "      <hr:LastName>Doe</hr:LastName>   </hr:Employee></hr:HolidayRequest>";
+		String request = """
+				<hr:HolidayRequest xmlns:hr="https://company.example.com/hr/schemas">
+					<hr:Holiday>
+						<hr:StartDate>2013-10-20</hr:StartDate>
+						<hr:EndDate>2013-11-22</hr:EndDate>
+					</hr:Holiday>
+					<hr:Employee>
+						<hr:Number>1</hr:Number>
+						<hr:FirstName>John</hr:FirstName>
+						<hr:LastName>Doe</hr:LastName>
+					</hr:Employee>
+				</hr:HolidayRequest>""";
 		StreamSource source = new StreamSource(new StringReader(request));
 		StreamResult result = new StreamResult(System.out);
 		this.webServiceTemplate.sendSourceAndReceiveToResult(source, result);
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/WebServiceServerTestSampleWsApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/WebServiceServerTestSampleWsApplicationTests.java
index db18ce0c4e28..34a47d28e0d1 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/WebServiceServerTestSampleWsApplicationTests.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webservices/src/test/java/smoketest/webservices/WebServiceServerTestSampleWsApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,15 @@
 package smoketest.webservices;
 
 import java.io.StringReader;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 
 import javax.xml.transform.stream.StreamSource;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import smoketest.webservices.service.HumanResourceService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.webservices.server.WebServiceServerTest;
-import org.springframework.boot.test.system.CapturedOutput;
-import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.ws.test.server.MockWebServiceClient;
 import org.springframework.ws.test.server.RequestCreators;
@@ -43,9 +38,9 @@
  * {@link MockWebServiceClient}.
  *
  * @author Andy Wilkinson
+ * @author Stephane Nicoll
  */
 @WebServiceServerTest
-@ExtendWith(OutputCaptureExtension.class)
 class WebServiceServerTestSampleWsApplicationTests {
 
 	@MockitoBean
@@ -55,17 +50,22 @@ class WebServiceServerTestSampleWsApplicationTests {
 	private MockWebServiceClient client;
 
 	@Test
-	void testSendingHolidayRequest(CapturedOutput output) throws ParseException {
-		String request = "<hr:HolidayRequest xmlns:hr=\"https://company.example.com/hr/schemas\">"
-				+ "   <hr:Holiday>      <hr:StartDate>2013-10-20</hr:StartDate>"
-				+ "      <hr:EndDate>2013-11-22</hr:EndDate>   </hr:Holiday>   <hr:Employee>"
-				+ "      <hr:Number>1</hr:Number>      <hr:FirstName>John</hr:FirstName>"
-				+ "      <hr:LastName>Doe</hr:LastName>   </hr:Employee></hr:HolidayRequest>";
+	void testSendingHolidayRequest() {
+		String request = """
+				<hr:HolidayRequest xmlns:hr="https://company.example.com/hr/schemas">
+					<hr:Holiday>
+						<hr:StartDate>2013-10-20</hr:StartDate>
+						<hr:EndDate>2013-11-22</hr:EndDate>
+					</hr:Holiday>
+					<hr:Employee>
+						<hr:Number>1</hr:Number>
+						<hr:FirstName>John</hr:FirstName>
+						<hr:LastName>Doe</hr:LastName>
+					</hr:Employee>
+				</hr:HolidayRequest>""";
 		StreamSource source = new StreamSource(new StringReader(request));
 		this.client.sendRequest(RequestCreators.withPayload(source)).andExpect(ResponseMatchers.noFault());
-		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-		then(this.service).should()
-			.bookHoliday(dateFormat.parse("2013-10-20"), dateFormat.parse("2013-11-22"), "John Doe");
+		then(this.service).should().bookHoliday(LocalDate.of(2013, 10, 20), LocalDate.of(2013, 11, 22), "John Doe");
 	}
 
 }
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index d44eac1e47ed..b1d096a8711f 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -22,7 +22,7 @@
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]cli[\\/]command[\\/]" checks="ImportControl" />
 	<suppress files="[\\/]src[\\/]main[\\/]java[\\/]sample[\\/]" checks="ImportControl" />
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]sample[\\/]" checks="ImportControl" />
-	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc*" />
+	<suppress files="[\\/]src[\\/]test(Fixtures)?[\\/]java[\\/]" checks="Javadoc*" />
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" id="mainCodeIllegalImportCheck" />
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="NonEmptyAtclauseDescription" />
 	<suppress files="[\\/]autoconfigure[\\/].*Properties\.java" checks="JavadocType" />