diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 04a6aa6313..11fccb6068 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -56,7 +56,7 @@ test623 test624 test625 test626 test627 test628 test629 test630 test631	\
 test632 test633 test634 test635 test636 test637 test638 test639	\
 test700 test701 test702 test703 test704 test705 test706 test707 test708	\
 test709 test710	\
-test800 test801 test802 test803 test804 test805 test806 test807	\
+test800 test801 test802 test803 test804 test805 test806 test807 test808	\
 test850 test851 test852 test853 test854 test855 test856 test857	\
 test900 test901 test902 test903 test904 test905	test906	\
 test1000 test1001 test1002 test1003 test1004 test1005	\
diff --git a/tests/data/test808 b/tests/data/test808
new file mode 100644
index 0000000000..ccc2cd6a18
--- /dev/null
+++ b/tests/data/test808
@@ -0,0 +1,48 @@
+<testcase>
+<info>
+<keywords>
+IMAP
+EXAMINE
+CUSTOMREQUEST
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+* 17 EXISTS
+* 2 RECENT
+* OK [UNSEEN 8] Message 8 is first unseen
+* OK [UIDVALIDITY 3857529045] UIDs valid
+* OK [UIDNEXT 4392] Predicted next UID
+* FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)
+* OK [PERMANENTFLAGS ()] No permanent flags permitted
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+imap
+</server>
+ <name>
+IMAP EXAMINE (CUSTOMREQUEST)
+ </name>
+ <command>
+'imap://%HOSTIP:%IMAPPORT' -u user:secret -X 'EXAMINE 808'
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 EXAMINE 808
+A004 LOGOUT
+</protocol>
+</verify>
+</testcase>