diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a7fb18e07f..c53def0409 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -71,7 +71,7 @@ test827 test828 test829 test830 test831 test832 test833 test834 test835 \
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 test876 \
-test877 test878 \
+test877 test878 test879 test880 test881 \
\
test900 test901 test902 test903 test904 test905 test906 test907 test908 \
test909 test910 test911 test912 test913 test914 test915 test916 test917 \
diff --git a/tests/data/test879 b/tests/data/test879
new file mode 100644
index 0000000000..7d88fbce0a
--- /dev/null
+++ b/tests/data/test879
@@ -0,0 +1,63 @@
+
+
+
+POP3
+POP3 AUTH CRAM-MD5 SASL DOWNGRADE
+RFC1734
+RFC2195
+RFC5034
+
+
+
+#
+# Server-side
+
+
+AUTH CRAM-MD5 PLAIN
+REPLY "AUTH CRAM-MD5" + Rubbish
+REPLY * -ERR AUTH exchange cancelled by client
+REPLY "AUTH PLAIN" +
+REPLY dXNlcgB1c2VyAHNlY3JldA== +OK Login successful
+
+
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+ yours sincerely
+
+
+
+#
+# Client-side
+
+
+pop3
+
+
+crypto
+
+
+POP3 CRAM-MD5 authentication with SASL downgrade
+
+
+pop3://%HOSTIP:%POP3PORT/879 -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+CAPA
+AUTH CRAM-MD5
+*
+AUTH PLAIN
+dXNlcgB1c2VyAHNlY3JldA==
+RETR 879
+QUIT
+
+
+
diff --git a/tests/data/test880 b/tests/data/test880
new file mode 100644
index 0000000000..9857bad947
--- /dev/null
+++ b/tests/data/test880
@@ -0,0 +1,73 @@
+
+
+
+POP3
+POP3 AUTH NTLM SASL DOWNGRADE
+RFC1734
+RFC5034
+
+
+
+#
+# Server-side
+
+
+AUTH NTLM PLAIN
+REPLY "AUTH NTLM" +
+REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + Rubbish
+REPLY * -ERR AUTH exchange cancelled by client
+REPLY "AUTH PLAIN" +
+REPLY dXNlcgB1c2VyAHNlY3JldA== +OK Login successful
+
+
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+ yours sincerely
+
+
+
+#
+# Client-side
+
+
+pop3
+
+
+NTLM
+
+
+POP3 NTLM authentication with SASL downgrade
+
+
+# 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/880 -u user:secret
+
+
+chkhostname curlhost
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+CAPA
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
+AUTH PLAIN
+dXNlcgB1c2VyAHNlY3JldA==
+RETR 880
+QUIT
+
+
+
diff --git a/tests/data/test881 b/tests/data/test881
new file mode 100644
index 0000000000..0f74bb4862
--- /dev/null
+++ b/tests/data/test881
@@ -0,0 +1,64 @@
+
+
+
+POP3
+POP3 AUTH DIGEST-MD5 SASL DOWNGRADE
+RFC1734
+RFC2831
+RFC5034
+
+
+
+#
+# Server-side
+
+
+AUTH DIGEST-MD5 PLAIN
+REPLY "AUTH DIGEST-MD5" + Rubbish
+REPLY * -ERR AUTH exchange cancelled by client
+REPLY "AUTH PLAIN" +
+REPLY dXNlcgB1c2VyAHNlY3JldA== +OK Login successful
+
+
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+ yours sincerely
+
+
+
+#
+# Client-side
+
+
+pop3
+
+
+debug
+crypto
+
+
+POP3 DIGEST-MD5 authentication with SASL downgrade
+
+
+pop3://%HOSTIP:%POP3PORT/881 -u user:secret
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+CAPA
+AUTH DIGEST-MD5
+*
+AUTH PLAIN
+dXNlcgB1c2VyAHNlY3JldA==
+RETR 881
+QUIT
+
+
+