diff --git a/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts b/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts
index 568c7bfe..568b13af 100644
--- a/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.hedera.block.jpms-modules.gradle.kts
@@ -144,13 +144,7 @@ extraJavaModuleInfo {
     module("com.google.auto.service:auto-service", "com.google.auto.service.processor")
     module("com.google.auto:auto-common", "com.google.auto.common")
 
-    // JMH only
-    module("net.sf.jopt-simple:jopt-simple", "jopt.simple")
-    module("org.openjdk.jmh:jmh-core", "jmh.core")
-    module("org.openjdk.jmh:jmh-generator-asm", "jmh.generator.asm")
-    module("org.openjdk.jmh:jmh-generator-bytecode", "jmh.generator.bytecode")
-    module("org.openjdk.jmh:jmh-generator-reflection", "jmh.generator.reflection")
-
+    // Test clients only
     module("com.google.protobuf:protobuf-java-util", "com.google.protobuf.util")
     module("junit:junit", "junit")
     module("org.hamcrest:hamcrest", "org.hamcrest")
diff --git a/server/src/test/java/com/hedera/block/server/BlockStreamServiceIT.java b/server/src/test/java/com/hedera/block/server/BlockStreamServiceIntegrationTest.java
similarity index 99%
rename from server/src/test/java/com/hedera/block/server/BlockStreamServiceIT.java
rename to server/src/test/java/com/hedera/block/server/BlockStreamServiceIntegrationTest.java
index ccf52f96..a8b32dcf 100644
--- a/server/src/test/java/com/hedera/block/server/BlockStreamServiceIT.java
+++ b/server/src/test/java/com/hedera/block/server/BlockStreamServiceIntegrationTest.java
@@ -61,7 +61,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-public class BlockStreamServiceIT {
+public class BlockStreamServiceIntegrationTest {
 
     private final System.Logger LOGGER = System.getLogger(getClass().getName());