diff --git a/jetty-websocket/websocket-core-common/src/main/java/module-info.java b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
index 9afd3e526aa0..822e3c6c6ac1 100644
--- a/jetty-websocket/websocket-core-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
@@ -24,7 +24,8 @@
 
     exports org.eclipse.jetty.websocket.core.internal to
         org.eclipse.jetty.websocket.core.client,
-        org.eclipse.jetty.websocket.core.server;
+        org.eclipse.jetty.websocket.core.server,
+        org.eclipse.jetty.util; // Export to DecoratedObjectFactory.
 
     // The Jetty & Javax API Layers need to access both access some internal utilities which we don't want to expose.
     exports org.eclipse.jetty.websocket.core.internal.util to
diff --git a/pom.xml b/pom.xml
index 885e54b8fd57..7f3a5be5a4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,6 @@
     <module>documentation</module>
     <module>jetty-keystore</module>
     <module>jetty-unixdomain-server</module>
-    <module>test-websocket-core</module>
   </modules>
 
   <build>
diff --git a/tests/test-jpms/test-websocket-core/src/main/java/module-info.java b/tests/test-jpms/test-websocket-core/src/main/java/module-info.java
index 33471bc1ce48..bf90ab65d564 100644
--- a/tests/test-jpms/test-websocket-core/src/main/java/module-info.java
+++ b/tests/test-jpms/test-websocket-core/src/main/java/module-info.java
@@ -1,3 +1,16 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
 module org.eclipse.jetty.websocket.core.tests
 {
     exports org.example.websocket;