diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java
index a0d0c38a795..9714a3d59a0 100644
--- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java
+++ b/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java
@@ -37,7 +37,6 @@ import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.javax.tests.Fuzzer;
 import org.eclipse.jetty.websocket.javax.tests.LocalServer;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -62,11 +61,7 @@ public class SessionTest
                 else
                 {
                     ret.append('[').append(pathParams.size()).append(']');
-                    List<String> keys = new ArrayList<>();
-                    for (String key : pathParams.keySet())
-                    {
-                        keys.add(key);
-                    }
+                    List<String> keys = new ArrayList<>(pathParams.keySet());
                     Collections.sort(keys);
                     for (String key : keys)
                     {
@@ -126,11 +121,7 @@ public class SessionTest
                     else
                     {
                         ret.append('[').append(pathParams.size()).append(']');
-                        List<String> keys = new ArrayList<>();
-                        for (String key : pathParams.keySet())
-                        {
-                            keys.add(key);
-                        }
+                        List<String> keys = new ArrayList<>(pathParams.keySet());
                         Collections.sort(keys);
                         for (String key : keys)
                         {
@@ -227,14 +218,13 @@ public class SessionTest
         container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/info/{a}/{b}/").build());
         container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/info/{a}/{b}/{c}/").build());
         container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/info/{a}/{b}/{c}/{d}/").build());
-        /*
+
         endpointClass = SessionInfoEndpoint.class;
-        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass,"/einfo/").build());
-        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass,"/einfo/{a}/").build());
-        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass,"/einfo/{a}/{b}/").build());
-        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass,"/einfo/{a}/{b}/{c}/").build());
-        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass,"/einfo/{a}/{b}/{c}/{d}/").build());
-        */
+        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/einfo/").build());
+        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/einfo/{a}/").build());
+        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/einfo/{a}/{b}/").build());
+        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/einfo/{a}/{b}/{c}/").build());
+        container.addEndpoint(ServerEndpointConfig.Builder.create(endpointClass, "/einfo/{a}/{b}/{c}/{d}/").build());
     }
 
     private void assertResponse(String requestPath, String requestMessage,
@@ -293,7 +283,6 @@ public class SessionTest
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
-    @Disabled
     public void testPathParamsEndpointEmpty(Case testCase) throws Exception
     {
         setup(testCase);
@@ -303,7 +292,6 @@ public class SessionTest
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
-    @Disabled
     public void testPathParamsEndpointSingle(Case testCase) throws Exception
     {
         setup(testCase);
@@ -313,7 +301,6 @@ public class SessionTest
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
-    @Disabled
     public void testPathParamsEndpointDouble(Case testCase) throws Exception
     {
         setup(testCase);
@@ -323,7 +310,6 @@ public class SessionTest
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
-    @Disabled
     public void testPathParamsEndpointTriple(Case testCase) throws Exception
     {
         setup(testCase);
@@ -363,7 +349,6 @@ public class SessionTest
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
-    @Disabled
     public void testRequestUriEndpointBasic(Case testCase) throws Exception
     {
         setup(testCase);
@@ -373,7 +358,6 @@ public class SessionTest
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
-    @Disabled
     public void testRequestUriEndpointWithPathParam(Case testCase) throws Exception
     {
         setup(testCase);
@@ -383,7 +367,6 @@ public class SessionTest
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("data")
-    @Disabled
     public void testRequestUriEndpointWithPathParamWithQuery(Case testCase) throws Exception
     {
         setup(testCase);