diff --git a/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/ConfigurationSourceTest.java b/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/TestConfigurationSource.java
similarity index 98%
rename from hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/ConfigurationSourceTest.java
rename to hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/TestConfigurationSource.java
index d4437cb88a27..ac92276a7302 100644
--- a/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/ConfigurationSourceTest.java
+++ b/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/TestConfigurationSource.java
@@ -23,7 +23,7 @@
 
 import java.util.Map;
 
-class ConfigurationSourceTest {
+class TestConfigurationSource {
 
   @Test
   void getPropsMatchPrefixAndTrimPrefix() {
diff --git a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/RpcClientTest.java b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
similarity index 98%
rename from hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/RpcClientTest.java
rename to hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
index 19aa3a7a79dd..f7010eaef119 100644
--- a/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/RpcClientTest.java
+++ b/hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/rpc/TestRpcClient.java
@@ -38,7 +38,7 @@
  * Run RPC Client tests.
  */
 @RunWith(Parameterized.class)
-public class RpcClientTest {
+public class TestRpcClient {
   private enum ValidateOmVersionTestCases {
     NULL_EXPECTED_NO_OM(
         null, // Expected version
@@ -200,7 +200,7 @@ public static Iterable<ValidateOmVersionTestCases> parameters() {
 
   private ValidateOmVersionTestCases testCase;
 
-  public RpcClientTest(ValidateOmVersionTestCases testCase) {
+  public TestRpcClient(ValidateOmVersionTestCases testCase) {
     this.testCase = testCase;
   }