test809 test810 test811 test812 test813 test814 \
\
test850 test851 test852 test853 test854 test855 test856 test857 test858 \
-test859 test860 \
+test859 test860 test861 \
\
test900 test901 test902 test903 test904 test905 test906 test907 test908 \
test909 test910 test911 \
--- /dev/null
+<testcase>
+<info>
+<keywords>
+POP3
+UIDL
+CUSTOMREQUEST\r
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<servercmd>\r
+CAPA UIDL USER\r
+</servercmd>\r
+# When doing UIDL, we get the default list output hard-coded in the test\r
+# POP3 server\r
+<datacheck>\r
+1 1\r
+2 2\r
+3 4\r
+</datacheck>\r
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+pop3
+</server>
+ <name>
+POP3 UIDL (CUSTOMREQUEST)
+ </name>
+ <command>
+pop3://%HOSTIP:%POP3PORT -u user:secret -X UIDL
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+CAPA\r
+USER user\r
+PASS secret\r
+UIDL\r
+QUIT\r
+</protocol>
+</verify>
+</testcase>