diff --git a/algorithms/src/test/java/algorithms/HillClimbingAlgorithmTest.java b/algorithms/src/test/java/algorithms/HillClimbingAlgorithmUnitTest.java
similarity index 97%
rename from algorithms/src/test/java/algorithms/HillClimbingAlgorithmTest.java
rename to algorithms/src/test/java/algorithms/HillClimbingAlgorithmUnitTest.java
index 666adbb180..e4746b521c 100644
--- a/algorithms/src/test/java/algorithms/HillClimbingAlgorithmTest.java
+++ b/algorithms/src/test/java/algorithms/HillClimbingAlgorithmUnitTest.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class HillClimbingAlgorithmTest {
+public class HillClimbingAlgorithmUnitTest {
     private Stack<String> initStack;
     private Stack<String> goalStack;
 
diff --git a/algorithms/src/test/java/algorithms/StringSearchAlgorithmsTest.java b/algorithms/src/test/java/algorithms/StringSearchAlgorithmsUnitTest.java
similarity index 93%
rename from algorithms/src/test/java/algorithms/StringSearchAlgorithmsTest.java
rename to algorithms/src/test/java/algorithms/StringSearchAlgorithmsUnitTest.java
index e260cd7e5b..c98a8a53f3 100755
--- a/algorithms/src/test/java/algorithms/StringSearchAlgorithmsTest.java
+++ b/algorithms/src/test/java/algorithms/StringSearchAlgorithmsUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import com.baeldung.algorithms.string.search.StringSearchAlgorithms;
 
-public class StringSearchAlgorithmsTest {
+public class StringSearchAlgorithmsUnitTest {
 	
 	
 	@Test
diff --git a/algorithms/src/test/java/algorithms/binarysearch/BinarySearchTest.java b/algorithms/src/test/java/algorithms/binarysearch/BinarySearchUnitTest.java
similarity index 95%
rename from algorithms/src/test/java/algorithms/binarysearch/BinarySearchTest.java
rename to algorithms/src/test/java/algorithms/binarysearch/BinarySearchUnitTest.java
index 959f47a275..74db4236b9 100644
--- a/algorithms/src/test/java/algorithms/binarysearch/BinarySearchTest.java
+++ b/algorithms/src/test/java/algorithms/binarysearch/BinarySearchUnitTest.java
@@ -7,7 +7,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import com.baeldung.algorithms.binarysearch.BinarySearch;
 
-public class BinarySearchTest {
+public class BinarySearchUnitTest {
 
     int[] sortedArray = { 0, 1, 2, 3, 4, 5, 5, 6, 7, 8, 9, 9 };
     int key = 6;
diff --git a/algorithms/src/test/java/algorithms/mcts/MCTSTest.java b/algorithms/src/test/java/algorithms/mcts/MCTSUnitTest.java
similarity index 99%
rename from algorithms/src/test/java/algorithms/mcts/MCTSTest.java
rename to algorithms/src/test/java/algorithms/mcts/MCTSUnitTest.java
index 375f66ab6f..edbf21390d 100644
--- a/algorithms/src/test/java/algorithms/mcts/MCTSTest.java
+++ b/algorithms/src/test/java/algorithms/mcts/MCTSUnitTest.java
@@ -15,7 +15,7 @@ import com.baeldung.algorithms.mcts.tictactoe.Board;
 import com.baeldung.algorithms.mcts.tictactoe.Position;
 import com.baeldung.algorithms.mcts.tree.Tree;
 
-public class MCTSTest {
+public class MCTSUnitTest {
     private Tree gameTree;
     private MonteCarloTreeSearch mcts;
 
diff --git a/algorithms/src/test/java/algorithms/minimax/MinimaxTest.java b/algorithms/src/test/java/algorithms/minimax/MinimaxUnitTest.java
similarity index 96%
rename from algorithms/src/test/java/algorithms/minimax/MinimaxTest.java
rename to algorithms/src/test/java/algorithms/minimax/MinimaxUnitTest.java
index b29c16386c..c07975bca0 100644
--- a/algorithms/src/test/java/algorithms/minimax/MinimaxTest.java
+++ b/algorithms/src/test/java/algorithms/minimax/MinimaxUnitTest.java
@@ -7,7 +7,7 @@ import static org.junit.Assert.*;
 import com.baeldung.algorithms.minimax.MiniMax;
 import com.baeldung.algorithms.minimax.Tree;
 
-public class MinimaxTest {
+public class MinimaxUnitTest {
     private Tree gameTree;
     private MiniMax miniMax;
 
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortTest.java b/algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
similarity index 93%
rename from algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
index 7774eb3e67..c7f3f7dc38 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
@@ -4,7 +4,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-public class BubbleSortTest {
+public class BubbleSortUnitTest {
 
     @Test
     public void givenIntegerArray_whenSortedWithBubbleSort_thenGetSortedArray() {
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java
similarity index 80%
rename from algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java
index bab2f480a5..0df4715b80 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceUnitTest.java
@@ -7,13 +7,13 @@ import org.junit.runners.Parameterized;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(Parameterized.class)
-public class EditDistanceTest extends EditDistanceDataProvider {
+public class EditDistanceUnitTest extends EditDistanceDataProvider {
 
     private String x;
     private String y;
     private int result;
 
-    public EditDistanceTest(String a, String b, int res) {
+    public EditDistanceUnitTest(String a, String b, int res) {
         super();
         x = a;
         y = b;
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceTest.java b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java
similarity index 72%
rename from algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java
index 7f9b8acdbd..af2430ec55 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionBruteForceUnitTest.java
@@ -6,11 +6,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(value = Parameterized.class)
-public class CycleDetectionBruteForceTest extends CycleDetectionTestBase {
+public class CycleDetectionBruteForceUnitTest extends CycleDetectionTestBase {
     boolean cycleExists;
     Node<Integer> head;
 
-    public CycleDetectionBruteForceTest(Node<Integer> head, boolean cycleExists) {
+    public CycleDetectionBruteForceUnitTest(Node<Integer> head, boolean cycleExists) {
         super();
         this.cycleExists = cycleExists;
         this.head = head;
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsTest.java b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java
similarity index 70%
rename from algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java
index 17d339bc33..ce31c84067 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByFastAndSlowIteratorsUnitTest.java
@@ -6,11 +6,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(value = Parameterized.class)
-public class CycleDetectionByFastAndSlowIteratorsTest extends CycleDetectionTestBase {
+public class CycleDetectionByFastAndSlowIteratorsUnitTest extends CycleDetectionTestBase {
     boolean cycleExists;
     Node<Integer> head;
 
-    public CycleDetectionByFastAndSlowIteratorsTest(Node<Integer> head, boolean cycleExists) {
+    public CycleDetectionByFastAndSlowIteratorsUnitTest(Node<Integer> head, boolean cycleExists) {
         super();
         this.cycleExists = cycleExists;
         this.head = head;
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingTest.java b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java
similarity index 72%
rename from algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java
index 73a2cc7861..4451c3d3c9 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleDetectionByHashingUnitTest.java
@@ -6,11 +6,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(value = Parameterized.class)
-public class CycleDetectionByHashingTest extends CycleDetectionTestBase {
+public class CycleDetectionByHashingUnitTest extends CycleDetectionTestBase {
     boolean cycleExists;
     Node<Integer> head;
 
-    public CycleDetectionByHashingTest(Node<Integer> head, boolean cycleExists) {
+    public CycleDetectionByHashingUnitTest(Node<Integer> head, boolean cycleExists) {
         super();
         this.cycleExists = cycleExists;
         this.head = head;
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceTest.java b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java
similarity index 76%
rename from algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java
index 6484c9988e..f69e3c35ba 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalBruteForceUnitTest.java
@@ -6,11 +6,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(value = Parameterized.class)
-public class CycleRemovalBruteForceTest extends CycleDetectionTestBase {
+public class CycleRemovalBruteForceUnitTest extends CycleDetectionTestBase {
     boolean cycleExists;
     Node<Integer> head;
 
-    public CycleRemovalBruteForceTest(Node<Integer> head, boolean cycleExists) {
+    public CycleRemovalBruteForceUnitTest(Node<Integer> head, boolean cycleExists) {
         super();
         this.cycleExists = cycleExists;
         this.head = head;
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesTest.java b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java
similarity index 75%
rename from algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java
index 7bfd89c502..c17aa6eeab 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalByCountingLoopNodesUnitTest.java
@@ -6,11 +6,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(value = Parameterized.class)
-public class CycleRemovalByCountingLoopNodesTest extends CycleDetectionTestBase {
+public class CycleRemovalByCountingLoopNodesUnitTest extends CycleDetectionTestBase {
     boolean cycleExists;
     Node<Integer> head;
 
-    public CycleRemovalByCountingLoopNodesTest(Node<Integer> head, boolean cycleExists) {
+    public CycleRemovalByCountingLoopNodesUnitTest(Node<Integer> head, boolean cycleExists) {
         super();
         this.cycleExists = cycleExists;
         this.head = head;
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesTest.java b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java
similarity index 74%
rename from algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java
index c77efb3e3e..06ff840a59 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/linkedlist/CycleRemovalWithoutCountingLoopNodesUnitTest.java
@@ -6,11 +6,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(value = Parameterized.class)
-public class CycleRemovalWithoutCountingLoopNodesTest extends CycleDetectionTestBase {
+public class CycleRemovalWithoutCountingLoopNodesUnitTest extends CycleDetectionTestBase {
     boolean cycleExists;
     Node<Integer> head;
 
-    public CycleRemovalWithoutCountingLoopNodesTest(Node<Integer> head, boolean cycleExists) {
+    public CycleRemovalWithoutCountingLoopNodesUnitTest(Node<Integer> head, boolean cycleExists) {
         super();
         this.cycleExists = cycleExists;
         this.head = head;
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterTest.java b/algorithms/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java
similarity index 98%
rename from algorithms/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java
index a4a169f158..26643e9c1e 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/moneywords/NumberWordConverterUnitTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 
 import com.baeldung.algorithms.numberwordconverter.NumberWordConverter;
 
-public class NumberWordConverterTest {
+public class NumberWordConverterUnitTest {
 
     @Test
     public void whenMoneyNegative_thenReturnInvalidInput() {
diff --git a/algorithms/src/test/java/com/baeldung/algorithms/prime/PrimeGeneratorTest.java b/algorithms/src/test/java/com/baeldung/algorithms/prime/PrimeGeneratorUnitTest.java
similarity index 93%
rename from algorithms/src/test/java/com/baeldung/algorithms/prime/PrimeGeneratorTest.java
rename to algorithms/src/test/java/com/baeldung/algorithms/prime/PrimeGeneratorUnitTest.java
index 4995e938b7..ffa1404eac 100644
--- a/algorithms/src/test/java/com/baeldung/algorithms/prime/PrimeGeneratorTest.java
+++ b/algorithms/src/test/java/com/baeldung/algorithms/prime/PrimeGeneratorUnitTest.java
@@ -7,7 +7,7 @@ import java.util.List;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class PrimeGeneratorTest {
+public class PrimeGeneratorUnitTest {
     @Test
     public void whenBruteForced_returnsSuccessfully() {
         final List<Integer> primeNumbers = primeNumbersBruteForce(20);
diff --git a/algorithms/src/test/java/com/baeldung/jgrapht/CompleteGraphTest.java b/algorithms/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java
similarity index 97%
rename from algorithms/src/test/java/com/baeldung/jgrapht/CompleteGraphTest.java
rename to algorithms/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java
index c085d54689..0b0d6ae822 100644
--- a/algorithms/src/test/java/com/baeldung/jgrapht/CompleteGraphTest.java
+++ b/algorithms/src/test/java/com/baeldung/jgrapht/CompleteGraphUnitTest.java
@@ -12,7 +12,7 @@ import org.jgrapht.graph.SimpleWeightedGraph;
 import org.junit.Before;
 import org.junit.Test;
 
-public class CompleteGraphTest {
+public class CompleteGraphUnitTest {
 
     static SimpleWeightedGraph<String, DefaultEdge> completeGraph;
     static int size = 10;
diff --git a/algorithms/src/test/java/com/baeldung/jgrapht/DirectedGraphTests.java b/algorithms/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTests.java
similarity index 99%
rename from algorithms/src/test/java/com/baeldung/jgrapht/DirectedGraphTests.java
rename to algorithms/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTests.java
index 7f4cc99715..4355de8e1e 100644
--- a/algorithms/src/test/java/com/baeldung/jgrapht/DirectedGraphTests.java
+++ b/algorithms/src/test/java/com/baeldung/jgrapht/DirectedGraphUnitTests.java
@@ -24,7 +24,7 @@ import org.jgrapht.traverse.DepthFirstIterator;
 import org.junit.Before;
 import org.junit.Test;
 
-public class DirectedGraphTests {
+public class DirectedGraphUnitTests {
     DirectedGraph<String, DefaultEdge> directedGraph;
 
     @Before
diff --git a/algorithms/src/test/java/com/baeldung/jgrapht/EulerianCircuitTest.java b/algorithms/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java
similarity index 97%
rename from algorithms/src/test/java/com/baeldung/jgrapht/EulerianCircuitTest.java
rename to algorithms/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java
index 6f0fb92ab7..8cf1b70898 100644
--- a/algorithms/src/test/java/com/baeldung/jgrapht/EulerianCircuitTest.java
+++ b/algorithms/src/test/java/com/baeldung/jgrapht/EulerianCircuitUnitTest.java
@@ -12,7 +12,7 @@ import org.jgrapht.graph.SimpleWeightedGraph;
 import org.junit.Before;
 import org.junit.Test;
 
-public class EulerianCircuitTest {
+public class EulerianCircuitUnitTest {
     SimpleWeightedGraph<String, DefaultEdge> simpleGraph;
 
     @Before
diff --git a/apache-curator/src/test/java/com/baeldung/apache/curator/BaseTest.java b/apache-curator/src/test/java/com/baeldung/apache/curator/BaseManualTest.java
similarity index 94%
rename from apache-curator/src/test/java/com/baeldung/apache/curator/BaseTest.java
rename to apache-curator/src/test/java/com/baeldung/apache/curator/BaseManualTest.java
index cfac3ee3f2..5722228b26 100644
--- a/apache-curator/src/test/java/com/baeldung/apache/curator/BaseTest.java
+++ b/apache-curator/src/test/java/com/baeldung/apache/curator/BaseManualTest.java
@@ -6,7 +6,7 @@ import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.retry.RetryNTimes;
 import org.junit.Before;
 
-public abstract class BaseTest {
+public abstract class BaseManualTest {
 
     @Before
     public void setup() {
diff --git a/apache-curator/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java b/apache-curator/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java
index d02ef8131d..1a6fe6ccd0 100644
--- a/apache-curator/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java
+++ b/apache-curator/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java
@@ -12,9 +12,9 @@ import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.x.async.AsyncCuratorFramework;
 import org.junit.Test;
 
-import com.baeldung.apache.curator.BaseTest;
+import com.baeldung.apache.curator.BaseManualTest;
 
-public class ConfigurationManagementManualTest extends BaseTest {
+public class ConfigurationManagementManualTest extends BaseManualTest {
 
     private static final String KEY_FORMAT = "/%s";
 
diff --git a/apache-curator/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java b/apache-curator/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java
index 4400c1d1aa..d7caa18ce9 100644
--- a/apache-curator/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java
+++ b/apache-curator/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java
@@ -11,9 +11,9 @@ import org.apache.curator.x.async.modeled.ModeledFramework;
 import org.apache.curator.x.async.modeled.ZPath;
 import org.junit.Test;
 
-import com.baeldung.apache.curator.BaseTest;
+import com.baeldung.apache.curator.BaseManualTest;
 
-public class ModelTypedExamplesManualTest extends BaseTest {
+public class ModelTypedExamplesManualTest extends BaseManualTest {
 
     @Test
     public void givenPath_whenStoreAModel_thenNodesAreCreated()
diff --git a/apache-curator/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java b/apache-curator/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java
index 04f4104e6b..0c5890ad59 100644
--- a/apache-curator/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java
+++ b/apache-curator/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java
@@ -10,9 +10,9 @@ import org.apache.curator.framework.recipes.shared.SharedCount;
 import org.apache.curator.framework.state.ConnectionState;
 import org.junit.Test;
 
-import com.baeldung.apache.curator.BaseTest;
+import com.baeldung.apache.curator.BaseManualTest;
 
-public class RecipesManualTest extends BaseTest {
+public class RecipesManualTest extends BaseManualTest {
 
     @Test
     public void givenRunningZookeeper_whenUsingLeaderElection_thenNoErrors() {
diff --git a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/ChunkerTest.java b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/ChunkerUnitTest.java
similarity index 97%
rename from apache-opennlp/src/test/java/com/baeldung/apache/opennlp/ChunkerTest.java
rename to apache-opennlp/src/test/java/com/baeldung/apache/opennlp/ChunkerUnitTest.java
index cc3abb422b..91dde8a2d1 100644
--- a/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/ChunkerTest.java
+++ b/apache-opennlp/src/test/java/com/baeldung/apache/opennlp/ChunkerUnitTest.java
@@ -10,7 +10,7 @@ import opennlp.tools.tokenize.SimpleTokenizer;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
-public class ChunkerTest {
+public class ChunkerUnitTest {
 
     @Test
     public void givenChunkerModel_whenChunk_thenChunksAreDetected() throws Exception {