diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringTest.java b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
similarity index 94%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringTest.java
rename to java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
index 31e268b4a3..9a88416179 100644
--- a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerArrayToStringUnitTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-public class CustomerArrayToStringTest {
+public class CustomerArrayToStringUnitTest {
     private static final String CUSTOMER_ARRAY_TO_STRING 
       = "Customer [orders=[Order [orderId=A1111, desc=Game, value=0]], getFirstName()=Rajesh, getLastName()=Bhojwani]";
 	 
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringTest.java b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
similarity index 94%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringTest.java
rename to java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
index 3c98394f85..5ffb0d0e58 100644
--- a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerComplexObjectToStringUnitTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-public class CustomerComplexObjectToStringTest {
+public class CustomerComplexObjectToStringUnitTest {
     private static final String CUSTOMER_COMPLEX_TO_STRING 
       = "Customer [order=Order [orderId=A1111, desc=Game, value=0], getFirstName()=Rajesh, getLastName()=Bhojwani]";
 	 
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringTest.java b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
similarity index 92%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringTest.java
rename to java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
index 2a29cb93d8..d43733bc60 100644
--- a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerPrimitiveToStringUnitTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-public class CustomerPrimitiveToStringTest {
+public class CustomerPrimitiveToStringUnitTest {
 
     private static final String CUSTOMER_PRIMITIVE_TO_STRING 
       = "Customer [balance=110, getFirstName()=Rajesh, getLastName()=Bhojwani]";
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerReflectionToStringTest.java b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerReflectionToStringUnitTest.java
similarity index 95%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerReflectionToStringTest.java
rename to java-strings/src/test/java/com/baeldung/string/tostring/CustomerReflectionToStringUnitTest.java
index 290bef7133..77dcab52e6 100644
--- a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerReflectionToStringTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerReflectionToStringUnitTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-public class CustomerReflectionToStringTest {
+public class CustomerReflectionToStringUnitTest {
     private static final String CUSTOMER_REFLECTION_TO_STRING = "com.baeldung.string.tostring.CustomerReflectionToString";
     	 
     @Test
diff --git a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringTest.java b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
similarity index 94%
rename from java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringTest.java
rename to java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
index c80969d453..e04512ff75 100644
--- a/java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringTest.java
+++ b/java-strings/src/test/java/com/baeldung/string/tostring/CustomerWrapperCollectionToStringUnitTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-public class CustomerWrapperCollectionToStringTest {
+public class CustomerWrapperCollectionToStringUnitTest {
     private static final String CUSTOMER_WRAPPER_COLLECTION_TO_STRING 
       = "Customer [score=8, orders=[Book, Pen], fullname=Bhojwani, Rajesh, getFirstName()=Rajesh, getLastName()=Bhojwani]";