diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index fa002b13f6f..b1c935b2f6f 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -9,17 +9,22 @@
jetty-client
Jetty :: Asynchronous HTTP Client
http://www.eclipse.org/jetty
+
${project.groupId}.client
target/test-policy
+
maven-surefire-plugin
- @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.client=jetty.servlet.api --add-modules java.security.jgss --add-modules jetty.servlet.api --add-modules org.eclipse.jetty.jmx --add-modules org.slf4j
+ @{argLine} ${jetty.surefire.argLine}
+ --add-modules java.security.jgss
+ --add-modules org.eclipse.jetty.jmx
+ --add-modules org.slf4j
diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml
index e7753a1fc70..06b47b0943a 100644
--- a/jetty-http2/http2-client/pom.xml
+++ b/jetty-http2/http2-client/pom.xml
@@ -20,7 +20,8 @@
maven-surefire-plugin
- @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http2.client=jetty.servlet.api,org.eclipse.jetty.http2.hpack --add-modules jetty.servlet.api
+ @{argLine} ${jetty.surefire.argLine}
+ --add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack
diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml
index da589baa10d..49a7e917d53 100644
--- a/jetty-http2/http2-http-client-transport/pom.xml
+++ b/jetty-http2/http2-http-client-transport/pom.xml
@@ -14,19 +14,6 @@
${project.groupId}.client.http
-
-
-
- maven-surefire-plugin
-
-
- @{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http2.http.client.transport=jetty.servlet.api --add-modules jetty.servlet.api
-
-
-
-
-
-
org.eclipse.jetty
diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml
index 3210faf13e0..fc66c9e5dcc 100644
--- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml
+++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml
@@ -14,21 +14,6 @@
${project.groupId}.unixsocket.client
-
-
-
- maven-surefire-plugin
-
-
- @{argLine} ${jetty.surefire.argLine}
- --add-modules jetty.servlet.api
- --add-reads org.eclipse.jetty.unixsocket.client=jetty.servlet.api
-
-
-
-
-
-
org.eclipse.jetty