diff --git a/core-java/src/test/java/org/baeldung/java/diamond/DiamondOperatorTest.java b/core-java/src/test/java/org/baeldung/java/diamond/DiamondOperatorUnitTest.java
similarity index 65%
rename from core-java/src/test/java/org/baeldung/java/diamond/DiamondOperatorTest.java
rename to core-java/src/test/java/org/baeldung/java/diamond/DiamondOperatorUnitTest.java
index ceb7c87100..f6c7f7162f 100644
--- a/core-java/src/test/java/org/baeldung/java/diamond/DiamondOperatorTest.java
+++ b/core-java/src/test/java/org/baeldung/java/diamond/DiamondOperatorUnitTest.java
@@ -4,9 +4,9 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class DiamondOperatorTest {
+public class DiamondOperatorUnitTest {
     @Test
-    public void shouldCreateCarUsingDiamondWithoutWarnings() {
+    public void whenCreateCarUsingDiamondOperator_thenSuccess() {
         Car<Diesel> myCar = new Car<>();
         assertNotNull(myCar);
     }