diff --git a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java
index 6ddfb0742..85134c0ee 100644
--- a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java
+++ b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.hateoas.config;
 
+import org.springframework.core.io.support.ResourcePatternResolver;
 import tools.jackson.databind.json.JsonMapper;
 
 import java.io.IOException;
@@ -59,6 +60,7 @@
  *
  * @author Oliver Gierke
  * @author Greg Turnquist
+ * @author Réda Housni Alaoui
  * @soundtrack Elephants Crossing - Wait (Live at Stadtfest Dresden)
  * @since 0.19
  */
@@ -173,7 +175,8 @@ private final List<Resource> loadResourceBundleResources(String baseName, boolea
 
 		try {
 			return Arrays //
-					.stream(context.getResources(String.format("classpath:%s%s.properties", baseName, withWildcard ? "*" : ""))) //
+					.stream(context.getResources(String.format("%s%s%s.properties", //
+							ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX, baseName, withWildcard ? "*" : ""))) //
 					.filter(Resource::exists) //
 					.collect(Collectors.toList());
 
diff --git a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java
index 07e411861..ff2db2500 100755
--- a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java
+++ b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java
@@ -74,6 +74,7 @@
  *
  * @author Oliver Gierke
  * @author Greg Turnquist
+ * @author Réda Housni Alaoui
  */
 @ExtendWith(MockitoExtension.class)
 class EnableHypermediaSupportIntegrationTest {
@@ -465,7 +466,7 @@ private static <T extends AnnotationConfigWebApplicationContext> Function<T, T>
 
 			try {
 
-				doReturn(new Resource[0]).when(spy).getResources("classpath:rest-default-messages.properties");
+				doReturn(new Resource[0]).when(spy).getResources("classpath*:rest-default-messages.properties");
 				doReturn(new Resource[] { resource }).when(spy).getResources(contains("rest-messages"));
 
 			} catch (IOException o_O) {