diff --git a/testing/tests/timezone/2021-OPTIONS_well-known_timezone.result b/testing/tests/timezone/2021-OPTIONS_well-known_timezone.result
new file mode 100644
index 00000000..579502b2
--- /dev/null
+++ b/testing/tests/timezone/2021-OPTIONS_well-known_timezone.result
@@ -0,0 +1,6 @@
+HTTP/1.1 301 Moved Permanently
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Location: http://mycaldav/tz.php
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
diff --git a/testing/tests/timezone/2021-OPTIONS_well-known_timezone.test b/testing/tests/timezone/2021-OPTIONS_well-known_timezone.test
new file mode 100644
index 00000000..4c843863
--- /dev/null
+++ b/testing/tests/timezone/2021-OPTIONS_well-known_timezone.test
@@ -0,0 +1,9 @@
+#
+# Do an OPTIONS request on a /.well-known URL for timezone
+TYPE=OPTIONS
+URL=http://regression.host/caldav.php/.well-known/timezone
+
+HEADER=User-Agent: DataAccess/1.0 (8A293)
+
+AUTH=user1:user1
+HEAD
diff --git a/testing/tests/timezone/2022-OPTIONS_well-known_timezone_noauth.result b/testing/tests/timezone/2022-OPTIONS_well-known_timezone_noauth.result
new file mode 100644
index 00000000..579502b2
--- /dev/null
+++ b/testing/tests/timezone/2022-OPTIONS_well-known_timezone_noauth.result
@@ -0,0 +1,6 @@
+HTTP/1.1 301 Moved Permanently
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Location: http://mycaldav/tz.php
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
diff --git a/testing/tests/timezone/2022-OPTIONS_well-known_timezone_noauth.test b/testing/tests/timezone/2022-OPTIONS_well-known_timezone_noauth.test
new file mode 100644
index 00000000..c49df099
--- /dev/null
+++ b/testing/tests/timezone/2022-OPTIONS_well-known_timezone_noauth.test
@@ -0,0 +1,9 @@
+#
+# Do an OPTIONS request on a /.well-known URL for timezone
+TYPE=OPTIONS
+URL=http://regression.host/caldav.php/.well-known/timezone
+
+HEADER=User-Agent: DataAccess/1.0 (8A293)
+
+NOAUTH
+HEAD
diff --git a/testing/tests/timezone/Load-Sample-Data.result b/testing/tests/timezone/Load-Sample-Data.result
new file mode 100644
index 00000000..e69de29b
diff --git a/testing/tests/timezone/sample-data.sql b/testing/tests/timezone/sample-data.sql
new file mode 100644
index 00000000..2ee7bbd3
--- /dev/null
+++ b/testing/tests/timezone/sample-data.sql
@@ -0,0 +1,5 @@
+-- Some sample data to prime the database...
+-- base-data.sql should be processed before this
+
+INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email )
+    VALUES( 10, TRUE, current_date, current_date, 'user1', '**user1', 'User 1', 'user1@example.net' );