diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index 77f3fdb625..92af416b94 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -87,7 +87,7 @@
         <module>spring-jpa-2</module>
         <module>spring-jdbc</module>
         <module>spring-jooq</module>
-        <!-- <module>spring-mybatis</module> --> <!-- needs fixing in BAEL-9021 -->
+        <module>spring-mybatis</module>
         <module>spring-persistence-simple</module>
     </modules>
 
diff --git a/persistence-modules/spring-mybatis/pom.xml b/persistence-modules/spring-mybatis/pom.xml
index 9247d59fe4..1a55e76900 100644
--- a/persistence-modules/spring-mybatis/pom.xml
+++ b/persistence-modules/spring-mybatis/pom.xml
@@ -84,7 +84,7 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.1.8.RELEASE</org.springframework.version>
+        <org.springframework.version>5.3.8</org.springframework.version>
         <!-- persistence -->
         <spring-mybatis.version>2.0.2</spring-mybatis.version>
         <mybatis.version>3.5.2</mybatis.version>
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootIntegrationTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootUnitTest.java
similarity index 82%
rename from persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootIntegrationTest.java
rename to persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootUnitTest.java
index 531356ffa2..d9f757aa30 100644
--- a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootIntegrationTest.java
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperBootUnitTest.java
@@ -8,6 +8,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @ContextConfiguration(classes = PersistenceAutoConfig.class)
-public class ArticleMapperBootIntegrationTest extends ArticleMapperCommonTest {
+public class ArticleMapperBootUnitTest extends ArticleMapperCommonUnitTest {
 
 }
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonUnitTest.java
similarity index 94%
rename from persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonTest.java
rename to persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonUnitTest.java
index 33071dc0c1..2a93ca3d61 100644
--- a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonTest.java
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperCommonUnitTest.java
@@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class ArticleMapperCommonTest {
+class ArticleMapperCommonUnitTest {
 
     @Autowired
     ArticleMapper articleMapper;
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperIntegrationTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperUnitTest.java
similarity index 80%
rename from persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperIntegrationTest.java
rename to persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperUnitTest.java
index 9298714cb2..9c677ecee5 100644
--- a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperIntegrationTest.java
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperUnitTest.java
@@ -6,6 +6,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = PersistenceConfig.class)
-public class ArticleMapperIntegrationTest extends ArticleMapperCommonTest {
+public class ArticleMapperUnitTest extends ArticleMapperCommonUnitTest {
 
 }
diff --git a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLIntegrationTest.java b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLUnitTest.java
similarity index 79%
rename from persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLIntegrationTest.java
rename to persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLUnitTest.java
index de8974d4ad..96c7c162c5 100644
--- a/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLIntegrationTest.java
+++ b/persistence-modules/spring-mybatis/src/test/java/com/baeldung/mybatis/spring/ArticleMapperXMLUnitTest.java
@@ -6,6 +6,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:/beans.xml")
-public class ArticleMapperXMLIntegrationTest extends ArticleMapperCommonTest {
+public class ArticleMapperXMLUnitTest extends ArticleMapperCommonUnitTest {
 
 }