diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index b32bb0abb2..c1bb105a52 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 test811 test812 test813 test814 \
+test809 test810 test811 test812 test813 test814 test815 test816 \
\
test850 test851 test852 test853 test854 test855 test856 test857 test858 \
test859 test860 test861 test862 test863 test864 test865 test866 test867 \
diff --git a/tests/data/test815 b/tests/data/test815
new file mode 100644
index 0000000000..b7f5f495ba
--- /dev/null
+++ b/tests/data/test815
@@ -0,0 +1,45 @@
+
+
+
+IMAP
+STORE
+CLOSE
+CUSTOMREQUEST
+
+
+
+#
+# Server-side
+
+
+* 123 FETCH (FLAGS (\Seen \Deleted))
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+IMAP delete message (CUSTOMREQUEST)
+
+
+imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -Q -CLOSE -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT 815
+A004 STORE 123 +Flags \Deleted
+A005 CLOSE
+A006 LOGOUT
+
+
+
diff --git a/tests/data/test816 b/tests/data/test816
new file mode 100644
index 0000000000..a5ff2b3c08
--- /dev/null
+++ b/tests/data/test816
@@ -0,0 +1,48 @@
+
+
+
+IMAP
+STORE
+EXPUNGE
+CUSTOMREQUEST
+
+
+
+#
+# Server-side
+
+
+* 123 FETCH (FLAGS (\Seen \Deleted))
+
+
+* 123 EXPUNGE
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+IMAP delete message with confirmation (CUSTOMREQUEST)
+
+
+imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -Q -EXPUNGE -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT 816
+A004 STORE 123 +Flags \Deleted
+A005 EXPUNGE
+A006 LOGOUT
+
+
+