diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ed9adfd1..2d64d36d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 detekt = "1.23.8"
-spring-boot-v3 = "3.5.3"
+spring-boot-v3 = "3.5.4"
 
 [libraries]
 detekt = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version.ref = "detekt" }
diff --git a/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/ApplicationTests.kt b/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/ApplicationTests.kt
index b499e349..dd18aacd 100644
--- a/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/ApplicationTests.kt
+++ b/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/ApplicationTests.kt
@@ -14,8 +14,8 @@ import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
-import org.springframework.dao.DataAccessResourceFailureException
-import java.util.Locale
+import org.springframework.dao.QueryTimeoutException
+import java.util.*
 import java.util.function.Consumer
 
 class ApplicationTests : TestBase() {
@@ -70,7 +70,7 @@ class ApplicationTests : TestBase() {
     @DisplayName("Throws exception when query exceeds timeout")
     fun exceptionWithLongQuery() {
         assertThatThrownBy { jdbcTemplate.execute("select pg_sleep(1.1);") }
-            .isInstanceOf(DataAccessResourceFailureException::class.java)
+            .isInstanceOf(QueryTimeoutException::class.java)
             .hasMessageContaining("ERROR: canceling statement due to user request")
     }
 
diff --git a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java
index aa49cb4b..fc6352a2 100644
--- a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java
+++ b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/ApplicationTests.java
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.dao.QueryTimeoutException;
 
 import java.util.Locale;
 
@@ -66,7 +66,7 @@ void jdbcQueryTimeoutFromProperties() {
     @DisplayName("Throws exception when query exceeds timeout")
     void exceptionWithLongQuery() {
         assertThatThrownBy(() -> jdbcTemplate.execute("select pg_sleep(1.1);"))
-            .isInstanceOf(DataAccessResourceFailureException.class)
+            .isInstanceOf(QueryTimeoutException.class)
             .hasMessageContaining("ERROR: canceling statement due to user request");
     }