diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 6d0405d23..1fbfc8a30 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 \
+test800 test801 test802 test803 \
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/test802 b/tests/data/test802
new file mode 100644
index 000000000..0d0f07e60
--- /dev/null
+++ b/tests/data/test802
@@ -0,0 +1,46 @@
+
+
+
+IMAP
+SELECT
+UIDVALIDITY
+
+
+
+#
+# Server-side
+
+
+body
+
+--
+ yours sincerely
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+IMAP SELECT UIDVALIDITY Success
+
+
+'imap://%HOSTIP:%IMAPPORT/802;UIDVALIDITY=3857529045/;UID=123/;SECTION=TEXT' -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT 802
+A004 FETCH 123 BODY[TEXT]
+A005 LOGOUT
+
+
+
diff --git a/tests/data/test803 b/tests/data/test803
new file mode 100644
index 000000000..4b1f655d1
--- /dev/null
+++ b/tests/data/test803
@@ -0,0 +1,44 @@
+
+
+
+IMAP
+SELECT
+UIDVALIDITY
+FAILURE
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+IMAP SELECT UIDVALIDITY Failure
+
+
+'imap://%HOSTIP:%IMAPPORT/803;UIDVALIDITY=12345/;UID=123' -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# CURLE_REMOTE_FILE_NOT_FOUND - UIDVALIDITY mismatch
+
+78
+
+
+A001 CAPABILITY
+A002 LOGIN user secret
+A003 SELECT 803
+A004 LOGOUT
+
+
+