diff --git a/autovalue/src/test/java/com/baeldung/autovalue/MoneyTest.java b/autovalue/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
similarity index 98%
rename from autovalue/src/test/java/com/baeldung/autovalue/MoneyTest.java
rename to autovalue/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
index af3afe84fb..a9482125a6 100644
--- a/autovalue/src/test/java/com/baeldung/autovalue/MoneyTest.java
+++ b/autovalue/src/test/java/com/baeldung/autovalue/MoneyUnitTest.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-public class MoneyTest {
+public class MoneyUnitTest {
 	@Test
 	public void givenTwoSameValueMoneyObjects_whenEqualityTestFails_thenCorrect() {
 		MutableMoney m1 = new MutableMoney(10000, "USD");
diff --git a/xml/src/test/java/com/baeldung/xml/DefaultParserTest.java b/xml/src/test/java/com/baeldung/xml/DefaultParserUnitTest.java
similarity index 98%
rename from xml/src/test/java/com/baeldung/xml/DefaultParserTest.java
rename to xml/src/test/java/com/baeldung/xml/DefaultParserUnitTest.java
index 734e7a93cb..31b4e1aecd 100644
--- a/xml/src/test/java/com/baeldung/xml/DefaultParserTest.java
+++ b/xml/src/test/java/com/baeldung/xml/DefaultParserUnitTest.java
@@ -8,7 +8,7 @@ import org.junit.Test;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-public class DefaultParserTest {
+public class DefaultParserUnitTest {
 
     final String fileName = "src/test/resources/example.xml";
     
diff --git a/xml/src/test/java/com/baeldung/xml/Dom4JParserTest.java b/xml/src/test/java/com/baeldung/xml/Dom4JParserUnitTest.java
similarity index 98%
rename from xml/src/test/java/com/baeldung/xml/Dom4JParserTest.java
rename to xml/src/test/java/com/baeldung/xml/Dom4JParserUnitTest.java
index 277eca8355..36b6e641f6 100644
--- a/xml/src/test/java/com/baeldung/xml/Dom4JParserTest.java
+++ b/xml/src/test/java/com/baeldung/xml/Dom4JParserUnitTest.java
@@ -11,7 +11,7 @@ import org.dom4j.Element;
 import org.dom4j.Node;
 import org.junit.Test;
 
-public class Dom4JParserTest {
+public class Dom4JParserUnitTest {
 
 	final String fileName = "src/test/resources/example.xml";
 
diff --git a/xml/src/test/java/com/baeldung/xml/JDomParserTest.java b/xml/src/test/java/com/baeldung/xml/JDomParserUnitTest.java
similarity index 96%
rename from xml/src/test/java/com/baeldung/xml/JDomParserTest.java
rename to xml/src/test/java/com/baeldung/xml/JDomParserUnitTest.java
index 981458469f..bfe72e872a 100644
--- a/xml/src/test/java/com/baeldung/xml/JDomParserTest.java
+++ b/xml/src/test/java/com/baeldung/xml/JDomParserUnitTest.java
@@ -10,7 +10,7 @@ import java.util.List;
 import org.jdom2.Element;
 import org.junit.Test;
 
-public class JDomParserTest {
+public class JDomParserUnitTest {
 	
 	final String fileName = "src/test/resources/example.xml";
 
diff --git a/xml/src/test/java/com/baeldung/xml/JaxbParserTest.java b/xml/src/test/java/com/baeldung/xml/JaxbParserUnitTest.java
similarity index 96%
rename from xml/src/test/java/com/baeldung/xml/JaxbParserTest.java
rename to xml/src/test/java/com/baeldung/xml/JaxbParserUnitTest.java
index 6c31a7bfdd..6f36c148fd 100644
--- a/xml/src/test/java/com/baeldung/xml/JaxbParserTest.java
+++ b/xml/src/test/java/com/baeldung/xml/JaxbParserUnitTest.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 
 import com.baeldung.xml.binding.Tutorials;
 
-public class JaxbParserTest {
+public class JaxbParserUnitTest {
 
 	
 	final String fileName = "src/test/resources/example.xml";
diff --git a/xml/src/test/java/com/baeldung/xml/JaxenDemoTest.java b/xml/src/test/java/com/baeldung/xml/JaxenDemoUnitTest.java
similarity index 93%
rename from xml/src/test/java/com/baeldung/xml/JaxenDemoTest.java
rename to xml/src/test/java/com/baeldung/xml/JaxenDemoUnitTest.java
index 2521fcaf8a..d0349048b3 100644
--- a/xml/src/test/java/com/baeldung/xml/JaxenDemoTest.java
+++ b/xml/src/test/java/com/baeldung/xml/JaxenDemoUnitTest.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 import org.junit.Test;
 
-public class JaxenDemoTest {
+public class JaxenDemoUnitTest {
 
 	final String fileName = "src/test/resources/example.xml";
 	
diff --git a/xml/src/test/java/com/baeldung/xml/StaxParserTest.java b/xml/src/test/java/com/baeldung/xml/StaxParserUnitTest.java
similarity index 94%
rename from xml/src/test/java/com/baeldung/xml/StaxParserTest.java
rename to xml/src/test/java/com/baeldung/xml/StaxParserUnitTest.java
index cf7ee1ee75..afddb591ca 100644
--- a/xml/src/test/java/com/baeldung/xml/StaxParserTest.java
+++ b/xml/src/test/java/com/baeldung/xml/StaxParserUnitTest.java
@@ -10,7 +10,7 @@ import org.junit.Test;
 
 import com.baeldung.xml.binding.Tutorial;
 
-public class StaxParserTest {
+public class StaxParserUnitTest {
 
 	final String fileName = "src/test/resources/example.xml";