diff --git a/server/src/test/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadataTest.java b/server/src/test/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadataTests.java
similarity index 99%
rename from server/src/test/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadataTest.java
rename to server/src/test/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadataTests.java
index b884fdf06edfa..850c18f03fa49 100644
--- a/server/src/test/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadataTest.java
+++ b/server/src/test/java/org/opensearch/gateway/remote/model/RemotePersistentSettingsMetadataTests.java
@@ -45,7 +45,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class RemotePersistentSettingsMetadataTest extends OpenSearchTestCase {
+public class RemotePersistentSettingsMetadataTests extends OpenSearchTestCase {
     private static final String TEST_BLOB_NAME = "/test-path/test-blob-name";
     private static final String TEST_BLOB_PATH = "test-path";
     private static final String TEST_BLOB_FILE_NAME = "test-blob-name";
diff --git a/server/src/test/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadataTest.java b/server/src/test/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadataTests.java
similarity index 99%
rename from server/src/test/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadataTest.java
rename to server/src/test/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadataTests.java
index e8130d2720bcf..b86044003aa55 100644
--- a/server/src/test/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadataTest.java
+++ b/server/src/test/java/org/opensearch/gateway/remote/model/RemoteTemplatesMetadataTests.java
@@ -48,7 +48,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class RemoteTemplatesMetadataTest extends OpenSearchTestCase {
+public class RemoteTemplatesMetadataTests extends OpenSearchTestCase {
     private static final String TEST_BLOB_NAME = "/test-path/test-blob-name";
     private static final String TEST_BLOB_PATH = "test-path";
     private static final String TEST_BLOB_FILE_NAME = "test-blob-name";