diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/TomcatHttpServer.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/TomcatHttpServer.java
index 5742c3ff94f..02ae4f28d38 100644
--- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/TomcatHttpServer.java
+++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/TomcatHttpServer.java
@@ -83,7 +83,7 @@ public class TomcatHttpServer extends AbstractHttpServer {
 		File base = new File(System.getProperty("java.io.tmpdir"));
 		Context rootContext = tomcatServer.addContext(this.contextPath, base.getAbsolutePath());
 		Tomcat.addServlet(rootContext, "httpHandlerServlet", servlet).setAsyncSupported(true);
-		rootContext.addServletMappingDecoded(this.servletMapping, "httpHandlerServlet");
+		rootContext.addServletMapping(this.servletMapping, "httpHandlerServlet", false);
 		if (wsListener != null) {
 			rootContext.addApplicationListener(wsListener.getName());
 		}
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
index 9dc4f44197d..92b9449b759 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
@@ -86,7 +86,7 @@ public class TomcatWebSocketTestServer implements WebSocketTestServer {
 		this.context = this.tomcatServer.addContext("", System.getProperty("java.io.tmpdir"));
 		this.context.addApplicationListener(WsContextListener.class.getName());
 		Tomcat.addServlet(this.context, "dispatcherServlet", new DispatcherServlet(wac)).setAsyncSupported(true);
-		this.context.addServletMappingDecoded("/", "dispatcherServlet");
+		this.context.addServletMapping("/", "dispatcherServlet", false);
 		for (Filter filter : filters) {
 			FilterDef filterDef = new FilterDef();
 			filterDef.setFilterName(filter.getClass().getName());