diff --git a/tests/data/test842 b/tests/data/test842
index 423335755ea3ebce4f645d8294b5a04a52cbce2f..e0928e24520e05994f44754989ea4329bb925092 100644
--- a/tests/data/test842
+++ b/tests/data/test842
@@ -40,6 +40,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
  <command>
 'imap://%HOSTIP:%IMAPPORT/842/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test843 b/tests/data/test843
index 6712c7ce54e6e74ebc90f9cd7ff410953656a1c7..8592c8bd16971ef955cde8af5fdee24e61d725e1 100644
--- a/tests/data/test843
+++ b/tests/data/test843
@@ -41,6 +41,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
  <command>
 'imap://%HOSTIP:%IMAPPORT/843/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test844 b/tests/data/test844
index 461ef5d609b9cbd860df804722d430dd7c20fb28..00761065d0e93e08c6fc7b83f618f4b0f34e2e86 100644
--- a/tests/data/test844
+++ b/tests/data/test844
@@ -32,6 +32,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
  <command>
 'imap://%HOSTIP:%IMAPPORT/844/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test845 b/tests/data/test845
index e98af664a2e0bcca44c1cc82160e3ef739598cc1..915327bde84e51ff85e0a3d195c46f1afd6ef628 100644
--- a/tests/data/test845
+++ b/tests/data/test845
@@ -33,6 +33,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  <command>
 'imap://%HOSTIP:%IMAPPORT/845/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test887 b/tests/data/test887
index 92a0e88f0a77ed9bff8e68438d146d5b1405acec..70afef7446252611151814088b5cbe940b1de33d 100644
--- a/tests/data/test887
+++ b/tests/data/test887
@@ -42,6 +42,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication
  <command>
 pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test888 b/tests/data/test888
index 63a9b6edea2a269772183e0bfff9b792ad30ed3d..5f9bee1ad7a5c52452fa08f36b20f8908dce2f84 100644
--- a/tests/data/test888
+++ b/tests/data/test888
@@ -42,6 +42,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response
  <command>
 pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test889 b/tests/data/test889
index 9b8a024f08e577338b2ba50c14ec6ef29e5d1651..f016934a01e060a1e753d4ad6b12ba148d8f3a2e 100644
--- a/tests/data/test889
+++ b/tests/data/test889
@@ -34,6 +34,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation
  <command>
 pop3://%HOSTIP:%POP3PORT/889 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test890 b/tests/data/test890
index 819e9d36a12aaa2aabdf5cbcd51fe3bc2dbcc265..e179f8bc8a03ecbe2aa19bc4896dff9cd3765019 100644
--- a/tests/data/test890
+++ b/tests/data/test890
@@ -34,6 +34,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  <command>
 pop3://%HOSTIP:%POP3PORT/890 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test946 b/tests/data/test946
index 313fd2166249b357aa282ee15062c76e3fcb4b4c..c052afaf7cac4d46b11a953e81bbd7740ae91abe 100644
--- a/tests/data/test946
+++ b/tests/data/test946
@@ -35,6 +35,10 @@ mail body
  <command>
 smtp://%HOSTIP:%SMTPPORT/946 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test947 b/tests/data/test947
index ad7cd78cb7c05525a38fbc4850360fdc97112b6a..f33db5e5b108bd68ae6a7e2169d14125c2d7c4b0 100644
--- a/tests/data/test947
+++ b/tests/data/test947
@@ -35,6 +35,10 @@ mail body
  <command>
 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 -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test948 b/tests/data/test948
index 317934d1b779565b5ebc095e93ef5fb272dbb862..510eb9aa25939ec7327f10c7a9158362cec87d7d 100644
--- a/tests/data/test948
+++ b/tests/data/test948
@@ -36,6 +36,10 @@ mail body
  <command>
 smtp://%HOSTIP:%SMTPPORT/948 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test949 b/tests/data/test949
index c78407db86d6a49557c24f21af984621f7de5d6e..bebf46646721d751f2b6b2bf7ecf3c627df92e7a 100644
--- a/tests/data/test949
+++ b/tests/data/test949
@@ -36,6 +36,10 @@ mail body
  <command>
 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 -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #