diff --git a/instrumentation/benchmarks/README.md b/instrumentation/benchmarks/README.md
index 2effc5546b..e0e74e083e 100644
--- a/instrumentation/benchmarks/README.md
+++ b/instrumentation/benchmarks/README.md
@@ -5,7 +5,13 @@ benchmarks for Brave instrumentation. You can use these to measure overhead
 of using Brave.
 
 ### Running the benchmark
-From the project directory, run `./mvnw install -pl instrumentation/benchmarks -am -DskipTests` to build the benchmarks, and the following to run them:
+From the project directory, run this to build the benchmarks:
+
+```bash
+$ ./mvnw install -pl instrumentation/benchmarks -am -Dmaven.test.skip.exec=true`
+```
+
+and the following to run them:
 
 ```bash
 $ java -jar instrumentation/benchmarks/target/benchmarks.jar
diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml
index ddfe434e70..092d8fc2c1 100644
--- a/instrumentation/benchmarks/pom.xml
+++ b/instrumentation/benchmarks/pom.xml
@@ -13,7 +13,9 @@
     the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.zipkin.brave</groupId>
@@ -31,142 +33,147 @@
     <undertow-servlet.version>2.2.30.Final</undertow-servlet.version>
   </properties>
 
-  <!-- can't import brave-bom due to build-support/go-offline.sh -->
+  <!-- All dependencies are marked test, because benchmarks are a form of test.
+       This module is skipped on -DskipTests, ensuring it isn't deployed. -->
   <dependencies>
+    <!-- can't import brave-bom due to build-support/go-offline.sh -->
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
       <artifactId>jmh-core</artifactId>
       <version>${jmh.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-generator-annprocess</artifactId>
-      <version>${jmh.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>${log4j.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-xray-recorder-sdk-core</artifactId>
       <version>2.15.1</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-http</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-httpclient</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-httpasyncclient</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpasyncclient</artifactId>
       <version>${httpasyncclient.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-spring-web</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
       <version>${spring5.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-okhttp3</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
       <version>${okhttp.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-jaxrs2</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.ltgt.jaxrs</groupId>
       <artifactId>resteasy-client-okhttp3</artifactId>
       <version>1.1</version>
+      <scope>test</scope>
     </dependency>
     <!-- Avoid CVE ridden version from resteasy-client-okhttp3 -->
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-client</artifactId>
       <version>${resteasy.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-servlet</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-spring-webmvc</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <version>${spring5.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-jersey-server</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-servlet</artifactId>
       <version>${jersey.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-netty-codec-http</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-codec-http</artifactId>
       <version>${netty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-kafka-clients</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
@@ -178,34 +185,40 @@
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
       </exclusions>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-jms</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
       <version>${activemq.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-instrumentation-spring-rabbit</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
       <artifactId>spring-rabbit</artifactId>
       <version>${spring-rabbit.version}</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.undertow</groupId>
       <artifactId>undertow-core</artifactId>
       <version>${undertow-servlet.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.undertow</groupId>
@@ -217,37 +230,49 @@
           <artifactId>jboss-servlet-api_3.1_spec</artifactId>
         </exclusion>
       </exclusions>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-undertow</artifactId>
       <version>${resteasy.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>brave-context-log4j2</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
+    <!-- use assembly instead of shade, as it naturally works for test-jar -->
     <plugins>
       <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/test/assembly/test-jar.xml</descriptor>
+          </descriptors>
+        </configuration>
         <executions>
           <execution>
+            <id>make-assembly</id>
             <phase>package</phase>
             <goals>
-              <goal>shade</goal>
+              <goal>single</goal>
             </goals>
             <configuration>
+              <attach>true</attach>
               <finalName>benchmarks</finalName>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
                   <mainClass>org.openjdk.jmh.Main</mainClass>
-                </transformer>
-              </transformers>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
+                </manifest>
+              </archive>
             </configuration>
           </execution>
         </executions>
@@ -257,15 +282,22 @@
         <executions>
           <execution>
             <id>default-compile</id>
-            <phase>compile</phase>
+            <phase>test-compile</phase>
             <goals>
-              <goal>compile</goal>
+              <goal>testCompile</goal>
             </goals>
             <configuration combine.self="override">
               <!-- instead of javac-with-errorprone -->
               <compilerId>javac</compilerId>
               <!-- scrub errorprone compiler args -->
-              <compilerArgs />
+              <compilerArgs/>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>org.openjdk.jmh</groupId>
+                  <artifactId>jmh-generator-annprocess</artifactId>
+                  <version>${jmh.version}</version>
+                </path>
+              </annotationProcessorPaths>
             </configuration>
           </execution>
         </executions>
diff --git a/instrumentation/benchmarks/src/test/assembly/test-jar.xml b/instrumentation/benchmarks/src/test/assembly/test-jar.xml
new file mode 100644
index 0000000000..3be0b4bee4
--- /dev/null
+++ b/instrumentation/benchmarks/src/test/assembly/test-jar.xml
@@ -0,0 +1,44 @@
+<!--
+
+    Copyright 2013-2024 The OpenZipkin Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+    in compliance with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software distributed under the License
+    is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+    or implied. See the License for the specific language governing permissions and limitations under
+    the License.
+
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+  <!-- This is an alternative to maven-shade-plugin, which makes an executable
+       jar from the test source tree. This was made due to lack of success
+       getting 'shadeTestJar' and similar configuration working. -->
+  <id>test-jar</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+      <unpack>true</unpack>
+      <scope>test</scope>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/test-classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/instrumentation/benchmarks/src/main/java/brave/EndToEndBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/EndToEndBenchmarks.java
similarity index 99%
rename from instrumentation/benchmarks/src/main/java/brave/EndToEndBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/EndToEndBenchmarks.java
index fa05dffb6b..6586202bd1 100644
--- a/instrumentation/benchmarks/src/main/java/brave/EndToEndBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/EndToEndBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/TracerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/TracerBenchmarks.java
similarity index 99%
rename from instrumentation/benchmarks/src/main/java/brave/TracerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/TracerBenchmarks.java
index d98ee8305f..16be4ced3a 100644
--- a/instrumentation/benchmarks/src/main/java/brave/TracerBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/TracerBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/baggage/BaggagePropagationBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/baggage/BaggagePropagationBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/baggage/BaggagePropagationBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/baggage/BaggagePropagationBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/handler/MutableSpanBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/handler/MutableSpanBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/handler/MutableSpanBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/handler/MutableSpanBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/http/HttpClientBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/http/HttpClientBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/http/HttpClientBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/http/HttpClientBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/http/HttpServerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/http/HttpServerBenchmarks.java
similarity index 99%
rename from instrumentation/benchmarks/src/main/java/brave/http/HttpServerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/http/HttpServerBenchmarks.java
index 73aebb3195..50916108d8 100644
--- a/instrumentation/benchmarks/src/main/java/brave/http/HttpServerBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/http/HttpServerBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/httpasyncclient/ApacheHttpAsyncClientBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/httpasyncclient/ApacheHttpAsyncClientBenchmarks.java
similarity index 97%
rename from instrumentation/benchmarks/src/main/java/brave/httpasyncclient/ApacheHttpAsyncClientBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/httpasyncclient/ApacheHttpAsyncClientBenchmarks.java
index 455ad1ffc8..1ffde07050 100644
--- a/instrumentation/benchmarks/src/main/java/brave/httpasyncclient/ApacheHttpAsyncClientBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/httpasyncclient/ApacheHttpAsyncClientBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/httpclient/ApacheHttpClientBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/httpclient/ApacheHttpClientBenchmarks.java
similarity index 97%
rename from instrumentation/benchmarks/src/main/java/brave/httpclient/ApacheHttpClientBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/httpclient/ApacheHttpClientBenchmarks.java
index e3522694c2..bf7eac28a3 100644
--- a/instrumentation/benchmarks/src/main/java/brave/httpclient/ApacheHttpClientBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/httpclient/ApacheHttpClientBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/internal/PlatformBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/internal/PlatformBenchmarks.java
similarity index 99%
rename from instrumentation/benchmarks/src/main/java/brave/internal/PlatformBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/internal/PlatformBenchmarks.java
index d90857567b..a1dcef318e 100644
--- a/instrumentation/benchmarks/src/main/java/brave/internal/PlatformBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/internal/PlatformBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/internal/codec/CharSequencesBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/internal/codec/CharSequencesBenchmarks.java
similarity index 99%
rename from instrumentation/benchmarks/src/main/java/brave/internal/codec/CharSequencesBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/internal/codec/CharSequencesBenchmarks.java
index 187bf73c1e..08f73537c7 100644
--- a/instrumentation/benchmarks/src/main/java/brave/internal/codec/CharSequencesBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/internal/codec/CharSequencesBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/internal/codec/EntrySplitterBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/internal/codec/EntrySplitterBenchmarks.java
similarity index 98%
rename from instrumentation/benchmarks/src/main/java/brave/internal/codec/EntrySplitterBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/internal/codec/EntrySplitterBenchmarks.java
index 90b9f54b25..1d7978b50b 100644
--- a/instrumentation/benchmarks/src/main/java/brave/internal/codec/EntrySplitterBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/internal/codec/EntrySplitterBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/internal/codec/ZipkinV2JsonWriterBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/internal/codec/ZipkinV2JsonWriterBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/internal/codec/ZipkinV2JsonWriterBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/internal/codec/ZipkinV2JsonWriterBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/internal/handler/NoopAwareSpanHandlerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/internal/handler/NoopAwareSpanHandlerBenchmarks.java
similarity index 98%
rename from instrumentation/benchmarks/src/main/java/brave/internal/handler/NoopAwareSpanHandlerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/internal/handler/NoopAwareSpanHandlerBenchmarks.java
index f93c43f534..571a569ee8 100644
--- a/instrumentation/benchmarks/src/main/java/brave/internal/handler/NoopAwareSpanHandlerBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/internal/handler/NoopAwareSpanHandlerBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/jaxrs2/JaxRs2ClientBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/jaxrs2/JaxRs2ClientBenchmarks.java
similarity index 97%
rename from instrumentation/benchmarks/src/main/java/brave/jaxrs2/JaxRs2ClientBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/jaxrs2/JaxRs2ClientBenchmarks.java
index df2eefa0cf..a03791bf33 100644
--- a/instrumentation/benchmarks/src/main/java/brave/jaxrs2/JaxRs2ClientBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/jaxrs2/JaxRs2ClientBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/jaxrs2/JaxRs2ServerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/jaxrs2/JaxRs2ServerBenchmarks.java
similarity index 98%
rename from instrumentation/benchmarks/src/main/java/brave/jaxrs2/JaxRs2ServerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/jaxrs2/JaxRs2ServerBenchmarks.java
index 8636e05a27..f2341b8544 100644
--- a/instrumentation/benchmarks/src/main/java/brave/jaxrs2/JaxRs2ServerBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/jaxrs2/JaxRs2ServerBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/jersey/server/FakeExtendedUriInfo.java b/instrumentation/benchmarks/src/test/java/brave/jersey/server/FakeExtendedUriInfo.java
similarity index 98%
rename from instrumentation/benchmarks/src/main/java/brave/jersey/server/FakeExtendedUriInfo.java
rename to instrumentation/benchmarks/src/test/java/brave/jersey/server/FakeExtendedUriInfo.java
index 6fe04485df..fe381c09ba 100644
--- a/instrumentation/benchmarks/src/main/java/brave/jersey/server/FakeExtendedUriInfo.java
+++ b/instrumentation/benchmarks/src/test/java/brave/jersey/server/FakeExtendedUriInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/jersey/server/JerseyServerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/jersey/server/JerseyServerBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/jersey/server/JerseyServerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/jersey/server/JerseyServerBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/jersey/server/TracingApplicationEventListenerAdapterBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/jersey/server/TracingApplicationEventListenerAdapterBenchmarks.java
similarity index 98%
rename from instrumentation/benchmarks/src/main/java/brave/jersey/server/TracingApplicationEventListenerAdapterBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/jersey/server/TracingApplicationEventListenerAdapterBenchmarks.java
index a62d5bef95..526ede7a02 100644
--- a/instrumentation/benchmarks/src/main/java/brave/jersey/server/TracingApplicationEventListenerAdapterBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/jersey/server/TracingApplicationEventListenerAdapterBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/jms/JmsMessageProducerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/jms/JmsMessageProducerBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/jms/JmsMessageProducerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/jms/JmsMessageProducerBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/kafka/clients/TracingProducerBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/kafka/clients/TracingProducerBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/netty/http/HelloWorldHandler.java b/instrumentation/benchmarks/src/test/java/brave/netty/http/HelloWorldHandler.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/netty/http/HelloWorldHandler.java
rename to instrumentation/benchmarks/src/test/java/brave/netty/http/HelloWorldHandler.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/netty/http/NettyHttpServerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/netty/http/NettyHttpServerBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/netty/http/NettyHttpServerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/netty/http/NettyHttpServerBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/okhttp3/OkHttpClientBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/okhttp3/OkHttpClientBenchmarks.java
similarity index 97%
rename from instrumentation/benchmarks/src/main/java/brave/okhttp3/OkHttpClientBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/okhttp3/OkHttpClientBenchmarks.java
index 0feec9f1d0..937e51139f 100644
--- a/instrumentation/benchmarks/src/main/java/brave/okhttp3/OkHttpClientBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/okhttp3/OkHttpClientBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/propagation/B3PropagationBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/propagation/B3PropagationBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/propagation/B3PropagationBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/propagation/B3PropagationBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/propagation/B3SinglePropagationBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/propagation/B3SinglePropagationBenchmarks.java
similarity index 98%
rename from instrumentation/benchmarks/src/main/java/brave/propagation/B3SinglePropagationBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/propagation/B3SinglePropagationBenchmarks.java
index cd606014f3..bb18dde8b3 100644
--- a/instrumentation/benchmarks/src/main/java/brave/propagation/B3SinglePropagationBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/propagation/B3SinglePropagationBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/propagation/CurrentTraceContextBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/propagation/CurrentTraceContextBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/propagation/CurrentTraceContextBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/propagation/CurrentTraceContextBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/sampler/SamplerBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/sampler/SamplerBenchmarks.java
similarity index 99%
rename from instrumentation/benchmarks/src/main/java/brave/sampler/SamplerBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/sampler/SamplerBenchmarks.java
index 40031a1d7d..c26ddeaf8f 100644
--- a/instrumentation/benchmarks/src/main/java/brave/sampler/SamplerBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/sampler/SamplerBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/servlet/ServletBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/servlet/ServletBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/servlet/ServletBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/servlet/ServletBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/servlet/internal/ServletRuntimeBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/servlet/internal/ServletRuntimeBenchmarks.java
similarity index 99%
rename from instrumentation/benchmarks/src/main/java/brave/servlet/internal/ServletRuntimeBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/servlet/internal/ServletRuntimeBenchmarks.java
index 5dd906bbef..941c87f792 100644
--- a/instrumentation/benchmarks/src/main/java/brave/servlet/internal/ServletRuntimeBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/servlet/internal/ServletRuntimeBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java
similarity index 100%
rename from instrumentation/benchmarks/src/main/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java
diff --git a/instrumentation/benchmarks/src/main/java/brave/spring/web/AsyncRestTemplateBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/spring/web/AsyncRestTemplateBenchmarks.java
similarity index 97%
rename from instrumentation/benchmarks/src/main/java/brave/spring/web/AsyncRestTemplateBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/spring/web/AsyncRestTemplateBenchmarks.java
index a291dcf6cf..e2bb54eff3 100644
--- a/instrumentation/benchmarks/src/main/java/brave/spring/web/AsyncRestTemplateBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/spring/web/AsyncRestTemplateBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/spring/web/RestTemplateBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/spring/web/RestTemplateBenchmarks.java
similarity index 97%
rename from instrumentation/benchmarks/src/main/java/brave/spring/web/RestTemplateBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/spring/web/RestTemplateBenchmarks.java
index 19a77c9325..c39b6c37a6 100644
--- a/instrumentation/benchmarks/src/main/java/brave/spring/web/RestTemplateBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/spring/web/RestTemplateBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/java/brave/spring/webmvc/WebMvcBenchmarks.java b/instrumentation/benchmarks/src/test/java/brave/spring/webmvc/WebMvcBenchmarks.java
similarity index 98%
rename from instrumentation/benchmarks/src/main/java/brave/spring/webmvc/WebMvcBenchmarks.java
rename to instrumentation/benchmarks/src/test/java/brave/spring/webmvc/WebMvcBenchmarks.java
index 2325859523..99717740de 100644
--- a/instrumentation/benchmarks/src/main/java/brave/spring/webmvc/WebMvcBenchmarks.java
+++ b/instrumentation/benchmarks/src/test/java/brave/spring/webmvc/WebMvcBenchmarks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/instrumentation/benchmarks/src/main/resources/log4j2.properties b/instrumentation/benchmarks/src/test/resources/log4j2.properties
similarity index 100%
rename from instrumentation/benchmarks/src/main/resources/log4j2.properties
rename to instrumentation/benchmarks/src/test/resources/log4j2.properties
diff --git a/pom.xml b/pom.xml
index 988d827f4b..6154d77402 100755
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
     <go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
     <!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
     <license-maven-plugin.version>4.3</license-maven-plugin.version>
+    <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
     <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
     <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
     <!-- Use same version as https://github.com/openzipkin/docker-java -->
@@ -155,7 +156,6 @@
     <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
-    <maven-shade-plugin.version>3.5.2</maven-shade-plugin.version>
     <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
     <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
     <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
@@ -372,11 +372,6 @@
           </configuration>
         </plugin>
 
-        <plugin>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>${maven-shade-plugin.version}</version>
-        </plugin>
-
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
           <version>${maven-invoker-plugin.version}</version>