diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 862b22e04..38ac1670f 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -64,7 +64,7 @@ test700 test701 test702 test703 test704 test705 test706 test707 test708 \
test709 test710 test711 test712 \
\
test800 test801 test802 test803 test804 test805 test806 test807 test808 \
-test809 test810 \
+test809 test810 test811 test812 test813 \
\
test850 test851 test852 test853 test854 test855 test856 test857 \
\
diff --git a/tests/data/test811 b/tests/data/test811
new file mode 100644
index 000000000..9d9469433
--- /dev/null
+++ b/tests/data/test811
@@ -0,0 +1,39 @@
+
+
+
+IMAP
+CREATE
+CUSTOMREQUEST
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+IMAP CREATE Mailbox (CUSTOMREQUEST)
+
+
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE 811'
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 CREATE 811
+A004 LOGOUT
+
+
+
diff --git a/tests/data/test812 b/tests/data/test812
new file mode 100644
index 000000000..586ed759b
--- /dev/null
+++ b/tests/data/test812
@@ -0,0 +1,39 @@
+
+
+
+IMAP
+DELETE
+CUSTOMREQUEST
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+IMAP DELETE Mailbox (CUSTOMREQUEST)
+
+
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE 812'
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 DELETE 812
+A004 LOGOUT
+
+
+
diff --git a/tests/data/test813 b/tests/data/test813
new file mode 100644
index 000000000..f157919a0
--- /dev/null
+++ b/tests/data/test813
@@ -0,0 +1,39 @@
+
+
+
+IMAP
+RENAME
+CUSTOMREQUEST
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+IMAP RENAME Mailbox (CUSTOMREQUEST)
+
+
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 813'
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 RENAME 666 813
+A004 LOGOUT
+
+
+