diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index e34b3232c..9db4b4e21 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -70,7 +70,8 @@ test827 test828 test829 test830 test831 test832 \
\
test850 test851 test852 test853 test854 test855 test856 test857 test858 \
test859 test860 test861 test862 test863 test864 test865 test866 test867 \
-test868 test869 test870 test871 test872 test873 test874 test875 \
+test868 test869 test870 test871 test872 test873 test874 test875 test876 \
+test877 test878 \
\
test900 test901 test902 test903 test904 test905 test906 test907 test908 \
test909 test910 test911 test912 test913 test914 test915 test916 test917 \
diff --git a/tests/data/test876 b/tests/data/test876
new file mode 100644
index 000000000..2050ba174
--- /dev/null
+++ b/tests/data/test876
@@ -0,0 +1,53 @@
+
+
+
+POP3
+POP3 AUTH CRAM-MD5
+RFC1734
+RFC2195
+RFC5034
+
+
+
+#
+# Server-side
+
+
+AUTH CRAM-MD5
+REPLY AUTH + Rubbish
+REPLY * -ERR AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+pop3
+
+
+crypto
+
+
+POP3 CRAM-MD5 graceful cancellation
+
+
+pop3://%HOSTIP:%POP3PORT/876 -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+CAPA
+AUTH CRAM-MD5
+*
+QUIT
+
+
+
diff --git a/tests/data/test877 b/tests/data/test877
new file mode 100644
index 000000000..33604cb0f
--- /dev/null
+++ b/tests/data/test877
@@ -0,0 +1,63 @@
+
+
+
+POP3
+POP3 AUTH NTLM
+RFC1734
+RFC5034
+
+
+
+#
+# Server-side
+
+
+AUTH NTLM
+REPLY AUTH +
+REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + Rubbish
+REPLY * -ERR AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+pop3
+
+
+NTLM
+
+
+POP3 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
+
+
+pop3://%HOSTIP:%POP3PORT/877 -u testuser:testpass
+
+
+chkhostname curlhost
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+CAPA
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
+QUIT
+
+
+
diff --git a/tests/data/test878 b/tests/data/test878
new file mode 100644
index 000000000..33ffb8657
--- /dev/null
+++ b/tests/data/test878
@@ -0,0 +1,54 @@
+
+
+
+POP3
+POP3 AUTH DIGEST-MD5
+RFC1734
+RFC2831
+RFC5034
+
+
+
+#
+# Server-side
+
+
+AUTH DIGEST-MD5
+REPLY AUTH + Rubbish
+REPLY * -ERR AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+pop3
+
+
+debug
+crypto
+
+
+POP3 DIGEST-MD5 graceful cancellation
+
+
+pop3://%HOSTIP:%POP3PORT/878 -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+CAPA
+AUTH DIGEST-MD5
+*
+QUIT
+
+
+