diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/config/JettyWebSocketConfiguration.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/config/JettyWebSocketConfiguration.java
index 2f3f03ccdb6..00cdbb53574 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/config/JettyWebSocketConfiguration.java
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/config/JettyWebSocketConfiguration.java
@@ -38,8 +38,8 @@ public class JettyWebSocketConfiguration extends AbstractConfiguration
         addDependents("org.eclipse.jetty.ee9.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
 
         protectAndExpose("org.eclipse.jetty.ee9.websocket.api.");
-        protectAndExpose("org.eclipse.jetty.websocket.server.");
-        protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter
+        protectAndExpose("org.eclipse.jetty.ee9.websocket.server.");
+        protectAndExpose("org.eclipse.jetty.ee9.websocket.servlet."); // For WebSocketUpgradeFilter
         hide("org.eclipse.jetty.server.internal.");
         hide("org.eclipse.jetty.server.config.");
     }
diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyWebSocketFilterTest.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyWebSocketFilterTest.java
index e0f43b947c1..47514463bd2 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyWebSocketFilterTest.java
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee9/websocket/tests/JettyWebSocketFilterTest.java
@@ -49,7 +49,6 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -304,7 +303,6 @@ public class JettyWebSocketFilterTest
         assertThat(socket.textMessages.poll(), is("hElLo wOrLd"));
     }
 
-    @Disabled
     @Test
     public void testDefaultWebSocketUpgradeFilterOrdering() throws Exception
     {
@@ -339,7 +337,6 @@ public class JettyWebSocketFilterTest
         assertThat(socket.textMessages.poll(), is(defaultIdleTimeout));
     }
 
-    @Disabled
     @Test
     public void testWebSocketUpgradeFilterOrdering() throws Exception
     {
diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml
index 85bad9fa7d5..aeb71b9746b 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering1.xml
@@ -8,7 +8,7 @@
 
 <filter>
     <filter-name>wsuf-alt</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.ee9.websocket.servlet.WebSocketUpgradeFilter</filter-class>
     <init-param>
       <param-name>idleTimeout</param-name>
       <param-value>5999</param-value>
diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml
index 456e5a17864..ffc3481ab8a 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-tests/src/test/resources/wsuf-ordering2.xml
@@ -9,7 +9,7 @@
 <!-- Add the custom filter first. -->
   <filter>
     <filter-name>wsuf-alt</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
+    <filter-class>org.eclipse.jetty.ee9.websocket.servlet.WebSocketUpgradeFilter</filter-class>
     <init-param>
       <param-name>idleTimeout</param-name>
       <param-value>5999</param-value>
@@ -22,11 +22,11 @@
 
   <!-- The default filter is overridden so it is tried after. -->
   <filter>
-    <filter-name>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-name>
-    <filter-class>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-class>
+    <filter-name>org.eclipse.jetty.ee9.websocket.servlet.WebSocketUpgradeFilter</filter-name>
+    <filter-class>org.eclipse.jetty.ee9.websocket.servlet.WebSocketUpgradeFilter</filter-class>
   </filter>
   <filter-mapping>
-    <filter-name>org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter</filter-name>
+    <filter-name>org.eclipse.jetty.ee9.websocket.servlet.WebSocketUpgradeFilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 </web-app>