diff --git a/test/tests/lock.js b/test/tests/lock.js
index ab00b06d..bf1aa49f 100644
--- a/test/tests/lock.js
+++ b/test/tests/lock.js
@@ -103,7 +103,7 @@ module.exports = (test, options, index) => test('lock', (isValid, server) =>
             },
             body: '<?xml version="1.0" encoding="utf-8" ?><D:lockinfo xmlns:D="DAV:"><D:lockscope><D:exclusive/></D:lockscope><D:locktype><D:write/></D:locktype><D:owner><D:href>'+url+'/user</D:href></D:owner></D:lockinfo>'
         }, (e, res, body) => _(e, () => {
-            const lock = body.substr(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, 'urn:uuid:24fa520c-520c-14fa-00d6-0000d546f655'.length);
+            const lock = body.substring(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, body.indexOf('</D:href>', body.indexOf('<D:locktoken><D:href>')));
             
             request({
                 url: url + '/test4.txt',
diff --git a/test/tests/unlock.js b/test/tests/unlock.js
index 7193a001..d9e449ef 100644
--- a/test/tests/unlock.js
+++ b/test/tests/unlock.js
@@ -36,8 +36,8 @@ module.exports = (test, options, index) => test('unlock', (isValid, server) =>
                     return;
                 }
 
-                const lock = body.substr(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, 'urn:uuid:24fa520c-520c-14fa-00d6-0000d546f655'.length);
-                
+                const lock = body.substring(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, body.indexOf('</D:href>', body.indexOf('<D:locktoken><D:href>')));
+                console.log(lock);
                 request({
                     url: url + '/test.txt',
                     method: 'UNLOCK',
@@ -89,7 +89,7 @@ module.exports = (test, options, index) => test('unlock', (isValid, server) =>
             },
             body: '<?xml version="1.0" encoding="utf-8" ?><D:lockinfo xmlns:D="DAV:"><D:lockscope><D:exclusive/></D:lockscope><D:locktype><D:write/></D:locktype><D:owner><D:href>'+url+'/user</D:href></D:owner></D:lockinfo>'
         }, (e, res, body) => _(e, () => {
-            const lock = body.substr(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, 'urn:uuid:24fa520c-520c-14fa-00d6-0000d546f655'.length);
+            const lock = body.substring(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, body.indexOf('</D:href>', body.indexOf('<D:locktoken><D:href>')));
             
             request({
                 url: url + '/test3.txt',
@@ -136,7 +136,7 @@ module.exports = (test, options, index) => test('unlock', (isValid, server) =>
                 },
                 body: '<?xml version="1.0" encoding="utf-8" ?><D:lockinfo xmlns:D="DAV:"><D:lockscope><D:exclusive/></D:lockscope><D:locktype><D:write/></D:locktype><D:owner><D:href>'+url+'/user</D:href></D:owner></D:lockinfo>'
             }, (e, res, body) => _(e, () => {
-                const lock = body.substr(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, 'urn:uuid:24fa520c-520c-14fa-00d6-0000d546f655'.length);
+                const lock = body.substring(body.indexOf('<D:locktoken><D:href>') + '<D:locktoken><D:href>'.length, body.indexOf('</D:href>', body.indexOf('<D:locktoken><D:href>')));
                 
                 wfsOwner.writeFile('/testFolder/test5.txt', 'Content!', (e) => _(e, () => {
                     wfsNotOwner.writeFile('/testFolder/test5.txt', 'Content!', (e) => {