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 4754b54f0e..7372d3627f 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
@@ -719,6 +719,12 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
 						"Config data location 'file:src/test/resources/config/0-empty/*/' contains no subdirectories");
 	}
 
+	@Test
+	void runWhenOptionalWildcardLocationHasNoSubdirectories() {
+		assertThatNoException().isThrownBy(() -> this.application
+				.run("--spring.config.location=optional:file:src/test/resources/config/0-empty/*/"));
+	}
+
 	@Test
 	void runWhenHasMandatoryWildcardLocationThatDoesNotExist() {
 		assertThatExceptionOfType(ConfigDataLocationNotFoundException.class)