diff --git a/hadoop-hdds/client/pom.xml b/hadoop-hdds/client/pom.xml
index e91ae265d6bd..94e3559efa76 100644
--- a/hadoop-hdds/client/pom.xml
+++ b/hadoop-hdds/client/pom.xml
@@ -98,6 +98,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index ace26f9eac4d..9237a2759595 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -229,6 +229,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml
index 66efffad82c6..3641a947bb28 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -222,6 +222,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index c5130da23cc7..0c105fd4b518 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -281,6 +281,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index e18e3178623e..cb0d18b121e0 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -166,6 +166,7 @@
         <groupId>org.apache.ozone</groupId>
         <artifactId>hdds-test-utils</artifactId>
         <version>${hdds.version}</version>
+        <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.apache.ozone</groupId>
diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index 15f113e4a5ac..4f7eedc32e06 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -56,6 +56,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
index 3d9e0670584b..f47c82d6dcbf 100644
--- a/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
+++ b/hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
@@ -102,6 +102,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index a73db0c7d89e..757e7eb043c0 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -219,6 +219,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index 0c4d55981920..f4da05146f10 100644
--- a/hadoop-hdds/test-utils/pom.xml
+++ b/hadoop-hdds/test-utils/pom.xml
@@ -26,76 +26,76 @@
   <description>Apache Ozone Distributed Data Store Test Utils</description>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jacoco</groupId>
+      <artifactId>org.jacoco.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>ch.qos.reload4j</groupId>
       <artifactId>reload4j</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/GenericTestUtils.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/GenericTestUtils.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/IntLambda.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/IntLambda.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/IntLambda.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/IntLambda.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/JacocoServer.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/JacocoServer.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/JacocoServer.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/JacocoServer.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/LambdaTestUtils.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/LambdaTestUtils.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j1Capturer.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/Log4j1Capturer.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j1Capturer.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/Log4j1Capturer.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j2Capturer.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/Log4j2Capturer.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j2Capturer.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/Log4j2Capturer.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/MetricsAsserts.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/MetricsAsserts.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/MetricsAsserts.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/MetricsAsserts.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/OzoneTestBase.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/OzoneTestBase.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/OzoneTestBase.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/OzoneTestBase.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SpyInputStream.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/SpyInputStream.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SpyInputStream.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/SpyInputStream.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SpyOutputStream.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/SpyOutputStream.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SpyOutputStream.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/SpyOutputStream.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TestClock.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/TestClock.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TestClock.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/TestClock.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TimedOutTestsListener.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/TimedOutTestsListener.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/TimedOutTestsListener.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/TimedOutTestsListener.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/package-info.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/package-info.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/package-info.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/package-info.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Flaky.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Flaky.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Flaky.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Flaky.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Native.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Native.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Native.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Native.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Slow.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Slow.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Slow.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Slow.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Unhealthy.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Unhealthy.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Unhealthy.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/Unhealthy.java
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/package-info.java b/hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/package-info.java
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/package-info.java
rename to hadoop-hdds/test-utils/src/test/java/org/apache/ozone/test/tag/package-info.java
diff --git a/hadoop-hdds/test-utils/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/hadoop-hdds/test-utils/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
similarity index 100%
rename from hadoop-hdds/test-utils/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
rename to hadoop-hdds/test-utils/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
diff --git a/hadoop-hdds/tools/pom.xml b/hadoop-hdds/tools/pom.xml
index 7f37a36b6555..07ffa537bb04 100644
--- a/hadoop-hdds/tools/pom.xml
+++ b/hadoop-hdds/tools/pom.xml
@@ -143,6 +143,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index 11aefb585333..a9bec341f861 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -107,6 +107,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-ozone/common/pom.xml b/hadoop-ozone/common/pom.xml
index ce1846ee78a2..109adb6228b5 100644
--- a/hadoop-ozone/common/pom.xml
+++ b/hadoop-ozone/common/pom.xml
@@ -155,6 +155,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
index 4715e0e28c5c..6283d86503f9 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -51,6 +51,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 518017fbeffc..ad249b8c4912 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -272,6 +272,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 9e5fade5f4c0..f5b141471c60 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -371,6 +371,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index a76493d02417..98e982f13ae0 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -161,6 +161,7 @@
         <groupId>org.apache.ozone</groupId>
         <artifactId>hdds-test-utils</artifactId>
         <version>${hdds.version}</version>
+        <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index c055e79764db..5a87ee19b70f 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -294,6 +294,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 1a363834a53e..a90ab529dd02 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -257,6 +257,7 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-test-utils</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>