diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
index 2bcb3135b84..03ae5862c47 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
@@ -41,9 +41,11 @@
  */
 final class PatternMappingFilterProxy implements Filter {
 
-	private static final String EXTENSION_MAPPING_PATTERN = "*.";
+	private static final String ALL_MAPPING_PATTERN = "*";
 
-	private static final String PATH_MAPPING_PATTERN = "/*";
+	private static final String EXTENSION_MAPPING_PATTERN = ALL_MAPPING_PATTERN + ".";
+
+	private static final String PATH_MAPPING_PATTERN = "/" + ALL_MAPPING_PATTERN;
 
 	private final Filter delegate;
 
@@ -73,7 +75,7 @@ private void addUrlPattern(String urlPattern) {
 		if (urlPattern.startsWith(EXTENSION_MAPPING_PATTERN)) {
 			this.endsWithMatches.add(urlPattern.substring(1));
 		}
-		else if (urlPattern.equals(PATH_MAPPING_PATTERN)) {
+		else if (urlPattern.equals(PATH_MAPPING_PATTERN) || urlPattern.equals(ALL_MAPPING_PATTERN)) {
 			this.startsWithMatches.add("");
 		}
 		else if (urlPattern.endsWith(PATH_MAPPING_PATTERN)) {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
index ffaa26a02a4..bf9a456fee4 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
@@ -93,7 +93,7 @@ public void matchPathMappingAllFolder() throws Exception {
 
 	@Test
 	public void matchPathMappingAll() throws Exception {
-		assertFilterInvoked("/test", "/*");
+		assertFilterInvoked("/test", "*");
 	}
 
 	@Test