diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml
index 165dbb9c7477..76f025e7176d 100644
--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -100,7 +100,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml
index 0c49d1bb8fc9..b776fea9d5bb 100644
--- a/jetty-http2/http2-hpack/pom.xml
+++ b/jetty-http2/http2-hpack/pom.xml
@@ -52,9 +52,8 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml
index 29a37a0b52ed..90dea52b8abd 100644
--- a/jetty-proxy/pom.xml
+++ b/jetty-proxy/pom.xml
@@ -59,7 +59,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 5083912a1a83..66b20de05fc1 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -46,7 +46,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index f611307301d3..4c92b273d6c5 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -60,7 +60,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 06f033c401e8..9bf6e21713c1 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -85,7 +85,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index e7146d414697..aad11e18233b 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -67,7 +67,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 8b08133ba716..1f5dcc4781c9 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -79,7 +79,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 15b2a110a6ec..a4d904218c9c 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -96,7 +96,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml
index 83c821612d03..5dcd2a9ebc41 100644
--- a/jetty-websocket/websocket-javax-tests/pom.xml
+++ b/jetty-websocket/websocket-javax-tests/pom.xml
@@ -30,7 +30,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml
index 745446b93495..8e9076c0b520 100644
--- a/jetty-websocket/websocket-jetty-tests/pom.xml
+++ b/jetty-websocket/websocket-jetty-tests/pom.xml
@@ -39,7 +39,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 3eaf8f5da281..1d60fad5fdce 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -102,7 +102,7 @@
       <type>pom</type>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http-tools</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>