diff --git a/tests/data/test842 b/tests/data/test842
index e0928e2452..b98d5a25e3 100644
--- a/tests/data/test842
+++ b/tests/data/test842
@@ -40,7 +40,8 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
'imap://%HOSTIP:%IMAPPORT/842/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
diff --git a/tests/data/test843 b/tests/data/test843
index 8592c8bd16..266aaa7c4d 100644
--- a/tests/data/test843
+++ b/tests/data/test843
@@ -41,7 +41,8 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
'imap://%HOSTIP:%IMAPPORT/843/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
diff --git a/tests/data/test844 b/tests/data/test844
index 00761065d0..4acd667264 100644
--- a/tests/data/test844
+++ b/tests/data/test844
@@ -32,7 +32,8 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
'imap://%HOSTIP:%IMAPPORT/844/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
diff --git a/tests/data/test845 b/tests/data/test845
index 915327bde8..152ab58279 100644
--- a/tests/data/test845
+++ b/tests/data/test845
@@ -33,7 +33,8 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
'imap://%HOSTIP:%IMAPPORT/845/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
diff --git a/tests/data/test887 b/tests/data/test887
index 70afef7446..b39dc21cc8 100644
--- a/tests/data/test887
+++ b/tests/data/test887
@@ -42,7 +42,8 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication
pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
diff --git a/tests/data/test888 b/tests/data/test888
index 5f9bee1ad7..1a359df225 100644
--- a/tests/data/test888
+++ b/tests/data/test888
@@ -42,7 +42,8 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response
pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
diff --git a/tests/data/test889 b/tests/data/test889
index f016934a01..5fbd0ca8ae 100644
--- a/tests/data/test889
+++ b/tests/data/test889
@@ -34,7 +34,8 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation
pop3://%HOSTIP:%POP3PORT/889 -u user --oauth2-bearer mF_9.B5f-4.1JqM
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
diff --git a/tests/data/test890 b/tests/data/test890
index e179f8bc8a..6392dfa017 100644
--- a/tests/data/test890
+++ b/tests/data/test890
@@ -34,7 +34,8 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
pop3://%HOSTIP:%POP3PORT/890 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
diff --git a/tests/data/test946 b/tests/data/test946
index c052afaf7c..d34bd914e8 100644
--- a/tests/data/test946
+++ b/tests/data/test946
@@ -20,7 +20,7 @@ REPLY dXNlcj11c2VyAWhvc3Q9MTI3LjAuMC4xAXBvcnQ9OTAwNQFhdXRoPUJlYXJlciBtRl85LkI1Zi
-#vi
+#
# Client-side
@@ -35,7 +35,8 @@ mail body
smtp://%HOSTIP:%SMTPPORT/946 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
diff --git a/tests/data/test947 b/tests/data/test947
index e889cfb39c..03648a4129 100644
--- a/tests/data/test947
+++ b/tests/data/test947
@@ -35,7 +35,8 @@ mail body
smtp://%HOSTIP:%SMTPPORT/947 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
diff --git a/tests/data/test948 b/tests/data/test948
index 510eb9aa25..51bb41ad2c 100644
--- a/tests/data/test948
+++ b/tests/data/test948
@@ -36,7 +36,8 @@ mail body
smtp://%HOSTIP:%SMTPPORT/948 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
diff --git a/tests/data/test949 b/tests/data/test949
index bebf466467..f84c42b400 100644
--- a/tests/data/test949
+++ b/tests/data/test949
@@ -36,7 +36,8 @@ mail body
smtp://%HOSTIP:%SMTPPORT/949 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
-# The data section doesn't do variable substitution, so we must assert this
+# The protocol section doesn't support ways of specifing the raw data in the
+# base64 encoded message so we must assert this
perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"