diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 9db4b4e21..b2a223bfc 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -76,7 +76,7 @@ test877 test878 \
test900 test901 test902 test903 test904 test905 test906 test907 test908 \
test909 test910 test911 test912 test913 test914 test915 test916 test917 \
test918 test919 test920 test921 test922 test923 test924 test925 test926 \
-test927 test928 test929 test930 test931 \
+test927 test928 test929 test930 test931 test932 test933 test934 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test932 b/tests/data/test932
new file mode 100644
index 000000000..73afbfcfa
--- /dev/null
+++ b/tests/data/test932
@@ -0,0 +1,52 @@
+
+
+
+SMTP
+SMTP AUTH CRAM-MD5
+RFC2195
+RFC4954
+
+
+
+#
+# Server-side
+
+
+AUTH CRAM-MD5
+REPLY AUTH 334 Rubbish
+REPLY * 501 AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+crypto
+
+
+SMTP CRAM-MD5 graceful cancellation
+
+
+smtp://%HOSTIP:%SMTPPORT/932 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+EHLO 932
+AUTH CRAM-MD5
+*
+QUIT
+
+
+
diff --git a/tests/data/test933 b/tests/data/test933
new file mode 100644
index 000000000..3b7ca21df
--- /dev/null
+++ b/tests/data/test933
@@ -0,0 +1,62 @@
+
+
+
+SMTP
+SMTP AUTH NTLM
+RFC4954
+
+
+
+#
+# Server-side
+
+
+AUTH NTLM
+REPLY AUTH 334 NTLM supported
+REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= 334 Rubbish
+REPLY * 501 AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+NTLM
+
+
+SMTP 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
+
+
+smtp://%HOSTIP:%SMTPPORT/933 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
+
+
+chkhostname curlhost
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+EHLO 933
+AUTH NTLM
+TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+*
+QUIT
+
+
+
diff --git a/tests/data/test934 b/tests/data/test934
new file mode 100644
index 000000000..79676f1d7
--- /dev/null
+++ b/tests/data/test934
@@ -0,0 +1,53 @@
+
+
+
+SMTP
+SMTP AUTH DIGEST-MD5
+RFC2831
+RFC4954
+
+
+
+#
+# Server-side
+
+
+AUTH DIGEST-MD5
+REPLY AUTH 334 Rubbish
+REPLY * 501 AUTH exchange cancelled by client
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+debug
+crypto
+
+
+SMTP DIGEST-MD5 graceful cancellation
+
+
+smtp://%HOSTIP:%SMTPPORT/934 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 67 - CURLE_LOGIN_DENIED
+
+67
+
+
+EHLO 934
+AUTH DIGEST-MD5
+*
+QUIT
+
+
+