Index: src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
===================================================================
--- src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java	(revision 522961)
+++ src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java	(working copy)
@@ -52,49 +52,49 @@
         testRootNode.save();
 
         // lock node and get lock token
-        Lock lock = n.lock(false, true);
+        Lock lock = n.lock(false, false);
+        String lockToken = lock.getLockToken();
+        try {
+            // assert: session must get a non-null lock token
+            assertNotNull("session must get a non-null lock token", lockToken);
 
-        // assert: session must get a non-null lock token
-        assertNotNull("session must get a non-null lock token",
-                lock.getLockToken());
+            // assert: session must hold lock token
+            assertTrue("session must hold lock token", containsLockToken(superuser, lockToken));
 
-        // assert: session must hold lock token
-        assertTrue("session must hold lock token",
-                containsLockToken(superuser, lock.getLockToken()));
+            // remove lock token
+            superuser.removeLockToken(lockToken);
+            // assert: session must get a null lock token
+            assertNull("session must get a null lock token", lock.getLockToken());
 
-        // remove lock token
-        String lockToken = lock.getLockToken();
-        superuser.removeLockToken(lockToken);
+            // assert: session must still hold lock token
+            assertFalse("session must not hold lock token",
+                    containsLockToken(superuser, lockToken));
 
-        // assert: session must get a null lock token
-        assertNull("session must get a null lock token",
-                lock.getLockToken());
+            // assert: session unable to modify node
+            try {
+                n.addNode(nodeName2, testNodeType);
+                fail("session unable to modify node");
+            } catch (LockException e) {
+                // expected
+            }
 
-        // assert: session must still hold lock token
-        assertFalse("session must not hold lock token",
-                containsLockToken(superuser, lockToken));
+            // add lock token
+            superuser.addLockToken(lockToken);
 
-        // assert: session unable to modify node
-        try {
+            // assert: session must get a non-null lock token
+            assertNotNull("session must get a non-null lock token",
+                    lock.getLockToken());
+
+            // assert: session must hold lock token
+            assertTrue("session must hold lock token",
+                    containsLockToken(superuser, lock.getLockToken()));
+
+            // assert: session able to modify node
             n.addNode(nodeName2, testNodeType);
-            fail("session unable to modify node");
-        } catch (LockException e) {
-            // expected
+        } finally {
+            // make sure lock token is added even if test fail
+            superuser.addLockToken(lockToken);
         }
-
-        // add lock token
-        superuser.addLockToken(lockToken);
-
-        // assert: session must get a non-null lock token
-        assertNotNull("session must get a non-null lock token",
-                lock.getLockToken());
-
-        // assert: session must hold lock token
-        assertTrue("session must hold lock token",
-                containsLockToken(superuser, lock.getLockToken()));
-
-        // assert: session able to modify node
-        n.addNode(nodeName2, testNodeType);
     }
 
     /**
@@ -415,7 +415,7 @@
             Node n2 = (Node) otherSuperuser.getItem(n1.getPath());
 
             // lock node
-            Lock lock = n2.lock(false, true);
+            Lock lock = n2.lock(false, false);
 
             // assert: user must get non-null token
             assertNotNull("user must get non-null token", lock.getLockToken());
@@ -434,6 +434,8 @@
         } finally {
             // log out
             otherSuperuser.logout();
+            // unlock again
+            n1.unlock();
         }
     }