diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
index badda0c084d..fbbb0b57794 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
@@ -140,8 +140,12 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
     {
         try
         {
-            ServletUpgradeRequest sockreq = new ServletUpgradeRequest(request);
-            ServletUpgradeResponse sockresp = new ServletUpgradeResponse(response);
+            // TODO: use ServletUpgradeRequest in Jetty 9.1
+            @SuppressWarnings("deprecation")
+            ServletWebSocketRequest sockreq = new ServletWebSocketRequest(request);
+            // TODO: use ServletUpgradeResponse in Jetty 9.1
+            @SuppressWarnings("deprecation")
+            ServletWebSocketResponse sockresp = new ServletWebSocketResponse(response);
 
             WebSocketCreator creator = getCreator();