1 files changed, 4 insertions, 0 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
index e277d4e075..2334542676 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
@@ -102,6 +102,8 @@ public class RemoveFromParentLockingTest {
                     "Cannot remove from parent when the session is not locked."
                             + " Furthermore, there is another locked session, indicating that the component might be about to be moved from one session to another.",
                     e.getMessage());
+        } finally {
+            VaadinSession.setCurrent(null);
         }
     }
 
@@ -119,6 +121,8 @@ public class RemoveFromParentLockingTest {
             notLockedComponent.addComponent(lockedComponent);
         } catch (AssertionError e) {
             // All is fine, don't care about the exact wording in this case
+        } finally {
+            VaadinSession.setCurrent(null);
         }
     }