diff --git a/org.eclipse.lsp4e.test/fragment.xml b/org.eclipse.lsp4e.test/fragment.xml
index a6275db8c..1f5afb039 100644
--- a/org.eclipse.lsp4e.test/fragment.xml
+++ b/org.eclipse.lsp4e.test/fragment.xml
@@ -4,13 +4,13 @@
    <extension
          point="org.eclipse.lsp4e.languageServer">
       <server
-            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
+            class="org.eclipse.lsp4e.tests.mock.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS">
       </server>
       <server
-            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
+            class="org.eclipse.lsp4e.tests.mock.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server2"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS 2">
@@ -22,19 +22,19 @@
             label="Test LS With Exception">
       </server>
        <server
-            class="org.eclipse.lsp4e.test.utils.MockConnectionProviderMultiRootFolders"
+            class="org.eclipse.lsp4e.tests.mock.MockConnectionProviderMultiRootFolders"
             id="org.eclipse.lsp4e.test.server-with-multi-root-support"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS With Multi-Root Support">
       </server>
       <server
-            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
+            class="org.eclipse.lsp4e.tests.mock.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server.disable"
             lastDocumentDisconnectedTimeout="0"
             label="Test LS Enablement">
       </server>
       <server
-            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
+            class="org.eclipse.lsp4e.tests.mock.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.server-with-last-document-disconnected-timeout"
             lastDocumentDisconnectedTimeout="2"
             label="Test LS with LastDocumentDisconnectedTimeout set to two seconds">
@@ -99,7 +99,7 @@
             </enabledWhen>
       </contentTypeMapping>
       <server
-            class="org.eclipse.lsp4e.test.utils.MockConnectionProvider"
+            class="org.eclipse.lsp4e.tests.mock.MockConnectionProvider"
             id="org.eclipse.lsp4e.test.singletonLS"
             label="Singleton LS"
             lastDocumentDisconnectedTimeout="0"
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServerWrapperTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServerWrapperTest.java
index 4c2938792..df29589a9 100644
--- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServerWrapperTest.java
+++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServerWrapperTest.java
@@ -30,8 +30,8 @@
 import org.eclipse.lsp4e.LanguageServerWrapper;
 import org.eclipse.lsp4e.LanguageServiceAccessor;
 import org.eclipse.lsp4e.test.utils.AbstractTestWithProject;
-import org.eclipse.lsp4e.test.utils.MockConnectionProviderMultiRootFolders;
 import org.eclipse.lsp4e.test.utils.TestUtils;
+import org.eclipse.lsp4e.tests.mock.MockConnectionProviderMultiRootFolders;
 import org.eclipse.ui.IEditorPart;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServersTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServersTest.java
index 1c0b43a0e..029600117 100644
--- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServersTest.java
+++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/LanguageServersTest.java
@@ -37,8 +37,8 @@
 import org.eclipse.lsp4e.LanguageServers.LanguageServerDocumentExecutor;
 import org.eclipse.lsp4e.internal.Pair;
 import org.eclipse.lsp4e.test.utils.AbstractTestWithProject;
-import org.eclipse.lsp4e.test.utils.MockConnectionProvider;
 import org.eclipse.lsp4e.test.utils.TestUtils;
+import org.eclipse.lsp4e.tests.mock.MockConnectionProvider;
 import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
 import org.eclipse.lsp4e.tests.mock.MockTextDocumentService;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/completion/CompleteCompletionTest.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/completion/CompleteCompletionTest.java
index a53d3584b..0f9bfa084 100644
--- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/completion/CompleteCompletionTest.java
+++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/completion/CompleteCompletionTest.java
@@ -37,8 +37,8 @@
 import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition;
 import org.eclipse.lsp4e.LanguageServiceAccessor;
 import org.eclipse.lsp4e.operations.completion.LSCompletionProposal;
-import org.eclipse.lsp4e.test.utils.MockConnectionProvider;
 import org.eclipse.lsp4e.test.utils.TestUtils;
+import org.eclipse.lsp4e.tests.mock.MockConnectionProvider;
 import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
 import org.eclipse.lsp4e.ui.UI;
 import org.eclipse.lsp4j.Command;
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/AllCleanRule.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/AllCleanRule.java
index 22296a23f..7ae5d7a97 100644
--- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/AllCleanRule.java
+++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/AllCleanRule.java
@@ -19,6 +19,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant;
 import org.eclipse.lsp4e.LanguageServiceAccessor;
+import org.eclipse.lsp4e.tests.mock.MockConnectionProvider;
 import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
 import org.eclipse.lsp4e.ui.UI;
 import org.eclipse.lsp4j.ServerCapabilities;
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProviderWithException.java b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProviderWithException.java
index 956b0c1f2..3b7d0c229 100644
--- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProviderWithException.java
+++ b/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProviderWithException.java
@@ -11,6 +11,8 @@
  *******************************************************************************/
 package org.eclipse.lsp4e.test.utils;
 
+import org.eclipse.lsp4e.tests.mock.MockConnectionProvider;
+
 public class MockConnectionProviderWithException extends MockConnectionProvider {
 
 	public MockConnectionProviderWithException() {
diff --git a/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF
index dcb03d46b..e5a48f9e7 100644
--- a/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF
+++ b/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF
@@ -6,6 +6,9 @@ Bundle-Version: 0.16.12.qualifier
 Bundle-Vendor: Eclipse LSP4E
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.lsp4j;bundle-version="[0.23.0,0.24.0)",
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.0,0.24.0)"
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.0,0.24.0)",
+ org.eclipse.lsp4e,
+ org.eclipse.jdt.annotation,
+ com.google.guava
 Export-Package: org.eclipse.lsp4e.tests.mock
 Automatic-Module-Name: org.eclipse.lsp4e.tests.mock
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProvider.java b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockConnectionProvider.java
similarity index 97%
rename from org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProvider.java
rename to org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockConnectionProvider.java
index 04a4db62c..7520a6561 100644
--- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProvider.java
+++ b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockConnectionProvider.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Michał Niewrzał (Rogue Wave Software Inc.) - initial implementation
  *******************************************************************************/
-package org.eclipse.lsp4e.test.utils;
+package org.eclipse.lsp4e.tests.mock;
 
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
@@ -29,7 +29,6 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.lsp4e.server.StreamConnectionProvider;
-import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.jsonrpc.messages.Message;
 import org.eclipse.lsp4j.launch.LSPLauncher;
diff --git a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProviderMultiRootFolders.java b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockConnectionProviderMultiRootFolders.java
similarity index 96%
rename from org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProviderMultiRootFolders.java
rename to org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockConnectionProviderMultiRootFolders.java
index a0036fede..56785d79f 100644
--- a/org.eclipse.lsp4e.test/src/org/eclipse/lsp4e/test/utils/MockConnectionProviderMultiRootFolders.java
+++ b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockConnectionProviderMultiRootFolders.java
@@ -10,7 +10,7 @@
  *  Michał Niewrzał (Rogue Wave Software Inc.) - initial implementation
  *  Martin Lippert (Pivotal Inc.) - Bug 531030 - fixed crash when initial project gets deleted in multi-root workspaces
  *******************************************************************************/
-package org.eclipse.lsp4e.test.utils;
+package org.eclipse.lsp4e.tests.mock;
 
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
@@ -32,8 +32,6 @@
 import java.util.logging.Logger;
 
 import org.eclipse.lsp4e.server.StreamConnectionProvider;
-import org.eclipse.lsp4e.tests.mock.MockLanguageServer;
-import org.eclipse.lsp4e.tests.mock.MockLanguageServerMultiRootFolders;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
 import org.eclipse.lsp4j.launch.LSPLauncher;
 import org.eclipse.lsp4j.services.LanguageClient;