diff --git a/testing/normalise_result b/testing/normalise_result
index 4b5b0af2..1b414cb0 100755
--- a/testing/normalise_result
+++ b/testing/normalise_result
@@ -24,5 +24,8 @@ while( <STDIN> ) {
     $_ = "";
   };
 
+  # Fix up any opaquelocktokens to something regular
+  s/opaquelocktoken:[[:xdigit:]]{8}-([[:xdigit:]]{4}-){3}[[:xdigit:]]{12}/opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/;
+
   print;
 }
diff --git a/testing/tests/regression-suite/800-Spec-LOCK-1.result b/testing/tests/regression-suite/800-Spec-LOCK-1.result
index 6484c878..630f7d01 100644
--- a/testing/tests/regression-suite/800-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/800-Spec-LOCK-1.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Lock-Token: <opaquelocktoken:d18fcef9-bafa-7004-6989-67e7cfdca934>
+Lock-Token: <opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx>
 Content-Length: 473
 Content-Type: text/xml; charset="utf-8"
 
@@ -20,7 +20,7 @@ Content-Type: text/xml; charset="utf-8"
    </owner>
    <timeout>Second-8640000</timeout>
    <locktoken>
-    <href>opaquelocktoken:d18fcef9-bafa-7004-6989-67e7cfdca934</href>
+    <href>opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</href>
    </locktoken>
   </activelock>
  </lockdiscovery>
diff --git a/testing/tests/regression-suite/801-Spec-LOCK-1.result b/testing/tests/regression-suite/801-Spec-LOCK-1.result
index 25795152..232fc691 100644
--- a/testing/tests/regression-suite/801-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/801-Spec-LOCK-1.result
@@ -19,7 +19,7 @@ Content-Type: text/xml; charset="utf-8"
    </owner>
    <timeout>Second-8640000</timeout>
    <locktoken>
-    <href>opaquelocktoken:d18fcef9-bafa-7004-6989-67e7cfdca934</href>
+    <href>opaquelocktoken:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx</href>
    </locktoken>
   </activelock>
  </lockdiscovery>