diff --git a/testing/tests/regression-suite/802-Spec-LOCK-1.result b/testing/tests/regression-suite/802-Spec-LOCK-1.result
new file mode 100644
index 00000000..002f3cb9
--- /dev/null
+++ b/testing/tests/regression-suite/802-Spec-LOCK-1.result
@@ -0,0 +1,12 @@
+HTTP/1.1 423 Locked
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Content-Length: 198
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>/user1/home/i1278618276.ics</href>
+  <status>HTTP/1.1 423 Resource Locked</status>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/802-Spec-LOCK-1.test b/testing/tests/regression-suite/802-Spec-LOCK-1.test
new file mode 100644
index 00000000..25a128cc
--- /dev/null
+++ b/testing/tests/regression-suite/802-Spec-LOCK-1.test
@@ -0,0 +1,26 @@
+#
+# Test specification compliance for LOCK request
+#  - This is a request for something which is already locked
+#    and should fail.
+#
+TYPE=LOCK
+URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+HEADER=Depth: 0
+HEADER=Timeout: Infinite,Second-4100000000
+HEADER=Content-type: text/xml; charset="utf-8"
+HEAD
+
+#
+# Include the data in-line
+#
+BEGINDATA
+<?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>http://andrew.mcmillan.net.nz/node/5/</D:href>
+  </D:owner>
+</D:lockinfo>
+ENDDATA
+
diff --git a/testing/tests/regression-suite/803-Spec-UNLOCK-1.result b/testing/tests/regression-suite/803-Spec-UNLOCK-1.result
new file mode 100644
index 00000000..002f3cb9
--- /dev/null
+++ b/testing/tests/regression-suite/803-Spec-UNLOCK-1.result
@@ -0,0 +1,12 @@
+HTTP/1.1 423 Locked
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Content-Length: 198
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>/user1/home/i1278618276.ics</href>
+  <status>HTTP/1.1 423 Resource Locked</status>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/803-Spec-UNLOCK-1.test b/testing/tests/regression-suite/803-Spec-UNLOCK-1.test
new file mode 100644
index 00000000..b4e49348
--- /dev/null
+++ b/testing/tests/regression-suite/803-Spec-UNLOCK-1.test
@@ -0,0 +1,14 @@
+#
+# Test specification compliance for LOCK/UNLOCK request
+#  - This should fail because we provide an invalid lock token
+#
+TYPE=UNLOCK
+URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+
+HEADER=Content-type: text/xml; charset="utf-8"
+HEADER=Lock-Token: <opaquelocktoken:cafefeed-c001-b055-ea75-deadbeef4a11>
+HEAD
+
+#
+# There is no data for an UNLOCK request
+#
diff --git a/testing/tests/regression-suite/804-Spec-UNLOCK-1.result b/testing/tests/regression-suite/804-Spec-UNLOCK-1.result
new file mode 100644
index 00000000..18d2005f
--- /dev/null
+++ b/testing/tests/regression-suite/804-Spec-UNLOCK-1.result
@@ -0,0 +1,5 @@
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Content-Length: 0
+Content-Type: text/plain; charset=UTF-8
+
diff --git a/testing/tests/regression-suite/804-Spec-UNLOCK-1.test b/testing/tests/regression-suite/804-Spec-UNLOCK-1.test
new file mode 100644
index 00000000..c8297f8a
--- /dev/null
+++ b/testing/tests/regression-suite/804-Spec-UNLOCK-1.test
@@ -0,0 +1,16 @@
+#
+# Test specification compliance for LOCK/UNLOCK request
+#
+TYPE=UNLOCK
+URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+
+# Get the lock token from the earlier lock
+GETSQL=locktoken
+SELECT opaquelocktoken FROM locks WHERE dav_name = '/user1/home/i1278618276.ics'
+ENDSQL
+
+HEADER=Lock-Token: <opaquelocktoken:##locktoken##>
+HEAD
+
+# There is no data for an UNLOCK request
+#