diff --git a/tests/data/test842 b/tests/data/test842
index 423335755e..e0928e2452 100644
--- a/tests/data/test842
+++ b/tests/data/test842
@@ -40,6 +40,10 @@ 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
+
+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 6712c7ce54..8592c8bd16 100644
--- a/tests/data/test843
+++ b/tests/data/test843
@@ -41,6 +41,10 @@ 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
+
+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 461ef5d609..00761065d0 100644
--- a/tests/data/test844
+++ b/tests/data/test844
@@ -32,6 +32,10 @@ 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
+
+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 e98af664a2..915327bde8 100644
--- a/tests/data/test845
+++ b/tests/data/test845
@@ -33,6 +33,10 @@ 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
+
+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 92a0e88f0a..70afef7446 100644
--- a/tests/data/test887
+++ b/tests/data/test887
@@ -42,6 +42,10 @@ 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
+
+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 63a9b6edea..5f9bee1ad7 100644
--- a/tests/data/test888
+++ b/tests/data/test888
@@ -42,6 +42,10 @@ 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
+
+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 9b8a024f08..f016934a01 100644
--- a/tests/data/test889
+++ b/tests/data/test889
@@ -34,6 +34,10 @@ 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
+
+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 819e9d36a1..e179f8bc8a 100644
--- a/tests/data/test890
+++ b/tests/data/test890
@@ -34,6 +34,10 @@ 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
+
+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 313fd21662..c052afaf7c 100644
--- a/tests/data/test946
+++ b/tests/data/test946
@@ -35,6 +35,10 @@ 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
+
+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 ad7cd78cb7..f33db5e5b1 100644
--- a/tests/data/test947
+++ b/tests/data/test947
@@ -35,6 +35,10 @@ 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
+
+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 317934d1b7..510eb9aa25 100644
--- a/tests/data/test948
+++ b/tests/data/test948
@@ -36,6 +36,10 @@ 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
+
+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 c78407db86..bebf466467 100644
--- a/tests/data/test949
+++ b/tests/data/test949
@@ -36,6 +36,10 @@ 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
+
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+
#