diff --git a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
similarity index 96%
rename from core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java
rename to core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
index 4e0f44e555..67fe173883 100644
--- a/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
@@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
 
-class PrimitivesAndWrapperTest {
+class PrimitivesAndWrapperUnitTest {
 
     @Test
     public void givenWrappers_whenBothArgsNonNull_thenReturnResult() {
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
similarity index 94%
rename from core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
index 5a41d444a4..c157ad6630 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingLombokTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class UsingLombokTest {
+class UsingLombokUnitTest {
 
     private UsingLombok classUnderTest;
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
similarity index 95%
rename from core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
index 74170d980b..6939caa4fb 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingObjectsTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class UsingObjectsTest {
+class UsingObjectsUnitTest {
 
     private UsingObjects classUnderTest;
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
index 5c42b9dff1..45367204b7 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingOptionalTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
@@ -9,7 +9,7 @@ import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class UsingOptionalTest {
+class UsingOptionalUnitTest {
 
     private UsingOptional classUnderTest;
 
diff --git a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
similarity index 97%
rename from core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java
rename to core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
index d10364b85e..451775abe1 100644
--- a/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsTest.java
+++ b/core-java/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class UsingStringUtilsTest {
+class UsingStringUtilsUnitTest {
 
     private UsingStringUtils classUnderTest;