diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index aca0936d0..b78eaabfa 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -65,6 +65,7 @@ test709 test710 test711 test712 \
 \
 test800 test801 test802 test803 test804 test805 test806 test807 test808 \
 test809 test810 test811 test812 test813 test814 test815 test816 test817 \
+test818 \
 \
 test850 test851 test852 test853 test854 test855 test856 test857 test858 \
 test859 test860 test861 test862 test863 test864 test865 test866 test867 \
diff --git a/tests/data/test818 b/tests/data/test818
new file mode 100644
index 000000000..403313b15
--- /dev/null
+++ b/tests/data/test818
@@ -0,0 +1,45 @@
+<testcase>
+<info>
+<keywords>
+IMAP
+NOOP
+CUSTOMREQUEST
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+* 22 EXPUNGE
+* 23 EXISTS
+* 3 RECENT
+* 14 FETCH (FLAGS (\Seen \Deleted))
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+imap
+</server>
+ <name>
+IMAP NOOP (CUSTOMREQUEST)
+ </name>
+ <command>
+imap://%HOSTIP:%IMAPPORT -X NOOP -u user:secret
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 NOOP
+A004 LOGOUT
+</protocol>
+</verify>
+</testcase>