1 files changed, 4 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
index 3adb284f1b..688b2ea4f5 100644
--- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
@@ -34,8 +34,11 @@ public class ThreadLocalInstances extends AbstractTestCase {
                 Thread thread = new Thread() {
                     @Override
                     public void run() {
-                        synchronized (ThreadLocalInstances.this) {
+                        getSession().getLock().lock();
+                        try {
                             reportCurrentStatus("background thread");
+                        } finally {
+                            getSession().getLock().unlock();
                         }
                     }
                 };