diff --git a/cuba/cuba.gradle b/cuba/cuba.gradle
index 4eb547e9..25c39940 100644
--- a/cuba/cuba.gradle
+++ b/cuba/cuba.gradle
@@ -50,6 +50,7 @@ dependencies {
     testImplementation 'commons-codec:commons-codec:1.13'
     testImplementation 'cglib:cglib-nodep:3.3.0'
     testImplementation 'org.objenesis:objenesis:3.1'
+    testImplementation 'org.codehaus.groovy:groovy-sql'
 
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
     testRuntimeOnly 'org.slf4j:slf4j-simple'
diff --git a/cuba/src/test/groovy/spec/haulmont/cuba/core/persistence_tools/GetOldValueTest.groovy b/cuba/src/test/groovy/spec/haulmont/cuba/core/persistence_tools/GetOldValueTest.groovy
index 7675ef7b..a1e12104 100644
--- a/cuba/src/test/groovy/spec/haulmont/cuba/core/persistence_tools/GetOldValueTest.groovy
+++ b/cuba/src/test/groovy/spec/haulmont/cuba/core/persistence_tools/GetOldValueTest.groovy
@@ -201,8 +201,8 @@ class GetOldValueTest extends CoreTestSpecification {
         persistence.runInTransaction { em ->
             order = persistence.getEntityManager().find(Order, order1.id, view)
 
-            def orderLine = order.orderLines.find { it.productName == 'prod11' }
-            em.remove(orderLine)
+            def foundOrderLine = order.orderLines.find { it.productName == 'prod11' }
+            em.remove(foundOrderLine)
 
             oldValue = persistenceTools.getOldValue(order, 'orderLines')
         }
diff --git a/cuba/src/test/groovy/spec/haulmont/cuba/core/tx_listeners/AfterCompleteTransactionListenerTest.groovy b/cuba/src/test/groovy/spec/haulmont/cuba/core/tx_listeners/AfterCompleteTransactionListenerTest.groovy
index b0c44499..126076cc 100644
--- a/cuba/src/test/groovy/spec/haulmont/cuba/core/tx_listeners/AfterCompleteTransactionListenerTest.groovy
+++ b/cuba/src/test/groovy/spec/haulmont/cuba/core/tx_listeners/AfterCompleteTransactionListenerTest.groovy
@@ -64,16 +64,16 @@ class AfterCompleteTransactionListenerTest extends CoreTestSpecification {
 
         when:
 
-        def user = persistence.callInTransaction { em ->
+        def reloadedUser = persistence.callInTransaction { em ->
             em.find(User, user.id)
         }
 
         then:
 
-        entityStates.isLoaded(user, 'login')
-        entityStates.isLoaded(user, 'name')
-        entityStates.isLoaded(user, 'group')
-        user.group != null
+        entityStates.isLoaded(reloadedUser, 'login')
+        entityStates.isLoaded(reloadedUser, 'name')
+        entityStates.isLoaded(reloadedUser, 'group')
+        reloadedUser.group != null
 
         cleanup:
 
@@ -87,16 +87,16 @@ class AfterCompleteTransactionListenerTest extends CoreTestSpecification {
 
         when:
 
-        def user = persistence.callInTransaction { em ->
+        def reloadedUser = persistence.callInTransaction { em ->
             em.find(User, user.id)
         }
 
         then:
 
-        entityStates.isLoaded(user, 'login')
-        entityStates.isLoaded(user, 'name')
-        entityStates.isLoaded(user, 'userRoles')
-        user.userRoles.size() == 1
+        entityStates.isLoaded(reloadedUser, 'login')
+        entityStates.isLoaded(reloadedUser, 'name')
+        entityStates.isLoaded(reloadedUser, 'userRoles')
+        reloadedUser.userRoles.size() == 1
 
         cleanup:
 
@@ -115,16 +115,16 @@ class AfterCompleteTransactionListenerTest extends CoreTestSpecification {
 
         when:
 
-        def user = persistence.callInTransaction { em ->
+        def reloadedUser = persistence.callInTransaction { em ->
             em.find(User, user.id, view)
         }
 
         then:
 
-        entityStates.isLoaded(user, 'login')
-        entityStates.isLoaded(user, 'group')
-        entityStates.isLoaded(user.group, 'name')
-        !entityStates.isLoaded(user, 'name')
+        entityStates.isLoaded(reloadedUser, 'login')
+        entityStates.isLoaded(reloadedUser, 'group')
+        entityStates.isLoaded(reloadedUser.group, 'name')
+        !entityStates.isLoaded(reloadedUser, 'name')
 
         cleanup:
 
@@ -147,15 +147,15 @@ class AfterCompleteTransactionListenerTest extends CoreTestSpecification {
 
         when:
 
-        def user = persistence.callInTransaction { em ->
+        def reloadedUser = persistence.callInTransaction { em ->
             em.find(User, user.id, view)
         }
 
         then:
 
-        entityStates.isLoaded(user, 'login')
-        entityStates.isLoaded(user, 'userRoles')
-        !entityStates.isLoaded(user, 'group')
+        entityStates.isLoaded(reloadedUser, 'login')
+        entityStates.isLoaded(reloadedUser, 'userRoles')
+        !entityStates.isLoaded(reloadedUser, 'group')
 
         cleanup:
 
@@ -175,14 +175,14 @@ class AfterCompleteTransactionListenerTest extends CoreTestSpecification {
 
         when:
 
-        def user = persistence.callInTransaction { em ->
+        def reloadedUser = persistence.callInTransaction { em ->
             em.find(User, user.id, view)
         }
 
         then:
 
-        entityStates.isLoaded(user, 'login')
-        !entityStates.isLoaded(user, 'userRoles')
+        entityStates.isLoaded(reloadedUser, 'login')
+        !entityStates.isLoaded(reloadedUser, 'userRoles')
 
         cleanup: