diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 6edc0b4451..3d23895dc0 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -95,6 +95,9 @@
407
408
409
+987
+988
+989
1112
1272
%endif
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 8da8da05bb..13211651f7 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -124,7 +124,8 @@ test954 test955 test956 test957 test958 test959 test960 test961 test962 \
test963 test964 test965 test966 test967 test968 test969 test970 test971 \
test972 test973 test974 test975 test976 test977 test978 \
\
-test980 test981 test982 test983 test984 test985 test986 \
+test980 test981 test982 test983 test984 test985 test986 test987 test988 \
+test989 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test987 b/tests/data/test987
new file mode 100644
index 0000000000..9176748e1e
--- /dev/null
+++ b/tests/data/test987
@@ -0,0 +1,51 @@
+
+
+
+SMTPS
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtps
+
+
+SMTPS with redundant explicit SSL request
+
+
+From: different
+To: another
+
+body
+
+
+-k --ssl-reqd --mail-rcpt recipient@example.com --mail-from sender@example.com -T - smtps://%HOSTIP:%SMTPSPORT/%TESTNUMBER
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO %TESTNUMBER
+MAIL FROM:
+RCPT TO:
+DATA
+QUIT
+
+
+From: different
+To: another
+
+body
+.
+
+
+
diff --git a/tests/data/test988 b/tests/data/test988
new file mode 100644
index 0000000000..71c873c8b9
--- /dev/null
+++ b/tests/data/test988
@@ -0,0 +1,48 @@
+
+
+
+IMAPS
+FETCH
+
+
+
+#
+# Server-side
+
+
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+ yours sincerely
+
+
+
+#
+# Client-side
+
+
+imaps
+
+
+IMAPS FETCH with redundant explicit SSL request
+
+
+-k --ssl-reqd -u '"user:sec"ret{' 'imaps://%HOSTIP:%IMAPSPORT/%TESTNUMBER/;MAILINDEX=1'
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+A001 CAPABILITY
+A002 LOGIN "\"user" "sec\"ret{"
+A003 SELECT %TESTNUMBER
+A004 FETCH 1 BODY[]
+A005 LOGOUT
+
+
+
diff --git a/tests/data/test989 b/tests/data/test989
new file mode 100644
index 0000000000..2fee9f8954
--- /dev/null
+++ b/tests/data/test989
@@ -0,0 +1,48 @@
+
+
+
+POP3S
+RETR
+
+
+
+#
+# Server-side
+
+
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+ yours sincerely
+
+
+
+#
+# Client-side
+
+
+pop3s
+
+
+POP3S RETR with redundant explicit SSL request
+
+
+-k --ssl-reqd -u user:secret pop3s://%HOSTIP:%POP3SPORT/%TESTNUMBER
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+CAPA
+USER user
+PASS secret
+RETR %TESTNUMBER
+QUIT
+
+
+