diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java
index c6dffb11f34..6d7147dc21d 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/proxy/WebSocketProxyTest.java
@@ -57,8 +57,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class WebSocketProxyTest
 {
-    private static final int PORT = 49998;
-
     private Server server;
     private EventSocket serverSocket;
     private WebSocketProxy webSocketProxy;
@@ -70,15 +68,8 @@ public class WebSocketProxyTest
     {
         server = new Server();
         ServerConnector connector = new ServerConnector(server);
-        connector.setPort(PORT);
         server.addConnector(connector);
 
-        client = new WebSocketClient();
-        client.start();
-        proxyUri = URI.create("ws://localhost:" + PORT + "/proxy");
-        URI echoUri = URI.create("ws://localhost:" + PORT + "/echo");
-        webSocketProxy = new WebSocketProxy(client, echoUri);
-
         ServletContextHandler contextHandler = new ServletContextHandler();
         serverSocket = new EchoSocket();
         JettyWebSocketServletContainerInitializer.configure(contextHandler, ((context, container) ->
@@ -94,6 +85,14 @@ public class WebSocketProxyTest
 
         server.setHandler(contextHandler);
         server.start();
+
+        int port = connector.getLocalPort();
+
+        client = new WebSocketClient();
+        client.start();
+        proxyUri = URI.create("ws://localhost:" + port + "/proxy");
+        URI echoUri = URI.create("ws://localhost:" + port + "/echo");
+        webSocketProxy = new WebSocketProxy(client, echoUri);
     }
 
     @AfterEach