diff --git a/testing-modules/spring-testing/README.md b/testing-modules/spring-testing/README.md
new file mode 100644
index 0000000000..a96ddccabb
--- /dev/null
+++ b/testing-modules/spring-testing/README.md
@@ -0,0 +1,2 @@
+### Relevant Articles:
+
diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
new file mode 100644
index 0000000000..a137bc8d33
--- /dev/null
+++ b/testing-modules/spring-testing/pom.xml
@@ -0,0 +1,75 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.baeldung</groupId>
+    <artifactId>spring-testing</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-testing</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>java-hamcrest</artifactId>
+            <version>${hamcrest.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>LATEST</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>LATEST</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>LATEST</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>LATEST</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>LATEST</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-testing</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+    </build>
+
+    <properties>
+        <!-- testing -->
+        <hamcrest.version>2.0.0.0</hamcrest.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/User.java b/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java
similarity index 100%
rename from testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/User.java
rename to testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java
diff --git a/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/UserRepository.java b/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java
similarity index 100%
rename from testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/UserRepository.java
rename to testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java
diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
similarity index 83%
rename from testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
rename to testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
index 5d565fea88..fcc646e8ea 100644
--- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
+++ b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
@@ -15,18 +15,22 @@ public class MockAnnotationUnitTest {
     UserRepository mockRepository;
 
     @Test
-    public void testMockAnnotation() {
+    public void givenCountMethodMocked_WhenCountInvoked_ThenMockValueReturned() {
         Mockito.when(mockRepository.count()).thenReturn(123L);
+
         long userCount = mockRepository.count();
+
         Assert.assertEquals(123L, userCount);
         Mockito.verify(mockRepository).count();
     }
     
     @Test
-    public void testMockitoMockMethod() {
+    public void givenCountMethodOfLocalMockVariableMocked_WhenCountInvoked_ThenMockedValueReturned() {
         UserRepository localMockRepository = Mockito.mock(UserRepository.class);
         Mockito.when(localMockRepository.count()).thenReturn(111L);
+
         long userCount = localMockRepository.count();
+
         Assert.assertEquals(111L, userCount);
         Mockito.verify(localMockRepository).count();
     }
diff --git a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
similarity index 91%
rename from testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
index 008e674696..3a7e58fb48 100644
--- a/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
+++ b/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
@@ -20,10 +20,12 @@ public class MockBeanAnnotationIntegrationTest {
     ApplicationContext context;
     
     @Test
-    public void testMockBean() {
+    public void givenCountMethodMocked_WhenCountInvoked_ThenMockValueReturned() {
         Mockito.when(mockRepository.count()).thenReturn(123L);
+
         UserRepository userRepoFromContext = context.getBean(UserRepository.class);
         long userCount = userRepoFromContext.count();
+
         Assert.assertEquals(123L, userCount);
         Mockito.verify(mockRepository).count();
     }