diff --git a/webserver/benchmark/jmh/README.md b/tests/benchmark/jmh/README.md
similarity index 100%
rename from webserver/benchmark/jmh/README.md
rename to tests/benchmark/jmh/README.md
diff --git a/webserver/benchmark/jmh/pom.xml b/tests/benchmark/jmh/pom.xml
similarity index 94%
rename from webserver/benchmark/jmh/pom.xml
rename to tests/benchmark/jmh/pom.xml
index 80c109eebcb..38e497ee328 100644
--- a/webserver/benchmark/jmh/pom.xml
+++ b/tests/benchmark/jmh/pom.xml
@@ -19,12 +19,12 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>io.helidon.webserver.benchmark</groupId>
-        <artifactId>helidon-webserver-benchmark-project</artifactId>
+        <groupId>io.helidon.tests.benchmark</groupId>
+        <artifactId>helidon-tests-benchmark-project</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>helidon-webserver-benchmark-jmh</artifactId>
+    <artifactId>helidon-tests-benchmark-jmh</artifactId>
     <name>Helidon WebServer Benchmarks JMH</name>
 
     <dependencies>
diff --git a/webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/Http1ParsingJmhTest.java b/tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/Http1ParsingJmhTest.java
similarity index 100%
rename from webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/Http1ParsingJmhTest.java
rename to tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/Http1ParsingJmhTest.java
diff --git a/webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpJmhTest.java b/tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpJmhTest.java
similarity index 100%
rename from webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpJmhTest.java
rename to tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpJmhTest.java
diff --git a/webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpPrologueParsingJmhTest.java b/tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpPrologueParsingJmhTest.java
similarity index 100%
rename from webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpPrologueParsingJmhTest.java
rename to tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HttpPrologueParsingJmhTest.java
diff --git a/webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HuJmhTest.java b/tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HuJmhTest.java
similarity index 100%
rename from webserver/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HuJmhTest.java
rename to tests/benchmark/jmh/src/main/java/io/helidon/webserver/benchmark/jmh/HuJmhTest.java
diff --git a/webserver/benchmark/jmh/src/main/resources/logging.properties b/tests/benchmark/jmh/src/main/resources/logging.properties
similarity index 100%
rename from webserver/benchmark/jmh/src/main/resources/logging.properties
rename to tests/benchmark/jmh/src/main/resources/logging.properties
diff --git a/webserver/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/BaseLine.java b/tests/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/BaseLine.java
similarity index 100%
rename from webserver/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/BaseLine.java
rename to tests/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/BaseLine.java
diff --git a/webserver/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/Histogram.java b/tests/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/Histogram.java
similarity index 100%
rename from webserver/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/Histogram.java
rename to tests/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/Histogram.java
diff --git a/webserver/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/JunitJmhRunnerTest.java b/tests/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/JunitJmhRunnerTest.java
similarity index 100%
rename from webserver/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/JunitJmhRunnerTest.java
rename to tests/benchmark/jmh/src/test/java/io/helidon/webserver/benchmark/jmh/JunitJmhRunnerTest.java
diff --git a/webserver/benchmark/pom.xml b/tests/benchmark/pom.xml
similarity index 65%
rename from webserver/benchmark/pom.xml
rename to tests/benchmark/pom.xml
index f1a420f3935..cbcdb4d6438 100644
--- a/webserver/benchmark/pom.xml
+++ b/tests/benchmark/pom.xml
@@ -19,13 +19,13 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>io.helidon.webserver</groupId>
-        <artifactId>helidon-webserver-project</artifactId>
+        <groupId>io.helidon.tests</groupId>
+        <artifactId>helidon-tests-project</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>io.helidon.webserver.benchmark</groupId>
-    <artifactId>helidon-webserver-benchmark-project</artifactId>
+    <groupId>io.helidon.tests.benchmark</groupId>
+    <artifactId>helidon-tests-benchmark-project</artifactId>
     <name>Helidon WebServer Benchmark Project</name>
     <packaging>pom</packaging>
 
@@ -33,13 +33,4 @@
         <module>jmh</module>
     </modules>
 
-    <properties>
-        <helidon.services.skip>true</helidon.services.skip>
-        <javadoc.skip>true</javadoc.skip>
-        <checkstyle.skip>true</checkstyle.skip>
-        <spotbugs.skip>true</spotbugs.skip>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.sources.skip>true</maven.sources.skip>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-    </properties>
 </project>
diff --git a/tests/pom.xml b/tests/pom.xml
index 3394e3d1241..3a88c5ffef2 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -46,6 +46,7 @@
         <module>apps</module>
         <module>functional</module>
         <module>integration</module>
+        <module>benchmark</module>
     </modules>
 
     <profiles>
diff --git a/webserver/pom.xml b/webserver/pom.xml
index 74cbae3103b..9f9a9e08af3 100644
--- a/webserver/pom.xml
+++ b/webserver/pom.xml
@@ -33,7 +33,6 @@
 
     <modules>
         <module>access-log</module>
-        <module>benchmark</module>
         <module>context</module>
         <module>cors</module>
         <module>graphql</module>