diff --git a/core-java/src/test/java/com/baeldung/java8/Java8StreamApiTest.java b/core-java/src/test/java/com/baeldung/java8/Java8StreamApiUnitTest.java
similarity index 99%
rename from core-java/src/test/java/com/baeldung/java8/Java8StreamApiTest.java
rename to core-java/src/test/java/com/baeldung/java8/Java8StreamApiUnitTest.java
index 37326c6d26..d9a72063af 100644
--- a/core-java/src/test/java/com/baeldung/java8/Java8StreamApiTest.java
+++ b/core-java/src/test/java/com/baeldung/java8/Java8StreamApiUnitTest.java
@@ -17,11 +17,11 @@ import java.util.stream.*;
 
 import static org.junit.Assert.*;
 
-public class Java8StreamApiTest {
+public class Java8StreamApiUnitTest {
 
     private long counter;
 
-    private static Logger log = LoggerFactory.getLogger(Java8StreamApiTest.class);
+    private static Logger log = LoggerFactory.getLogger(Java8StreamApiUnitTest.class);
 
     private List<Product> productList;
 
diff --git a/core-java/src/test/java/com/baeldung/java8/Java8StreamsTest.java b/core-java/src/test/java/com/baeldung/java8/Java8StreamsUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/java8/Java8StreamsTest.java
rename to core-java/src/test/java/com/baeldung/java8/Java8StreamsUnitTest.java
index 1f1dda49ce..fc83553c6e 100644
--- a/core-java/src/test/java/com/baeldung/java8/Java8StreamsTest.java
+++ b/core-java/src/test/java/com/baeldung/java8/Java8StreamsUnitTest.java
@@ -14,7 +14,7 @@ import java.util.stream.Stream;
 
 import static org.junit.Assert.*;
 
-public class Java8StreamsTest {
+public class Java8StreamsUnitTest {
 
     private List<String> list;
 
diff --git a/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeTest.java b/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/java8/JavaFolderSizeTest.java
rename to core-java/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java
index f2e7452137..e4a152b6a4 100644
--- a/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeTest.java
+++ b/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java
@@ -14,7 +14,7 @@ import java.util.stream.StreamSupport;
 
 import static org.junit.Assert.assertEquals;
 
-public class JavaFolderSizeTest {
+public class JavaFolderSizeUnitTest {
 
     private String path;
 
diff --git a/core-java/src/test/java/com/baeldung/java8/JavaTryWithResourcesTest.java b/core-java/src/test/java/com/baeldung/java8/JavaTryWithResourcesUnitTest.java
similarity index 98%
rename from core-java/src/test/java/com/baeldung/java8/JavaTryWithResourcesTest.java
rename to core-java/src/test/java/com/baeldung/java8/JavaTryWithResourcesUnitTest.java
index 224c4e9d6a..4c843ccaaf 100644
--- a/core-java/src/test/java/com/baeldung/java8/JavaTryWithResourcesTest.java
+++ b/core-java/src/test/java/com/baeldung/java8/JavaTryWithResourcesUnitTest.java
@@ -8,7 +8,7 @@ import java.io.StringWriter;
 import java.util.Date;
 import java.util.Scanner;
 
-public class JavaTryWithResourcesTest {
+public class JavaTryWithResourcesUnitTest {
 
     private static final String TEST_STRING_HELLO_WORLD = "Hello World";
     private Date resource1Date, resource2Date;