diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index dba374720..e34b3232c 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -66,7 +66,7 @@ test709 test710 test711 test712 \
test800 test801 test802 test803 test804 test805 test806 test807 test808 \
test809 test810 test811 test812 test813 test814 test815 test816 test817 \
test818 test819 test820 test821 test822 test823 test824 test825 test826 \
-test827 test828 test829 \
+test827 test828 test829 test830 test831 test832 \
\
test850 test851 test852 test853 test854 test855 test856 test857 test858 \
test859 test860 test861 test862 test863 test864 test865 test866 test867 \
diff --git a/tests/data/test830 b/tests/data/test830
new file mode 100644
index 000000000..42587f6e3
--- /dev/null
+++ b/tests/data/test830
@@ -0,0 +1,51 @@
+
+
+
+IMAP
+IMAP AUTH CRAM-MD5
+RFC2195
+
+
+
+#
+# Server-side
+
+
+AUTH CRAM-MD5
+REPLY AUTHENTICATE + Rubbish
+REPLY * A002 NO AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+crypto
+
+
+IMAP CRAM-MD5 graceful cancellation
+
+
+'imap://%HOSTIP:%IMAPPORT/830/;UID=1' -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+A001 CAPABILITY
+A002 AUTHENTICATE CRAM-MD5
+*
+A003 LOGOUT
+
+
+
diff --git a/tests/data/test831 b/tests/data/test831
new file mode 100644
index 000000000..651327c6d
--- /dev/null
+++ b/tests/data/test831
@@ -0,0 +1,61 @@
+
+
+
+IMAP
+IMAP AUTH NTLM
+
+
+
+#
+# Server-side
+
+
+AUTH NTLM
+REPLY AUTHENTICATE +
+REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + Rubbish
+REPLY * A002 NO AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+NTLM
+
+
+IMAP NTLM graceful cancellation
+
+
+# we force our own host name, in order to make the test machine independent
+CURL_GETHOSTNAME=curlhost
+# we try to use the LD_PRELOAD hack, if not a debug build
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
+
+
+'imap://%HOSTIP:%IMAPPORT/831/;UID=1' -u testuser:testpass
+
+
+chkhostname curlhost
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+A001 CAPABILITY
+A002 AUTHENTICATE NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
+A003 LOGOUT
+
+
+
diff --git a/tests/data/test832 b/tests/data/test832
new file mode 100644
index 000000000..c563a05e1
--- /dev/null
+++ b/tests/data/test832
@@ -0,0 +1,52 @@
+
+
+
+IMAP
+IMAP AUTH DIGEST-MD5
+RFC2831
+
+
+
+#
+# Server-side
+
+
+AUTH DIGEST-MD5
+REPLY AUTHENTICATE + Rubbish
+REPLY * A002 NO AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+imap
+
+
+debug
+crypto
+
+
+IMAP DIGEST-MD5 graceful cancellation
+
+
+'imap://%HOSTIP:%IMAPPORT/832/;UID=1' -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+A001 CAPABILITY
+A002 AUTHENTICATE DIGEST-MD5
+*
+A003 LOGOUT
+
+
+