diff --git a/persistence-modules/spring-boot-persistence/pom.xml b/persistence-modules/spring-boot-persistence/pom.xml
index 72ac40222f..ca7c7306e7 100644
--- a/persistence-modules/spring-boot-persistence/pom.xml
+++ b/persistence-modules/spring-boot-persistence/pom.xml
@@ -25,6 +25,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.zaxxer</groupId>
+                    <artifactId>HikariCP</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/exists/Car.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/Car.java
similarity index 93%
rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/exists/Car.java
rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/Car.java
index bf09caf6ff..736c12fb07 100644
--- a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/exists/Car.java
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/Car.java
@@ -1,4 +1,4 @@
-package com.baeldung.exists;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -17,7 +17,7 @@ public class Car {
     private Integer power;
     private String model;
 
-    Car() {
+    public Car() {
 
     }
 
diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/exists/CarRepository.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/CarRepository.java
similarity index 91%
rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/exists/CarRepository.java
rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/CarRepository.java
index a54f19f4cd..0176b14169 100644
--- a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/exists/CarRepository.java
+++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/CarRepository.java
@@ -1,10 +1,12 @@
-package com.baeldung.exists;
+package com.baeldung.boot.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.boot.domain.Car;
+
 /**
  * @author paullatzelsperger
  * @since 2019-03-20
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java
index 1633df35d6..f9a48a7e66 100644
--- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java
@@ -13,11 +13,15 @@ import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.baeldung.boot.Application;
+import com.baeldung.boot.domain.Car;
+import com.baeldung.boot.repository.CarRepository;
+
 import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = {Application.class})
 public class CarRepositoryIntegrationTest {
 
     @Autowired
diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/tomcatconnectionpool/test/application/SpringBootTomcatConnectionPoolIntegrationTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/tomcatconnectionpool/test/application/SpringBootTomcatConnectionPoolIntegrationTest.java
index 76a4261a24..5400d76fbe 100644
--- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/tomcatconnectionpool/test/application/SpringBootTomcatConnectionPoolIntegrationTest.java
+++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/tomcatconnectionpool/test/application/SpringBootTomcatConnectionPoolIntegrationTest.java
@@ -20,6 +20,6 @@ public class SpringBootTomcatConnectionPoolIntegrationTest {
     
     @Test
     public void givenTomcatConnectionPoolInstance_whenCheckedPoolClassName_thenCorrect() {
-        assertThat(dataSource.getClass().getName()).isEqualTo("com.zaxxer.hikari.HikariDataSource");
+        assertThat(dataSource.getClass().getName()).isEqualTo("org.apache.tomcat.jdbc.pool.DataSource");
     }
 }