diff --git a/testing-modules/mockito/pom.xml b/testing-modules/mockito/pom.xml
index c2e5b4bf31..45ce288fa9 100644
--- a/testing-modules/mockito/pom.xml
+++ b/testing-modules/mockito/pom.xml
@@ -46,6 +46,38 @@
             <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>
@@ -67,7 +99,6 @@
         <!-- testing -->
         <powermock.version>1.7.0</powermock.version>
         <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/mockito/src/main/java/org/baeldung/mockito/repository/User.java
new file mode 100644
index 0000000000..28cd4f9fb0
--- /dev/null
+++ b/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/User.java
@@ -0,0 +1,49 @@
+package org.baeldung.mockito.repository;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "users")
+public class User {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+    private String name;
+    private Integer status;
+
+    public User() {
+    }
+
+    public User(String name, Integer status) {
+        this.name = name;
+        this.status = status;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}
\ No newline at end of file
diff --git a/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/UserRepository.java b/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/UserRepository.java
new file mode 100644
index 0000000000..3f1952a5e7
--- /dev/null
+++ b/testing-modules/mockito/src/main/java/org/baeldung/mockito/repository/UserRepository.java
@@ -0,0 +1,9 @@
+package org.baeldung.mockito.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository("userRepository")
+public interface UserRepository extends JpaRepository<User, Integer> {
+
+}
diff --git a/spring-boot/src/test/java/org/baeldung/MockAnnotationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
similarity index 82%
rename from spring-boot/src/test/java/org/baeldung/MockAnnotationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
index a70b31177f..5d565fea88 100644
--- a/spring-boot/src/test/java/org/baeldung/MockAnnotationTest.java
+++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package org.baeldung.mockito;
 
-import org.baeldung.repository.UserRepository;
+import org.baeldung.mockito.repository.UserRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,7 +9,7 @@ import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class MockAnnotationTest {
+public class MockAnnotationUnitTest {
     
     @Mock
     UserRepository mockRepository;
@@ -28,6 +28,6 @@ public class MockAnnotationTest {
         Mockito.when(localMockRepository.count()).thenReturn(111L);
         long userCount = localMockRepository.count();
         Assert.assertEquals(111L, userCount);
-        Mockito.verify(localMockRepository).count();  
+        Mockito.verify(localMockRepository).count();
     }
 }
diff --git a/spring-boot/src/test/java/org/baeldung/MockBeanAnnotationIntegrationTest.java b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
similarity index 91%
rename from spring-boot/src/test/java/org/baeldung/MockBeanAnnotationIntegrationTest.java
rename to testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
index 0c93004a49..008e674696 100644
--- a/spring-boot/src/test/java/org/baeldung/MockBeanAnnotationIntegrationTest.java
+++ b/testing-modules/mockito/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung;
+package org.baeldung.mockito;
 
-import org.baeldung.repository.UserRepository;
+import org.baeldung.mockito.repository.UserRepository;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,7 +10,6 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
-
 @RunWith(SpringRunner.class)
 public class MockBeanAnnotationIntegrationTest {