diff --git a/core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackTests.java b/core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java
similarity index 90%
rename from core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackTests.java
rename to core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java
index 63f2d28902..4550994aa3 100644
--- a/core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackTests.java
+++ b/core-java-collections/src/test/java/com/baeldung/stack_tests/MultithreadingCorrectnessStackUnitTest.java
@@ -12,10 +12,10 @@ import static java.util.stream.IntStream.range;
 /**
  * Correctness tests for Stack in multi threaded environment.
  */
-public class MultithreadingCorrectnessStackTests {
+public class MultithreadingCorrectnessStackUnitTest {
 
     @Test
-    public void test_multithreading_correctness_with_synchronized_deque() {
+    public void givenSynchronizedDeque_whenExecutedParallel_thenWorkRight() {
 
         DequeBasedSynchronizedStack<Integer> deque = new DequeBasedSynchronizedStack<>();
 
@@ -41,7 +41,7 @@ public class MultithreadingCorrectnessStackTests {
     }
 
     @Test
-    public void test_multithreading_correctness_with_concurrent_linked_queue() {
+    public void givenConcurrentLinkedQueue_whenExecutedParallel_thenWorkRight() {
 
         ConcurrentLinkedDeque<Integer> deque = new ConcurrentLinkedDeque<>();
 
@@ -67,7 +67,7 @@ public class MultithreadingCorrectnessStackTests {
     }
 
     @Test
-    public void test_multithreading_correctness_with_array_deque() {
+    public void givenArrayDeque_whenExecutedParallel_thenShouldFail() {
 
         ArrayDeque<Integer> deque = new ArrayDeque<>();
 
diff --git a/core-java-collections/src/test/java/com/baeldung/stack_tests/StackTests.java b/core-java-collections/src/test/java/com/baeldung/stack_tests/StackUnitTest.java
similarity index 87%
rename from core-java-collections/src/test/java/com/baeldung/stack_tests/StackTests.java
rename to core-java-collections/src/test/java/com/baeldung/stack_tests/StackUnitTest.java
index 31a84c3a34..07c4760186 100644
--- a/core-java-collections/src/test/java/com/baeldung/stack_tests/StackTests.java
+++ b/core-java-collections/src/test/java/com/baeldung/stack_tests/StackUnitTest.java
@@ -17,10 +17,10 @@ import static java.util.stream.IntStream.range;
 /**
  * These tests are to understand the Stack implementation in Java Collections.
  */
-public class StackTests {
+public class StackUnitTest {
 
     @Test
-    public void test_basic_with_stack() {
+    public void givenStack_whenPushPopPeek_thenWorkRight() {
         Stack<String> namesStack = new Stack<>();
 
         namesStack.push("Bill Gates");
@@ -34,7 +34,7 @@ public class StackTests {
     }
 
     @Test
-    public void test_basic_with_synchronized_deque() {
+    public void givenSynchronizedDeque_whenPushPopPeek_thenWorkRight() {
         DequeBasedSynchronizedStack<String> namesStack = new DequeBasedSynchronizedStack<>();
 
         namesStack.push("Bill Gates");
@@ -48,7 +48,7 @@ public class StackTests {
     }
 
     @Test
-    public void test_basic_with_concurrent_linked_queue() {
+    public void givenConcurrentLinkedDeque_whenPushPopPeek_thenWorkRight() {
         ConcurrentLinkedDeque<String> namesStack = new ConcurrentLinkedDeque<>();
 
         namesStack.push("Bill Gates");