diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/exception/test/JacksonExceptionsUnitTest.java
similarity index 99%
rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsUnitTest.java
rename to jackson/src/test/java/com/baeldung/jackson/exception/test/JacksonExceptionsUnitTest.java
index cd2c2925d6..dd0fe8dc56 100644
--- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsUnitTest.java
+++ b/jackson/src/test/java/com/baeldung/jackson/exception/test/JacksonExceptionsUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.jackson.test;
+package com.baeldung.jackson.exception.test;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
diff --git a/spring-4/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java b/spring-4/src/test/java/com/baeldung/hikari/ApplicationWithHikariConnectionPool.java
similarity index 89%
rename from spring-4/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
rename to spring-4/src/test/java/com/baeldung/hikari/ApplicationWithHikariConnectionPool.java
index 0bd8637681..7f8736ae87 100644
--- a/spring-4/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
+++ b/spring-4/src/test/java/com/baeldung/hikari/ApplicationWithHikariConnectionPool.java
@@ -1,4 +1,4 @@
-package com.baeldung.connectionpool;
+package com.baeldung.hikari;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-4/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java b/spring-4/src/test/java/com/baeldung/hikari/HikariIntegrationTest.java
similarity index 95%
rename from spring-4/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
rename to spring-4/src/test/java/com/baeldung/hikari/HikariIntegrationTest.java
index 0cc876d5b1..e3ed608521 100644
--- a/spring-4/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
+++ b/spring-4/src/test/java/com/baeldung/hikari/HikariIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.connectionpool;
+package com.baeldung.hikari;
 
 import static org.junit.Assert.*;
 
diff --git a/spring-5/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java b/spring-5/src/test/java/com/baeldung/hikari/ApplicationWithHikariConnectionPool.java
similarity index 89%
rename from spring-5/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
rename to spring-5/src/test/java/com/baeldung/hikari/ApplicationWithHikariConnectionPool.java
index 0bd8637681..7f8736ae87 100644
--- a/spring-5/src/test/java/com/baeldung/connectionpool/ApplicationWithHikariConnectionPool.java
+++ b/spring-5/src/test/java/com/baeldung/hikari/ApplicationWithHikariConnectionPool.java
@@ -1,4 +1,4 @@
-package com.baeldung.connectionpool;
+package com.baeldung.hikari;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-5/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java b/spring-5/src/test/java/com/baeldung/hikari/HikariIntegrationTest.java
similarity index 94%
rename from spring-5/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
rename to spring-5/src/test/java/com/baeldung/hikari/HikariIntegrationTest.java
index d91cca85ee..0c4b91bd8a 100644
--- a/spring-5/src/test/java/com/baeldung/connectionpool/HikariIntegrationTest.java
+++ b/spring-5/src/test/java/com/baeldung/hikari/HikariIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.connectionpool;
+package com.baeldung.hikari;
 
 import static org.junit.Assert.*;