diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerTests.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerUnitTest.java
similarity index 97%
rename from testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerTests.java
rename to testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerUnitTest.java
index 745cb67145..f51721ecde 100644
--- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerTests.java
+++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerUnitTest.java
@@ -12,7 +12,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.testcontainers.containers.DockerComposeContainer;
 
-public class DockerComposeContainerTests {
+public class DockerComposeContainerUnitTest {
     @ClassRule
     public static DockerComposeContainer compose = 
       new DockerComposeContainer(
diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerTests.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerUnitTest.java
similarity index 97%
rename from testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerTests.java
rename to testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerUnitTest.java
index 61da6fc57b..32dbba7dcf 100644
--- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerTests.java
+++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerUnitTest.java
@@ -13,7 +13,7 @@ import org.junit.platform.commons.annotation.Testable;
 import org.testcontainers.containers.GenericContainer;
 
 @Testable
-public class GenericContainerTests {
+public class GenericContainerUnitTest {
     @ClassRule
     public static GenericContainer simpleWebServer =
       new GenericContainer("alpine:3.2")
diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/PostgreSqlContainerTests.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/PostgreSqlContainerUnitTest.java
similarity index 96%
rename from testing-modules/test-containers/src/test/java/com/baeldung/testconainers/PostgreSqlContainerTests.java
rename to testing-modules/test-containers/src/test/java/com/baeldung/testconainers/PostgreSqlContainerUnitTest.java
index 4261fa2353..f458f1a999 100644
--- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/PostgreSqlContainerTests.java
+++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/PostgreSqlContainerUnitTest.java
@@ -13,7 +13,7 @@ import org.junit.platform.commons.annotation.Testable;
 import org.testcontainers.containers.PostgreSQLContainer;
 
 @Testable
-public class PostgreSqlContainerTests {
+public class PostgreSqlContainerUnitTest {
     @Rule
     public PostgreSQLContainer postgresContainer = new PostgreSQLContainer();
 
diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerTests.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerUnitTest.java
similarity index 95%
rename from testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerTests.java
rename to testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerUnitTest.java
index 8f7b0af762..c10deac0f7 100644
--- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerTests.java
+++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerUnitTest.java
@@ -12,7 +12,7 @@ import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.GenericContainer;
 
-public class WebDriverContainerTests {
+public class WebDriverContainerUnitTest {
     @Rule
     public BrowserWebDriverContainer chrome
       = new BrowserWebDriverContainer()