diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
index b351ff5c29..fbd8e488f6 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
@@ -26,14 +26,12 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.dao.CannotAcquireLockException;
-import org.springframework.dao.CannotSerializeTransactionException;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.dao.QueryTimeoutException;
+import org.springframework.dao.TransientDataAccessException;
 import org.springframework.integration.support.locks.DefaultLockRegistry;
 import org.springframework.integration.support.locks.ExpirableLockRegistry;
 import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.integration.util.UUIDConverter;
-import org.springframework.transaction.TransactionTimedOutException;
 import org.springframework.util.Assert;
 
 /**
@@ -47,6 +45,7 @@ import org.springframework.util.Assert;
  * @author Artem Bilan
  * @author Vedran Pavic
  * @author Kai Zimmermann
+ * @author Bartosz Rempuszewski
  *
  * @since 4.3
  */
@@ -125,15 +124,9 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
 					}
 					break;
 				}
-				catch (CannotSerializeTransactionException e) {
+				catch (TransientDataAccessException e) {
 					// try again
 				}
-				catch (TransactionTimedOutException e) {
-					// try again
-				}
-				catch (QueryTimeoutException e) {
-                    // try again
-                }
 				catch (InterruptedException e) {
 						/*
 						 * This method must be uninterruptible so catch and ignore
@@ -165,15 +158,9 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
 					}
 					break;
 				}
-				catch (CannotSerializeTransactionException e) {
+				catch (TransientDataAccessException e) {
 					// try again
 				}
-				catch (TransactionTimedOutException e) {
-					// try again
-				}
-				catch (QueryTimeoutException e) {
-                    // try again
-                }
 				catch (InterruptedException ie) {
 					this.delegate.unlock();
 					Thread.currentThread().interrupt();
@@ -215,15 +202,9 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
 					}
 					return acquired;
 				}
-				catch (CannotSerializeTransactionException e) {
+				catch (TransientDataAccessException e) {
 					// try again
 				}
-				catch (TransactionTimedOutException e) {
-					// try again
-				}
-				catch (QueryTimeoutException e) {
-                    // try again
-                }
 				catch (Exception e) {
 					this.delegate.unlock();
 					rethrowAsLockException(e);