1292 files changed, 4386 insertions, 4389 deletions
diff --git a/tests/data/test1 b/tests/data/test1
index eba794a02..f39a08b19 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -35,7 +35,7 @@ http
 HTTP GET
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/1
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test10 b/tests/data/test10
index ed89bb95d..5b5534b67 100644
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -26,9 +26,9 @@ http
 simple HTTP PUT from file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/10 -T log/test10.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test10.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -44,7 +44,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/10 HTTP/1.1
+PUT /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test100 b/tests/data/test100
index 72f9c8562..e680a7b4a 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -36,7 +36,7 @@ ftp
 FTP dir list PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/test-100/
+ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>
 
@@ -47,7 +47,7 @@ ftp://%HOSTIP:%FTPPORT/test-100/
 USER anonymous
 PASS ftp@example.com
 PWD
-CWD test-100
+CWD test-%TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test1000 b/tests/data/test1000
index e6f8eef41..37f210ed8 100644
--- a/tests/data/test1000
+++ b/tests/data/test1000
@@ -24,7 +24,7 @@ ftp
 FTP dir list PASV with -I
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1000/ -I
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I
 </command>
 </client>
 
@@ -35,7 +35,7 @@ ftp://%HOSTIP:%FTPPORT/1000/ -I
 USER anonymous
 PASS ftp@example.com
 PWD
-CWD 1000
+CWD %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1001 b/tests/data/test1001
index 6edaade79..59d2ff869 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT and resumed upload and modified method
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1001 -u auser:apasswd --digest -T log/1001 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/1001">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 
-GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="6af4d89c952f4dd4cc215a6878dc499d"
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1002 b/tests/data/test1002
index 7ec7501f7..d33f35b9c 100644
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -71,9 +71,9 @@ proxy
 HTTP PUT with Digest auth, resumed upload and modified method, twice
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1002.upload1 -T log/1002 http://%HOSTIP:%HTTPPORT/1002.upload2 -T log/1002 -u auser:apasswd --digest -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T log/%TESTNUMBER -u auser:apasswd --digest -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/1002">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -81,7 +81,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@@ -89,9 +89,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 
-GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
@@ -100,7 +100,7 @@ Content-Length: 3
 Expect: 100-continue
 
 st
-GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@@ -108,9 +108,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 
-GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload2", response="d711f0d2042786d930de635ba0d1a1d0"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER.upload2", response="d711f0d2042786d930de635ba0d1a1d0"
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1003 b/tests/data/test1003
index 08e377a79..9adc996a9 100644
--- a/tests/data/test1003
+++ b/tests/data/test1003
@@ -27,7 +27,7 @@ ftp
 FTP with excessively large server command response line
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1003
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1003
-RETR 1003
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1004 b/tests/data/test1004
index 4a2b15939..cb2b6d69c 100644
--- a/tests/data/test1004
+++ b/tests/data/test1004
@@ -36,7 +36,7 @@ http
 HTTP GET with empty proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1004 --proxy ""
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy ""
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/1004 --proxy ""
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1004 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1005 b/tests/data/test1005
index 5c0c67643..59d98cc65 100644
--- a/tests/data/test1005
+++ b/tests/data/test1005
@@ -27,7 +27,7 @@ ftp
 FTP with excessively large number of server command response lines
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1005
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1005
-RETR 1005
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1006 b/tests/data/test1006
index b37f807b7..08f7247c1 100644
--- a/tests/data/test1006
+++ b/tests/data/test1006
@@ -28,7 +28,7 @@ ftp
 FTP with excessively large number of server command response lines (boundary condition)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1006
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1006
-RETR 1006
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1007 b/tests/data/test1007
index db2717ae3..e3c12b8d1 100644
--- a/tests/data/test1007
+++ b/tests/data/test1007
@@ -17,9 +17,9 @@ tftp
 TFTP send with invalid permission on server
  </name>
  <command>
--T log/test1007.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
 </command>
-<file name="log/test1007.txt">
+<file name="log/test%TESTNUMBER.txt">
 This data will not be sent
 </file>
 </client>
diff --git a/tests/data/test1008 b/tests/data/test1008
index 7dab6e9d5..321e98a81 100644
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -101,7 +101,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.1008:%HTTPPORT/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -111,20 +111,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1008:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1008:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-GET /path/10080002 HTTP/1.1
-Host: test.remote.example.com.1008:%HTTPPORT
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1009 b/tests/data/test1009
index e1929beb2..223fcdbd0 100644
--- a/tests/data/test1009
+++ b/tests/data/test1009
@@ -28,7 +28,7 @@ tftp
 TFTP retrieve with --local-port
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//1009 --local-port 44444-45444
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --local-port 44444-45444
 </command>
 </client>
 
@@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1009
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1010 b/tests/data/test1010
index ef073f5e5..9314ca66e 100644
--- a/tests/data/test1010
+++ b/tests/data/test1010
@@ -36,7 +36,7 @@ ftp
 FTP dir list nocwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//list/this/path/1010/ ftp://%HOSTIP:%FTPPORT//list/this/path/1010/ --ftp-method nocwd
+ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ --ftp-method nocwd
 </command>
 </client>
 
@@ -49,9 +49,9 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE A
-LIST /list/this/path/1010
+LIST /list/this/path/%TESTNUMBER
 EPSV
-LIST /list/this/path/1010
+LIST /list/this/path/%TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1011 b/tests/data/test1011
index 7af9e0d8e..1ff01ca6b 100644
--- a/tests/data/test1011
+++ b/tests/data/test1011
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK
-Location: moo.html&testcase=/10110002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK
-Location: moo.html&testcase=/10110002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
 
@@ -49,7 +49,7 @@ http
 HTTP POST with 301 redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo"
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo"
 </command>
 </client>
 
@@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /blah/1011 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-mooGET /blah/moo.html&testcase=/10110002 HTTP/1.1
+mooGET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1012 b/tests/data/test1012
index 64a6f47df..af17bb818 100644
--- a/tests/data/test1012
+++ b/tests/data/test1012
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsclose
-Location: moo.html&testcase=/10120002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK swsclose
-Location: moo.html&testcase=/10120002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP POST with 301 redirect and --post301
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301
 </command>
 </client>
 
@@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1012 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-mooPOST /blah/moo.html&testcase=/10120002 HTTP/1.1
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1013 b/tests/data/test1013
index 9a1e6d4e3..17a3371f1 100644
--- a/tests/data/test1013
+++ b/tests/data/test1013
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER protocols
 </postcheck>
 </client>
 
diff --git a/tests/data/test1014 b/tests/data/test1014
index 5116aad7c..875fa7762 100644
--- a/tests/data/test1014
+++ b/tests/data/test1014
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --features
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features
+%SRCDIR/libtest/test1013.pl ../curl-config log/stdout%TESTNUMBER features
 </postcheck>
 </client>
 
diff --git a/tests/data/test1015 b/tests/data/test1015
index c568b8678..fc6ffc344 100644
--- a/tests/data/test1015
+++ b/tests/data/test1015
@@ -28,9 +28,9 @@ http
 --data-urlencode
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1015 --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@log/1015.txt" --data-urlencode @log/1015.txt 
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@log/%TESTNUMBER.txt" --data-urlencode @log/%TESTNUMBER.txt 
 </command>
-<file name="log/1015.txt">
+<file name="log/%TESTNUMBER.txt">
 content to _?!#$'|<>
 </file>
 </client>
@@ -39,7 +39,7 @@ content to _?!#$'|<>
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1015 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1016 b/tests/data/test1016
index 01bf100f3..340dd969b 100644
--- a/tests/data/test1016
+++ b/tests/data/test1016
@@ -23,9 +23,9 @@ file
 X-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 1-4 file://localhost%FILE_PWD/log/test1016.txt 
+-r 1-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1016.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
diff --git a/tests/data/test1017 b/tests/data/test1017
index 9790d776d..034c87a7f 100644
--- a/tests/data/test1017
+++ b/tests/data/test1017
@@ -24,9 +24,9 @@ file
 0-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 0-3 file://localhost%FILE_PWD/log/test1017.txt 
+-r 0-3 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1017.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
diff --git a/tests/data/test1018 b/tests/data/test1018
index ddf1f2595..25d8cb180 100644
--- a/tests/data/test1018
+++ b/tests/data/test1018
@@ -23,9 +23,9 @@ file
 X-X range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 4-4 file://localhost%FILE_PWD/log/test1018.txt 
+-r 4-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1018.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>
diff --git a/tests/data/test1019 b/tests/data/test1019
index 2a92ae5cf..02732b483 100644
--- a/tests/data/test1019
+++ b/tests/data/test1019
@@ -24,9 +24,9 @@ file
 X- range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 7- file://localhost%FILE_PWD/log/test1019.txt 
+-r 7- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1019.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
diff --git a/tests/data/test102 b/tests/data/test102
index 141bc0f35..19be93564 100644
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -30,7 +30,7 @@ ftp
 FTP RETR PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/102
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -44,8 +44,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 102
-RETR 102
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1020 b/tests/data/test1020
index 0d88532f7..91c9b6389 100644
--- a/tests/data/test1020
+++ b/tests/data/test1020
@@ -24,9 +24,9 @@ file
 -Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r -9 file://localhost%FILE_PWD/log/test1020.txt 
+-r -9 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1020.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
diff --git a/tests/data/test1021 b/tests/data/test1021
index 7e32efe09..c4a90a6d9 100644
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -106,7 +106,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.1021:%HTTPPORT/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -116,25 +116,25 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-GET /path/10210002 HTTP/1.1
-Host: test.remote.example.com.1021:%HTTPPORT
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1022 b/tests/data/test1022
index 6a8b01258..e55b51ffe 100644
--- a/tests/data/test1022
+++ b/tests/data/test1022
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --version
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1022 version
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER version
 </postcheck>
 </client>
 
diff --git a/tests/data/test1023 b/tests/data/test1023
index 9c916a085..18071c6da 100644
--- a/tests/data/test1023
+++ b/tests/data/test1023
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1023 vernum
+%SRCDIR/libtest/test1022.pl ../curl-config log/stdout%TESTNUMBER vernum
 </postcheck>
 </client>
 
diff --git a/tests/data/test1024 b/tests/data/test1024
index a9c95abe4..5fba9d325 100644
--- a/tests/data/test1024
+++ b/tests/data/test1024
@@ -14,7 +14,7 @@ cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10240002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
 
@@ -25,7 +25,7 @@ This server reply is for testing a Location: following with cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10240003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
 
@@ -45,14 +45,14 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10240002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
 
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10240003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
 
@@ -75,24 +75,24 @@ http
 HTTP Location: following with cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1024 -L -c log/jar1024
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1024 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /data/10240002.txt HTTP/1.1
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/10240003.txt HTTP/1.1
+GET /want/%TESTNUMBER0003.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1025 b/tests/data/test1025
index 20d99fcb2..5f96e1123 100644
--- a/tests/data/test1025
+++ b/tests/data/test1025
@@ -14,7 +14,7 @@ cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10250002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
 
@@ -25,7 +25,7 @@ This server reply is for testing a Location: following with cookies
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10250003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
 
@@ -45,14 +45,14 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../data/10250002.txt
+Location: ../data/%TESTNUMBER0002.txt
 Set-Cookie: firstcookie=want; path=/want/
 Content-Length: 69
 
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ../want/10250003.txt
+Location: ../want/%TESTNUMBER0003.txt
 Set-Cookie: nextcookie=data; path=/data/
 Content-Length: 69
 
@@ -75,26 +75,26 @@ http
 HTTP Location: following with command-line and server cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1025 -L -c log/jar1025 -b forcedcookie=yes
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER -b forcedcookie=yes
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1025 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: forcedcookie=yes
 
-GET /data/10250002.txt HTTP/1.1
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: forcedcookie=yes
 
-GET /want/10250003.txt HTTP/1.1
+GET /want/%TESTNUMBER0003.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1026 b/tests/data/test1026
index 6bda7a43f..a702a1d6d 100644
--- a/tests/data/test1026
+++ b/tests/data/test1026
@@ -28,7 +28,7 @@ curl --manual
 # Search for these two sentinel lines in the manual output; if they are found,
 # then chances are good the entire manual is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1026
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
 </postcheck>
 </client>
 
diff --git a/tests/data/test1027 b/tests/data/test1027
index 9c3d6e3ea..7574203e2 100644
--- a/tests/data/test1027
+++ b/tests/data/test1027
@@ -25,7 +25,7 @@ curl --help
 # Search for these two sentinel lines in the help output; if they are found,
 # then chances are good the entire help is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1027
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
 </postcheck>
 </client>
 
diff --git a/tests/data/test1028 b/tests/data/test1028
index 02d0e1d06..cff302815 100644
--- a/tests/data/test1028
+++ b/tests/data/test1028
@@ -19,7 +19,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: ftp://%HOSTIP:%FTPPORT/10280002
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
 Content-Length: 0
 Connection: close
 
@@ -45,7 +45,7 @@ ftp
 HTTP Location: redirect to FTP URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/10280001 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/10280001 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /10280001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -63,8 +63,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 10280002
-RETR 10280002
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
 QUIT
 </protocol>
 <stdout>
@@ -73,7 +73,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: ftp://%HOSTIP:%FTPPORT/10280002
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
 Content-Length: 0
 Connection: close
 
diff --git a/tests/data/test1029 b/tests/data/test1029
index b1f5982e4..f39ac6ed4 100644
--- a/tests/data/test1029
+++ b/tests/data/test1029
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10290002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 
@@ -30,14 +30,14 @@ http
 HTTP Location: and 'redirect_url' check
  </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1029 -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1029 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -45,12 +45,12 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10290002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10290002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/1029 0 
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER 0 
 </stdout>
 </verify>
 </testcase>
diff --git a/tests/data/test103 b/tests/data/test103
index 15712f5da..308c15491 100644
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -27,7 +27,7 @@ ftp
 FTP RETR PORT with CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 </command>
 </client>
 
@@ -46,8 +46,8 @@ CWD a
 CWD path
 PORT 127,0,0,1,0,0
 TYPE I
-SIZE 103
-RETR 103
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1030 b/tests/data/test1030
index 735c08b7a..bd4e18f1a 100644
--- a/tests/data/test1030
+++ b/tests/data/test1030
@@ -67,9 +67,9 @@ crypto
 HTTP PUT with --anyauth authorization (picking Digest)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1030 -T log/put1030 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1030">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -80,7 +80,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1030 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -91,9 +91,9 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1030 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1030", response="01cb59db1ddaac246b072d5f5f0716d9"
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="01cb59db1ddaac246b072d5f5f0716d9"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
diff --git a/tests/data/test1031 b/tests/data/test1031
index c139b356c..c6e479588 100644
--- a/tests/data/test1031
+++ b/tests/data/test1031
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ?coolsite=yes/10310002.txt
+Location: ?coolsite=yes/%TESTNUMBER0002.txt
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: ?coolsite=yes/10310002.txt
+Location: ?coolsite=yes/%TESTNUMBER0002.txt
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 HTTP Location: following to a query string
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/this/1031 -L
+http://%HOSTIP:%HTTPPORT/want/this/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/this/1031 HTTP/1.1
+GET /want/this/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/this/1031?coolsite=yes/10310002.txt HTTP/1.1
+GET /want/this/%TESTNUMBER?coolsite=yes/%TESTNUMBER0002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1032 b/tests/data/test1032
index a3d8be706..8af07dc78 100644
--- a/tests/data/test1032
+++ b/tests/data/test1032
@@ -35,7 +35,7 @@ http
 HTTP HEAD with --range
  </name>
  <command>
---range 1-3 --head http://%HOSTIP:%HTTPPORT/1032
+--range 1-3 --head http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP HEAD with --range
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /1032 HTTP/1.1
+HEAD /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=1-3
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1033 b/tests/data/test1033
index 34676ea7f..7d9ff0364 100644
--- a/tests/data/test1033
+++ b/tests/data/test1033
@@ -40,7 +40,7 @@ http
 HTTP GET with 102 response!
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1033
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/1033
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1033 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1034 b/tests/data/test1034
index 89083a294..565a1b728 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -40,7 +40,7 @@ HTTP over proxy with malformatted IDN host name
 # This host name contains an invalid UTF-8 byte sequence that can't be
 # converted into an IDN name
 <stdin>
-url = "http://invalid-utf8-�.local/page/1034"
+url = "http://invalid-utf8-�.local/page/%TESTNUMBER"
 </stdin>
  <command>
 -K - -x %HOSTIP:%NOLISTENPORT
diff --git a/tests/data/test1035 b/tests/data/test1035
index b67eab281..a2b98cc94 100644
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -35,7 +35,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 HTTP over proxy with too long IDN host name
  </name>
  <command>
-http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 -x %HOSTIP:%NOLISTENPORT
+http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/%TESTNUMBER -x %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 
diff --git a/tests/data/test1036 b/tests/data/test1036
index b8ebc4fc0..4ab61a278 100644
--- a/tests/data/test1036
+++ b/tests/data/test1036
@@ -31,9 +31,9 @@ ftp
 FTP download resume from end of file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1036 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1036.out">
+<file name="log/curl%TESTNUMBER.out">
 This is the start!!
 </file>
 </client>
@@ -47,12 +47,12 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 1036
+SIZE %TESTNUMBER
 REST 20
-RETR 1036
+RETR %TESTNUMBER
 QUIT
 </protocol>
-<file name="log/curl1036.out">
+<file name="log/curl%TESTNUMBER.out">
 This is the start!!
 expected to be a file without the first part
 but we emulate that
diff --git a/tests/data/test1037 b/tests/data/test1037
index d9cdc0a66..d9cacb233 100644
--- a/tests/data/test1037
+++ b/tests/data/test1037
@@ -31,9 +31,9 @@ ftp
 FTP download resume from end of empty file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1037 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1037.out">
+<file name="log/curl%TESTNUMBER.out">
 </file>
 </client>
 
@@ -46,8 +46,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 1037
-RETR 1037
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1038 b/tests/data/test1038
index 9572d78e0..acac84a29 100644
--- a/tests/data/test1038
+++ b/tests/data/test1038
@@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1038 -T log/upload1038 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload1038">
+<file name="log/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 
 worx?
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1038
-APPE 1038
+SIZE %TESTNUMBER
+APPE %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test1039 b/tests/data/test1039
index 654d836d2..53d7cb5cb 100644
--- a/tests/data/test1039
+++ b/tests/data/test1039
@@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of empty file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1039 -T log/upload1039 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload1039">
+<file name="log/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 
 worx?
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1039
-STOR 1039
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test104 b/tests/data/test104
index 82df98aee..8b44911de 100644
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -21,7 +21,7 @@ ftp
 FTP --head to get file size only
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/104 --head
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head
 </command>
 </client>
 
@@ -33,9 +33,9 @@ PASS ftp@example.com
 PWD
 CWD a
 CWD path
-MDTM 104
+MDTM %TESTNUMBER
 TYPE I
-SIZE 104
+SIZE %TESTNUMBER
 REST 0
 QUIT
 </protocol>
diff --git a/tests/data/test1040 b/tests/data/test1040
index d480bb448..8899c5b06 100644
--- a/tests/data/test1040
+++ b/tests/data/test1040
@@ -47,9 +47,9 @@ http
 HTTP GET with resume from end of entirely-downloaded file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1040 -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1040.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/1040 -C -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1040 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=100-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1041 b/tests/data/test1041
index 646b36fb3..5580b9589 100644
--- a/tests/data/test1041
+++ b/tests/data/test1041
@@ -31,7 +31,7 @@ http
  <name>
 HTTP PUT with resume from end of already-uploaded file
  </name>
-<file name="log/test1041.txt">
+<file name="log/test%TESTNUMBER.txt">
 012345678
 012345678
 012345678
@@ -44,7 +44,7 @@ HTTP PUT with resume from end of already-uploaded file
 012345678
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C -
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
 # curl doesn't do a HEAD request on the remote file so it has no idea whether
 # it can skip part of the file or not.  Instead, it sends the entire file.
 <protocol>
-PUT /1041 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 0-99/100
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1042 b/tests/data/test1042
index d374d2ab5..4a33ae826 100644
--- a/tests/data/test1042
+++ b/tests/data/test1042
@@ -59,9 +59,9 @@ http
 HTTP GET beyond end of entirely-downloaded file, no server resume
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1042 -C 200
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
 </command>
-<file name="log/curl1042.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -81,7 +81,7 @@ http://%HOSTIP:%HTTPPORT/1042 -C 200
 33
 </errorcode>
 <protocol>
-GET /1042 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=200-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1043 b/tests/data/test1043
index e200b61ea..c728b9688 100644
--- a/tests/data/test1043
+++ b/tests/data/test1043
@@ -58,9 +58,9 @@ http
 HTTP GET with resume from end of file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1043 -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl1043.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -71,7 +71,7 @@ http://%HOSTIP:%HTTPPORT/1043 -C -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1043 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=40-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1044 b/tests/data/test1044
index a95f5681d..c5f3a2925 100644
--- a/tests/data/test1044
+++ b/tests/data/test1044
@@ -32,7 +32,7 @@ ftp
 FTP download large file info with -I
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/1044 -I
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 </command>
 </client>
 
@@ -43,9 +43,9 @@ USER anonymous
 PASS ftp@example.com
 PWD
 CWD blalbla
-MDTM 1044
+MDTM %TESTNUMBER
 TYPE I
-SIZE 1044
+SIZE %TESTNUMBER
 REST 0
 QUIT
 </protocol>
diff --git a/tests/data/test1045 b/tests/data/test1045
index 9de169bab..c2c7df7f6 100644
--- a/tests/data/test1045
+++ b/tests/data/test1045
@@ -32,7 +32,7 @@ http
 HTTP GET with numeric localhost --interface
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>
 
@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1045 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1046 b/tests/data/test1046
index 0f04b8a33..f78109893 100644
--- a/tests/data/test1046
+++ b/tests/data/test1046
@@ -36,7 +36,7 @@ http-ipv6
 HTTP-IPv6 GET with numeric localhost --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1046" --interface ::1
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ::1
 </command>
 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out
 <precheck>
@@ -48,7 +48,7 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENT6IP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1046 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1049 b/tests/data/test1049
index de18bee3b..713b4bb19 100644
--- a/tests/data/test1049
+++ b/tests/data/test1049
@@ -28,7 +28,7 @@ tftp
 TFTP retrieve with localhost --interface
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//1049 --interface %CLIENTIP
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --interface %CLIENTIP
 </command>
 </client>
 
@@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1049
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test105 b/tests/data/test105
index 14679d17b..74922d559 100644
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -31,7 +31,7 @@ ftp
 FTP user+password in URL and ASCII transfer
  </name>
  <command>
-ftp://userdude:passfellow@%HOSTIP:%FTPPORT/105 --use-ascii
+ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii
 </command>
 </client>
 
@@ -44,7 +44,7 @@ PWD
 EPSV
 PASV
 TYPE A
-RETR 105
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1051 b/tests/data/test1051
index 7a8eae1bd..5a1cf34c6 100644
--- a/tests/data/test1051
+++ b/tests/data/test1051
@@ -13,7 +13,7 @@ followlocation
 HTTP/1.1 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10510002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
 
@@ -32,7 +32,7 @@ If this is received, the location following worked
 HTTP/1.1 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10510002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
 
@@ -56,9 +56,9 @@ http
 HTTP PUT with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1051 -L -T log/test1051.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1051.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -80,7 +80,7 @@ the
 # server says 301 and 100 _after_ the entire PUT body has been sent.
 
 <protocol>
-PUT /want/1051 HTTP/1.1
+PUT /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -96,7 +96,7 @@ for
 the
    PUT
       feature
-PUT /want/data/10510002.txt?coolsite=yes HTTP/1.1
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1052 b/tests/data/test1052
index e0c2f32a6..8f8ee61bc 100644
--- a/tests/data/test1052
+++ b/tests/data/test1052
@@ -13,7 +13,7 @@ followlocation
 HTTP/1.0 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10520002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
 
@@ -30,7 +30,7 @@ If this is received, the location following worked
 HTTP/1.0 301 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10520002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
 
@@ -52,9 +52,9 @@ http
 HTTP 1.0 PUT with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1052 -0 -L -T log/test1052.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1052.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -75,7 +75,7 @@ the
 # including the full request-body before it responds. So in this test the
 # server says 301 and 200 _after_ the entire PUT body has been sent.
 <protocol>
-PUT /want/1052 HTTP/1.0
+PUT /want/%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -90,7 +90,7 @@ for
 the
    PUT
       feature
-PUT /want/data/10520002.txt?coolsite=yes HTTP/1.0
+PUT /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1053 b/tests/data/test1053
index c32eb08ce..bd5de2568 100644
--- a/tests/data/test1053
+++ b/tests/data/test1053
@@ -15,7 +15,7 @@ followlocation
 HTTP/1.1 307 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10530002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
 
@@ -34,7 +34,7 @@ blablabla
 HTTP/1.1 307 Redirect swsclose
 Date: Thu, 29 Jul 2008 14:49:00 GMT
 Server: test-server/fake
-Location: data/10530002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 0
 Connection: close
 
@@ -58,10 +58,10 @@ http
 HTTP RFC1867-type formposting from file with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1053 -L -F name=daniel -F tool=curl -F file=@log/test1053.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1053.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -74,7 +74,7 @@ bar
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/1053 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -90,7 +90,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------9ef8d6205763
-Content-Disposition: form-data; name="file"; filename="test1053.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
@@ -98,7 +98,7 @@ This is a moo-
 bar
 
 ------------------------------9ef8d6205763--
-POST /we/want/data/10530002.txt?coolsite=yes HTTP/1.1
+POST /we/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -114,7 +114,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------9ef8d6205763
-Content-Disposition: form-data; name="file"; filename="test1053.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
diff --git a/tests/data/test1054 b/tests/data/test1054
index ac6671f6e..d8b1d452c 100644
--- a/tests/data/test1054
+++ b/tests/data/test1054
@@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsclose
-Location: moo/testcase/10540002
+Location: moo/testcase/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK swsclose
-Location: moo/testcase/10540002
+Location: moo/testcase/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
 
@@ -47,11 +47,11 @@ http
  <name>
 HTTP POST from file with 301 redirect and --post301
  </name>
-<file name="log/test1054.txt">
+<file name="log/test%TESTNUMBER.txt">
 field=data
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @log/test%TESTNUMBER.txt --post301
 </command>
 </client>
 
@@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1054 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 10
 Content-Type: application/x-www-form-urlencoded
 
-field=dataPOST /blah/moo/testcase/10540002 HTTP/1.1
+field=dataPOST /blah/moo/testcase/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1055 b/tests/data/test1055
index 243d5070a..f6f37531f 100644
--- a/tests/data/test1055
+++ b/tests/data/test1055
@@ -18,7 +18,7 @@ HTTP/1.1 307 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
-Location: ftp://%HOSTIP:%FTPPORT/1055
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 Content-Length: 0
 Connection: close
 
@@ -36,9 +36,9 @@ ftp
 HTTP PUT Location: redirect to FTP URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1055 -L -T log/test1055.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1055.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -55,7 +55,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1055 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -76,7 +76,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 1055
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test1056 b/tests/data/test1056
index 7ccdb2199..2bf70ccfe 100644
--- a/tests/data/test1056
+++ b/tests/data/test1056
@@ -13,7 +13,7 @@ IPv6
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: http://[::1%259999]:%HTTP6PORT/moo/10560002
+Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
 
@@ -27,7 +27,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: http://[::1%259999]:%HTTP6PORT/moo/10560002
+Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
 
@@ -53,7 +53,7 @@ http-ipv6
 HTTP follow redirect from IPv4 to IPv6 with scope
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/1056 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /moo/10560002 HTTP/1.1
+GET /moo/%TESTNUMBER0002 HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1057 b/tests/data/test1057
index b4ef20c8d..ce3fc0b61 100644
--- a/tests/data/test1057
+++ b/tests/data/test1057
@@ -30,7 +30,7 @@ ftp
 FTP retrieve a byte-range relative to end of file
  </name>
  <command>
--r -12 ftp://%HOSTIP:%FTPPORT/1057
+-r -12 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,9 +42,9 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1057
+SIZE %TESTNUMBER
 REST 52
-RETR 1057
+RETR %TESTNUMBER
 ABOR
 QUIT
 </protocol>
diff --git a/tests/data/test1058 b/tests/data/test1058
index d177b5fd7..ee6c300c1 100644
--- a/tests/data/test1058
+++ b/tests/data/test1058
@@ -33,14 +33,14 @@ http
 HTTP range relative to end of file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1058 -r -101
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1058 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=-101
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1059 b/tests/data/test1059
index b3aacbed6..95d4b95cd 100644
--- a/tests/data/test1059
+++ b/tests/data/test1059
@@ -35,7 +35,7 @@ http
 HTTP CONNECT with proxytunnel to unsupported FTP URL
  </name>
  <command>
-ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
+ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -47,8 +47,8 @@ ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
 56
 </errorcode>
 <protocol>
-CONNECT test-number:1059 HTTP/1.1
-Host: test-number:1059
+CONNECT test-number:%TESTNUMBER HTTP/1.1
+Host: test-number:%TESTNUMBER
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test106 b/tests/data/test106
index b7676f7a0..981e9dfa9 100644
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -29,7 +29,7 @@ ftp
 FTP GET with type=A style ASCII URL using %20 codes
  </name>
  <command>
-"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/106;type=A"
+"ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/%TESTNUMBER;type=A"
 </command>
 </client>
 
@@ -44,7 +44,7 @@ CWD path with  spaces
 CWD and things2
 EPSV
 TYPE A
-RETR 106
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1060 b/tests/data/test1060
index c3a76a7f8..7eab061e6 100644
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -875,26 +875,26 @@ proxy
 HTTP proxy CONNECT auth Digest, large headers and data
  </name>
  <command>
-http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1
-Host: test.remote.haxx.se.1060:8990
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1
-Host: test.remote.haxx.se.1060:8990
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="e1fbed39c26f4efe284adc0e576ff638"
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-GET /path/10600002 HTTP/1.1
-Host: test.remote.haxx.se.1060:8990
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1061 b/tests/data/test1061
index 39b23b35b..c7fcedbc9 100644
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -880,26 +880,26 @@ proxy
 HTTP proxy CONNECT auth Digest, large headers and chunked data
  </name>
  <command>
-http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1
-Host: test.remote.haxx.se.1061:8990
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1
-Host: test.remote.haxx.se.1061:8990
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="4e23449fa93224834299e7282a70472c"
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-GET /path/10610002 HTTP/1.1
-Host: test.remote.haxx.se.1061:8990
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1062 b/tests/data/test1062
index d96686e05..df72e6622 100644
--- a/tests/data/test1062
+++ b/tests/data/test1062
@@ -28,7 +28,7 @@ ftp
 FTP with excessively long server command response lines, boundary condition
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/1062
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 1062
-RETR 1062
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1063 b/tests/data/test1063
index de2085d3e..ca1ba14a8 100644
--- a/tests/data/test1063
+++ b/tests/data/test1063
@@ -28,9 +28,9 @@ Invalid large X- range on a file://
 # This range value is 2**32+7, which will be truncated to the valid value 7
 # if the large file support is not working correctly
  <command>
--r 4294967303- file://localhost%FILE_PWD/log/test1063.txt 
+-r 4294967303- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
 </command>
-<file name="log/test1063.txt">
+<file name="log/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>
diff --git a/tests/data/test1064 b/tests/data/test1064
index 3d2f4d2cb..81014845f 100644
--- a/tests/data/test1064
+++ b/tests/data/test1064
@@ -35,9 +35,9 @@ http
 HTTP PUT twice
  </name>
  <command>
--H "Expect:" -T log/1064 http://%HOSTIP:%HTTPPORT/1064.upload1 -T log/1064 http://%HOSTIP:%HTTPPORT/10640002.upload2
+-H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.upload2
 </command>
-<file name="log/1064">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -45,14 +45,14 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1064.upload1 HTTP/1.1
+PUT /%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 5
 
 test
-PUT /10640002.upload2 HTTP/1.1
+PUT /%TESTNUMBER0002.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1065 b/tests/data/test1065
index 1d27ffb4b..8bef0e1e0 100644
--- a/tests/data/test1065
+++ b/tests/data/test1065
@@ -36,9 +36,9 @@ http
 HTTP PUT with one file but two URLs
  </name>
  <command>
--H "Expect:" -T log/1065 http://%HOSTIP:%HTTPPORT/1065.upload1 http://%HOSTIP:%HTTPPORT/10650002.url2
+-H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.url2
 </command>
-<file name="log/1065">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -46,14 +46,14 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1065.upload1 HTTP/1.1
+PUT /%TESTNUMBER.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 5
 
 test
-GET /10650002.url2 HTTP/1.1
+GET /%TESTNUMBER0002.url2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1066 b/tests/data/test1066
index 8175af172..1fbd7dc08 100644
--- a/tests/data/test1066
+++ b/tests/data/test1066
@@ -35,19 +35,19 @@ http
 HTTP --dump-header - with two URLs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1066 http://%HOSTIP:%HTTPPORT/want/10660001 --dump-header -
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER0001 --dump-header -
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1066 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/10660001 HTTP/1.1
+GET /want/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1067 b/tests/data/test1067
index 5790f6b86..e5023f58f 100644
--- a/tests/data/test1067
+++ b/tests/data/test1067
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/10670002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/10670002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,28 +53,28 @@ http
 HTTP Location: following with auto-referer
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1067 --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1067 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Referer: firstone.html
 
-GET /want/data/10670002.txt?coolsite=yes HTTP/1.1
+GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Referer: http://%HOSTIP:%HTTPPORT/want/1067
+Referer: http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 
 </protocol>
 <stderr nonewline="yes">
-|http://%HOSTIP:%HTTPPORT/want/1067|
+|http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER|
 </stderr>
 </verify>
 </testcase>
diff --git a/tests/data/test1068 b/tests/data/test1068
index 702d307a5..bf3ae4ee0 100644
--- a/tests/data/test1068
+++ b/tests/data/test1068
@@ -29,7 +29,7 @@ http
 HTTP PUT from stdin
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/bzz/1068 -T -
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T -
 </command>
 <stdin>
 more than one byte
@@ -39,7 +39,7 @@ more than one byte
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /bzz/1068 HTTP/1.1
+PUT /bzz/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1069 b/tests/data/test1069
index c47c357d7..2eb665922 100644
--- a/tests/data/test1069
+++ b/tests/data/test1069
@@ -20,7 +20,7 @@ http
 HTTP 1.0 PUT from stdin with no content length
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/bzz/1069 -T - -0
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -0
 </command>
 <stdin>
 this data can't be sent
diff --git a/tests/data/test107 b/tests/data/test107
index 25b645200..911de45bd 100644
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -15,7 +15,7 @@ ftp
  <name>
 FTP PASV upload file
  </name>
-<file name="log/test107.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -24,7 +24,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/107 -T log/test107.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -44,7 +44,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 107
+STOR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1070 b/tests/data/test1070
index 6056e5d93..3e4d37a52 100644
--- a/tests/data/test1070
+++ b/tests/data/test1070
@@ -32,9 +32,9 @@ http
 HTTP POST with server closing connection before (all) data is received
  </name>
  <command>
- -d @log/input1070 http://%HOSTIP:%HTTPPORT/1070 -H "Expect: 100-continue"
+ -d @log/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue"
 </command>
-<file name="log/input1070">
+<file name="log/input%TESTNUMBER">
 This creates the named file with this content before the test case is run,
 which is useful if the test case needs a file to act on. We create this file
 rather large (larger than your typical TCP packet) so that not all of it can nor
@@ -49,7 +49,7 @@ OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1070 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1071 b/tests/data/test1071
index d89b74bd0..6c6947227 100644
--- a/tests/data/test1071
+++ b/tests/data/test1071
@@ -73,9 +73,9 @@ crypto
 Downgraded HTTP PUT to HTTP 1.0 with authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1071 -T log/put1071 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1071">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -86,7 +86,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1071 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -97,9 +97,9 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1071 HTTP/1.0
+PUT /%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1071", response="df4cef6b52a30e65d472dd848d2055a1"
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="df4cef6b52a30e65d472dd848d2055a1"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
diff --git a/tests/data/test1072 b/tests/data/test1072
index 128f0944c..f9fb73044 100644
--- a/tests/data/test1072
+++ b/tests/data/test1072
@@ -40,7 +40,7 @@ crypto
 HTTP chunked PUT to HTTP 1.0 server with authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1072 -T - -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -u testuser:testpass --anyauth
 </command>
 <stdin>
 This is data we upload with PUT
@@ -56,7 +56,7 @@ which is impossible in HTTP/1.0
 25
 </errorcode>
 <protocol>
-PUT /1072 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1073 b/tests/data/test1073
index 80f5ec0dc..775c08798 100644
--- a/tests/data/test1073
+++ b/tests/data/test1073
@@ -18,7 +18,7 @@ chunked Transfer-Encoding
 HTTP/1.0 301 Redirect swsclose
 Server: testcurl
 Content-Type: text/plain
-Location: /newlocation/10730002
+Location: /newlocation/%TESTNUMBER0002
 Content-Length: 0
 Connection: close
 
@@ -34,7 +34,7 @@ http
 HTTP chunked PUT to HTTP 1.0 server with redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1073 -T - -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -L
 </command>
 <stdin>
 This is data we upload with PUT
@@ -50,7 +50,7 @@ which is impossible in HTTP/1.0
 25
 </errorcode>
 <protocol>
-PUT /1073 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1074 b/tests/data/test1074
index e19557495..55a956ec9 100644
--- a/tests/data/test1074
+++ b/tests/data/test1074
@@ -39,7 +39,7 @@ http
 HTTP downgrade to HTTP/1.0 on second request
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1074 http://%HOSTIP:%HTTPPORT/wantmore/10740001
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>
 
@@ -60,12 +60,12 @@ surprise2
 </stdout>
 
 <protocol>
-GET /want/1074 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /wantmore/10740001 HTTP/1.0
+GET /wantmore/%TESTNUMBER0001 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1075 b/tests/data/test1075
index f0f255ab6..2d111f284 100644
--- a/tests/data/test1075
+++ b/tests/data/test1075
@@ -52,9 +52,9 @@ http
 HTTP PUT with --anyauth authorization (picking Basic)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1075 -T log/put1075 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put1075">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -65,7 +65,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1075 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -76,7 +76,7 @@ This is data we upload with PUT
 a second line
 line three
 four is the number of lines
-PUT /1075 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1076 b/tests/data/test1076
index 7e51ad43d..017a7d11e 100644
--- a/tests/data/test1076
+++ b/tests/data/test1076
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: moo.html&testcase=/10760002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: moo.html&testcase=/10760002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP POST with 302 redirect and --post302
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302
 </command>
 </client>
 
@@ -57,14 +57,14 @@ http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1076 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-mooPOST /blah/moo.html&testcase=/10760002 HTTP/1.1
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1077 b/tests/data/test1077
index fe5e4267e..28af6e978 100644
--- a/tests/data/test1077
+++ b/tests/data/test1077
@@ -50,7 +50,7 @@ proxy
 FTP over HTTP proxy with downgrade to HTTP 1.0
  </name>
  <command>
--x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002
+-x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
 </command>
 </client>
 
@@ -58,13 +58,13 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1078 b/tests/data/test1078
index 35254239e..6f303d0bc 100644
--- a/tests/data/test1078
+++ b/tests/data/test1078
@@ -43,7 +43,7 @@ http-proxy
 HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
  </name>
  <command>
---proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078 http://%HOSTIP.1078:%HTTPPORT/we/want/that/page/1078
+--proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -54,20 +54,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.1078:%HTTPPORT HTTP/1.0
-Host: %HOSTIP.1078:%HTTPPORT
+CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.0
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/1078 HTTP/1.1
-Host: %HOSTIP.1078:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/want/that/page/1078 HTTP/1.0
-Host: %HOSTIP.1078:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.0
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1079 b/tests/data/test1079
index 460439d53..361c4bd0d 100644
--- a/tests/data/test1079
+++ b/tests/data/test1079
@@ -49,7 +49,7 @@ crypto
 HTTP retry after closed connection and empty response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
@@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
 52
 </errorcode>
 <protocol>
-GET /1079 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1079 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1079", response="e340c7cdca0950462070f46ee139e9f7"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="e340c7cdca0950462070f46ee139e9f7"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test108 b/tests/data/test108
index eb2ea63c1..6f6e3c83c 100644
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -21,9 +21,9 @@ ftp
 FTP PORT upload with CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T log/upload108 -P -
+ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P -
 </command>
-<file name="log/upload108">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -45,7 +45,7 @@ CWD STOR
 CWD RETR
 PORT 127,0,0,1,5,109
 TYPE I
-STOR 108
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test1080 b/tests/data/test1080
index 9fa48576d..bc7249a93 100644
--- a/tests/data/test1080
+++ b/tests/data/test1080
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10800002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 
@@ -30,19 +30,19 @@ http
 HTTP Location: on two URLs 'redirect_url' check
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1080 http://%HOSTIP:%HTTPPORT/we/want/our/1080 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1080 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/want/our/1080 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -50,19 +50,19 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10800002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10800002.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10800002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10800002.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
 </stdout>
 </verify>
 </testcase>
diff --git a/tests/data/test1081 b/tests/data/test1081
index 0aaf751a6..9f5a192e7 100644
--- a/tests/data/test1081
+++ b/tests/data/test1081
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data nocheck="yes">
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10810099.txt?coolsite=yes
+Location: data/%TESTNUMBER0099.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 
@@ -38,19 +38,19 @@ http
 HTTP no Location: on second URL 'redirect_url' check
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1081 http://%HOSTIP:%HTTPPORT/we/want/our/10810002 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER0002 -w '%{redirect_url}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1081 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/want/our/10810002 HTTP/1.1
+GET /we/want/our/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -58,12 +58,12 @@ Accept: */*
 </protocol>
 <stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
-Location: data/10810099.txt?coolsite=yes
+Location: data/%TESTNUMBER0099.txt?coolsite=yes
 Content-Length: 62
 Connection: close
 
 This server reply is for testing a simple Location: following
-http://%HOSTIP:%HTTPPORT/we/want/our/data/10810099.txt?coolsite=yes
+http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0099.txt?coolsite=yes
 HTTP/1.1 200 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test1082 b/tests/data/test1082
index 6791a6b10..3ee436bf0 100644
--- a/tests/data/test1082
+++ b/tests/data/test1082
@@ -32,7 +32,7 @@ http
 HTTP GET with localhost --interface
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1082 -4 --interface localhost
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface localhost
 </command>
 <precheck>
 perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP' ne '127.0.0.1' );"
@@ -43,7 +43,7 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1082 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1083 b/tests/data/test1083
index 89beea0fc..d7713b1cf 100644
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -36,7 +36,7 @@ http-ipv6
 HTTP-IPv6 GET with ip6-localhost --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ip6-localhost
 </command>
 <precheck>
 perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
@@ -47,7 +47,7 @@ perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1083 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1084 b/tests/data/test1084
index db6ab5e94..7a6292b88 100644
--- a/tests/data/test1084
+++ b/tests/data/test1084
@@ -27,7 +27,7 @@ none
 HTTP GET with invalid --interface
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1084 --interface non-existing-host.haxx.se.
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --interface non-existing-host.haxx.se.
 </command>
 </client>
 
diff --git a/tests/data/test1085 b/tests/data/test1085
index ac1f0629c..582fdb085 100644
--- a/tests/data/test1085
+++ b/tests/data/test1085
@@ -29,7 +29,7 @@ none
 HTTP-IPv6 GET with invalid --interface
  </name>
  <command>
--g "http://%HOST6IP:%NOLISTENPORT/1085" --interface non-existing-host.haxx.se.
+-g "http://%HOST6IP:%NOLISTENPORT/%TESTNUMBER" --interface non-existing-host.haxx.se.
 </command>
 # Ensure the IPv6 stack is operational before running this test (other tests
 # use the startup of the IPv6 test server as a substitute check for this).
diff --git a/tests/data/test1086 b/tests/data/test1086
index 354b2e09a..f081ebddb 100644
--- a/tests/data/test1086
+++ b/tests/data/test1086
@@ -87,7 +87,7 @@ ftp
 FTP download with strict timeout and slow data transfer
  </name>
  <command timeout="1">
-ftp://%HOSTIP:%FTPPORT/1086 -m 7
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 7
 </command>
 </client>
 
@@ -103,8 +103,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1086
-RETR 1086
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1087 b/tests/data/test1087
index 5e91fb2a5..b084c9b64 100644
--- a/tests/data/test1087
+++ b/tests/data/test1087
@@ -26,7 +26,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10871002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
 
@@ -53,7 +53,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10871002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
 
@@ -78,7 +78,7 @@ http
 HTTP, proxy with --anyauth and Location: to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/10871000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
+http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth
 </command>
 <features>
 proxy
@@ -89,20 +89,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://goto.second.host.now/10871002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
 Host: goto.second.host.now
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1088 b/tests/data/test1088
index 0a1a6656a..9f12f25ab 100644
--- a/tests/data/test1088
+++ b/tests/data/test1088
@@ -27,7 +27,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10881002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
 
@@ -54,7 +54,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/plain
 Funny-head: yesyes
-Location: http://goto.second.host.now/10881002
+Location: http://goto.second.host.now/%TESTNUMBER1002
 Content-Length: 0
 Connection: close
 
@@ -79,7 +79,7 @@ http
 HTTP, proxy with --anyauth and Location: to new host using location-trusted
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/10881000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
+http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth
 </command>
 <features>
 proxy
@@ -90,20 +90,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://goto.second.host.now/10881002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
 Host: goto.second.host.now
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1089 b/tests/data/test1089
index 56415a7da..c8c5307aa 100644
--- a/tests/data/test1089
+++ b/tests/data/test1089
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10890001
+Location: ./%TESTNUMBER0001
 
 monster
 </data>
@@ -43,7 +43,7 @@ http
 HTTP GET --write-out with redirected fetch
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -51,12 +51,12 @@ http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1089 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /10890001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -69,7 +69,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10890001
+Location: ./%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -81,7 +81,7 @@ bigger monster
 2
 1
 15
-http://%HOSTIP:%HTTPPORT/10890001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
diff --git a/tests/data/test109 b/tests/data/test109
index c027885b1..739e90b1c 100644
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -21,9 +21,9 @@ ftp
 FTP PASV upload append
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/109 -T log/upload109 --append
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --append
 </command>
-<file name="log/upload109">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -37,7 +37,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-APPE 109
+APPE %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test1090 b/tests/data/test1090
index f30538d24..0551519fb 100644
--- a/tests/data/test1090
+++ b/tests/data/test1090
@@ -18,7 +18,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10900001
+Location: ./%TESTNUMBER0001
 
 monster
 </data>
@@ -50,7 +50,7 @@ http
 HTTP GET --write-out with redirected fetch and chunked reply
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -58,12 +58,12 @@ http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1090 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /10900001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -76,7 +76,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./10900001
+Location: ./%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -88,7 +88,7 @@ bigger monster
 2
 1
 15
-http://%HOSTIP:%HTTPPORT/10900001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
diff --git a/tests/data/test1091 b/tests/data/test1091
index 24669334b..788f2dc27 100644
--- a/tests/data/test1091
+++ b/tests/data/test1091
@@ -24,7 +24,7 @@ ftp
 FTP URL with type=i
  </name>
  <command>
-"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/1091;type=i" --use-ascii
+"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=i" --use-ascii
 </command>
 </client>
 
@@ -39,8 +39,8 @@ CWD tmp
 CWD moo
 EPSV
 TYPE I
-SIZE 1091
-RETR 1091
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1092 b/tests/data/test1092
index b0cdc0d69..1c3c4696f 100644
--- a/tests/data/test1092
+++ b/tests/data/test1092
@@ -36,7 +36,7 @@ proxy
 FTP with type=i over HTTP proxy
  </name>
  <command>
-"ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i" --use-ascii -x %HOSTIP:%HTTPPORT
+"ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i" --use-ascii -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -44,7 +44,7 @@ FTP with type=i over HTTP proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i HTTP/1.1
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1093 b/tests/data/test1093
index da2d83cd4..5e1484d16 100644
--- a/tests/data/test1093
+++ b/tests/data/test1093
@@ -28,7 +28,7 @@ tftp
 TFTP retrieve with mode=i
  </name>
  <command>
-"tftp://%HOSTIP:%TFTPPORT//1093;mode=i" --use-ascii
+"tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=i" --use-ascii
 </command>
 </client>
 
@@ -41,7 +41,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1093
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1094 b/tests/data/test1094
index c7b09caae..3ed53f281 100644
--- a/tests/data/test1094
+++ b/tests/data/test1094
@@ -34,7 +34,7 @@ tftp
 TFTP retrieve with mode=netascii
  </name>
  <command>
-"tftp://%HOSTIP:%TFTPPORT//1094;mode=netascii"
+"tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=netascii"
 </command>
 </client>
 
@@ -47,7 +47,7 @@ mode: netascii
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1094
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1095 b/tests/data/test1095
index 3e562b037..efb8413b2 100644
--- a/tests/data/test1095
+++ b/tests/data/test1095
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest and realm with quoted quotes
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1095 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1095 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1095 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/1095", response="a1c7931ece9e8617bae2715045e4f49f"
+Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/%TESTNUMBER", response="a1c7931ece9e8617bae2715045e4f49f"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1096 b/tests/data/test1096
index a6c32c3a1..2eb9d1f9f 100644
--- a/tests/data/test1096
+++ b/tests/data/test1096
@@ -24,7 +24,7 @@ ftp
 Two FTP downloads, with failed RETR but re-used control connection
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/dir/1096 ftp://%HOSTIP:%FTPPORT/dir/1096
+ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER
 </command>
 </client>
 
@@ -40,11 +40,11 @@ PWD
 CWD dir
 EPSV
 TYPE I
-SIZE 1096
-RETR 1096
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 1096
-RETR 1096
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1097 b/tests/data/test1097
index 218d57bbe..5a73e89b4 100644
--- a/tests/data/test1097
+++ b/tests/data/test1097
@@ -53,21 +53,21 @@ proxy
 HTTP POST using CONNECT with --proxy-ntlm but no auth is required
  </name>
  <command>
-http://test.a.galaxy.far.far.away.1097:%HTTPPORT/1097 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p
+http://test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-CONNECT test.a.galaxy.far.far.away.1097:%HTTPPORT HTTP/1.1
-Host: test.a.galaxy.far.far.away.1097:%HTTPPORT
+CONNECT test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-POST /1097 HTTP/1.1
-Host: test.a.galaxy.far.far.away.1097:%HTTPPORT
+POST /%TESTNUMBER HTTP/1.1
+Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
diff --git a/tests/data/test1098 b/tests/data/test1098
index 4dfeea8ea..8e31c32b6 100644
--- a/tests/data/test1098
+++ b/tests/data/test1098
@@ -36,7 +36,7 @@ FTP RETR twice over proxy confirming persistent connection
  </name>
 
  <command>
-ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT
+ftp://ftp-site/moo/%TESTNUMBER ftp://ftp-site/moo/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -44,13 +44,13 @@ ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://ftp-site/moo/1098 HTTP/1.1
+GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1
 Host: ftp-site:21
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET ftp://ftp-site/moo/1098 HTTP/1.1
+GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1
 Host: ftp-site:21
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1099 b/tests/data/test1099
index 4a33189ec..f2fa2f28b 100644
--- a/tests/data/test1099
+++ b/tests/data/test1099
@@ -9,7 +9,7 @@ FAILURE
 
 <reply>
 <data nocheck="yes">
-data for 1099
+data for %TESTNUMBER
 </data>
 </reply>
 
@@ -23,7 +23,7 @@ tftp
 TFTP get first a non-existing file then an existing
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//1099
+tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>
 
@@ -42,10 +42,10 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1099
+filename: /%TESTNUMBER
 </protocol>
 <stdout>
-data for 1099
+data for %TESTNUMBER
 </stdout>
 </verify>
 </testcase>
diff --git a/tests/data/test11 b/tests/data/test11
index 0ae1de420..89844ea14 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/110002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 simple HTTP Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/11 -L
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/11 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/data/110002.txt?coolsite=yes HTTP/1.1
+GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test110 b/tests/data/test110
index b63ba8a2d..6c892ed2a 100644
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -30,7 +30,7 @@ ftp
 FTP download resume with set limit
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/110 -C 20
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20
 </command>
 </client>
 
@@ -43,9 +43,9 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 110
+SIZE %TESTNUMBER
 REST 20
-RETR 110
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1100 b/tests/data/test1100
index 5bb807200..78c005cf6 100644
--- a/tests/data/test1100
+++ b/tests/data/test1100
@@ -32,7 +32,7 @@ This is not the real page either!
 HTTP/1.1 302 Thanks for this, but we want to redir you!
 Server: Microsoft-IIS/5.0
 Content-Type: text/html; charset=iso-8859-1
-Location: /1100
+Location: /%TESTNUMBER
 Content-Length: 34
 
 This is not the real page either!
@@ -48,7 +48,7 @@ WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4Ab
 HTTP/1.1 302 Thanks for this, but we want to redir you!
 Server: Microsoft-IIS/5.0
 Content-Type: text/html; charset=iso-8859-1
-Location: /1100
+Location: /%TESTNUMBER
 Content-Length: 34
 
 HTTP/1.1 200 Thanks for this! swsclose
@@ -80,7 +80,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/1100 -u testuser:testpass --ntlm -L -d "stuff to send away" 
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L -d "stuff to send away" 
 </command>
 <precheck>
 chkhostname curlhost
@@ -89,7 +89,7 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-POST /1100 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
@@ -97,7 +97,7 @@ Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /1100 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
@@ -105,7 +105,7 @@ Accept: */*
 Content-Length: 18
 Content-Type: application/x-www-form-urlencoded
 
-stuff to send awayGET /1100 HTTP/1.1
+stuff to send awayGET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1101 b/tests/data/test1101
index 145e38ef5..f7e504f91 100644
--- a/tests/data/test1101
+++ b/tests/data/test1101
@@ -34,14 +34,14 @@ no_proxy=%HOSTIP
 http_proxy=http://non-existing-host.haxx.se:3128/
 </setenv>
  <command>
-http://user:secret@%HOSTIP:%HTTPPORT/gimme/1101
+http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /gimme/1101 HTTP/1.1
+GET /gimme/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpzZWNyZXQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1102 b/tests/data/test1102
index addc7b572..c2fd03438 100644
--- a/tests/data/test1102
+++ b/tests/data/test1102
@@ -28,7 +28,7 @@ ftp
 FTP OS/400 server name format check
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1102
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,8 +43,8 @@ SITE NAMEFMT 1
 PWD
 EPSV
 TYPE I
-SIZE 1102
-RETR 1102
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1103 b/tests/data/test1103
index 4d45056d5..4624c9d21 100644
--- a/tests/data/test1103
+++ b/tests/data/test1103
@@ -27,7 +27,7 @@ ftp
 FTP non-OS/400 server
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1103
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PWD
 SYST
 EPSV
 TYPE I
-SIZE 1103
-RETR 1103
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1104 b/tests/data/test1104
index 33d8542e4..27c43009e 100644
--- a/tests/data/test1104
+++ b/tests/data/test1104
@@ -13,7 +13,7 @@ cookies
 <data>
 HTTP/1.1 301 Moved
 Date: Tue, 09 Nov 2010 14:49:00 GMT
-Location: /want/data/11040002
+Location: /want/data/%TESTNUMBER0002
 Server: test-server/fake
 Set-Cookie: test=true; domain=127.0.0.1; path=/; expires=Thu Jan  1 00:00:00 GMT 1970;
 Set-Cookie: test2=true; domain=127.0.0.1; path=/; expires=Fri Feb 13 11:56:27 GMT 2037;
@@ -34,7 +34,7 @@ If this is received, the location following worked
 <datacheck>
 HTTP/1.1 301 Moved
 Date: Tue, 09 Nov 2010 14:49:00 GMT
-Location: /want/data/11040002
+Location: /want/data/%TESTNUMBER0002
 Server: test-server/fake
 Set-Cookie: test=true; domain=127.0.0.1; path=/; expires=Thu Jan  1 00:00:00 GMT 1970;
 Set-Cookie: test2=true; domain=127.0.0.1; path=/; expires=Fri Feb 13 11:56:27 GMT 2037;
@@ -59,7 +59,7 @@ http
 HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1104 -L -x %HOSTIP:%HTTPPORT -c log/cookies1104.jar
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT -c log/cookies%TESTNUMBER.jar
 </command>
 <features>
 proxy
@@ -69,13 +69,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/1104 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://%HOSTIP:%HTTPPORT/want/data/11040002 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1105 b/tests/data/test1105
index 771ef3a78..a06a05173 100644
--- a/tests/data/test1105
+++ b/tests/data/test1105
@@ -32,7 +32,7 @@ http
 HTTP with cookie parser and header recording
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT/we/want/1105?parm1=this*that/other/thing&parm2=foobar/1105" -c log/cookie1105.txt -d "userid=myname&password=mypassword"
+"http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER" -c log/cookie%TESTNUMBER.txt -d "userid=myname&password=mypassword"
 </command>
 <precheck>
 perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
@@ -42,7 +42,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /we/want/1105?parm1=this*that/other/thing&parm2=foobar/1105 HTTP/1.1
+POST /we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -51,7 +51,7 @@ Content-Type: application/x-www-form-urlencoded
 
 userid=myname&password=mypassword
 </protocol>
-<file name="log/cookie1105.txt" mode="text">
+<file name="log/cookie%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1106 b/tests/data/test1106
index 14adae45f..f6e589302 100644
--- a/tests/data/test1106
+++ b/tests/data/test1106
@@ -37,7 +37,7 @@ FTP URL and with ftp_proxy environment variable set
 ftp_proxy=http://%HOSTIP:%HTTPPORT/
 </setenv>
  <command>
-ftp://%HOSTIP:23456/1106
+ftp://%HOSTIP:23456/%TESTNUMBER
 </command>
 
 </client>
@@ -45,7 +45,7 @@ ftp://%HOSTIP:23456/1106
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:23456/1106 HTTP/1.1
+GET ftp://%HOSTIP:23456/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:23456
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1107 b/tests/data/test1107
index 6adc6360c..4946e8937 100644
--- a/tests/data/test1107
+++ b/tests/data/test1107
@@ -31,7 +31,7 @@ ftp
 FTP RETR PASV with PRET
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1107 --ftp-pret
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 </command>
 
 </client>
@@ -42,11 +42,11 @@ ftp://%HOSTIP:%FTPPORT/1107 --ftp-pret
 USER anonymous
 PASS ftp@example.com
 PWD
-PRET RETR 1107
+PRET RETR %TESTNUMBER
 EPSV
 TYPE I
-SIZE 1107
-RETR 1107
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1108 b/tests/data/test1108
index f83eb9570..3667b118b 100644
--- a/tests/data/test1108
+++ b/tests/data/test1108
@@ -24,7 +24,7 @@ ftp
 FTP RETR PASV with PRET not supported
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1108 --ftp-pret
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret
 </command>
 
 </client>
@@ -35,7 +35,7 @@ ftp://%HOSTIP:%FTPPORT/1108 --ftp-pret
 USER anonymous
 PASS ftp@example.com
 PWD
-PRET RETR 1108
+PRET RETR %TESTNUMBER
 </protocol>
 # we expect that the server doesn't understand PRET
 <errorcode>
diff --git a/tests/data/test1109 b/tests/data/test1109
index e504ce9da..eb209a5d6 100644
--- a/tests/data/test1109
+++ b/tests/data/test1109
@@ -26,7 +26,7 @@ http
 HTTP GET with URL that contains fragment after the path
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1109#test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER#test
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1109#test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1109 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test111 b/tests/data/test111
index bcaa55425..25df3aee5 100644
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -23,7 +23,7 @@ ftp
 FTP download resume beyond file size
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/111 -C 2000
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000
 </command>
 </client>
 
@@ -38,7 +38,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 111
+SIZE %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1110 b/tests/data/test1110
index 50bd4d20c..a363fef9c 100644
--- a/tests/data/test1110
+++ b/tests/data/test1110
@@ -27,7 +27,7 @@ http
 HTTP GET with URL that contains a fragment after the query part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1110?q=foobar#fragment
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment
 </command>
 </client>
 
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/1110?q=foobar#fragment
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1110?q=foobar HTTP/1.1
+GET /%TESTNUMBER?q=foobar HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1111 b/tests/data/test1111
index 1ba21bffd..1e9203a45 100644
--- a/tests/data/test1111
+++ b/tests/data/test1111
@@ -27,7 +27,7 @@ http
 HTTP GET with URL whose fragment contains a # (which is illegal)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1111?q=foobar#fragment#fragment2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment#fragment2
 </command>
 </client>
 
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/1111?q=foobar#fragment#fragment2
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1111?q=foobar HTTP/1.1
+GET /%TESTNUMBER?q=foobar HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1112 b/tests/data/test1112
index 849f671c8..b918c7310 100644
--- a/tests/data/test1112
+++ b/tests/data/test1112
@@ -89,7 +89,7 @@ ftps
 FTPS download with strict timeout and slow data transfer
  </name>
  <command timeout="1">
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/1112 -m 16
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 16
 </command>
 </client>
 
@@ -107,8 +107,8 @@ PROT C
 PWD
 EPSV
 TYPE I
-SIZE 1112
-RETR 1112
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1115 b/tests/data/test1115
index 0b1f034ee..315fce3fc 100644
--- a/tests/data/test1115
+++ b/tests/data/test1115
@@ -33,14 +33,14 @@ http
 HTTP GET with unexpected 1xx response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1115
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1115 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1116 b/tests/data/test1116
index ce5305d79..2542b41f5 100644
--- a/tests/data/test1116
+++ b/tests/data/test1116
@@ -49,7 +49,7 @@ http
 HTTP GET with chunked trailer without Trailer:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1116 -D log/heads1116
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/1116 -D log/heads1116
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1116 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/heads1116">
+<file name="log/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!
 Server: fakeit/0.9 fakeitbad/1.0
 Transfer-Encoding: chunked
diff --git a/tests/data/test1117 b/tests/data/test1117
index 6bd323f07..50466aa32 100644
--- a/tests/data/test1117
+++ b/tests/data/test1117
@@ -44,7 +44,7 @@ http
 HTTP with invalid range then another URL
  </name>
  <command>
--r 10-22 http://%HOSTIP:%HTTPPORT/want/1117 http://%HOSTIP:%HTTPPORT/wantmore/11170001
+-r 10-22 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>
 
@@ -69,13 +69,13 @@ partial body
 </stdout>
 
 <protocol>
-GET /want/1117 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=10-22
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /wantmore/11170001 HTTP/1.1
+GET /wantmore/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=10-22
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1118 b/tests/data/test1118
index 052adb163..9024e0864 100644
--- a/tests/data/test1118
+++ b/tests/data/test1118
@@ -35,7 +35,7 @@ http
 URL without slash and @-letter in query
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT?email=name@example.com/1118
+http://%HOSTIP:%HTTPPORT?email=name@example.com/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT?email=name@example.com/1118
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?email=name@example.com/1118 HTTP/1.1
+GET /?email=name@example.com/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test112 b/tests/data/test112
index eb3400c57..6d23c4457 100644
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -20,9 +20,9 @@ ftp
 FTP PASV upload resume
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/112 -T log/upload112 -C 40
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 40
 </command>
-<file name="log/upload112">
+<file name="log/upload%TESTNUMBER">
 this is the *****crap******** that we're gonna upload
 
 worx?
@@ -37,7 +37,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-APPE 112
+APPE %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test1120 b/tests/data/test1120
index 4ea204258..c7cd27568 100644
--- a/tests/data/test1120
+++ b/tests/data/test1120
@@ -23,7 +23,7 @@ ftp
 FTP with 421 timeout response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/1120
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1121 b/tests/data/test1121
index 839c55364..823a52e7a 100644
--- a/tests/data/test1121
+++ b/tests/data/test1121
@@ -27,7 +27,7 @@ http
 HTTP multiple provided Host: headers
  </name>
  <command>
--H "Host: host1" -H "Host: host2" -H "Host: host3" http://%HOSTIP:%HTTPPORT/1121
+-H "Host: host1" -H "Host: host2" -H "Host: host3" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -35,7 +35,7 @@ HTTP multiple provided Host: headers
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1121 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: host1
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1122 b/tests/data/test1122
index d5b51a2cf..8f2fd870a 100644
--- a/tests/data/test1122
+++ b/tests/data/test1122
@@ -48,7 +48,7 @@ http
 HTTP GET gzip transfer-encoded content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1122 --tr-encoding
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1122 --tr-encoding
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1122 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1123 b/tests/data/test1123
index 841a326ad..5ee840094 100644
--- a/tests/data/test1123
+++ b/tests/data/test1123
@@ -179,7 +179,7 @@ http
 HTTP GET deflate transfer-encoded content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1123 --tr-encoding
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>
 
@@ -187,7 +187,7 @@ http://%HOSTIP:%HTTPPORT/1123 --tr-encoding
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1123 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1124 b/tests/data/test1124
index 61c5cfb6c..fc3c9cf69 100644
--- a/tests/data/test1124
+++ b/tests/data/test1124
@@ -47,7 +47,7 @@ http
 HTTP GET gzip+chunked transfer-encoded content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1124 --tr-encoding
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/1124 --tr-encoding
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1124 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1125 b/tests/data/test1125
index 51e3db783..1bb306bbe 100644
--- a/tests/data/test1125
+++ b/tests/data/test1125
@@ -48,7 +48,7 @@ http
 HTTP GET transfer-encoding with custom Connection:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1125 --tr-encoding -H "Connection: close"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close"
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1125 --tr-encoding -H "Connection: close"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1125 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1126 b/tests/data/test1126
index ad8e6e08c..d45f40dad 100644
--- a/tests/data/test1126
+++ b/tests/data/test1126
@@ -31,7 +31,7 @@ http
 HTTP 200 If-Modified-Since with newer document
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1126 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/1126 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1126 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1127 b/tests/data/test1127
index 71bdfa168..968f80bf1 100644
--- a/tests/data/test1127
+++ b/tests/data/test1127
@@ -40,7 +40,7 @@ http
 HTTP 200 If-Modified-Since with older document
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1127 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/1127 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1127 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1128 b/tests/data/test1128
index d8a655723..193ee40da 100644
--- a/tests/data/test1128
+++ b/tests/data/test1128
@@ -41,7 +41,7 @@ http
 HTTP 200 If-Modified-Since with old+new documents
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1128 http://%HOSTIP:%HTTPPORT/11280001 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -49,13 +49,13 @@ http://%HOSTIP:%HTTPPORT/1128 http://%HOSTIP:%HTTPPORT/11280001 -z "dec 12 12:00
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1128 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
 
-GET /11280001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1129 b/tests/data/test1129
index ec69e1e0f..df4a9b0f9 100644
--- a/tests/data/test1129
+++ b/tests/data/test1129
@@ -41,7 +41,7 @@ skip: 1053700
 # Client-side
 <client>
 # 1053700 x 'x'
-<file name="log/file1129">
+<file name="log/file%TESTNUMBER">
 %repeat[1053700 x x]%
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP POST expect 100-continue with a 404
  </name>
  <command option="no-output">
--d @log/file1129 http://%HOSTIP:%HTTPPORT/1129 http://%HOSTIP:%HTTPPORT/11290001
+-d @log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -75,7 +75,7 @@ Content-Type: text/html
 -foo-
 </stdout>
 <protocol>
-POST /1129 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -83,7 +83,7 @@ Content-Length: 1053700
 Content-Type: application/x-www-form-urlencoded
 Expect: 100-continue
 
-POST /11290001 HTTP/1.1
+POST /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test113 b/tests/data/test113
index 0046297cf..8264a6f2d 100644
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -21,7 +21,7 @@ ftp
 FTP download, failed login: USER not valid
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/113
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1130 b/tests/data/test1130
index 0af591aaa..50ebeddc8 100644
--- a/tests/data/test1130
+++ b/tests/data/test1130
@@ -41,7 +41,7 @@ skip: 100
 # Client-side
 <client>
 # 100 x 'x'
-<file name="log/file1130">
+<file name="log/file%TESTNUMBER">
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP POST forced expect 100-continue with a 404
  </name>
  <command option="no-output">
--d @log/file1130 http://%HOSTIP:%HTTPPORT/1130 http://%HOSTIP:%HTTPPORT/11300001 -H "Expect: 100-continue"
+-d @log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue"
 </command>
 </client>
 
@@ -75,7 +75,7 @@ Content-Type: text/html
 -foo-
 </stdout>
 <protocol>
-POST /1130 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -83,7 +83,7 @@ Expect: 100-continue
 Content-Length: 100
 Content-Type: application/x-www-form-urlencoded
 
-POST /11300001 HTTP/1.1
+POST /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1131 b/tests/data/test1131
index 920dfe1b7..8ead289c5 100644
--- a/tests/data/test1131
+++ b/tests/data/test1131
@@ -41,7 +41,7 @@ skip: 100
 # Client-side
 <client>
 # 100 x 'x'
-<file name="log/file1131">
+<file name="log/file%TESTNUMBER">
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP PUT expect 100-continue with a 400
  </name>
  <command option="no-output">
--T log/file1131 http://%HOSTIP:%HTTPPORT/1131 -T log/file1131 http://%HOSTIP:%HTTPPORT/11310001
+-T log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -75,14 +75,14 @@ Content-Type: text/html
 FAILURE2
 </stdout>
 <protocol>
-PUT /1131 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 100
 Expect: 100-continue
 
-PUT /11310001 HTTP/1.1
+PUT /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1133 b/tests/data/test1133
index 6a088c084..cd15f549f 100644
--- a/tests/data/test1133
+++ b/tests/data/test1133
@@ -26,10 +26,10 @@ http
 HTTP RFC1867-type formposting with filename/data contains ',', ';', '"'
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1133 -F "file=@\"log/test1133,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test1133,and;.txt"' -F 'file3=@"log/test1133,and;.txt";type=m/f,"log/test1133,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"log/test%TESTNUMBER,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test%TESTNUMBER,and;.txt"' -F 'file3=@"log/test%TESTNUMBER,and;.txt";type=m/f,"log/test%TESTNUMBER,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1133,and;.txt">
+<file name="log/test%TESTNUMBER,and;.txt">
 foo bar
 This is a bar foo
 bar
@@ -43,7 +43,7 @@ foo
 ^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
 </strip>
 <protocol>
-POST /we/want/1133 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -60,7 +60,7 @@ bar
 foo
 
 ------------------------------24e78000bd32
-Content-Disposition: form-data; name="file2"; filename="test1133,and;.txt"
+Content-Disposition: form-data; name="file2"; filename="test%TESTNUMBER,and;.txt"
 Content-Type: text/plain
 
 foo bar
@@ -72,7 +72,7 @@ foo
 Content-Disposition: form-data; name="file3"
 Content-Type: multipart/mixed; boundary=----------------------------7f0e85a48b0b
 
-Content-Disposition: attachment; filename="test1133,and;.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER,and;.txt"
 Content-Type: m/f
 
 foo bar
@@ -80,7 +80,7 @@ This is a bar foo
 bar
 foo
 
-Content-Disposition: attachment; filename="test1133,and;.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER,and;.txt"
 Content-Type: text/plain
 
 foo bar
diff --git a/tests/data/test1134 b/tests/data/test1134
index 5e7c4602e..01ceba1f6 100644
--- a/tests/data/test1134
+++ b/tests/data/test1134
@@ -38,7 +38,7 @@ http
 HTTP connection re-use with different credentials
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1134 -u user1:password1 --next http://%HOSTIP:%HTTPPORT/11340001 -u 2user:password2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user1:password1 --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u 2user:password2
 </command>
 </client>
 
@@ -46,13 +46,13 @@ http://%HOSTIP:%HTTPPORT/1134 -u user1:password1 --next http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1134 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjE6cGFzc3dvcmQx
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /11340001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic MnVzZXI6cGFzc3dvcmQy
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1136 b/tests/data/test1136
index 1dfa8d349..1ce533622 100644
--- a/tests/data/test1136
+++ b/tests/data/test1136
@@ -45,14 +45,14 @@ Check cookies against PSL
 TZ=GMT
 </setenv>
 <command>
-http://www.example.ck/1136 http://www.ck/1136 http://z-1.compute-1.amazonaws.com/1136 -b none -c log/jar1136.txt -x %HOSTIP:%HTTPPORT
+http://www.example.ck/%TESTNUMBER http://www.ck/%TESTNUMBER http://z-1.compute-1.amazonaws.com/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT
 </command>
 
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/jar1136.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1137 b/tests/data/test1137
index a2bfcbac1..aa37325a7 100644
--- a/tests/data/test1137
+++ b/tests/data/test1137
@@ -31,7 +31,7 @@ ftp
 FTP RETR --ignore-content-length
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1137 --ignore-content-length
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length
 </command>
 
 </client>
@@ -45,7 +45,7 @@ PWD
 EPSV
 PASV
 TYPE I
-RETR 1137
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1138 b/tests/data/test1138
index 729536be0..6c5f00d0d 100644
--- a/tests/data/test1138
+++ b/tests/data/test1138
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/11380002    
+Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/%TESTNUMBER0002    
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/11380002    
+Location: ../moo.html/?name=آغاز-سم-زدایی-از-بازار-پول&testcase=/%TESTNUMBER0002    
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP redirect with UTF-8 characters
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/1138 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1138 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/1138 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/are/all/moo.html/?name=%d8%a2%d8%ba%d8%a7%d8%b2-%d8%b3%d9%85-%d8%b2%d8%af%d8%a7%db%8c%db%8c-%d8%a7%d8%b2-%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1-%d9%be%d9%88%d9%84&testcase=/11380002 HTTP/1.1
+GET /we/are/all/moo.html/?name=%d8%a2%d8%ba%d8%a7%d8%b2-%d8%b3%d9%85-%d8%b2%d8%af%d8%a7%db%8c%db%8c-%d8%a7%d8%b2-%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1-%d9%be%d9%88%d9%84&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test114 b/tests/data/test114
index 6611aedeb..8d8cc86b1 100644
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -21,7 +21,7 @@ ftp
 FTP download, failed login: PASS not valid
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/114
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1141 b/tests/data/test1141
index 063d3b284..97faec45c 100644
--- a/tests/data/test1141
+++ b/tests/data/test1141
@@ -12,7 +12,7 @@ followlocation
 <data>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:///foo.example.com/want/11410001
+Location: http:///foo.example.com/want/%TESTNUMBER0001
 
 This server reply is for testing
 </data>
@@ -26,7 +26,7 @@ hej
 <datacheck>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:///foo.example.com/want/11410001
+Location: http:///foo.example.com/want/%TESTNUMBER0001
 
 HTTP/1.1 200 hello
 Connection: close
@@ -45,7 +45,7 @@ http
 HTTP redirect to http:/// (three slashes!)
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/1141 -L -x http://%HOSTIP:%HTTPPORT
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -55,13 +55,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/1141 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://foo.example.com/want/11410001 HTTP/1.1
+GET http://foo.example.com/want/%TESTNUMBER0001 HTTP/1.1
 Host: foo.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1142 b/tests/data/test1142
index 3577ac468..b8dc33e47 100644
--- a/tests/data/test1142
+++ b/tests/data/test1142
@@ -12,7 +12,7 @@ followlocation
 <data>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:////foo.example.com/want/11420001
+Location: http:////foo.example.com/want/%TESTNUMBER0001
 
 This server reply is for testing
 </data>
@@ -26,7 +26,7 @@ hej
 <datacheck>
 HTTP/1.1 302 This is a weirdo text message
 Connection: close
-Location: http:////foo.example.com/want/11420001
+Location: http:////foo.example.com/want/%TESTNUMBER0001
 
 </datacheck>
 </reply>
@@ -40,7 +40,7 @@ http
 HTTP redirect to http://// (four slashes!)
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/1142 -L -x http://%HOSTIP:%HTTPPORT
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -50,7 +50,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/1142 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1143 b/tests/data/test1143
index 8239c444f..a3b97402e 100644
--- a/tests/data/test1143
+++ b/tests/data/test1143
@@ -26,7 +26,7 @@ http
 HTTP URL with http:/ (one slash!)
  </name>
  <command>
-http:/%HOSTIP:%HTTPPORT/want/1143
+http:/%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 <setenv>
 # Needed for MSYS2 to not treat the argument as a POSIX path list
@@ -38,7 +38,7 @@ MSYS2_ARG_CONV_EXCL=http:/
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1143 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1144 b/tests/data/test1144
index 588355569..1fc852b22 100644
--- a/tests/data/test1144
+++ b/tests/data/test1144
@@ -47,7 +47,7 @@ http
 HTTP HEAD, receive no headers only body
  </name>
  <command>
--I http://%HOSTIP:%HTTPPORT/1144 --http0.9
+-I http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -55,7 +55,7 @@ HTTP HEAD, receive no headers only body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /1144 HTTP/1.1
+HEAD /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1145 b/tests/data/test1145
index 287bebfcc..ce855524f 100644
--- a/tests/data/test1145
+++ b/tests/data/test1145
@@ -19,9 +19,9 @@ file:// bad host
 # This command should not succeed since we only accept
 # file:/// file://localhost/ file://127.0.0.1/
 <command>
-file://bad-host%PWD/log/test1145.txt
+file://bad-host%PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1145.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
diff --git a/tests/data/test1146 b/tests/data/test1146
index 636748ee5..0278ab895 100644
--- a/tests/data/test1146
+++ b/tests/data/test1146
@@ -25,9 +25,9 @@ file
 --proto-default file
 </name>
 <command option="no-include">
---proto-default file %PWD/log/test1146.txt
+--proto-default file %PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test1146.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
diff --git a/tests/data/test1147 b/tests/data/test1147
index 831197487..ea1ae00e4 100644
--- a/tests/data/test1147
+++ b/tests/data/test1147
@@ -35,7 +35,7 @@ http
  <name>
 Get -H headers from a file
  </name>
-<file name="log/heads1147.txt">
+<file name="log/heads%TESTNUMBER.txt">
 One: 1
 Two: 2
 no-colon
@@ -44,7 +44,7 @@ no-colon
 User-Agent:
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/1147 -H @log/heads1147.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/1147 -H @log/heads1147.txt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1147 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 One: 1
diff --git a/tests/data/test1148 b/tests/data/test1148
index 14c688528..658cfcab8 100644
--- a/tests/data/test1148
+++ b/tests/data/test1148
@@ -35,7 +35,7 @@ http
 progress-bar
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1148 -# --stderr log/stderrlog1148
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr log/stderrlog%TESTNUMBER
 </command>
 <setenv>
 LC_ALL=
@@ -46,7 +46,7 @@ LC_NUMERIC=en_US.UTF-8
 #
 <verify>
 <protocol>
-GET /1148 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -56,7 +56,7 @@ Accept: */*
 # Check that the progress finished at 100% and has the right bar width.
 # Note the dot in 100.0% is regex to match any character since different
 # locales use different separators.
-<file name="log/stderrlog1148" mode="text">
+<file name="log/stderrlog%TESTNUMBER" mode="text">
 correct
 </file>
 <stripfile>
diff --git a/tests/data/test1149 b/tests/data/test1149
index f0c297dc1..ac4d1c10f 100644
--- a/tests/data/test1149
+++ b/tests/data/test1149
@@ -37,7 +37,7 @@ ftp
 FTP dir list multicwd then again nocwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/list/this/path/1149/ --ftp-method multicwd --next ftp://%HOSTIP:%FTPPORT/list/this/path/1149/ --ftp-method nocwd
+ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method nocwd
 </command>
 </client>
 
@@ -51,13 +51,13 @@ PWD
 CWD list
 CWD this
 CWD path
-CWD 1149
+CWD %TESTNUMBER
 EPSV
 TYPE A
 LIST
 CWD /
 EPSV
-LIST list/this/path/1149
+LIST list/this/path/%TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test115 b/tests/data/test115
index f37a7e9fd..869027884 100644
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -23,7 +23,7 @@ ftp
 FTP download, failed PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/115
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1150 b/tests/data/test1150
index cc436a147..6a07b73df 100644
--- a/tests/data/test1150
+++ b/tests/data/test1150
@@ -30,7 +30,7 @@ http
 HTTP proxy with URLs using different ports
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.example.com.1150:150/path http://test.remote.example.com.1150:1234/path/
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.example.com.%TESTNUMBER:150/path http://test.remote.example.com.%TESTNUMBER:1234/path/
 </command>
 <features>
 proxy
@@ -40,14 +40,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.example.com.1150:150/path HTTP/1.1
-Host: test.remote.example.com.1150:150
+GET http://test.remote.example.com.%TESTNUMBER:150/path HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:150
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.example.com.1150:1234/path/ HTTP/1.1
-Host: test.remote.example.com.1150:1234
+GET http://test.remote.example.com.%TESTNUMBER:1234/path/ HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:1234
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1151 b/tests/data/test1151
index 6a1510011..c8e1c6791 100644
--- a/tests/data/test1151
+++ b/tests/data/test1151
@@ -38,20 +38,20 @@ http
 HTTP with too long cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1151 -c log/cookies1151.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1151 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/cookies1151.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1152 b/tests/data/test1152
index aa8c0a7e4..870215d9f 100644
--- a/tests/data/test1152
+++ b/tests/data/test1152
@@ -40,7 +40,7 @@ ftp
 FTP with uneven quote in PWD response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/test-1152/
+ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>
 
@@ -51,7 +51,7 @@ ftp://%HOSTIP:%FTPPORT/test-1152/
 USER anonymous
 PASS ftp@example.com
 PWD
-CWD test-1152
+CWD test-%TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test1153 b/tests/data/test1153
index c0e37c133..b48143132 100644
--- a/tests/data/test1153
+++ b/tests/data/test1153
@@ -40,7 +40,7 @@ ftp
 FTP with quoted double quotes
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/test-1153/
+ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
 </command>
 </client>
 
@@ -51,7 +51,7 @@ ftp://%HOSTIP:%FTPPORT/test-1153/
 USER anonymous
 PASS ftp@example.com
 PWD
-CWD test-1153
+CWD test-%TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test1154 b/tests/data/test1154
index 4fc0b56dd..ab1addec6 100644
--- a/tests/data/test1154
+++ b/tests/data/test1154
@@ -33,7 +33,7 @@ http
 HTTP GET with 100K (too long) response header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1154
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/1154
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1154 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1155 b/tests/data/test1155
index 735f6e533..65d76b6f5 100644
--- a/tests/data/test1155
+++ b/tests/data/test1155
@@ -28,20 +28,20 @@ http
 HTTP cookie with parameter word as name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1155 -c log/cookies1155.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1155 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/cookies1155.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1156 b/tests/data/test1156
index ff57bb0ec..35eb2dcfe 100644
--- a/tests/data/test1156
+++ b/tests/data/test1156
@@ -52,7 +52,7 @@ body
 http
 </server>
 <tool>
-lib1156
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP resume/range fail range-error content-range combinations
diff --git a/tests/data/test1157 b/tests/data/test1157
index dbb8ed581..8c0bcc346 100644
--- a/tests/data/test1157
+++ b/tests/data/test1157
@@ -35,10 +35,10 @@ http
  <name>
 Get -H headers from empty file
  </name>
-<file name="log/heads1157.txt">
+<file name="log/heads%TESTNUMBER.txt">
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/1157 -H @log/heads1157.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/1157 -H @log/heads1157.txt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1157 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1158 b/tests/data/test1158
index c6a71c65c..fd21d74bb 100644
--- a/tests/data/test1158
+++ b/tests/data/test1158
@@ -26,13 +26,13 @@ http
 HTTP RFC1867-type formposting with filename containing '"'
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/1158 -F "file=@\"log/test1158\\\".txt\";type=mo/foo;filename=\"test1158\\\".txt\"" -F 'file2=@"log/test1158\".txt"' -F 'file3=@"log/test1158\".txt";type=m/f,"log/test1158\".txt"'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"log/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"log/test%TESTNUMBER\".txt"' -F 'file3=@"log/test%TESTNUMBER\".txt";type=m/f,"log/test%TESTNUMBER\".txt"'
 </command>
 <precheck>
 perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
 </precheck>
 # We create this file before the command is invoked!
-<file name=log/test1158".txt>
+<file name=log/test%TESTNUMBER".txt>
 foo bar
 This is a bar foo
 bar
@@ -46,7 +46,7 @@ foo
 ^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
 </strip>
 <protocol>
-POST /we/want/1158 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -54,7 +54,7 @@ Content-Length: 954
 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32
 
 ------------------------------24e78000bd32
-Content-Disposition: form-data; name="file"; filename="test1158\".txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER\".txt"
 Content-Type: mo/foo
 
 foo bar
@@ -63,7 +63,7 @@ bar
 foo
 
 ------------------------------24e78000bd32
-Content-Disposition: form-data; name="file2"; filename="test1158\".txt"
+Content-Disposition: form-data; name="file2"; filename="test%TESTNUMBER\".txt"
 Content-Type: text/plain
 
 foo bar
@@ -75,7 +75,7 @@ foo
 Content-Disposition: form-data; name="file3"
 Content-Type: multipart/mixed; boundary=----------------------------7f0e85a48b0b
 
-Content-Disposition: attachment; filename="test1158\".txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER\".txt"
 Content-Type: m/f
 
 foo bar
@@ -83,7 +83,7 @@ This is a bar foo
 bar
 foo
 
-Content-Disposition: attachment; filename="test1158\".txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER\".txt"
 Content-Type: text/plain
 
 foo bar
diff --git a/tests/data/test1159 b/tests/data/test1159
index ea07f238f..b09aff0e3 100644
--- a/tests/data/test1159
+++ b/tests/data/test1159
@@ -30,14 +30,14 @@ http
 HTTP Location: and 'redirect_url' with non-supported scheme
  </name>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1159 -w '%{redirect_url}\n'
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1159 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test116 b/tests/data/test116
index 2ed4ab08c..f05c1bd2f 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -29,7 +29,7 @@ ipv6
 FTP download, failed PORT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/116 -P 1.2.3.4
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4
 </command>
 </client>
 
diff --git a/tests/data/test1160 b/tests/data/test1160
index 7004d37db..ac10e5a91 100644
--- a/tests/data/test1160
+++ b/tests/data/test1160
@@ -29,20 +29,20 @@ http
 HTTP with long funny format cookie
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1160 -c log/cookies1160.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1160 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/cookies1160.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1161 b/tests/data/test1161
index b9c36c24c..89c1e657c 100644
--- a/tests/data/test1161
+++ b/tests/data/test1161
@@ -28,20 +28,20 @@ http
 HTTP cookie with path set twice
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1161 -c log/cookies1161.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1161 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/cookies1161.txt" mode="text">
+<file name="log/cookies%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1164 b/tests/data/test1164
index f62b0f66e..6140c2ec8 100644
--- a/tests/data/test1164
+++ b/tests/data/test1164
@@ -29,7 +29,7 @@ http
 HTTP/0.9 GET and all zeroes
  </name>
  <command option="force-output">
-http://%HOSTIP:%HTTPPORT/1164 -w '%{size_download}\n' --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9
 </command>
 </client>
 
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/1164 -w '%{size_download}\n' --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1164 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1166 b/tests/data/test1166
index ba8e17fed..609939f29 100644
--- a/tests/data/test1166
+++ b/tests/data/test1166
@@ -30,19 +30,19 @@ http
 HTTP response with cookies but not receiving!
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1166 http://%HOSTIP:%HTTPPORT/want/1166
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1166 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/1166 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1168 b/tests/data/test1168
index f41820b69..5d0ed3a67 100644
--- a/tests/data/test1168
+++ b/tests/data/test1168
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /data/11680002.txt
+Location: /data/%TESTNUMBER0002.txt
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /data/11680002.txt
+Location: /data/%TESTNUMBER0002.txt
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,20 +53,20 @@ http
 HTTP redirect with credentials using # in user and password
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -u "catmai#d:#DZaRJYrixKE*gFY"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/1168 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /data/11680002.txt HTTP/1.1
+GET /data/%TESTNUMBER0002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test117 b/tests/data/test117
index 2caad0da5..b9c4b2eba 100644
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -22,7 +22,7 @@ ftp
 FTP download, failed TYPE
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/117
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1170 b/tests/data/test1170
index 39ff3c8c9..688fbed79 100644
--- a/tests/data/test1170
+++ b/tests/data/test1170
@@ -48,7 +48,7 @@ http
 HTTP GET transfer-encoding with removed Connection:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1170 --tr-encoding -H "Connection:"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:"
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1170 --tr-encoding -H "Connection:"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1170 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1171 b/tests/data/test1171
index bc98d312e..7057e0cb5 100644
--- a/tests/data/test1171
+++ b/tests/data/test1171
@@ -48,7 +48,7 @@ http
 HTTP GET transfer-encoding with blanked Connection:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1171 --tr-encoding -H "Connection;"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;"
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/1171 --tr-encoding -H "Connection;"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1171 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1172 b/tests/data/test1172
index a099057f2..53179623d 100644
--- a/tests/data/test1172
+++ b/tests/data/test1172
@@ -26,7 +26,7 @@ http
 HTTP/0.9 GET response denied
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1172 --no-http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-http0.9
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1172 --no-http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1172 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1174 b/tests/data/test1174
index 7768696ff..5f45bb862 100644
--- a/tests/data/test1174
+++ b/tests/data/test1174
@@ -26,7 +26,7 @@ http
 HTTP/0.9 GET response denied by default
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1174
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1174
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1174 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1176 b/tests/data/test1176
index 5a76a2055..bc3711c56 100644
--- a/tests/data/test1176
+++ b/tests/data/test1176
@@ -34,7 +34,7 @@ http
 HTTP GET
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/1176 -o 'log/base-#0'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o 'log/base-#0'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1176 -o 'log/base-#0'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1176 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1178 b/tests/data/test1178
index 6ebdf8c4f..f8fa1ca1c 100644
--- a/tests/data/test1178
+++ b/tests/data/test1178
@@ -30,7 +30,7 @@ HTTP proxy auth with credentials longer than 256 bytes
  </name>
 # 400 x 'A' : 600 x 'B' ...
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 -x http://%HOSTIP:%HTTPPORT -U AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -U AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 </command>
 <features>
 proxy
@@ -41,7 +41,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1179 b/tests/data/test1179
index 206ee7cae..8dca8ab88 100644
--- a/tests/data/test1179
+++ b/tests/data/test1179
@@ -25,7 +25,7 @@ manual
 error when using unknown command line option
 </name>
 <command>
---never-implemented http://never.use.this.example.com/1179
+--never-implemented http://never.use.this.example.com/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test118 b/tests/data/test118
index 94985e319..4d47282af 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -25,7 +25,7 @@ ftp
 FTP download, failed RETR
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/118
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 118
-RETR 118
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1180 b/tests/data/test1180
index 88e8bc43c..1eb9ed69b 100644
--- a/tests/data/test1180
+++ b/tests/data/test1180
@@ -31,13 +31,13 @@ proxy
 HTTP GET request with proxy and -H "Proxy-Connection: keep-alive"
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT -H "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/1180
+--proxy http://%HOSTIP:%HTTPPORT -H "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1180 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1181 b/tests/data/test1181
index 3d77b634a..367265c80 100644
--- a/tests/data/test1181
+++ b/tests/data/test1181
@@ -31,13 +31,13 @@ proxy
 HTTP GET request with proxy and --proxy-header "Proxy-Connection: Keep-Alive"
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT --proxy-header "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/1181
+--proxy http://%HOSTIP:%HTTPPORT --proxy-header "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1181 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1182 b/tests/data/test1182
index 0e5a672d2..105d3d1f4 100644
--- a/tests/data/test1182
+++ b/tests/data/test1182
@@ -16,13 +16,13 @@ Verify that runtests.pl accepts an exclude file with the -E option
 </name>
 
 <command type="perl">
-%SRCDIR/runtests.pl -o TESTDIR=%SRCDIR/log/data -o LOGDIR=%SRCDIR/log/log -E %SRCDIR/log/test1182-exclude-file 1
+%SRCDIR/runtests.pl -o TESTDIR=%SRCDIR/log/data -o LOGDIR=%SRCDIR/log/log -E %SRCDIR/log/test%TESTNUMBER-exclude-file 1
 </command>
 <precheck>
-mkdir %SRCDIR/log/data ; mkdir %SRCDIR/log/log; cp %SRCDIR/data/test1 %SRCDIR/log/data; echo 'test:1:Test should not run for unit test 1182' > %SRCDIR/log/test1182-exclude-file
+mkdir %SRCDIR/log/data ; mkdir %SRCDIR/log/log; cp %SRCDIR/data/test1 %SRCDIR/log/data; echo 'test:1:Test should not run for unit test %TESTNUMBER' > %SRCDIR/log/test%TESTNUMBER-exclude-file
 </precheck>
 <postcheck>
-grep -q "Test should not run for unit test 1182" %SRCDIR/log/stdout1182
+grep -q "Test should not run for unit test %TESTNUMBER" %SRCDIR/log/stdout%TESTNUMBER
 </postcheck>
 
 </client>
diff --git a/tests/data/test1183 b/tests/data/test1183
index d8309e6ad..2955bdcc4 100644
--- a/tests/data/test1183
+++ b/tests/data/test1183
@@ -35,10 +35,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
-# Verify that the %TESTNUMBER has been resolved to 1183
+# Verify that the %TESTNUMBER has been resolved to %TESTNUMBER
 <verify>
 <protocol>
-GET /1183 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1188 b/tests/data/test1188
index 6078ee483..0cbaaeb04 100644
--- a/tests/data/test1188
+++ b/tests/data/test1188
@@ -26,19 +26,19 @@ http
 --write-out with %{onerror} and %{urlnum} to stderr
  </name>
 <command>
--f -s -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' http://%HOSTIP:%HTTPPORT/we/want/our/1188 http://%HOSTIP:%HTTPPORT/we/want/our/1188
+-f -s -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1188 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/want/our/1188 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test119 b/tests/data/test119
index 95d1021ca..6999e0da7 100644
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -24,7 +24,7 @@ ftp
 FTP download, failed RETR with PORT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/119 -P -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 </client>
 
@@ -43,8 +43,8 @@ USER anonymous
 PASS ftp@example.com
 PWD
 TYPE I
-SIZE 119
-RETR 119
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1190 b/tests/data/test1190
index 007a15013..f866352ea 100644
--- a/tests/data/test1190
+++ b/tests/data/test1190
@@ -30,7 +30,7 @@ mqtt
 MQTT SUBSCRIBE
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1190
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1191 b/tests/data/test1191
index a36bc3113..69cf33fbd 100644
--- a/tests/data/test1191
+++ b/tests/data/test1191
@@ -26,7 +26,7 @@ mqtt
 MQTT PUBLISH
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1191 -d something
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d something
 </command>
 </client>
 
diff --git a/tests/data/test1192 b/tests/data/test1192
index 691c7783f..47036ab83 100644
--- a/tests/data/test1192
+++ b/tests/data/test1192
@@ -30,7 +30,7 @@ mqtt
 MQTT SUBSCRIBE 2k topic
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/1192
+mqtt://%HOSTIP:%MQTTPORT/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1193 b/tests/data/test1193
index 8da9abb21..bed10b241 100644
--- a/tests/data/test1193
+++ b/tests/data/test1193
@@ -26,9 +26,9 @@ mqtt
 MQTT PUBLISH 2k payload
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1193 -d @log/payload1193
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d @log/payload%TESTNUMBER
 </command>
-<file name="log/payload1193">
+<file name="log/payload%TESTNUMBER">
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
diff --git a/tests/data/test1194 b/tests/data/test1194
index 497891add..cabf6beb0 100644
--- a/tests/data/test1194
+++ b/tests/data/test1194
@@ -33,7 +33,7 @@ mqtt
 MQTT SUBSCRIBE with PUBLISH befoire SUBACK
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1194
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1195 b/tests/data/test1195
index 0dfaccd53..803bdd980 100644
--- a/tests/data/test1195
+++ b/tests/data/test1195
@@ -34,7 +34,7 @@ mqtt
 MQTT SUBSCRIBE with short PUBLISH
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1195
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1196 b/tests/data/test1196
index c07efd927..929014412 100644
--- a/tests/data/test1196
+++ b/tests/data/test1196
@@ -35,7 +35,7 @@ mqtt
 MQTT with error in CONNACK
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/1196
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1197 b/tests/data/test1197
index 634a30b41..8b882c714 100644
--- a/tests/data/test1197
+++ b/tests/data/test1197
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./11970001
+Location: ./%TESTNUMBER0001
 
 monster
 </data>
@@ -43,7 +43,7 @@ http
 HTTP POST redirected to GET and --write-out method
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1197 -w "%{method}\n" -L -d "twinkle twinkle little star"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{method}\n" -L -d "twinkle twinkle little star"
 </command>
 </client>
 
@@ -51,14 +51,14 @@ http://%HOSTIP:%HTTPPORT/1197 -w "%{method}\n" -L -d "twinkle twinkle little sta
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /1197 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 27
 Content-Type: application/x-www-form-urlencoded
 
-twinkle twinkle little starGET /11970001 HTTP/1.1
+twinkle twinkle little starGET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -71,7 +71,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./11970001
+Location: ./%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test12 b/tests/data/test12
index 8f93abbaa..a7c30d220 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -36,14 +36,14 @@ http
 HTTP range support
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 100-200
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/12 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=100-200
 User-Agent: curl/%VERSION
diff --git a/tests/data/test120 b/tests/data/test120
index 85d49f529..45e11a63e 100644
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -31,7 +31,7 @@ ftp
 ftp download with post-quote delete operation
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file"
 </command>
 </client>
 
@@ -44,8 +44,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 120
-RETR 120
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 DELE file
 QUIT
 </protocol>
diff --git a/tests/data/test1200 b/tests/data/test1200
index ba1159f80..886fa166f 100644
--- a/tests/data/test1200
+++ b/tests/data/test1200
@@ -25,7 +25,7 @@ gopher
 Gopher index
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT/1/1200
+gopher://%HOSTIP:%GOPHERPORT/1/%TESTNUMBER
 </command>
 </client>
 
@@ -33,7 +33,7 @@ gopher://%HOSTIP:%GOPHERPORT/1/1200
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/1200
+/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1201 b/tests/data/test1201
index 29a059aa0..9f1ba664b 100644
--- a/tests/data/test1201
+++ b/tests/data/test1201
@@ -25,7 +25,7 @@ gopher
 Gopher selector
  </name>
  <command>
-gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/1201?
+gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/%TESTNUMBER?
 </command>
 </client>
 
@@ -33,7 +33,7 @@ gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/1201?
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/selector/SELECTOR/1201?
+/selector/SELECTOR/%TESTNUMBER?
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1202 b/tests/data/test1202
index 6c91a774c..aefb6d008 100644
--- a/tests/data/test1202
+++ b/tests/data/test1202
@@ -26,7 +26,7 @@ gopher
 Gopher query
  </name>
  <command>
-"gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine%09query%20succeeded/1202"
+"gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine%09query%20succeeded/%TESTNUMBER"
 </command>
 </client>
 
@@ -34,7 +34,7 @@ Gopher query
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/the/search/engine	query succeeded/1202
+/the/search/engine	query succeeded/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1203 b/tests/data/test1203
index 02d094da0..9f4648e27 100644
--- a/tests/data/test1203
+++ b/tests/data/test1203
@@ -29,7 +29,7 @@ gopher-ipv6
 Gopher IPv6 index
  </name>
  <command>
--g gopher://%HOST6IP:%GOPHER6PORT/1/moo/1203
+-g gopher://%HOST6IP:%GOPHER6PORT/1/moo/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ Gopher IPv6 index
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/moo/1203
+/moo/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1204 b/tests/data/test1204
index 50738011c..9e8c2b6a0 100644
--- a/tests/data/test1204
+++ b/tests/data/test1204
@@ -55,19 +55,19 @@ http
 HTTP with WWW-Authenticate and multiple auths in a single line
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1204 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1204 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1204 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1205 b/tests/data/test1205
index 9f1a34ce1..df77175d6 100644
--- a/tests/data/test1205
+++ b/tests/data/test1205
@@ -30,7 +30,7 @@ http
 HTTP GET with 18K HTTP header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1205
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1205
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1205 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1206 b/tests/data/test1206
index 3f853d1d9..b19259270 100644
--- a/tests/data/test1206
+++ b/tests/data/test1206
@@ -26,7 +26,7 @@ ftp
 FTP PORT and 425 on download
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1206 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -42,8 +42,8 @@ PASS ftp@example.com
 PWD
 EPRT |1|
 TYPE I
-SIZE 1206
-RETR 1206
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 <errorcode>
diff --git a/tests/data/test1207 b/tests/data/test1207
index 283e46d5b..f105df54c 100644
--- a/tests/data/test1207
+++ b/tests/data/test1207
@@ -26,7 +26,7 @@ ftp
 FTP PORT and 421 on download
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1207 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -42,8 +42,8 @@ PASS ftp@example.com
 PWD
 EPRT |1|
 TYPE I
-SIZE 1207
-RETR 1207
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 <errorcode>
diff --git a/tests/data/test1208 b/tests/data/test1208
index 055aa9327..47ceb64d4 100644
--- a/tests/data/test1208
+++ b/tests/data/test1208
@@ -27,7 +27,7 @@ ftp
 FTP PORT download, no data conn and no transient negative reply
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1208 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -48,8 +48,8 @@ PASS ftp@example.com
 PWD
 EPRT |1|
 TYPE I
-SIZE 1208
-RETR 1208
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 <errorcode>
 28
diff --git a/tests/data/test1209 b/tests/data/test1209
index 76bce5fd5..4d442d177 100644
--- a/tests/data/test1209
+++ b/tests/data/test1209
@@ -26,7 +26,7 @@ ftp
 FTP PORT download, no data conn and no positive preliminary reply
  </name>
  <command>
---max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/1209 -P -
+--max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -48,8 +48,8 @@ PASS ftp@example.com
 PWD
 EPRT |1|
 TYPE I
-SIZE 1209
-RETR 1209
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 <errorcode>
 28
diff --git a/tests/data/test121 b/tests/data/test121
index de7a56174..b8ec70136 100644
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -29,7 +29,7 @@ ftp
 ftp download with post- and pre-transfer delete operations
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/121 -Q "-DELE after_transfer" -Q "DELE before_transfer"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_transfer"
 </command>
 </client>
 
@@ -42,8 +42,8 @@ PWD
 DELE before_transfer
 EPSV
 TYPE I
-SIZE 121
-RETR 121
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 DELE after_transfer
 QUIT
 </protocol>
diff --git a/tests/data/test1210 b/tests/data/test1210
index a1cf5a78d..037eb16d8 100644
--- a/tests/data/test1210
+++ b/tests/data/test1210
@@ -39,7 +39,7 @@ HTTP GET with -J without Content-Disposition
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1210 -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/1210 -J -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1210 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/1210">
+<file name="log/%TESTNUMBER">
 12345
 </file>
 
diff --git a/tests/data/test1211 b/tests/data/test1211
index 5418a85f7..6d31357df 100644
--- a/tests/data/test1211
+++ b/tests/data/test1211
@@ -26,7 +26,7 @@ ftp
 FTP PORT and 425 on download
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1211 -P -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 
 </client>
@@ -43,8 +43,8 @@ PASS ftp@example.com
 PWD
 EPRT |1|
 TYPE I
-SIZE 1211
-RETR 1211
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 <errorcode>
 28
diff --git a/tests/data/test1212 b/tests/data/test1212
index befd91f4c..5a9308971 100644
--- a/tests/data/test1212
+++ b/tests/data/test1212
@@ -31,14 +31,14 @@ noproxy setting together with socks proxy
  </name>
 
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/ulion/1212 --socks5 non-existing-host.haxx.se:1080 --noproxy %HOSTIP --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/ulion/%TESTNUMBER --socks5 non-existing-host.haxx.se:1080 --noproxy %HOSTIP --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /ulion/1212 HTTP/1.1
+GET /ulion/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpzZWNyZXQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1213 b/tests/data/test1213
index 5abf974df..6bd4d2c36 100644
--- a/tests/data/test1213
+++ b/tests/data/test1213
@@ -33,7 +33,7 @@ HTTP with proxy and host-only URL
 # for normal server use, and we need to make sure it gets converted to
 # RFC style even for proxies
  <command>
--x %HOSTIP:%HTTPPORT we.want.that.site.com.1213
+-x %HOSTIP:%HTTPPORT we.want.that.site.com.%TESTNUMBER
 </command>
 <features>
 proxy
@@ -43,8 +43,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com.1213/ HTTP/1.1
-Host: we.want.that.site.com.1213
+GET http://we.want.that.site.com.%TESTNUMBER/ HTTP/1.1
+Host: we.want.that.site.com.%TESTNUMBER
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1214 b/tests/data/test1214
index 0957fb71c..175869397 100644
--- a/tests/data/test1214
+++ b/tests/data/test1214
@@ -33,7 +33,7 @@ HTTP with proxy and URL with ? and no slash separator
 # for normal server use, and we need to make sure it gets converted to
 # RFC style even for proxies
  <command>
--x %HOSTIP:%HTTPPORT http://we.want.that.site.com.1214?moo=foo
+-x %HOSTIP:%HTTPPORT http://we.want.that.site.com.%TESTNUMBER?moo=foo
 </command>
 <features>
 proxy
@@ -43,8 +43,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com.1214/?moo=foo HTTP/1.1
-Host: we.want.that.site.com.1214
+GET http://we.want.that.site.com.%TESTNUMBER/?moo=foo HTTP/1.1
+Host: we.want.that.site.com.%TESTNUMBER
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1215 b/tests/data/test1215
index 7aa1c4237..83e650329 100644
--- a/tests/data/test1215
+++ b/tests/data/test1215
@@ -76,7 +76,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/1215 -u testuser:testpass --ntlm --proxy http://%HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <precheck>
 chkhostname curlhost
@@ -86,14 +86,14 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1216 b/tests/data/test1216
index 622713323..5353b36d1 100644
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -31,9 +31,9 @@ http
 HTTP cookie domains tailmatching the host name
  </name>
  <command>
-http://example.fake/c/1216 http://bexample.fake/c/1216 -b log/injar1216 -x %HOSTIP:%HTTPPORT
+http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b log/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
-<file name="log/injar1216">
+<file name="log/injar%TESTNUMBER">
 example.fake	FALSE	/a	FALSE	2139150993	mooo	indeed
 example.fake	FALSE	/b	FALSE	0		moo1	indeed
 example.fake	FALSE	/c	FALSE	2139150993	moo2	indeed
@@ -47,14 +47,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.fake/c/1216 HTTP/1.1
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1
 Host: example.fake
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Cookie: moo3=indeed; moo2=indeed
 
-GET http://bexample.fake/c/1216 HTTP/1.1
+GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1
 Host: bexample.fake
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1217 b/tests/data/test1217
index 1efa4d604..0f4772d97 100644
--- a/tests/data/test1217
+++ b/tests/data/test1217
@@ -26,7 +26,7 @@ ftp
 FTP with rubbish before name in 257-response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/get/file/1217 ftp://%HOSTIP:%FTPPORT/get/file/again/1217 --ftp-method singlecwd
+ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/again/%TESTNUMBER --ftp-method singlecwd
 </command>
 </client>
 
@@ -44,13 +44,13 @@ PWD
 CWD get/file
 EPSV
 TYPE I
-SIZE 1217
-RETR 1217
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 CWD /this/is/the/path
 CWD get/file/again
 EPSV
-SIZE 1217
-RETR 1217
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1218 b/tests/data/test1218
index b9914d25f..259281c1c 100644
--- a/tests/data/test1218
+++ b/tests/data/test1218
@@ -30,7 +30,7 @@ http
 HTTP cookies and domains with same prefix
  </name>
  <command>
-http://example.fake/c/1218 http://example.fake/c/1218 http://bexample.fake/c/1218 -b nonexisting -x %HOSTIP:%HTTPPORT
+http://example.fake/c/%TESTNUMBER http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -40,20 +40,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.fake/c/1218 HTTP/1.1
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1
 Host: example.fake
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://example.fake/c/1218 HTTP/1.1
+GET http://example.fake/c/%TESTNUMBER HTTP/1.1
 Host: example.fake
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Cookie: bug=fixed
 
-GET http://bexample.fake/c/1218 HTTP/1.1
+GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1
 Host: bexample.fake
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1219 b/tests/data/test1219
index e42a211a2..f579859fd 100644
--- a/tests/data/test1219
+++ b/tests/data/test1219
@@ -30,7 +30,7 @@ ftp
 FTP with no user+password required (230 response)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1219
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -41,8 +41,8 @@ ftp://%HOSTIP:%FTPPORT/1219
 PWD
 EPSV
 TYPE I
-SIZE 1219
-RETR 1219
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test122 b/tests/data/test122
index fb1dd05fc..8d636af47 100644
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -25,7 +25,7 @@ ftp
 FTP download resume with whole file already downloaded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/122 -C 5
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5
 </command>
 </client>
 
@@ -38,7 +38,7 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 122
+SIZE %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1220 b/tests/data/test1220
index c8eb52cb1..49cbf2c49 100644
--- a/tests/data/test1220
+++ b/tests/data/test1220
@@ -21,9 +21,9 @@ file
 file:// URLs with query string
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test1220.txt?a_query=foobar#afragment
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt?a_query=foobar#afragment
 </command>
-<file name="log/test1220.txt">
+<file name="log/test%TESTNUMBER.txt">
 contents in a single file
 </file>
 </client>
diff --git a/tests/data/test1223 b/tests/data/test1223
index 46461546d..9404adf6f 100644
--- a/tests/data/test1223
+++ b/tests/data/test1223
@@ -30,7 +30,7 @@ http
 HTTP GET -w remote_ip and -w remote_port
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1223 -w 'IP %{remote_ip} and PORT %{remote_port}\n'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'IP %{remote_ip} and PORT %{remote_port}\n'
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1223 -w 'IP %{remote_ip} and PORT %{remote_port}\n'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1223 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1224 b/tests/data/test1224
index 315936b99..fc898a7a1 100644
--- a/tests/data/test1224
+++ b/tests/data/test1224
@@ -27,7 +27,7 @@ ftp
 FTP fetch a file from the root directory
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//1224
+ftp://%HOSTIP:%FTPPORT//%TESTNUMBER
 </command>
 
 </client>
@@ -41,8 +41,8 @@ PWD
 CWD /
 EPSV
 TYPE I
-SIZE 1224
-RETR 1224
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1225 b/tests/data/test1225
index 09a1abb79..7e4f39b01 100644
--- a/tests/data/test1225
+++ b/tests/data/test1225
@@ -27,7 +27,7 @@ ftp
 FTP fetch two files using absolute paths
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//foo/1225 ftp://%HOSTIP:%FTPPORT//foo/bar/1225
+ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUMBER
 </command>
 
 </client>
@@ -42,14 +42,14 @@ CWD /
 CWD foo
 EPSV
 TYPE I
-SIZE 1225
-RETR 1225
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 CWD /
 CWD foo
 CWD bar
 EPSV
-SIZE 1225
-RETR 1225
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1226 b/tests/data/test1226
index 6381b122a..a22776eac 100644
--- a/tests/data/test1226
+++ b/tests/data/test1226
@@ -27,7 +27,7 @@ ftp
 FTP fetch a file from the root directory with singlecwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//1226 --ftp-method singlecwd
+ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd
 </command>
 
 </client>
@@ -41,8 +41,8 @@ PWD
 CWD /
 EPSV
 TYPE I
-SIZE 1226
-RETR 1226
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1227 b/tests/data/test1227
index 46b28d510..1cd9bf24f 100644
--- a/tests/data/test1227
+++ b/tests/data/test1227
@@ -27,7 +27,7 @@ ftp
 FTP fetch a file from the root directory with nocwd
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT//1227 --ftp-method nocwd
+ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd
 </command>
 
 </client>
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE /1227
-RETR /1227
+SIZE /%TESTNUMBER
+RETR /%TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1228 b/tests/data/test1228
index 529c7e55d..2a7faff48 100644
--- a/tests/data/test1228
+++ b/tests/data/test1228
@@ -29,7 +29,7 @@ http
 HTTP cookie path match
  </name>
  <command>
-http://example.fake/hoge/1228 http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT
+http://example.fake/hoge/%TESTNUMBER http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -39,7 +39,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.fake/hoge/1228 HTTP/1.1
+GET http://example.fake/hoge/%TESTNUMBER HTTP/1.1
 Host: example.fake
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1229 b/tests/data/test1229
index 0cb45358a..06d81758e 100644
--- a/tests/data/test1229
+++ b/tests/data/test1229
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest authorization with user name needing escape
  </name>
  <command>
-http://%5cuser%22:password@%HOSTIP:%HTTPPORT/1229 --digest
+http://%5cuser%22:password@%HOSTIP:%HTTPPORT/%TESTNUMBER --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1229 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1229 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/1229", response="f2694d426040712584c156d3de72b8d6"
+Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="f2694d426040712584c156d3de72b8d6"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test123 b/tests/data/test123
index 4bbfce9a4..1604f0b0c 100644
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -19,9 +19,9 @@ ftp
 FTP upload resume with whole file already downloaded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/123 -T log/upload123 -C 51
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 51
 </command>
-<file name="log/upload123">
+<file name="log/upload%TESTNUMBER">
 --------------------------------------------------
 </file>
 </client>
diff --git a/tests/data/test1230 b/tests/data/test1230
index 5184f2a7d..8d4a35c8d 100644
--- a/tests/data/test1230
+++ b/tests/data/test1230
@@ -53,9 +53,9 @@ http
  <name>
 HTTP CONNECT to IPv6 numerical address
  </name>
-# 0x4ce == 1230, the test number
+# 0x4ce == %TESTNUMBER, the test number
  <command>
-http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT
+http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -68,7 +68,7 @@ Host: [1234:1234:1234::4ce]:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-GET /wanted/page/1230 HTTP/1.1
+GET /wanted/page/%TESTNUMBER HTTP/1.1
 Host: [1234:1234:1234::4ce]:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1231 b/tests/data/test1231
index 7b085c523..c37f50915 100644
--- a/tests/data/test1231
+++ b/tests/data/test1231
@@ -37,7 +37,7 @@ http
 HTTP URL with dotdot removal from path
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/../../hej/but/who/../1231?stupid=me/../1231#soo/../1231 http://%HOSTIP:%HTTPPORT/../../hej/but/who/../12310001#/../12310001
+http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 </client>
 
@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/../../hej/but/who/../1231?stupid=me/../1231#soo/../1231
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /hej/but/1231?stupid=me/../1231 HTTP/1.1
+GET /hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /hej/but/12310001 HTTP/1.1
+GET /hej/but/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1232 b/tests/data/test1232
index 7a74cb12d..3f91ecf5c 100644
--- a/tests/data/test1232
+++ b/tests/data/test1232
@@ -39,7 +39,7 @@ http
 HTTP URL with dotdot removal from path using an HTTP proxy
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1232:8990/../../hej/but/who/../1232?stupid=me/../1232#soo/../1232 http://test.remote.haxx.se.1232:8990/../../hej/but/who/../12320001#/../12320001
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 <features>
 proxy
@@ -50,14 +50,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.haxx.se.1232:8990/hej/but/1232?stupid=me/../1232 HTTP/1.1
-Host: test.remote.haxx.se.1232:8990
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.haxx.se.1232:8990/hej/but/12320001 HTTP/1.1
-Host: test.remote.haxx.se.1232:8990
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER0001 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1233 b/tests/data/test1233
index 1d4d3d561..b5dedca09 100644
--- a/tests/data/test1233
+++ b/tests/data/test1233
@@ -26,7 +26,7 @@ ftp
 FTP failing to connect to EPSV port, switching to PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1233
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,8 +39,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 1233
-RETR 1233
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1234 b/tests/data/test1234
index 577ba51aa..c20b3b4a3 100644
--- a/tests/data/test1234
+++ b/tests/data/test1234
@@ -19,7 +19,7 @@ none
 abusing {}-globbing
  </name>
  <command>
-"%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{"
+"%HOSTIP:%NOLISTENPORT/%TESTNUMBER[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{"
 </command>
 </client>
 
diff --git a/tests/data/test1235 b/tests/data/test1235
index 3fffb4209..b04958eeb 100644
--- a/tests/data/test1235
+++ b/tests/data/test1235
@@ -34,54 +34,54 @@ http
 multiple requests using {}{} in the URL
  </name>
  <command>
-"%HOSTIP:%HTTPPORT/{1235,1235}{0001,0002}"
+"%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}{0001,0002}"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /12350001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /12350002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /12350001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /12350002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 <stdout>
---_curl_--%HOSTIP:%HTTPPORT/12350001
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 15
 
 the number one
---_curl_--%HOSTIP:%HTTPPORT/12350002
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 16
 
 two is nice too
---_curl_--%HOSTIP:%HTTPPORT/12350001
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 15
 
 the number one
---_curl_--%HOSTIP:%HTTPPORT/12350002
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 16
diff --git a/tests/data/test1237 b/tests/data/test1237
index a016e5fb6..8e9590e24 100644
--- a/tests/data/test1237
+++ b/tests/data/test1237
@@ -27,14 +27,14 @@ http
 URL with 1000+ letter user name + password
  </name>
  <command>
-"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB@%HOSTIP:%HTTPPORT/1237"
+"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB@%HOSTIP:%HTTPPORT/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1237 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1238 b/tests/data/test1238
index 88c9a5b3b..606dd1fe4 100644
--- a/tests/data/test1238
+++ b/tests/data/test1238
@@ -37,7 +37,7 @@ slow TFTP retrieve cancel due to -Y and -y
  </name>
 # if less than 1000 bytes/sec within 2 seconds, abort!
  <command>
-tftp://%HOSTIP:%TFTPPORT//1238 -Y1000 -y2
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER -Y1000 -y2
 </command>
 </client>
 
@@ -50,7 +50,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /1238
+filename: /%TESTNUMBER
 </protocol>
 # 28 = CURLE_OPERATION_TIMEDOUT
 <errorcode>
diff --git a/tests/data/test1239 b/tests/data/test1239
index cf7c40573..1679ce5b3 100644
--- a/tests/data/test1239
+++ b/tests/data/test1239
@@ -34,7 +34,7 @@ http
 HTTP with -z + -w response_code and simulated 304
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1239 -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code}'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1239 -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1239 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test124 b/tests/data/test124
index 255d8731f..f21c28f05 100644
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -26,7 +26,7 @@ ftp
 FTP download, failed PWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/124
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,8 +39,8 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 124
-RETR 124
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1240 b/tests/data/test1240
index 44ce1f69b..11a7e0f89 100644
--- a/tests/data/test1240
+++ b/tests/data/test1240
@@ -25,19 +25,19 @@ http
 glob [0-1] with stuff after range (7.33.0 regression)
  </name>
  <command>
-"%HOSTIP:%HTTPPORT/0[0-1]/1240"
+"%HOSTIP:%HTTPPORT/0[0-1]/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /00/1240 HTTP/1.1
+GET /00/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /01/1240 HTTP/1.1
+GET /01/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1241 b/tests/data/test1241
index 0089828f8..952fa2355 100644
--- a/tests/data/test1241
+++ b/tests/data/test1241
@@ -38,7 +38,7 @@ http
 HTTP _without_ dotdot removal
  </name>
  <command>
---path-as-is --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241#soo/../1241 http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001#/../12410001
+--path-as-is --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001
 </command>
 <features>
 proxy
@@ -49,14 +49,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241 HTTP/1.1
-Host: test.remote.haxx.se.1241:8990
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001 HTTP/1.1
-Host: test.remote.haxx.se.1241:8990
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1242 b/tests/data/test1242
index 80111eba5..9f573a756 100644
--- a/tests/data/test1242
+++ b/tests/data/test1242
@@ -27,7 +27,7 @@ tftp
 TFTP retrieve without TFTP options requests
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//1242 --tftp-no-options
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-no-options
 </command>
 </client>
 
@@ -37,7 +37,7 @@ tftp://%HOSTIP:%TFTPPORT//1242 --tftp-no-options
 <protocol>
 opcode: 1
 mode: octet
-filename: /1242
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1243 b/tests/data/test1243
index 8a89af055..f8b246fe7 100644
--- a/tests/data/test1243
+++ b/tests/data/test1243
@@ -16,9 +16,9 @@ tftp
 TFTP send without TFTP options requests
  </name>
  <command>
--T log/test1243.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options
 </command>
-<file name="log/test1243.txt">
+<file name="log/test%TESTNUMBER.txt">
 a chunk of
 data
 sent
@@ -38,7 +38,7 @@ sent
 <protocol>
 opcode: 2
 mode: octet
-filename: /test1243.txt
+filename: /test%TESTNUMBER.txt
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test1244 b/tests/data/test1244
index c2ac4a4d1..fa8ac9075 100644
--- a/tests/data/test1244
+++ b/tests/data/test1244
@@ -39,7 +39,7 @@ proxy
 HTTP GET same URL - different proxy ports
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPORT/124400001 -x %HOSTIP:%HTTPSPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER00001 -x %HOSTIP:%HTTPSPORT
 </command>
 </client>
 
@@ -51,7 +51,7 @@ http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPO
 56
 </errorcode>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/1244 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1245 b/tests/data/test1245
index 09b3ff7ea..0814e7dc3 100644
--- a/tests/data/test1245
+++ b/tests/data/test1245
@@ -18,7 +18,7 @@ HTTP/1.1 301 OK swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 0
-Location: ftp://%HOSTIP:%FTPPORT/1245
+Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 Connection: close
 
 </data>
@@ -35,7 +35,7 @@ ftp
 --proto deny must override --proto-redir allow
 </name>
 <command>
---location --proto +all,-ftp --proto-redir -all,+ftp http://%HOSTIP:%HTTPPORT/1245
+--location --proto +all,-ftp --proto-redir -all,+ftp http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ ftp
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1245 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1246 b/tests/data/test1246
index bc3d2b000..4cb0c3a16 100644
--- a/tests/data/test1246
+++ b/tests/data/test1246
@@ -38,7 +38,7 @@ http
 URL with '#' at end of host name instead of '/'
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1246:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.1246:%HTTPPORT#@127.127.127.127/again.html
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.%TESTNUMBER:%HTTPPORT#@127.127.127.127/again.html
 </command>
 <features>
 proxy
@@ -49,14 +49,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.haxx.se.1246:%HTTPPORT/ HTTP/1.1
-Host: test.remote.haxx.se.1246:%HTTPPORT
+GET http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://no-scheme-url.com.1246:%HTTPPORT/ HTTP/1.1
-Host: no-scheme-url.com.1246:%HTTPPORT
+GET http://no-scheme-url.com.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
+Host: no-scheme-url.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1247 b/tests/data/test1247
index ff127eb57..02c695cd6 100644
--- a/tests/data/test1247
+++ b/tests/data/test1247
@@ -23,7 +23,7 @@ http
 --fail-early
  </name>
  <command>
---fail-early h1234://%HOSTIP:%HTTPPORT/1247 http://%HOSTIP:%HTTPPORT/1247
+--fail-early h1234://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1248 b/tests/data/test1248
index 0c5a165ab..721c03e73 100644
--- a/tests/data/test1248
+++ b/tests/data/test1248
@@ -29,14 +29,14 @@ http
 Access a non-proxied host with using the combination of --proxy option and --noproxy option
 </name>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%NOLISTENPORT/ --noproxy %HOSTIP --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENPORT/ --noproxy %HOSTIP --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1248 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpzZWNyZXQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1249 b/tests/data/test1249
index 2ddfd5b34..cae3e995a 100644
--- a/tests/data/test1249
+++ b/tests/data/test1249
@@ -32,14 +32,14 @@ Access a non-proxied host with using the combination of --proxy option and NO_PR
 NO_PROXY=%HOSTIP
 </setenv>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%NOLISTENPORT/ --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENPORT/ --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1249 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpzZWNyZXQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test125 b/tests/data/test125
index 5677aeb47..39b2b32ce 100644
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -21,7 +21,7 @@ ftp
 FTP download, failed CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/to/file/125
+ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1250 b/tests/data/test1250
index d48e90a98..4c47cf2b1 100644
--- a/tests/data/test1250
+++ b/tests/data/test1250
@@ -33,14 +33,14 @@ Access a non-proxied host with using the combination of http_proxy env var and -
 http_proxy=http://dummy:%PROXYPORT/
 </setenv>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1250 --noproxy %HOSTIP --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1250 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpzZWNyZXQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1251 b/tests/data/test1251
index ab2816aba..f5db4d3d7 100644
--- a/tests/data/test1251
+++ b/tests/data/test1251
@@ -34,14 +34,14 @@ http_proxy=http://dummy:%PROXYPORT/
 NO_PROXY=%HOSTIP
 </setenv>
 <command>
-http://user:secret@%HOSTIP:%HTTPPORT/1251 --max-time 5
+http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --max-time 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1251 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpzZWNyZXQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1252 b/tests/data/test1252
index c5f5f5b17..13fe3b3d9 100644
--- a/tests/data/test1252
+++ b/tests/data/test1252
@@ -33,14 +33,14 @@ Under condition using --proxy, override NO_PROXY by --nproxy and access target U
 NO_PROXY=example.com
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/1252 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1252 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1253 b/tests/data/test1253
index bb41966ab..96f0a2d20 100644
--- a/tests/data/test1253
+++ b/tests/data/test1253
@@ -33,7 +33,7 @@ Under condition using --proxy, override NO_PROXY by --nproxy and access target U
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1253 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
+http://somewhere.example.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
 </command>
 <features>
 proxy
@@ -43,7 +43,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1253 HTTP/1.1
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
 Host: somewhere.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1254 b/tests/data/test1254
index 20ba60684..a39cbd26e 100644
--- a/tests/data/test1254
+++ b/tests/data/test1254
@@ -33,7 +33,7 @@ Under condition using --proxy, override NO_PROXY by --nproxy and access target U
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1254 --proxy http://%HOSTIP:%HTTPPORT --noproxy ""
+http://somewhere.example.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy ""
 </command>
 <features>
 proxy
@@ -43,7 +43,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1254 HTTP/1.1
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
 Host: somewhere.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1255 b/tests/data/test1255
index a5119d970..7c1fa2438 100644
--- a/tests/data/test1255
+++ b/tests/data/test1255
@@ -34,14 +34,14 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=example.com
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/1255 --noproxy %HOSTIP
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1255 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1256 b/tests/data/test1256
index 8bbd02c66..f9f0fdc77 100644
--- a/tests/data/test1256
+++ b/tests/data/test1256
@@ -34,7 +34,7 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1256 --noproxy %HOSTIP
+http://somewhere.example.com/%TESTNUMBER --noproxy %HOSTIP
 </command>
 <features>
 proxy
@@ -44,7 +44,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1256 HTTP/1.1
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
 Host: somewhere.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1257 b/tests/data/test1257
index 47822d303..82c61ee74 100644
--- a/tests/data/test1257
+++ b/tests/data/test1257
@@ -34,7 +34,7 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=example.com
 </setenv>
 <command>
-http://somewhere.example.com/1257 --noproxy ""
+http://somewhere.example.com/%TESTNUMBER --noproxy ""
 </command>
 <features>
 proxy
@@ -44,7 +44,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://somewhere.example.com/1257 HTTP/1.1
+GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
 Host: somewhere.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1258 b/tests/data/test1258
index 233e72b9c..a4cef156c 100644
--- a/tests/data/test1258
+++ b/tests/data/test1258
@@ -30,14 +30,14 @@ http
 HTTP, use cookies with localhost
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1258 http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1258 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: localhost
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1259 b/tests/data/test1259
index 966350745..4e0c6d495 100644
--- a/tests/data/test1259
+++ b/tests/data/test1259
@@ -27,14 +27,14 @@ http
 HTTP URL with semicolon in password
  </name>
  <command>
-"http://user:pass;word@%HOSTIP:%HTTPPORT/we/want/1259"
+"http://user:pass;word@%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1259 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpwYXNzO3dvcmQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test126 b/tests/data/test126
index 0872214af..f1b252734 100644
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -26,7 +26,7 @@ ftp
 FTP download with multiple replies at once in RETR
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/lululul/126
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ CWD blalbla
 CWD lululul
 EPSV
 TYPE I
-SIZE 126
-RETR 126
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1260 b/tests/data/test1260
index b246882cb..cff79e298 100644
--- a/tests/data/test1260
+++ b/tests/data/test1260
@@ -22,7 +22,7 @@ http
 HTTP URL with rubbish after port number
  </name>
  <command>
--g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/1260" "http://%HOSTIP:%NOLISTENPORT:80/we/want/1260" "http://user@example.com:80@localhost"
+-g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://%HOSTIP:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://user@example.com:80@localhost"
 </command>
 </client>
 
diff --git a/tests/data/test1261 b/tests/data/test1261
index ef3cded57..e60c9cca9 100644
--- a/tests/data/test1261
+++ b/tests/data/test1261
@@ -30,14 +30,14 @@ http
 'redirect_url' with --location and --max-redir
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1261 -w '%{redirect_url}\n' --location --max-redir 0
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' --location --max-redir 0
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1261 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1262 b/tests/data/test1262
index ed526c099..63abe8b8f 100644
--- a/tests/data/test1262
+++ b/tests/data/test1262
@@ -23,7 +23,7 @@ ftp
 FTP request and denied to download an older file with -z
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/1262 -z "-1 jan 2001"
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001"
 </command>
 </client>
 
@@ -33,7 +33,7 @@ USER anonymous
 PASS ftp@example.com
 PWD
 CWD blalbla
-MDTM 1262
+MDTM %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1263 b/tests/data/test1263
index 88b13775e..ef42f20e0 100644
--- a/tests/data/test1263
+++ b/tests/data/test1263
@@ -23,7 +23,7 @@ http
 HTTP URL with rubbish after IPv6 bracket
  </name>
  <command>
--g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/1263" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/1263" "http://user@[::1]@localhost"
+-g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/%TESTNUMBER" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/%TESTNUMBER" "http://user@[::1]@localhost"
 </command>
 </client>
 
diff --git a/tests/data/test1264 b/tests/data/test1264
index 272db736c..54fb6ffa3 100644
--- a/tests/data/test1264
+++ b/tests/data/test1264
@@ -22,7 +22,7 @@ http
 HTTP URL with space in host name
  </name>
  <command>
--g "http://127.0.0.1 www.example.com/we/want/1264"
+-g "http://127.0.0.1 www.example.com/we/want/%TESTNUMBER"
 </command>
 </client>
 
diff --git a/tests/data/test1265 b/tests/data/test1265
index 5a7118c84..b18f2db74 100644
--- a/tests/data/test1265
+++ b/tests/data/test1265
@@ -34,14 +34,14 @@ http_proxy=http://%HOSTIP:%HTTPPORT
 NO_PROXY=::1
 </setenv>
 <command>
-http://%HOST6IP:%HTTP6PORT/1265
+http://%HOST6IP:%HTTP6PORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1265 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1266 b/tests/data/test1266
index 1de936e03..c5c8ba37d 100644
--- a/tests/data/test1266
+++ b/tests/data/test1266
@@ -26,7 +26,7 @@ http
 HTTP GET with a single-byte HTTP/0.9 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1266 --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1266 --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1266 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1267 b/tests/data/test1267
index 06500e87b..7ca6dde80 100644
--- a/tests/data/test1267
+++ b/tests/data/test1267
@@ -26,7 +26,7 @@ http
 HTTP GET with a invalid HTTP/1 response line start
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1267 --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/1267 --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1267 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1268 b/tests/data/test1268
index c5fe5f749..562f376a3 100644
--- a/tests/data/test1268
+++ b/tests/data/test1268
@@ -23,12 +23,12 @@ unix-sockets
 file name argument looks like a flag
  </name>
  <command>
---stderr log/moo1268 --unix-socket -k hej://moo
+--stderr log/moo%TESTNUMBER --unix-socket -k hej://moo
 </command>
 </client>
 
 <verify>
-<file name="log/moo1268" mode="text">
+<file name="log/moo%TESTNUMBER" mode="text">
 Warning: The file name argument '-k' looks like a flag.
 curl: (1) Protocol "hej" not supported or disabled in libcurl
 </file>
diff --git a/tests/data/test1269 b/tests/data/test1269
index 7cf86cab3..f68cf9c09 100644
--- a/tests/data/test1269
+++ b/tests/data/test1269
@@ -20,7 +20,7 @@ none
 too large --retry-delay value
  </name>
  <command>
---retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/1269
+--retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test127 b/tests/data/test127
index ac46d8d00..0b0f4f598 100644
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -23,7 +23,7 @@ ftp
 FTP --disable-epsv
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/to/file/127 --disable-epsv
+ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv
 </command>
 </client>
 
@@ -38,8 +38,8 @@ CWD to
 CWD file
 PASV
 TYPE I
-SIZE 127
-RETR 127
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1270 b/tests/data/test1270
index 680e1e47c..0c289d0cf 100644
--- a/tests/data/test1270
+++ b/tests/data/test1270
@@ -35,14 +35,14 @@ http
 Basic 'redirect_url'
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1270 -w '%{redirect_url}\n' -s
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' -s
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1270 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1271 b/tests/data/test1271
index ce89c38f2..184fd87f1 100644
--- a/tests/data/test1271
+++ b/tests/data/test1271
@@ -27,16 +27,16 @@ http
 --write-out from file with empty file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/1271 -w @log/blank1271
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @log/blank%TESTNUMBER
 </command>
-<file name="log/blank1271">
+<file name="log/blank%TESTNUMBER">
 </file>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/our/1271 HTTP/1.1
+GET /we/want/our/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1272 b/tests/data/test1272
index fb2da2e32..fc1baea10 100644
--- a/tests/data/test1272
+++ b/tests/data/test1272
@@ -26,7 +26,7 @@ gophers
 Gophers index
  </name>
  <command>
--k gophers://%HOSTIP:%GOPHERSPORT/1/1272
+-k gophers://%HOSTIP:%GOPHERSPORT/1/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ Gophers index
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-/1272
+/%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test128 b/tests/data/test128
index 743cd126f..c9429c5fe 100644
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -20,9 +20,9 @@ ftp
 FTP upload with --crlf
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/128 -T log/upload128 --crlf
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --crlf
 </command>
-<file name="log/upload128">
+<file name="log/upload%TESTNUMBER">
 file
 with unix newlines
 meant to be
@@ -41,7 +41,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 128
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test1280 b/tests/data/test1280
index 59e3968b0..3744dc810 100644
--- a/tests/data/test1280
+++ b/tests/data/test1280
@@ -27,29 +27,29 @@ http
 simple [a-d] globbing
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/[a-d]/1280
+http://%HOSTIP:%HTTPPORT/[a-d]/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /a/1280 HTTP/1.1
+GET /a/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /b/1280 HTTP/1.1
+GET /b/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /c/1280 HTTP/1.1
+GET /c/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /d/1280 HTTP/1.1
+GET /d/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1281 b/tests/data/test1281
index 661b3c851..f6781d460 100644
--- a/tests/data/test1281
+++ b/tests/data/test1281
@@ -24,7 +24,7 @@ http
 reject non-numerical port number in URL
  </name>
  <command>
-http://%HOSTIP:alpha/beta/1281
+http://%HOSTIP:alpha/beta/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1282 b/tests/data/test1282
index 197356c6b..76e7a000e 100644
--- a/tests/data/test1282
+++ b/tests/data/test1282
@@ -25,7 +25,7 @@ GSS-API
 FTP with 633 response before gss initialized
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1282
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
diff --git a/tests/data/test1283 b/tests/data/test1283
index 65284ca66..df0458cc5 100644
--- a/tests/data/test1283
+++ b/tests/data/test1283
@@ -30,20 +30,20 @@ http
 globbing range with same start and stop
 </name>
 <command option="no-output">
-http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/1283 -o "log/outfile1283_#1#2#3#4.dump"
+http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/%TESTNUMBER -o "log/outfile%TESTNUMBER_#1#2#3#4.dump"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /a1b2/1283 HTTP/1.1
+GET /a1b2/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/outfile1283_a1b2.dump">
+<file name="log/outfile%TESTNUMBER_a1b2.dump">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 6
diff --git a/tests/data/test1284 b/tests/data/test1284
index 4509a9b91..dd2d8b8b7 100644
--- a/tests/data/test1284
+++ b/tests/data/test1284
@@ -60,23 +60,23 @@ HTTP POST --digest with user-specified Content-Length header
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/1284
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /1284 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /1284 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1284", response="5763079608de439072861a59ac733515"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="5763079608de439072861a59ac733515"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
diff --git a/tests/data/test1285 b/tests/data/test1285
index 62828ba4f..e5a38e071 100644
--- a/tests/data/test1285
+++ b/tests/data/test1285
@@ -60,9 +60,9 @@ HTTP PUT --digest with user-specified Content-Length header
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 85" -u auser:apasswd --digest -T log/put1285 http://%HOSTIP:%HTTPPORT/1285
+-H "Content-Length: 85" -u auser:apasswd --digest -T log/put%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/put1285">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -73,15 +73,15 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1285 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 
-PUT /1285 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1285", response="dc185587d5e8391b347eef194c2a3cd6"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="dc185587d5e8391b347eef194c2a3cd6"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
diff --git a/tests/data/test1286 b/tests/data/test1286
index c64a79b47..df0f35fc5 100644
--- a/tests/data/test1286
+++ b/tests/data/test1286
@@ -22,7 +22,7 @@ Content-Length: 0
 HTTP/1.1 302 Thanks for this, but we want to redir you!
 Server: Microsoft-IIS/5.0
 Content-Type: text/html; charset=iso-8859-1
-Location: /12860001
+Location: /%TESTNUMBER0001
 Content-Length: 0
 
 </data1000>
@@ -44,7 +44,7 @@ Content-Length: 0
 HTTP/1.1 302 Thanks for this, but we want to redir you!
 Server: Microsoft-IIS/5.0
 Content-Type: text/html; charset=iso-8859-1
-Location: /12860001
+Location: /%TESTNUMBER0001
 Content-Length: 0
 
 HTTP/1.1 404 Not Found
@@ -71,7 +71,7 @@ HTTP GET --digest increasing nonce-count
 # This test is to ensure the nonce-count (nc) increases
 # https://github.com/curl/curl/pull/1251
 <command>
--u auser:apasswd --location --digest http://%HOSTIP:%HTTPPORT/1286
+-u auser:apasswd --location --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -89,20 +89,20 @@ HTTP GET --digest increasing nonce-count
 if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map { s/^(cnonce=)"[a-zA-Z0-9+\/=]+"$/$1REMOVED/; s/^(response=)"[a-f0-9]{32}"$/$1REMOVED/; s/^qop="auth"$/qop=auth/; $_ } sort split(/, */, $2)) . $3; }
 </strippart>
 <protocol>
-GET /1286 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1286 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/1286", username="auser"
+Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER", username="auser"
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /12860001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/12860001", username="auser"
+Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER0001", username="auser"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1287 b/tests/data/test1287
index ef4c25e83..5493e7dc0 100644
--- a/tests/data/test1287
+++ b/tests/data/test1287
@@ -58,7 +58,7 @@ http-proxy
 HTTP over proxy-tunnel ignore TE and CL in CONNECT 2xx responses
 </name>
 <command>
--v --proxytunnel -x %HOSTIP:%PROXYPORT http://test.1287:%HTTPPORT/we/want/that/page/1287
+-v --proxytunnel -x %HOSTIP:%PROXYPORT http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -69,20 +69,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.1287:%HTTPPORT HTTP/1.1
-Host: test.1287:%HTTPPORT
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/1287 HTTP/1.1
-Host: test.1287:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/stderr1287" mode="text">
+<file name="log/stderr%TESTNUMBER" mode="text">
 * Ignoring Content-Length in CONNECT 200 response
 * Ignoring Transfer-Encoding in CONNECT 200 response
 </file>
diff --git a/tests/data/test1288 b/tests/data/test1288
index c0c7576c1..583fc42f3 100644
--- a/tests/data/test1288
+++ b/tests/data/test1288
@@ -42,7 +42,7 @@ http-proxy
 Suppress proxy CONNECT response headers
 </name>
 <command>
---proxytunnel --suppress-connect-headers --dump-header - --include --write-out "\nCONNECT CODE: %{http_connect}\nRECEIVED HEADER BYTE TOTAL: %{size_header}\n" --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.1288:%HTTPPORT/we/want/that/page/1288
+--proxytunnel --suppress-connect-headers --dump-header - --include --write-out "\nCONNECT CODE: %{http_connect}\nRECEIVED HEADER BYTE TOTAL: %{size_header}\n" --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -53,15 +53,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.1288:%HTTPPORT HTTP/1.1
-Host: %HOSTIP.1288:%HTTPPORT
+CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/1288 HTTP/1.1
-Host: %HOSTIP.1288:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test129 b/tests/data/test129
index 6fe4ad9c5..6da58be2d 100644
--- a/tests/data/test129
+++ b/tests/data/test129
@@ -35,7 +35,7 @@ http
 HTTP/1.2 is rejected
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/129
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/129
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /129 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1290 b/tests/data/test1290
index 871dcd763..959247863 100644
--- a/tests/data/test1290
+++ b/tests/data/test1290
@@ -29,14 +29,14 @@ http
 Verify URL globbing ignores []
 </name>
 <command>
-"http://%HOSTIP:%HTTPPORT/we/want/[]/page/1290"
+"http://%HOSTIP:%HTTPPORT/we/want/[]/page/%TESTNUMBER"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/[]/page/1290 HTTP/1.1
+GET /we/want/[]/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1291 b/tests/data/test1291
index a2e505fc9..5997dcc3b 100644
--- a/tests/data/test1291
+++ b/tests/data/test1291
@@ -24,14 +24,14 @@ none
 Attempt to upload 1000 files but fail immediately
 </name>
 <command>
--K log/cmd1291 --fail-early
+-K log/cmd%TESTNUMBER --fail-early
 </command>
 <file name="log/upload-this">
 XXXXXXXx
 </file>
 # generate the config file
 <precheck>
-perl -e 'for(1 .. 1000) { printf("upload-file=log/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/1291\n", $_);}' > log/cmd1291;
+perl -e 'for(1 .. 1000) { printf("upload-file=log/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/%TESTNUMBER\n", $_);}' > log/cmd%TESTNUMBER;
 </precheck>
 </client>
 
diff --git a/tests/data/test1292 b/tests/data/test1292
index 7910d6d1a..8b8806e41 100644
--- a/tests/data/test1292
+++ b/tests/data/test1292
@@ -30,7 +30,7 @@ http
 Replaced internal headers with a blank one
  </name>
  <command>
- -H "Host;" -H "Accept;" http://%HOSTIP:%HTTPPORT/1292
+ -H "Host;" -H "Accept;" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ Replaced internal headers with a blank one
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1292 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host:
 User-Agent: curl/%VERSION
 Accept:
diff --git a/tests/data/test1293 b/tests/data/test1293
index 557920f41..824886194 100644
--- a/tests/data/test1293
+++ b/tests/data/test1293
@@ -36,7 +36,7 @@ http
 Multipart formpost to two URLs, the first failing
  </name>
  <command>
-http://0 http://%HOSTIP:%HTTPPORT/1293 -F=
+http://0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F=
 </command>
 </client>
 
@@ -48,7 +48,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /1293 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1294 b/tests/data/test1294
index 201562404..7f2a37797 100644
--- a/tests/data/test1294
+++ b/tests/data/test1294
@@ -44,7 +44,7 @@ HTTP GET with split initial request send
 CURL_SMALLREQSEND=128
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1294 -H "Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to wit, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511"
+http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER -H "Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to wit, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511"
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1294 HTTP/1.1
+GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1295 b/tests/data/test1295
index dc6abeb0d..e3692f5d6 100644
--- a/tests/data/test1295
+++ b/tests/data/test1295
@@ -44,7 +44,7 @@ HTTP POST with split initial request send
 CURL_SMALLREQSEND=100
 </setenv>
 <command>
-http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1295 -H "012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300" -d "Mr. Sherlock Holmes, who was usually very late in the mornings, save upon those not infrequent occasions when he was up all night, was seated at the breakfast table." -w '%{size_upload}\n'
+http://%HOSTIP:%HTTPPORT/012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER -H "012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300" -d "Mr. Sherlock Holmes, who was usually very late in the mornings, save upon those not infrequent occasions when he was up all night, was seated at the breakfast table." -w '%{size_upload}\n'
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1295 HTTP/1.1
+POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1296 b/tests/data/test1296
index 040c01814..20dc26570 100644
--- a/tests/data/test1296
+++ b/tests/data/test1296
@@ -35,14 +35,14 @@ HTTP URL with %0a in name part
 </name>
 
 <command>
-http://user%0aname:password@%HOSTIP:%HTTPPORT/1296
+http://user%0aname:password@%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1296 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcgpuYW1lOnBhc3N3b3Jk
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1297 b/tests/data/test1297
index 6cffff85d..f41036223 100644
--- a/tests/data/test1297
+++ b/tests/data/test1297
@@ -33,7 +33,7 @@ http-proxy
 CONNECT to peer that returns nothing
 </name>
 <command>
---proxytunnel --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.1297:%HTTPPORT/we/want/that/page/1297
+--proxytunnel --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -44,15 +44,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.1297:%HTTPPORT HTTP/1.1
-Host: %HOSTIP.1297:%HTTPPORT
+CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/1297 HTTP/1.1
-Host: %HOSTIP.1297:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1298 b/tests/data/test1298
index a9ed01049..2afefac5d 100644
--- a/tests/data/test1298
+++ b/tests/data/test1298
@@ -35,7 +35,7 @@ http
 HTTP GET special path with --request-target
  </name>
  <command>
---request-target "XXX" "http://%HOSTIP:%HTTPPORT/" -H "Testno: 1298"
+--request-target "XXX" "http://%HOSTIP:%HTTPPORT/" -H "Testno: %TESTNUMBER"
 </command>
 </client>
 
@@ -47,7 +47,7 @@ GET XXX HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Testno: 1298
+Testno: %TESTNUMBER
 
 </protocol>
 </verify>
diff --git a/tests/data/test1299 b/tests/data/test1299
index bfb8e5d0d..7f3e80e0c 100644
--- a/tests/data/test1299
+++ b/tests/data/test1299
@@ -34,7 +34,7 @@ http
 Send "OPTIONS *" with --request-target
  </name>
  <command>
---request-target '*' -X OPTIONS http://%HOSTIP:%HTTPPORT/ -H "Testno: 1299"
+--request-target '*' -X OPTIONS http://%HOSTIP:%HTTPPORT/ -H "Testno: %TESTNUMBER"
 </command>
 </client>
 
@@ -46,7 +46,7 @@ OPTIONS * HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Testno: 1299
+Testno: %TESTNUMBER
 
 </protocol>
 </verify>
diff --git a/tests/data/test13 b/tests/data/test13
index 121697947..72dd19100 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -25,14 +25,14 @@ http
 HTTP custom request 'DELETE'
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -X DELETE
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-DELETE /want/13 HTTP/1.1
+DELETE /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test130 b/tests/data/test130
index 85892f1ee..31447cbbe 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc; no user/pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc130 ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc130" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 # machine %HOSTIP login user1 password commented
 machine %HOSTIP login user1 password passwd1
diff --git a/tests/data/test1304 b/tests/data/test1304
index b402bfc8b..699a2e43f 100644
--- a/tests/data/test1304
+++ b/tests/data/test1304
@@ -18,7 +18,7 @@ unittest
  <name>
 netrc parsing unit tests
  </name>
-<file name="log/netrc1304">
+<file name="log/netrc%TESTNUMBER">
 machine example.com login admin password passwd
 machine curl.example.com login none password none
 </file>
diff --git a/tests/data/test1305 b/tests/data/test1305
index 52efbcbb0..7d14aa849 100644
--- a/tests/data/test1305
+++ b/tests/data/test1305
@@ -20,7 +20,7 @@ unittest
 internal hash create/destroy testing
  </name>
 <command>
-1305
+%TESTNUMBER
 </command>
 </client>
 </testcase>
diff --git a/tests/data/test1306 b/tests/data/test1306
index b490efb51..7ed450324 100644
--- a/tests/data/test1306
+++ b/tests/data/test1306
@@ -23,7 +23,7 @@ internal hash create/add/destroy testing
 unit1305
 </tool>
 <command>
-1306
+%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1308 b/tests/data/test1308
index 3755ef8b4..0c7d1b02d 100644
--- a/tests/data/test1308
+++ b/tests/data/test1308
@@ -20,7 +20,7 @@ http
  <name>
 formpost unit tests
  </name>
-<file name="log/test-1308">
+<file name="log/test-%TESTNUMBER">
 Piece of the file that is to uploaded as a formpost
 </file>
 </client>
diff --git a/tests/data/test131 b/tests/data/test131
index 6e99d8a86..63bd02194 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -38,9 +38,9 @@ ftp
 FTP (optional .netrc; user/no pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc131 ftp://user2@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc131" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
diff --git a/tests/data/test1310 b/tests/data/test1310
index cb9db8281..11dcfef0c 100644
--- a/tests/data/test1310
+++ b/tests/data/test1310
@@ -74,10 +74,10 @@ CURL_NTLM_WB_FILE=%PWD/server/fake_ntlm
 # set source directory so fake_ntlm can find the test files
 CURL_NTLM_AUTH_SRCDIR=%SRCDIR
 # set the test number
-CURL_NTLM_AUTH_TESTNUM=1310
+CURL_NTLM_AUTH_TESTNUM=%TESTNUMBER
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/1310 -u testuser:anypasswd --ntlm-wb
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:anypasswd --ntlm-wb
 </command>
 <precheck>
 chkhostname curlhost
@@ -87,13 +87,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1310 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAA
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1310 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE8AAAAYABgAZwAAAAAAAABAAAAACAAIAEAAAAAHAAcASAAAAAAAAAAAAAAAggEAAHRlc3R1c2VyVU5LTk9XTlpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOQ==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1311 b/tests/data/test1311
index 874b01e13..6d5496f0c 100644
--- a/tests/data/test1311
+++ b/tests/data/test1311
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1311; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -J and Content-Disposition
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1311 -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -48,13 +48,13 @@ http://%HOSTIP:%HTTPPORT/1311 -J -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1311 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/name1311">
+<file name="log/name%TESTNUMBER">
 12345
 </file>
 
diff --git a/tests/data/test1312 b/tests/data/test1312
index bff2068b0..2d4891458 100644
--- a/tests/data/test1312
+++ b/tests/data/test1312
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: inline; filename="name1312;weird"
+Content-Disposition: inline; filename="name%TESTNUMBER;weird"
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -J, Content-Disposition and ; in filename
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-%HOSTIP:%HTTPPORT/1312 -J -O
+%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -48,13 +48,13 @@ CURL_TESTDIR=%PWD/log
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1312 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/name1312;weird">
+<file name="log/name%TESTNUMBER;weird">
 12345
 </file>
 
diff --git a/tests/data/test1313 b/tests/data/test1313
index 7781b46ec..b1ac1fcea 100644
--- a/tests/data/test1313
+++ b/tests/data/test1313
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: inline; filename='name1313
+Content-Disposition: inline; filename='name%TESTNUMBER
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -J, Content-Disposition, uneven quotes
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1313 -J -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
 </command>
 </client>
 
@@ -48,13 +48,13 @@ http://%HOSTIP:%HTTPPORT/1313 -J -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1313 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/name1313">
+<file name="log/name%TESTNUMBER">
 12345
 </file>
 
diff --git a/tests/data/test1314 b/tests/data/test1314
index 55e3299e4..343a1c240 100644
--- a/tests/data/test1314
+++ b/tests/data/test1314
@@ -13,7 +13,7 @@ followlocation
 <data>
 HTTP/1.1 301 This is a weirdo text message swsbounce
 Server: test-server/fake
-Location: //somewhere.example.com/reply/1314
+Location: //somewhere.example.com/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -32,7 +32,7 @@ moo
 <datacheck>
 HTTP/1.1 301 This is a weirdo text message swsbounce
 Server: test-server/fake
-Location: //somewhere.example.com/reply/1314
+Location: //somewhere.example.com/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -54,7 +54,7 @@ http
 HTTP Location: following a // prefixed url
  </name>
  <command>
-http://firstplace.example.com/want/1314 -L -x http://%HOSTIP:%HTTPPORT
+http://firstplace.example.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -64,13 +64,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://firstplace.example.com/want/1314 HTTP/1.1
+GET http://firstplace.example.com/want/%TESTNUMBER HTTP/1.1
 Host: firstplace.example.com
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://somewhere.example.com/reply/1314 HTTP/1.1
+GET http://somewhere.example.com/reply/%TESTNUMBER HTTP/1.1
 Host: somewhere.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1315 b/tests/data/test1315
index ffc7bdc7b..3d3faa8af 100644
--- a/tests/data/test1315
+++ b/tests/data/test1315
@@ -29,10 +29,10 @@ http
 HTTP RFC1867-type formposting - -F with three files, one with explicit type
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1315 -F name=value -F 'file=@log/test1315.txt,log/test1315.txt;type=magic/content,log/test1315.txt'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@log/test%TESTNUMBER.txt,log/test%TESTNUMBER.txt;type=magic/content,log/test%TESTNUMBER.txt'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1315.txt">
+<file name="log/test%TESTNUMBER.txt">
 dummy data
 </file>
 </client>
@@ -43,7 +43,7 @@ dummy data
 -----+\w+
 </strip>
 <protocol>
-POST /we/want/1315 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -58,19 +58,19 @@ value
 Content-Disposition: form-data; name="file"
 Content-Type: multipart/mixed; boundary=----------------------------aaaaaaaaaaaa
 
-Content-Disposition: attachment; filename="test1315.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 dummy data
 
 ------------------------------9ef8d6205763
-Content-Disposition: attachment; filename="test1315.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Type: magic/content
 
 dummy data
 
 ------------------------------9ef8d6205763
-Content-Disposition: attachment; filename="test1315.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 dummy data
diff --git a/tests/data/test1316 b/tests/data/test1316
index d6ea5e180..935c46798 100644
--- a/tests/data/test1316
+++ b/tests/data/test1316
@@ -61,7 +61,7 @@ http
 FTP LIST tunneled through HTTP proxy
  </name>
  <command>
-ftp://ftp.1316:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
+ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
diff --git a/tests/data/test1317 b/tests/data/test1317
index dcde5902b..6ef065280 100644
--- a/tests/data/test1317
+++ b/tests/data/test1317
@@ -36,7 +36,7 @@ http
 HTTP with --resolve
 </name>
 <command>
---resolve example.com:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/1317
+--resolve example.com:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP with --resolve
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1317 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: example.com:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1318 b/tests/data/test1318
index a01ab27f6..0844852e9 100644
--- a/tests/data/test1318
+++ b/tests/data/test1318
@@ -36,7 +36,7 @@ http
 HTTP with --resolve and same host name using different cases
  </name>
  <command>
---resolve MiXeDcAsE.cOm:%HTTPPORT:%HOSTIP http://MiXeDcAsE.cOm:%HTTPPORT/1318 http://mixedcase.com:%HTTPPORT/13180001
+--resolve MiXeDcAsE.cOm:%HTTPPORT:%HOSTIP http://MiXeDcAsE.cOm:%HTTPPORT/%TESTNUMBER http://mixedcase.com:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -44,12 +44,12 @@ HTTP with --resolve and same host name using different cases
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1318 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: MiXeDcAsE.cOm:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /13180001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: mixedcase.com:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1319 b/tests/data/test1319
index b37a97055..ea1192524 100644
--- a/tests/data/test1319
+++ b/tests/data/test1319
@@ -56,7 +56,7 @@ proxy
 POP3 fetch tunneled through HTTP proxy
  </name>
  <command>
-pop3://pop.1319:%POP3PORT/1319 -p -x %HOSTIP:%PROXYPORT -u user:secret
+pop3://pop.%TESTNUMBER:%POP3PORT/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -u user:secret
 </command>
 </client>
 
@@ -67,12 +67,12 @@ pop3://pop.1319:%POP3PORT/1319 -p -x %HOSTIP:%PROXYPORT -u user:secret
 CAPA
 USER user
 PASS secret
-RETR 1319
+RETR %TESTNUMBER
 QUIT
 </protocol>
 <proxy>
-CONNECT pop.1319:%POP3PORT HTTP/1.1
-Host: pop.1319:%POP3PORT
+CONNECT pop.%TESTNUMBER:%POP3PORT HTTP/1.1
+Host: pop.%TESTNUMBER:%POP3PORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test132 b/tests/data/test132
index 51cb89c9c..d33980fa7 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc; user/passwd supplied) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc132 ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc132" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
diff --git a/tests/data/test1320 b/tests/data/test1320
index 2db0e3dee..7b43382b9 100644
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -39,7 +39,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT
+smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt recipient@example.com --mail-from se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1320
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
@@ -61,8 +61,8 @@ body
 .
 </upload>
 <proxy>
-CONNECT smtp.1320:%SMTPPORT HTTP/1.1
-Host: smtp.1320:%SMTPPORT
+CONNECT smtp.%TESTNUMBER:%SMTPPORT HTTP/1.1
+Host: smtp.%TESTNUMBER:%SMTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test1321 b/tests/data/test1321
index 460779784..88d865e7b 100644
--- a/tests/data/test1321
+++ b/tests/data/test1321
@@ -52,7 +52,7 @@ proxy
 IMAP FETCH tunneled through HTTP proxy
  </name>
  <command>
-'imap://imap.1321:%IMAPPORT/1321/;MAILINDEX=1' -u user:secret -p -x %HOSTIP:%PROXYPORT
+'imap://imap.%TESTNUMBER:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
@@ -62,13 +62,13 @@ IMAP FETCH tunneled through HTTP proxy
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 1321
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
 <proxy>
-CONNECT imap.1321:%IMAPPORT HTTP/1.1
-Host: imap.1321:%IMAPPORT
+CONNECT imap.%TESTNUMBER:%IMAPPORT HTTP/1.1
+Host: imap.%TESTNUMBER:%IMAPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test1322 b/tests/data/test1322
index eb05fe5b6..ffd5048a7 100644
--- a/tests/data/test1322
+++ b/tests/data/test1322
@@ -37,7 +37,7 @@ http
 HTTP with --resolve and hostname with trailing dot
 </name>
 <command>
---ipv4 --resolve example.com.:%HTTPPORT:%HOSTIP http://example.com.:%HTTPPORT/1322
+--ipv4 --resolve example.com.:%HTTPPORT:%HOSTIP http://example.com.:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ HTTP with --resolve and hostname with trailing dot
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1322 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: example.com:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1324 b/tests/data/test1324
index 46f6e92a7..c62e73f02 100644
--- a/tests/data/test1324
+++ b/tests/data/test1324
@@ -36,7 +36,7 @@ http-ipv6
 HTTP with --resolve and [ipv6address]
 </name>
 <command>
---resolve example.com:%HTTP6PORT:%HOST6IP http://example.com:%HTTP6PORT/1324
+--resolve example.com:%HTTP6PORT:%HOST6IP http://example.com:%HTTP6PORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP with --resolve and [ipv6address]
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1324 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: example.com:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1325 b/tests/data/test1325
index dadac8c23..dea2b2a11 100644
--- a/tests/data/test1325
+++ b/tests/data/test1325
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 308 OK swsclose
-Location: 13250002
+Location: %TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -28,7 +28,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 308 OK swsclose
-Location: 13250002
+Location: %TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -51,7 +51,7 @@ http
 HTTP 308-redirect with POST
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/1325 -L -d "moo"
+http://%HOSTIP:%HTTPPORT/we/%TESTNUMBER -L -d "moo"
 </command>
 </client>
 
@@ -59,14 +59,14 @@ http://%HOSTIP:%HTTPPORT/we/1325 -L -d "moo"
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /we/1325 HTTP/1.1
+POST /we/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-mooPOST /we/13250002 HTTP/1.1
+mooPOST /we/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1326 b/tests/data/test1326
index 2bcf64bda..22c49cf47 100644
--- a/tests/data/test1326
+++ b/tests/data/test1326
@@ -29,7 +29,7 @@ telnet
 TELNET to HTTP server
  </name>
 <stdin>
-GET /we/want/1326 HTTP/1.0
+GET /we/want/%TESTNUMBER HTTP/1.0
 
 </stdin>
  <command>
@@ -41,7 +41,7 @@ telnet://%HOSTIP:%HTTPPORT --upload-file -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1326 HTTP/1.0
+GET /we/want/%TESTNUMBER HTTP/1.0
 
 </protocol>
 </verify>
diff --git a/tests/data/test1327 b/tests/data/test1327
index a6e3d4fdc..791189b90 100644
--- a/tests/data/test1327
+++ b/tests/data/test1327
@@ -24,15 +24,15 @@ telnet
 TELNET check of upload with stdout redirected
  </name>
 <stdin>
-GET /ignore/for/1327 HTTP/1.0
+GET /ignore/for/%TESTNUMBER HTTP/1.0
 
 </stdin>
-<file name="log/1327.txt">
-GET /we/want/1327 HTTP/1.0
+<file name="log/%TESTNUMBER.txt">
+GET /we/want/%TESTNUMBER HTTP/1.0
 
 </file>
  <command option="no-output">
-telnet://%HOSTIP:%HTTPPORT -T log/1327.txt
+telnet://%HOSTIP:%HTTPPORT -T log/%TESTNUMBER.txt
 </command>
 </client>
 
@@ -40,7 +40,7 @@ telnet://%HOSTIP:%HTTPPORT -T log/1327.txt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1327 HTTP/1.0
+GET /we/want/%TESTNUMBER HTTP/1.0
 
 </protocol>
 </verify>
diff --git a/tests/data/test1328 b/tests/data/test1328
index fc9fef991..b7b3e3247 100644
--- a/tests/data/test1328
+++ b/tests/data/test1328
@@ -47,7 +47,7 @@ http
 HTTP GET a globbed range with -f
  </name>
  <command>
--f 'http://%HOSTIP:%HTTPPORT/[13280000-13280001]' -o log/#1
+-f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o log/#1
 </command>
 </client>
 
@@ -55,12 +55,12 @@ HTTP GET a globbed range with -f
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /13280000 HTTP/1.1
+GET /%TESTNUMBER0000 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /13280001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1329 b/tests/data/test1329
index 2cec0b895..0ca5b5aae 100644
--- a/tests/data/test1329
+++ b/tests/data/test1329
@@ -15,7 +15,7 @@ http
 /-prefixed proxy name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/1329 -x "/server"
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x "/server"
 </command>
 <features>
 proxy
diff --git a/tests/data/test133 b/tests/data/test133
index 0b4d2ff70..e9fe83f7c 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -37,9 +37,9 @@ ftp
 FTP (compulsory .netrc; ignored user/passwd) dir list PASV
  </name>
  <command>
--n --netrc-file log/netrc133 ftp://mary:mark@%HOSTIP:%FTPPORT/
+-n --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc133" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
diff --git a/tests/data/test1330 b/tests/data/test1330
index f7ac9b0dd..2cc5aedd7 100644
--- a/tests/data/test1330
+++ b/tests/data/test1330
@@ -32,8 +32,8 @@ nothing
 # Verify data after the test has been "shot"
 <verify>
 <file name="log/memdump">
-MEM unit1330.c: malloc()
-MEM unit1330.c: free()
+MEM unit%TESTNUMBER.c: malloc()
+MEM unit%TESTNUMBER.c: free()
 </file>
 <stripfile>
 s/ =.*//
diff --git a/tests/data/test1331 b/tests/data/test1331
index 09aabf879..4ef0c14df 100644
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -62,7 +62,7 @@ http
 HTTP --proxy-anyauth and 407 with cookies
  </name>
  <command>
--U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/1331 --proxy-anyauth -c log/dump1331
+-U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER --proxy-anyauth -c log/dump%TESTNUMBER
 </command>
 <features>
 proxy
@@ -72,13 +72,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://z.x.com/1331 HTTP/1.1
+GET http://z.x.com/%TESTNUMBER HTTP/1.1
 Host: z.x.com
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://z.x.com/1331 HTTP/1.1
+GET http://z.x.com/%TESTNUMBER HTTP/1.1
 Host: z.x.com
 Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1332 b/tests/data/test1332
index 0ecbfbee1..b7d201be0 100644
--- a/tests/data/test1332
+++ b/tests/data/test1332
@@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/13320002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -27,7 +27,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/13320002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -50,7 +50,7 @@ http
 HTTP POST with 303 redirect and --post303
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1332 -L -d "moo" --post303
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post303
 </command>
 </client>
 
@@ -58,14 +58,14 @@ http://%HOSTIP:%HTTPPORT/blah/1332 -L -d "moo" --post303
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /blah/1332 HTTP/1.1
+POST /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-mooPOST /blah/moo.html&testcase=/13320002 HTTP/1.1
+mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1333 b/tests/data/test1333
index c49cf96aa..0a991e48b 100644
--- a/tests/data/test1333
+++ b/tests/data/test1333
@@ -31,7 +31,7 @@ http
 HTTP POST zero length, chunked-encoded
  </name>
  <command>
--d "" --header "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/1333
+-d "" --header "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,7 +39,7 @@ HTTP POST zero length, chunked-encoded
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /1333 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1334 b/tests/data/test1334
index a0210cb5e..b19155923 100644
--- a/tests/data/test1334
+++ b/tests/data/test1334
@@ -38,7 +38,7 @@ HTTP GET with -O without Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1334 -O -D log/heads1334
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -46,18 +46,18 @@ http://%HOSTIP:%HTTPPORT/1334 -O -D log/heads1334
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1334 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1334">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1334">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -67,7 +67,7 @@ Content-Type: text/html
 
 </file2>
 
-<file3 name="log/stdout1334">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1335 b/tests/data/test1335
index 7f20c300f..e3507603b 100644
--- a/tests/data/test1335
+++ b/tests/data/test1335
@@ -38,7 +38,7 @@ HTTP GET with -O without Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1335 -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
 </command>
 </client>
 
@@ -46,18 +46,18 @@ http://%HOSTIP:%HTTPPORT/1335 -O -D -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1335 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1335">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1335">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test1336 b/tests/data/test1336
index 129c35009..631f204e8 100644
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1336; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O and Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1336 -O -D log/heads1336
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1336
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,29 +50,29 @@ perl %SRCDIR/libtest/notexists.pl log/name1336
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1336 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1336">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1336">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1336; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
-<file3 name="log/stdout1336">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1337 b/tests/data/test1337
index 0d7b20494..808c8a2a4 100644
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1337; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O and Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1337 -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1337
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,25 +50,25 @@ perl %SRCDIR/libtest/notexists.pl log/name1337
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1337 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1337">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1337">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1337; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
diff --git a/tests/data/test1338 b/tests/data/test1338
index 8fa05cfb0..672e9aea8 100644
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -39,7 +39,7 @@ HTTP GET with -O -J without Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1338 -J -O -D log/heads1338
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -47,18 +47,18 @@ http://%HOSTIP:%HTTPPORT/1338 -J -O -D log/heads1338
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1338 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1338">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1338">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -68,7 +68,7 @@ Content-Type: text/html
 
 </file2>
 
-<file3 name="log/stdout1338">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1339 b/tests/data/test1339
index 0ebd5c492..4bc77e976 100644
--- a/tests/data/test1339
+++ b/tests/data/test1339
@@ -39,7 +39,7 @@ HTTP GET with -O -J without Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1339 -J -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D -
 </command>
 </client>
 
@@ -47,18 +47,18 @@ http://%HOSTIP:%HTTPPORT/1339 -J -O -D -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1339 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1339">
+<file1 name="log/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1339">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test134 b/tests/data/test134
index 4ca63accd..00d1732df 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -39,9 +39,9 @@ FTP (optional .netrc; programmatic user/passwd) dir list PASV
 
 # -u overrides netrc which overrides the URL
 <command>
---netrc-optional --netrc-file log/netrc134 -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc134" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
diff --git a/tests/data/test1340 b/tests/data/test1340
index 509c659c2..17218bea0 100644
--- a/tests/data/test1340
+++ b/tests/data/test1340
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1340; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 -w "curl: Saved to filename %{filename_effective}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D log/heads%TESTNUMBER -w "curl: Saved to filename %{filename_effective}\n"
 </command>
 </client>
 
@@ -48,30 +48,30 @@ http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 -w "curl: Saved to filename
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1340 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/name1340">
+<file1 name="log/name%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1340">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1340; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
-<file3 name="log/stdout1340" mode="text">
-curl: Saved to filename %PWD/log/name1340
+<file3 name="log/stdout%TESTNUMBER" mode="text">
+curl: Saved to filename %PWD/log/name%TESTNUMBER
 </file3>
 
 </verify>
diff --git a/tests/data/test1341 b/tests/data/test1341
index 9a7000180..9203cc6ce 100644
--- a/tests/data/test1341
+++ b/tests/data/test1341
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1341; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1341 -J -O -D - -w "curl: Saved to filename %{filename_effective}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl: Saved to filename %{filename_effective}\n"
 </command>
 </client>
 
@@ -48,27 +48,27 @@ http://%HOSTIP:%HTTPPORT/1341 -J -O -D - -w "curl: Saved to filename %{filename_
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1341 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/name1341">
+<file1 name="log/name%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1341">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1341; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
-curl: Saved to filename %PWD/log/name1341
+curl: Saved to filename %PWD/log/name%TESTNUMBER
 </file2>
 
 </verify>
diff --git a/tests/data/test1342 b/tests/data/test1342
index 92aed317e..6bab2831e 100644
--- a/tests/data/test1342
+++ b/tests/data/test1342
@@ -38,7 +38,7 @@ HTTP GET with -O -i without Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1342 -i -O -D log/heads1342
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -46,14 +46,14 @@ http://%HOSTIP:%HTTPPORT/1342 -i -O -D log/heads1342
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1342 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1342">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/heads1342">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -74,7 +74,7 @@ Content-Type: text/html
 
 </file2>
 
-<file3 name="log/stdout1342">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1343 b/tests/data/test1343
index ed5b2d30a..3f0d63059 100644
--- a/tests/data/test1343
+++ b/tests/data/test1343
@@ -38,7 +38,7 @@ HTTP GET with -O -i without Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1343 -i -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
 </command>
 </client>
 
@@ -46,14 +46,14 @@ http://%HOSTIP:%HTTPPORT/1343 -i -O -D -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1343 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1343">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1343">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test1344 b/tests/data/test1344
index 43aeb8b92..bb3361679 100644
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1344; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O -i and Content-Disposition, -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1344 -i -O -D log/heads1344
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1344
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,37 +50,37 @@ perl %SRCDIR/libtest/notexists.pl log/name1344
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1344 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1344">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1344; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </file1>
 
-<file2 name="log/heads1344">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1344; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
-<file3 name="log/stdout1344">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1345 b/tests/data/test1345
index d645e748d..bd9470c14 100644
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1345; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O -i and Content-Disposition, -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1345 -i -O -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1345
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,33 +50,33 @@ perl %SRCDIR/libtest/notexists.pl log/name1345
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1345 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1345">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1345; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </file1>
 
-<file2 name="log/stdout1345">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1345; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
diff --git a/tests/data/test1346 b/tests/data/test1346
index 367a9dfa6..32d434d03 100644
--- a/tests/data/test1346
+++ b/tests/data/test1346
@@ -38,7 +38,7 @@ HTTP GET with -O -i without Content-Disposition, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1346 -i -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
 </command>
 </client>
 
@@ -46,14 +46,14 @@ http://%HOSTIP:%HTTPPORT/1346 -i -O
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1346 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1346">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1346">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1347 b/tests/data/test1347
index 20e0d4aea..46e1ae608 100644
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1347; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -39,10 +39,10 @@ HTTP GET with -O -i and Content-Disposition, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1347 -i -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1347
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,26 +50,26 @@ perl %SRCDIR/libtest/notexists.pl log/name1347
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1347 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/1347">
+<file1 name="log/%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1347; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </file1>
 
-<file2 name="log/stdout1347">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1348 b/tests/data/test1348
index 5f374cb2f..df7a620c3 100644
--- a/tests/data/test1348
+++ b/tests/data/test1348
@@ -31,7 +31,7 @@ FTP download, file without Content-Disposition inside, using -O
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1348 -O
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
 </command>
 </client>
 
@@ -44,17 +44,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1348
-RETR file1348
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1348">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1348">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1349 b/tests/data/test1349
index 33906f8a2..10ba0bddc 100644
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1349 -O -D log/heads1349
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -44,19 +44,19 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1349
-RETR file1349
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1349">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads1349">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -69,14 +69,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1349 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1349">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test135 b/tests/data/test135
index 10eb0eacd..353735d6a 100644
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -32,7 +32,7 @@ ftp
 FTP retrieve a byte-range
  </name>
  <command>
--r 4-16 ftp://%HOSTIP:%FTPPORT/135
+-r 4-16 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,9 +44,9 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 135
+SIZE %TESTNUMBER
 REST 4
-RETR 135
+RETR %TESTNUMBER
 ABOR
 QUIT
 </protocol>
diff --git a/tests/data/test1350 b/tests/data/test1350
index b7885972c..e9ea522ba 100644
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1350 -O -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
 </command>
 </client>
 
@@ -44,19 +44,19 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1350
-RETR file1350
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1350">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/stdout1350">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -69,7 +69,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1350 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1351 b/tests/data/test1351
index 3e9cc211b..4c8ed4caa 100644
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -32,7 +32,7 @@ FTP download, file without C-D inside, using -O -J -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1351 -O -J -D log/heads1351
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -45,19 +45,19 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1351
-RETR file1351
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1351">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads1351">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -70,14 +70,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1351 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1351">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1352 b/tests/data/test1352
index cf690af67..3af12a801 100644
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -32,7 +32,7 @@ FTP download, file without C-D inside, using -O -J -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1352 -O -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
 </command>
 </client>
 
@@ -45,19 +45,19 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1352
-RETR file1352
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1352">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/stdout1352">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -70,7 +70,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1352 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1353 b/tests/data/test1353
index 8bd751c26..34049706d 100644
--- a/tests/data/test1353
+++ b/tests/data/test1353
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -i -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1353 -O -i -D log/heads1353
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -44,19 +44,19 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1353
-RETR file1353
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1353">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads1353">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -69,14 +69,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1353 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1353">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1354 b/tests/data/test1354
index 13c5a1bb5..e5d15635a 100644
--- a/tests/data/test1354
+++ b/tests/data/test1354
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -i -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1354 -O -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
 </command>
 </client>
 
@@ -44,17 +44,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1354
-RETR file1354
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1354">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1354">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -67,7 +67,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1354 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1355 b/tests/data/test1355
index e7a392c1d..f008803e6 100644
--- a/tests/data/test1355
+++ b/tests/data/test1355
@@ -31,7 +31,7 @@ FTP download, file without C-D inside, using -O -i, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1355 -O -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
 </command>
 </client>
 
@@ -44,17 +44,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1355
-RETR file1355
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1355">
+<file1 name="log/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1355">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1356 b/tests/data/test1356
index 72f573105..7be22473a 100644
--- a/tests/data/test1356
+++ b/tests/data/test1356
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1356 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1356; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with Content-Disposition inside, using -O
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1356 -O
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1356
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1356
-RETR file1356
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1356">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1356; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1356">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1357 b/tests/data/test1357
index fca58cea5..ebb102c95 100644
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1357 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1357; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1357 -O -D log/heads1357
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1357
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1357
-RETR file1357
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1357">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1357; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1357">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -85,14 +85,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
-150 Binary data connection for 1357 () (214 bytes).
+150 Binary data connection for %TESTNUMBER () (214 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1357">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1358 b/tests/data/test1358
index 684afe1c4..983e1cdc0 100644
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1358 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1358; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1358 -O -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1358
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1358
-RETR file1358
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1358">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1358; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1358">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -85,7 +85,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
-150 Binary data connection for 1358 () (214 bytes).
+150 Binary data connection for %TESTNUMBER () (214 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1359 b/tests/data/test1359
index bae91f0d0..c4fb2eec4 100644
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1359 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1359; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -40,10 +40,10 @@ FTP download, file with C-D inside, using -O -J -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1359 -O -J -D log/heads1359
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1359
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -56,24 +56,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1359
-RETR file1359
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1359">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1359; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1359">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -86,14 +86,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
-150 Binary data connection for 1359 () (214 bytes).
+150 Binary data connection for %TESTNUMBER () (214 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1359">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test136 b/tests/data/test136
index 25940b50d..63d936b54 100644
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -22,7 +22,7 @@ ftp
 FTP with user and no password
  </name>
  <command>
--u user: ftp://%HOSTIP:%FTPPORT/136
+-u user: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,8 +34,8 @@ PASS
 PWD
 EPSV
 TYPE I
-SIZE 136
-RETR 136
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1360 b/tests/data/test1360
index f0aac4bb4..3f7b43535 100644
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1360 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1360; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -40,10 +40,10 @@ FTP download, file with C-D inside, using -O -J -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1360 -O -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1360
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -56,24 +56,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1360
-RETR file1360
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1360">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1360; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1360">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -86,7 +86,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
-150 Binary data connection for 1360 () (214 bytes).
+150 Binary data connection for %TESTNUMBER () (214 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1361 b/tests/data/test1361
index c37b8fc58..3f1f37893 100644
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1361 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1361; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -i -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1361 -O -i -D log/heads1361
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1361
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1361
-RETR file1361
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1361">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1361; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1361">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -85,14 +85,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
-150 Binary data connection for 1361 () (214 bytes).
+150 Binary data connection for %TESTNUMBER () (214 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1361">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1362 b/tests/data/test1362
index be174efef..c5a09cbe8 100644
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1362 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1362; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -i -D stdout
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1362 -O -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1362
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1362
-RETR file1362
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1362">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1362; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1362">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -85,7 +85,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
-150 Binary data connection for 1362 () (214 bytes).
+150 Binary data connection for %TESTNUMBER () (214 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1363 b/tests/data/test1363
index 36b7069ce..e48074b46 100644
--- a/tests/data/test1363
+++ b/tests/data/test1363
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1363 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1363; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -39,10 +39,10 @@ FTP download, file with C-D inside, using -O -i, without -D
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1363 -O -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name1363
+perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -55,24 +55,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1363
-RETR file1363
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/file1363">
+<file1 name="log/file%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1363; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1363">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1364 b/tests/data/test1364
index 8184573e4..ac2c423d2 100644
--- a/tests/data/test1364
+++ b/tests/data/test1364
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1364 -o log/outfile1364 -D log/heads1364
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1364
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,18 +41,18 @@ perl %SRCDIR/libtest/notexists.pl log/1364
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1364 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1364">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1364">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -62,7 +62,7 @@ Content-Type: text/html
 
 </file2>
 
-<file3 name="log/stdout1364">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1365 b/tests/data/test1365
index 6da4f648e..cee54b3a7 100644
--- a/tests/data/test1365
+++ b/tests/data/test1365
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1365 -o log/outfile1365 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1365
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,18 +41,18 @@ perl %SRCDIR/libtest/notexists.pl log/1365
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1365 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1365">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1365">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test1366 b/tests/data/test1366
index 7a33c2995..ae634cf65 100644
--- a/tests/data/test1366
+++ b/tests/data/test1366
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1366; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1366 -o log/outfile1366 -D log/heads1366
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1366 log/name1366
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,29 +42,29 @@ perl %SRCDIR/libtest/notexists.pl log/1366 log/name1366
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1366 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1366">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1366">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1366; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
-<file3 name="log/stdout1366">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1367 b/tests/data/test1367
index 211b20b7d..a74a4c423 100644
--- a/tests/data/test1367
+++ b/tests/data/test1367
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1367; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1367 -o log/outfile1367 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1367 log/name1367
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,25 +42,25 @@ perl %SRCDIR/libtest/notexists.pl log/1367 log/name1367
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1367 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1367">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1367">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1367; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
diff --git a/tests/data/test1368 b/tests/data/test1368
index 12bc53211..629a635d9 100644
--- a/tests/data/test1368
+++ b/tests/data/test1368
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -J without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1368 -J -o log/outfile1368 -D log/heads1368
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1368
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,18 +42,18 @@ perl %SRCDIR/libtest/notexists.pl log/1368
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1368 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1368">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1368">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -63,7 +63,7 @@ Content-Type: text/html
 
 </file2>
 
-<file3 name="log/stdout1368">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1369 b/tests/data/test1369
index 114c84a60..08665d12d 100644
--- a/tests/data/test1369
+++ b/tests/data/test1369
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -J without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1369 -J -o log/outfile1369 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1369
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,18 +42,18 @@ perl %SRCDIR/libtest/notexists.pl log/1369
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1369 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1369">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1369">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test137 b/tests/data/test137
index b8e2726a0..7766f09ff 100644
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -25,7 +25,7 @@ ftp
 FTP download without size in RETR string
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/lululul/137
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>
 
@@ -39,8 +39,8 @@ CWD blalbla
 CWD lululul
 EPSV
 TYPE I
-SIZE 137
-RETR 137
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1370 b/tests/data/test1370
index 576ca8438..96e7e7457 100644
--- a/tests/data/test1370
+++ b/tests/data/test1370
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1370; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -32,10 +32,10 @@ http
 HTTP GET -o fname -J and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1370 -J -o log/outfile1370 -D log/heads1370
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1370 log/name1370
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -43,29 +43,29 @@ perl %SRCDIR/libtest/notexists.pl log/1370 log/name1370
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1370 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1370">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads1370">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1370; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
-<file3 name="log/stdout1370">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1371 b/tests/data/test1371
index 9a5a3c438..aa5c69a75 100644
--- a/tests/data/test1371
+++ b/tests/data/test1371
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1371; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -32,10 +32,10 @@ http
 HTTP GET -o fname -J and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1371 -J -o log/outfile1371 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1371 log/name1371
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -43,25 +43,25 @@ perl %SRCDIR/libtest/notexists.pl log/1371 log/name1371
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1371 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1371">
+<file1 name="log/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout1371">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1371; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
diff --git a/tests/data/test1372 b/tests/data/test1372
index 7f079e6cf..29c478cdf 100644
--- a/tests/data/test1372
+++ b/tests/data/test1372
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1372 -i -o log/outfile1372 -D log/heads1372
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1372
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1372
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1372 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1372">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/heads1372">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -69,7 +69,7 @@ Content-Type: text/html
 
 </file2>
 
-<file3 name="log/stdout1372">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1373 b/tests/data/test1373
index 5e94144f8..b4c737d68 100644
--- a/tests/data/test1373
+++ b/tests/data/test1373
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1373 -i -o log/outfile1373 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1373
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1373
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1373 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1373">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1373">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test1374 b/tests/data/test1374
index e8379c5af..07bd3bb5a 100644
--- a/tests/data/test1374
+++ b/tests/data/test1374
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1374; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1374 -i -o log/outfile1374 -D log/heads1374
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1374 log/name1374
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,37 +42,37 @@ perl %SRCDIR/libtest/notexists.pl log/1374 log/name1374
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1374 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1374">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1374; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </file1>
 
-<file2 name="log/heads1374">
+<file2 name="log/heads%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1374; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
-<file3 name="log/stdout1374">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1375 b/tests/data/test1375
index f7ff0eebc..2acdb54a1 100644
--- a/tests/data/test1375
+++ b/tests/data/test1375
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1375; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1375 -i -o log/outfile1375 -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1375 log/name1375
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,33 +42,33 @@ perl %SRCDIR/libtest/notexists.pl log/1375 log/name1375
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1375 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1375">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1375; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </file1>
 
-<file2 name="log/stdout1375">
+<file2 name="log/stdout%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1375; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </file2>
 
diff --git a/tests/data/test1376 b/tests/data/test1376
index c78f0ed64..f81f35fe3 100644
--- a/tests/data/test1376
+++ b/tests/data/test1376
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, without -D
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1376 -i -o log/outfile1376
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1376
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1376
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1376 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1376">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout1376">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1377 b/tests/data/test1377
index d08c3ac94..745f08f48 100644
--- a/tests/data/test1377
+++ b/tests/data/test1377
@@ -15,7 +15,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1377; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </data>
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, without -D
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1377 -i -o log/outfile1377
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1377 log/name1377
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -42,26 +42,26 @@ perl %SRCDIR/libtest/notexists.pl log/1377 log/name1377
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1377 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1377">
+<file1 name="log/outfile%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1377; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 12345
 </file1>
 
-<file2 name="log/stdout1377">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1378 b/tests/data/test1378
index e004afcaf..d04e740bf 100644
--- a/tests/data/test1378
+++ b/tests/data/test1378
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without Content-Disposition inside, using -o fname
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1378 -o log/download1378
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1378
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1378
-RETR file1378
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1378">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1378">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1379 b/tests/data/test1379
index 81314b6db..e611ac6b8 100644
--- a/tests/data/test1379
+++ b/tests/data/test1379
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1379 -o log/download1379 -D log/heads1379
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1379
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1379
-RETR file1379
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1379">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads1379">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -62,14 +62,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1379 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1379">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test138 b/tests/data/test138
index 873313848..f70eb078e 100644
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -28,7 +28,7 @@ ftp
 FTP download without size in RETR string and no SIZE command
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/lululul/138
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER
 </command>
 </client>
 
@@ -42,8 +42,8 @@ CWD blalbla
 CWD lululul
 EPSV
 TYPE I
-SIZE 138
-RETR 138
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1380 b/tests/data/test1380
index e71527001..3cc52613b 100644
--- a/tests/data/test1380
+++ b/tests/data/test1380
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1380 -o log/download1380 -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1380
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1380
-RETR file1380
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1380">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1380">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -62,7 +62,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1380 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1381 b/tests/data/test1381
index a55c6b588..a62ee4748 100644
--- a/tests/data/test1381
+++ b/tests/data/test1381
@@ -24,10 +24,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -J -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1381 -o log/download1381 -J -D log/heads1381
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1381
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -40,17 +40,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1381
-RETR file1381
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1381">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads1381">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -63,14 +63,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1381 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1381">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1382 b/tests/data/test1382
index a657e1fe2..8c49877b1 100644
--- a/tests/data/test1382
+++ b/tests/data/test1382
@@ -24,10 +24,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -J -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1382 -o log/download1382 -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1382
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -40,17 +40,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1382
-RETR file1382
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1382">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1382">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -63,7 +63,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1382 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1383 b/tests/data/test1383
index 0694a2240..34f3cf6bc 100644
--- a/tests/data/test1383
+++ b/tests/data/test1383
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -i -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1383 -o log/download1383 -i -D log/heads1383
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1383
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1383
-RETR file1383
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1383">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads1383">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -62,14 +62,14 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1383 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1383">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1384 b/tests/data/test1384
index c07c266b4..f27d59a75 100644
--- a/tests/data/test1384
+++ b/tests/data/test1384
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -i -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1384 -o log/download1384 -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1384
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1384
-RETR file1384
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1384">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1384">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -62,7 +62,7 @@ mooo
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
-150 Binary data connection for 1384 () (10 bytes).
+150 Binary data connection for %TESTNUMBER () (10 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1385 b/tests/data/test1385
index ee35ab704..e35c674b3 100644
--- a/tests/data/test1385
+++ b/tests/data/test1385
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without C-D inside, using -o fname -i, without -D
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1385 -o log/download1385 -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1385
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -39,17 +39,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1385
-RETR file1385
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1385">
+<file1 name="log/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1385">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1386 b/tests/data/test1386
index ceaebd72e..471493b44 100644
--- a/tests/data/test1386
+++ b/tests/data/test1386
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1386 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1386; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with Content-Disposition inside, using -o fname
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1386 -o log/download1386
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1386 log/name1386
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1386
-RETR file1386
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1386">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1386; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1386">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test1387 b/tests/data/test1387
index 8bacfcbbf..c8f5ae6d7 100644
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1387 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1387; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1387 -o log/download1387 -D log/heads1387
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1387 log/name1387
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1387
-RETR file1387
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1387">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1387; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1387">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -77,14 +77,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
-150 Binary data connection for 1387 () (222 bytes).
+150 Binary data connection for %TESTNUMBER () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1387">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1388 b/tests/data/test1388
index a8046a3fa..479ca42f0 100644
--- a/tests/data/test1388
+++ b/tests/data/test1388
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1388 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1388; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1388 -o log/download1388 -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1388 log/name1388
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1388
-RETR file1388
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1388">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1388; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1388">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -77,7 +77,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
-150 Binary data connection for 1388 () (222 bytes).
+150 Binary data connection for %TESTNUMBER () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1389 b/tests/data/test1389
index 8387a2395..eb35d39f5 100644
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1389 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1389; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -32,10 +32,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -J -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1389 -o log/download1389 -J -D log/heads1389
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1389 log/name1389
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,24 +48,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1389
-RETR file1389
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1389">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1389; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1389">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -78,14 +78,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
-150 Binary data connection for 1389 () (222 bytes).
+150 Binary data connection for %TESTNUMBER () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1389">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test139 b/tests/data/test139
index 15a242b66..ab04953c5 100644
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -25,7 +25,7 @@ ftp
 FTP download a newer file with -z
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/139 -z "1 jan 1989"
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989"
 </command>
 </client>
 
@@ -36,11 +36,11 @@ USER anonymous
 PASS ftp@example.com
 PWD
 CWD blalbla
-MDTM 139
+MDTM %TESTNUMBER
 EPSV
 TYPE I
-SIZE 139
-RETR 139
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1390 b/tests/data/test1390
index 10ed5d0f5..fc30849d3 100644
--- a/tests/data/test1390
+++ b/tests/data/test1390
@@ -9,7 +9,7 @@ RETR
 
 # Server-side
 <reply>
-# file1390 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1390; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -32,10 +32,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -J -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1390 -o log/download1390 -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1390 log/name1390
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,24 +48,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1390
-RETR file1390
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1390">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1390; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1390">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -78,7 +78,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
-150 Binary data connection for 1390 () (222 bytes).
+150 Binary data connection for %TESTNUMBER () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1391 b/tests/data/test1391
index 94b5587f6..ce28e5aa7 100644
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1391 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1391; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -i -D file
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1391 -o log/download1391 -i -D log/heads1391
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D log/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1391 log/name1391
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1391
-RETR file1391
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1391">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1391; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/heads1391">
+<file2 name="log/heads%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -77,14 +77,14 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
-150 Binary data connection for 1391 () (222 bytes).
+150 Binary data connection for %TESTNUMBER () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout1391">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
 
 </verify>
diff --git a/tests/data/test1392 b/tests/data/test1392
index 0d5607ed6..99e13c349 100644
--- a/tests/data/test1392
+++ b/tests/data/test1392
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1392 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1392; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -i -D stdout
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1392 -o log/download1392 -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1392 log/name1392
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1392
-RETR file1392
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1392">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1392; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1392">
+<file2 name="log/stdout%TESTNUMBER">
 220-        _   _ ____  _     
 220-    ___| | | |  _ \| |    
 220-   / __| | | | |_) | |    
@@ -77,7 +77,7 @@ MOOOO
 229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
-150 Binary data connection for 1392 () (222 bytes).
+150 Binary data connection for %TESTNUMBER () (222 bytes).
 226 File transfer complete
 </file2>
 <stripfile2>
diff --git a/tests/data/test1393 b/tests/data/test1393
index 1d4da7d93..1402eaf4c 100644
--- a/tests/data/test1393
+++ b/tests/data/test1393
@@ -8,7 +8,7 @@ RETR
 
 # Server-side
 <reply>
-# file1393 contents...
+# file%TESTNUMBER contents...
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1393; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </data>
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with C-D inside, using -o fname -i, without -D
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file1393 -o log/download1393 -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file1393 log/name1393
+perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -47,24 +47,24 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE file1393
-RETR file1393
+SIZE file%TESTNUMBER
+RETR file%TESTNUMBER
 QUIT
 </protocol>
 
-<file1 name="log/download1393">
+<file1 name="log/download%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 6
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1393; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 MOOOO
 </file1>
 
-<file2 name="log/stdout1393">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
 
 </verify>
diff --git a/tests/data/test14 b/tests/data/test14
index f6c568ede..f2bf61004 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -24,14 +24,14 @@ http
 HTTP HEAD with Connection: close
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/14 -i --head
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -i --head
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /want/14 HTTP/1.1
+HEAD /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test140 b/tests/data/test140
index 4d8bc85c7..36a01cc1c 100644
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -24,7 +24,7 @@ ftp
 FTP download file with -z, expected to not transfer
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/140 -z "1 jan 2004"
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004"
 </command>
 </client>
 
@@ -35,7 +35,7 @@ USER anonymous
 PASS ftp@example.com
 PWD
 CWD blalbla
-MDTM 140
+MDTM %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1400 b/tests/data/test1400
index 04b2e0c95..08fa023d4 100644
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -31,14 +31,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1400 --libcurl log/test1400.c
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1400 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_HTTP09_ALLOWED/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1400.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1400");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");
   curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
diff --git a/tests/data/test1401 b/tests/data/test1401
index 7c1620951..609b34ce0 100644
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -35,14 +35,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1401 --libcurl log/test1401.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1401 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic ZmFrZTp1c2Vy
 User-Agent: MyUA
@@ -60,7 +60,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1401.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1401");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_USERPWD, "fake:user");
   curl_easy_setopt(hnd, CURLOPT_HTTPAUTH, (long)CURLAUTH_BASIC);
   curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, slist1);
diff --git a/tests/data/test1402 b/tests/data/test1402
index 990d3f94e..89515a8ce 100644
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -32,14 +32,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1402 --libcurl log/test1402.c -d "foo=bar" -d "baz=quux"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c -d "foo=bar" -d "baz=quux"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /we/want/1402 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -58,7 +58,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1402.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1402");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "foo=bar&baz=quux");
   curl_easy_setopt(hnd, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)16);
   curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");
diff --git a/tests/data/test1403 b/tests/data/test1403
index 8f1eec403..f8964f86b 100644
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -32,14 +32,14 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1403 --libcurl log/test1403.c -G -d "foo=bar" -d "baz=quux"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c -G -d "foo=bar" -d "baz=quux"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1403?foo=bar&baz=quux HTTP/1.1
+GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test1403.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1403?foo=bar&baz=quux");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?foo=bar&baz=quux");
   curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");
   curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
diff --git a/tests/data/test1404 b/tests/data/test1404
index 400fb65c2..49f66a1cc 100644
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -33,10 +33,10 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/1404 -F name=value -F 'file=@log/test1404.txt,log/test1404.txt;type=magic/content;encoder=8bit,log/test1404.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl log/test1404.c
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@log/test%TESTNUMBER.txt,log/test%TESTNUMBER.txt;type=magic/content;encoder=8bit,log/test%TESTNUMBER.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl log/test%TESTNUMBER.c
 </command>
 # We create this file before the command is invoked!
-<file name="log/test1404.txt">
+<file name="log/test%TESTNUMBER.txt">
 dummy data
 </file>
 </client>
@@ -47,7 +47,7 @@ dummy data
 -----+\w+
 </strip>
 <protocol>
-POST /we/want/1404 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -62,20 +62,20 @@ value
 Content-Disposition: form-data; name="file"
 Content-Type: multipart/mixed; boundary=----------------------------aaaaaaaaaaaa
 
-Content-Disposition: attachment; filename="test1404.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 dummy data
 
 ------------------------------9ef8d6205763
-Content-Disposition: attachment; filename="test1404.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Type: magic/content
 Content-Transfer-Encoding: 8bit
 
 dummy data
 
 ------------------------------9ef8d6205763
-Content-Disposition: attachment; filename="test1404.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 X-testheader-1: header 1
 X-testheader-2: header 2
@@ -98,7 +98,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/
 # CURL_DOES_CONVERSION generates an extra comment.
 $_ = '' if /\/\* "value" \*\//
 </stripfile>
-<file name="log/test1404.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1404");
+  curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER");
   mime1 = curl_mime_init(hnd);
   part1 = curl_mime_addpart(mime1);
   curl_mime_data(part1, "value", CURL_ZERO_TERMINATED);
@@ -131,13 +131,13 @@ int main(int argc, char *argv[])
   part1 = curl_mime_addpart(mime1);
   mime2 = curl_mime_init(hnd);
   part2 = curl_mime_addpart(mime2);
-  curl_mime_filedata(part2, "log/test1404.txt");
+  curl_mime_filedata(part2, "log/test%TESTNUMBER.txt");
   part2 = curl_mime_addpart(mime2);
-  curl_mime_filedata(part2, "log/test1404.txt");
+  curl_mime_filedata(part2, "log/test%TESTNUMBER.txt");
   curl_mime_encoder(part2, "8bit");
   curl_mime_type(part2, "magic/content");
   part2 = curl_mime_addpart(mime2);
-  curl_mime_filedata(part2, "log/test1404.txt");
+  curl_mime_filedata(part2, "log/test%TESTNUMBER.txt");
   curl_mime_headers(part2, slist1, 1);
   slist1 = NULL;
   curl_mime_subparts(part1, mime2);
diff --git a/tests/data/test1405 b/tests/data/test1405
index b4087704f..0a144e1a4 100644
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -36,7 +36,7 @@ ftp
 SSL_CERT_FILE=
 </setenv>
  <command>
-ftp://%HOSTIP:%FTPPORT/1405 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl log/test1405.c
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -53,12 +53,12 @@ PASV
 TYPE I
 NOOP 2
 FAIL HARD
-SIZE 1405
-RETR 1405
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 NOOP 3
 QUIT
 </protocol>
-<file name="log/test1405.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "ftp://%HOSTIP:%FTPPORT/1405");
+  curl_easy_setopt(hnd, CURLOPT_URL, "ftp://%HOSTIP:%FTPPORT/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_QUOTE, slist1);
   curl_easy_setopt(hnd, CURLOPT_POSTQUOTE, slist2);
   curl_easy_setopt(hnd, CURLOPT_PREQUOTE, slist3);
diff --git a/tests/data/test1406 b/tests/data/test1406
index 38f68d11e..498374779 100644
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -28,14 +28,14 @@ smtp
 <setenv>
 SSL_CERT_FILE=
 </setenv>
-<file name="log/test1406.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different
 To: another
 
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/1406 --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T log/test1406.eml --libcurl log/test1406.c
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/1406 --mail-rcpt recipient.one@example.com --mail-rcpt
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1406
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com> SIZE=38
 RCPT TO:<recipient.one@example.com>
 RCPT TO:<recipient.two@example.com>
@@ -57,7 +57,7 @@ To: another
 body
 .
 </upload>
-<file name="log/test1406.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "smtp://%HOSTIP:%SMTPPORT/1406");
+  curl_easy_setopt(hnd, CURLOPT_URL, "smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_UPLOAD, 1L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L);
diff --git a/tests/data/test1407 b/tests/data/test1407
index a7e13ba75..5dba13943 100644
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -13,7 +13,7 @@ LIST
 # Server-side
 <reply>
 <servercmd>
-REPLY LIST +OK 1407 100\r\n.
+REPLY LIST +OK %TESTNUMBER 100\r\n.
 </servercmd>
 </reply>
 
@@ -30,7 +30,7 @@ pop3
 SSL_CERT_FILE=
 </setenv>
 <command>
-pop3://%HOSTIP:%POP3PORT/1407 -l -u user:secret --libcurl log/test1407.c
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -41,10 +41,10 @@ pop3://%HOSTIP:%POP3PORT/1407 -l -u user:secret --libcurl log/test1407.c
 CAPA
 USER user
 PASS secret
-LIST 1407
+LIST %TESTNUMBER
 QUIT
 </protocol>
-<file name="log/test1407.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "pop3://%HOSTIP:%POP3PORT/1407");
+  curl_easy_setopt(hnd, CURLOPT_URL, "pop3://%HOSTIP:%POP3PORT/%TESTNUMBER");
   curl_easy_setopt(hnd, CURLOPT_DIRLISTONLY, 1L);
   curl_easy_setopt(hnd, CURLOPT_USERPWD, "user:secret");
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
diff --git a/tests/data/test1408 b/tests/data/test1408
index f3acb0c9f..d4f40f72e 100644
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -48,7 +48,7 @@ http-ipv6
 HTTP receive cookies over IPV6
  </name>
  <command>
--c log/jar1408 -g http://%HOST6IP:%HTTP6PORT/path/14080001 http://%HOST6IP:%HTTP6PORT/path/14080002
+-c log/jar%TESTNUMBER -g http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0001 http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0002
 </command>
 </client>
 
@@ -56,12 +56,12 @@ HTTP receive cookies over IPV6
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/14080001 HTTP/1.1
+GET /path/%TESTNUMBER0001 HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /path/14080002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1409 b/tests/data/test1409
index 8d54b4c95..120bf3cf3 100644
--- a/tests/data/test1409
+++ b/tests/data/test1409
@@ -17,7 +17,7 @@ none
 Pass in string to -C
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1409 -C wrong
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -C wrong
 </command>
 </client>
 
diff --git a/tests/data/test141 b/tests/data/test141
index 694d87c38..3fff42d9b 100644
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -26,7 +26,7 @@ ftp
 FTP download info with -I
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/blalbla/141 -I
+ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I
 </command>
 </client>
 
@@ -37,9 +37,9 @@ USER anonymous
 PASS ftp@example.com
 PWD
 CWD blalbla
-MDTM 141
+MDTM %TESTNUMBER
 TYPE I
-SIZE 141
+SIZE %TESTNUMBER
 REST 0
 QUIT
 </protocol>
diff --git a/tests/data/test1410 b/tests/data/test1410
index a8b89db3f..65e52d406 100644
--- a/tests/data/test1410
+++ b/tests/data/test1410
@@ -17,7 +17,7 @@ none
 Pass in negative number to --max-time
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1410 --max-time -4
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --max-time -4
 </command>
 </client>
 
diff --git a/tests/data/test1411 b/tests/data/test1411
index f251ecc02..a7d23ee2f 100644
--- a/tests/data/test1411
+++ b/tests/data/test1411
@@ -36,10 +36,10 @@ http
 HTTP with zero size file PUT
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1411 -T log/empty1411
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/empty%TESTNUMBER
 </command>
 # create an empty file
-<file name="log/empty1411">
+<file name="log/empty%TESTNUMBER">
 </file>
 </client>
 
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/1411 -T log/empty1411
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /1411 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1412 b/tests/data/test1412
index 808ed17f2..20521704c 100644
--- a/tests/data/test1412
+++ b/tests/data/test1412
@@ -94,9 +94,9 @@ crypto
 HTTP GET with --anyauth with two URLs (picking Digest) 
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1412 -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/14120001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
-<file name="log/put1412">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -107,25 +107,25 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1412 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1412 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1412", response="0390dbe89e31adca0413d11f91f30e7f"
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="0390dbe89e31adca0413d11f91f30e7f"
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14120001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14120001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/14120001", response="0085df91870374c8bf4e94415e7fbf8e"
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER0001", response="0085df91870374c8bf4e94415e7fbf8e"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1413 b/tests/data/test1413
index cbb260872..920417bae 100644
--- a/tests/data/test1413
+++ b/tests/data/test1413
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: moo.html/14130002#fragmentpart
+Location: moo.html/%TESTNUMBER0002#fragmentpart
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: moo.html/14130002#fragmentpart
+Location: moo.html/%TESTNUMBER0002#fragmentpart
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP redirect with fragment in new URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/this/1413 -L
+http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/this/1413 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/1413 HTTP/1.1
+GET /this/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /this/moo.html/14130002 HTTP/1.1
+GET /this/moo.html/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1414 b/tests/data/test1414
index 444037839..33214b04f 100644
--- a/tests/data/test1414
+++ b/tests/data/test1414
@@ -32,7 +32,7 @@ ftp
 FTP PORT without SIZE or EPRT support
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1414 -P -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
 </command>
 </client>
 
@@ -49,8 +49,8 @@ PWD
 EPRT |1|
 PORT
 TYPE I
-SIZE 1414
-RETR 1414
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1415 b/tests/data/test1415
index e0f330e11..79b14e6bd 100644
--- a/tests/data/test1415
+++ b/tests/data/test1415
@@ -44,7 +44,7 @@ Delete expired cookies
 TZ=GMT
 </setenv>
 <command>
-http://example.com/we/want/1415 -b none -c log/jar1415.txt -x %HOSTIP:%HTTPPORT
+http://example.com/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -54,7 +54,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.com/we/want/1415 HTTP/1.1
+GET http://example.com/we/want/%TESTNUMBER HTTP/1.1
 Host: example.com
 User-Agent: curl/%VERSION
 Accept: */*
@@ -62,7 +62,7 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 
-<file name="log/jar1415.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1416 b/tests/data/test1416
index f6e9bbfe4..f3c6ba590 100644
--- a/tests/data/test1416
+++ b/tests/data/test1416
@@ -37,7 +37,7 @@ http
 HTTP GET with chunked Transfer-Encoding overflowed chunked size
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1416
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/1416
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1416 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1417 b/tests/data/test1417
index a141b11d2..a0dd086d5 100644
--- a/tests/data/test1417
+++ b/tests/data/test1417
@@ -49,7 +49,7 @@ http
 HTTP GET with chunked encoding and chunked trailer without CRs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1417 -D log/heads1417
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/1417 -D log/heads1417
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1417 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/heads1417">
+<file name="log/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!
 Server: fakeit/0.9 fakeitbad/1.0
 Transfer-Encoding: chunked
diff --git a/tests/data/test1418 b/tests/data/test1418
index 51d2e5f0a..83c38b0f3 100644
--- a/tests/data/test1418
+++ b/tests/data/test1418
@@ -87,32 +87,32 @@ crypto
 HTTP with --anyauth and connection re-use
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1418 -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/14180003
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1418 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1418 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/1418", response="986238b7e0077754944c966f56d9bc77"
+Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER", response="986238b7e0077754944c966f56d9bc77"
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14180003 HTTP/1.1
+GET /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14180003 HTTP/1.1
+GET /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/14180003", response="1c6390a67bac3283a9b023402f3b3540"
+Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/%TESTNUMBER0003", response="1c6390a67bac3283a9b023402f3b3540"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1419 b/tests/data/test1419
index 6d05f0b5a..6be31498a 100644
--- a/tests/data/test1419
+++ b/tests/data/test1419
@@ -45,19 +45,19 @@ http
 HTTP with --anyauth (but no auth!) and connection re-use
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1419 --anyauth http://%HOSTIP:%HTTPPORT/14190003
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1419 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14190003 HTTP/1.1
+GET /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test142 b/tests/data/test142
index e26aa192a..f64dddb59 100644
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -20,7 +20,7 @@ ftp
 FTP URL with 150 dir levels
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/142
+ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/%TESTNUMBER
 </command>
 </client>
 
@@ -182,8 +182,8 @@ CWD part149
 CWD part150
 EPSV
 TYPE I
-SIZE 142
-RETR 142
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1420 b/tests/data/test1420
index 4b8d7bbf4..d100a6139 100644
--- a/tests/data/test1420
+++ b/tests/data/test1420
@@ -36,7 +36,7 @@ imap
 SSL_CERT_FILE=
 </setenv>
 <command>
-'imap://%HOSTIP:%IMAPPORT/1420/;MAILINDEX=1' -u user:secret --libcurl log/test1420.c
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --libcurl log/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -46,11 +46,11 @@ SSL_CERT_FILE=
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 1420
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
-<file name="log/test1420.c" mode="text">
+<file name="log/test%TESTNUMBER.c" mode="text">
 /********* Sample code generated by the curl command line tool **********
  * All curl_easy_setopt() options are documented at:
  * https://curl.se/libcurl/c/curl_easy_setopt.html
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
   hnd = curl_easy_init();
   curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L);
-  curl_easy_setopt(hnd, CURLOPT_URL, "imap://%HOSTIP:%IMAPPORT/1420/;MAILINDEX=1");
+  curl_easy_setopt(hnd, CURLOPT_URL, "imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1");
   curl_easy_setopt(hnd, CURLOPT_USERPWD, "user:secret");
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L);
diff --git a/tests/data/test1421 b/tests/data/test1421
index c219770e3..5b55547ce 100644
--- a/tests/data/test1421
+++ b/tests/data/test1421
@@ -33,7 +33,7 @@ http
 Re-using HTTP proxy connection for two different host names
  </name>
  <command>
---proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.1421:8990/ http://different.remote.haxx.se.1421:8990
+--proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/ http://different.remote.haxx.se.%TESTNUMBER:8990
 </command>
 <features>
 proxy
@@ -56,14 +56,14 @@ Content-Length: 6
 -foo-
 </stdout>
 <protocol>
-GET http://test.remote.haxx.se.1421:8990/ HTTP/1.1
-Host: test.remote.haxx.se.1421:8990
+GET http://test.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1
-Host: different.remote.haxx.se.1421:8990
+GET http://different.remote.haxx.se.%TESTNUMBER:8990/ HTTP/1.1
+Host: different.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1422 b/tests/data/test1422
index b6489ed44..7cd1d1345 100644
--- a/tests/data/test1422
+++ b/tests/data/test1422
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Length: 0
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name1422; charset=funny; option=str//nge
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge
 
 </data>
 </reply>
@@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition (empty file)
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1422 -J -O file://%PWD/log/name1422
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%PWD/log/name%TESTNUMBER
 </command>
 </client>
 
@@ -48,14 +48,14 @@ http://%HOSTIP:%HTTPPORT/1422 -J -O file://%PWD/log/name1422
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1422 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/name1422">
+<file1 name="log/name%TESTNUMBER">
 </file1>
 
 </verify>
diff --git a/tests/data/test1423 b/tests/data/test1423
index 62dbe93f4..2eb1d8003 100644
--- a/tests/data/test1423
+++ b/tests/data/test1423
@@ -30,10 +30,10 @@ file
 HTTP GET -o fname without Content-Disposition (empty file)
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1423 -o log/outfile1423 file://%PWD/log/outfile1423
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER file://%PWD/log/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/1423
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -41,14 +41,14 @@ perl %SRCDIR/libtest/notexists.pl log/1423
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1423 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1423">
+<file1 name="log/outfile%TESTNUMBER">
 </file1>
 
 </verify>
diff --git a/tests/data/test1424 b/tests/data/test1424
index 8f922e620..ebe5f5213 100644
--- a/tests/data/test1424
+++ b/tests/data/test1424
@@ -46,11 +46,11 @@ http
 <name>
 HTTP GET -o fname without Content-Disposition (unmet time condition)
 </name>
-<file name="log/outfile1424">
+<file name="log/outfile%TESTNUMBER">
 original contents
 </file>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1424 -z "dec 12 11:00:00 1999 GMT" -o log/outfile1424
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" -o log/outfile%TESTNUMBER
 </command>
 </client>
 
@@ -58,7 +58,7 @@ http://%HOSTIP:%HTTPPORT/1424 -z "dec 12 11:00:00 1999 GMT" -o log/outfile1424
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1424 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -66,7 +66,7 @@ If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 
 </protocol>
 
-<file1 name="log/outfile1424">
+<file1 name="log/outfile%TESTNUMBER">
 original contents
 </file1>
 
diff --git a/tests/data/test1425 b/tests/data/test1425
index 4d2bc24c8..2bd6d8437 100644
--- a/tests/data/test1425
+++ b/tests/data/test1425
diff --git a/tests/data/test1426 b/tests/data/test1426
index d8317fc2b..9ed994a56 100644
--- a/tests/data/test1426
+++ b/tests/data/test1426
diff --git a/tests/data/test1427 b/tests/data/test1427
index 648b1da56..adce46a84 100644
--- a/tests/data/test1427
+++ b/tests/data/test1427
@@ -15,7 +15,7 @@ none
 too large -m timeout value
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1427 -m 184467440737095510
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -m 184467440737095510
 </command>
 </client>
 
diff --git a/tests/data/test1428 b/tests/data/test1428
index 24cbcffa6..ac91fd2f5 100644
--- a/tests/data/test1428
+++ b/tests/data/test1428
@@ -50,7 +50,7 @@ http-proxy
 HTTP over proxy-tunnel with --proxy-header and --header
  </name>
  <command>
-http://test.1428:%HTTPPORT/we/want/that/page/1428 -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --header "header-type: server" --proxy-header "header-type: proxy"
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --header "header-type: server" --proxy-header "header-type: proxy"
 </command>
 <features>
 proxy
@@ -61,16 +61,16 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.1428:%HTTPPORT HTTP/1.1
-Host: test.1428:%HTTPPORT
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 header-type: proxy
 
 </proxy>
 <protocol>
-GET /we/want/that/page/1428 HTTP/1.1
-Host: test.1428:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 Authorization: Basic aWFtOm15OjtzZWxm
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1429 b/tests/data/test1429
index 40bc86b1d..9fc3cd246 100644
--- a/tests/data/test1429
+++ b/tests/data/test1429
@@ -35,7 +35,7 @@ http
 HTTP GET with 4-digit response code
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1429 --write-out '%{response_code}' --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{response_code}' --http0.9
 </command>
 </client>
 
@@ -58,7 +58,7 @@ Funny-head: yesyes
 234
 </stdout>
 <protocol>
-GET /1429 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test143 b/tests/data/test143
index 22bec3323..be5b33571 100644
--- a/tests/data/test143
+++ b/tests/data/test143
@@ -22,7 +22,7 @@ ftp
 FTP URL with type=a
  </name>
  <command>
-"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/143;type=a"
+"ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=a"
 </command>
 </client>
 
@@ -37,7 +37,7 @@ CWD tmp
 CWD moo
 EPSV
 TYPE A
-RETR 143
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1430 b/tests/data/test1430
index d227aa74a..3dbeae856 100644
--- a/tests/data/test1430
+++ b/tests/data/test1430
@@ -33,7 +33,7 @@ http
 HTTP GET with negative response code
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1430
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/1430
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1430 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1431 b/tests/data/test1431
index 2f52347b4..be6277d89 100644
--- a/tests/data/test1431
+++ b/tests/data/test1431
@@ -33,7 +33,7 @@ http
 HTTP GET with single-digit response code
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1431
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/1431
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1431 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1432 b/tests/data/test1432
index eeddcfdeb..ab76e94b0 100644
--- a/tests/data/test1432
+++ b/tests/data/test1432
@@ -34,7 +34,7 @@ http
 HTTP GET with 100-digit response code and survive
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1432
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1432
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1432 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1433 b/tests/data/test1433
index 0de9c2618..ac5081635 100644
--- a/tests/data/test1433
+++ b/tests/data/test1433
@@ -34,7 +34,7 @@ http
 HTTP GET with 100-digit subversion number in response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1433
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/1433
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1433 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1434 b/tests/data/test1434
index 55031be71..4801ee2c0 100644
--- a/tests/data/test1434
+++ b/tests/data/test1434
@@ -58,9 +58,9 @@ http
 HTTP GET resume at exactly the existing file size is fine
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1434 -C 100
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100
 </command>
-<file name="log/curl1434.out">
+<file name="log/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678
@@ -77,7 +77,7 @@ http://%HOSTIP:%HTTPPORT/1434 -C 100
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1434 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=100-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1435 b/tests/data/test1435
index 73262498e..5e91f0289 100644
--- a/tests/data/test1435
+++ b/tests/data/test1435
@@ -28,13 +28,13 @@ http-unix
 simple HTTP GET over Unix socket
  </name>
  <command>
---unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/1435
+--unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1435 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: server-interpreted.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1436 b/tests/data/test1436
index 040b3b389..38190f4a8 100644
--- a/tests/data/test1436
+++ b/tests/data/test1436
@@ -42,23 +42,23 @@ http-unix
 HTTP requests with multiple connections over Unix socket
  </name>
  <command>
---unix-socket %HTTPUNIXPATH http://one.example.com/14360001 http://two.example.com/14360002 http://one.example.com/14360003
+--unix-socket %HTTPUNIXPATH http://one.example.com/%TESTNUMBER0001 http://two.example.com/%TESTNUMBER0002 http://one.example.com/%TESTNUMBER0003
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /14360001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: one.example.com
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14360002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: two.example.com
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14360003 HTTP/1.1
+GET /%TESTNUMBER0003 HTTP/1.1
 Host: one.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1437 b/tests/data/test1437
index 07346a9e8..87a36d565 100644
--- a/tests/data/test1437
+++ b/tests/data/test1437
@@ -59,21 +59,21 @@ crypto
 HTTP with duplicated WWW-Authenticate parameters
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1437 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1437 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1437 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/1437", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1438 b/tests/data/test1438
index 5d509b58f..40a25bfd4 100644
--- a/tests/data/test1438
+++ b/tests/data/test1438
@@ -29,7 +29,7 @@ http
 Check if %{scheme} returns HTTP
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1438 --write-out '%{scheme}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{scheme}'
 </command>
 </client>
 
@@ -46,7 +46,7 @@ testdata
 HTTP
 </stdout>
 <protocol>
-GET /1438 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1439 b/tests/data/test1439
index 561c715f9..9a9196e4b 100644
--- a/tests/data/test1439
+++ b/tests/data/test1439
@@ -29,7 +29,7 @@ http
 Check if %{http_version} returns 1.1
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1439 --write-out '%{http_version}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{http_version}'
 </command>
 </client>
 
@@ -46,7 +46,7 @@ testdata
 1.1
 </stdout>
 <protocol>
-GET /1439 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1443 b/tests/data/test1443
index bc029ddfd..a59958ae7 100644
--- a/tests/data/test1443
+++ b/tests/data/test1443
@@ -40,12 +40,12 @@ HTTP GET with -O and --remote-time
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1443 -O --remote-time
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time
 </command>
 # Verify the mtime of the file. The mtime is specifically chosen to be an even
 # number so that it can be represented exactly on a FAT filesystem.
 <postcheck>
-perl -e 'exit((stat("log/1443"))[9] != 960898200)'
+perl -e 'exit((stat("log/%TESTNUMBER"))[9] != 960898200)'
 </postcheck>
 </client>
 
@@ -53,13 +53,13 @@ perl -e 'exit((stat("log/1443"))[9] != 960898200)'
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1443 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/1443">
+<file name="log/%TESTNUMBER">
 12345
 </file>
 </verify>
diff --git a/tests/data/test1444 b/tests/data/test1444
index 7eec21b99..71b5f0ea0 100644
--- a/tests/data/test1444
+++ b/tests/data/test1444
@@ -26,12 +26,12 @@ ftp
 FTP with --remote-time
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1444 --remote-time
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time
 </command>
 # Verify the mtime of the file. The mtime is specifically chosen to be an even
 # number so that it can be represented exactly on a FAT filesystem.
 <postcheck>
-perl -e 'exit((stat("log/curl1444.out"))[9] != 1234567890)'
+perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 1234567890)'
 </postcheck>
 </client>
 
@@ -41,11 +41,11 @@ perl -e 'exit((stat("log/curl1444.out"))[9] != 1234567890)'
 USER anonymous
 PASS ftp@example.com
 PWD
-MDTM 1444
+MDTM %TESTNUMBER
 EPSV
 TYPE I
-SIZE 1444
-RETR 1444
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1445 b/tests/data/test1445
index 936c9aea6..1811e071f 100644
--- a/tests/data/test1445
+++ b/tests/data/test1445
@@ -15,17 +15,17 @@ FILE
 file
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test1445.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 file:// with --remote-time
  </name>
  <command>
-file://localhost%FILE_PWD/log/test1445.dir/plainfile.txt --remote-time
+file://localhost%FILE_PWD/log/test%TESTNUMBER.dir/plainfile.txt --remote-time
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1445.dir && \
-perl -e 'exit((stat("log/curl1445.out"))[9] != 946728000)'
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir && \
+perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 946728000)'
 </postcheck>
 </client>
 
diff --git a/tests/data/test1446 b/tests/data/test1446
index 637df583f..0088375b4 100644
--- a/tests/data/test1446
+++ b/tests/data/test1446
@@ -18,17 +18,17 @@ SFTP
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test1446.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP with --remote-time
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test1446.dir/rofile.txt --insecure --remote-time
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1446.dir && \
-perl -e 'exit((stat("log/curl1446.out"))[9] != 978264000)'
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir && \
+perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 978264000)'
 </postcheck>
 </client>
 
diff --git a/tests/data/test1448 b/tests/data/test1448
index e0f88b9fb..600f72415 100644
--- a/tests/data/test1448
+++ b/tests/data/test1448
@@ -18,7 +18,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: http://åäö.se:%HTTPPORT/14480001
+Location: http://åäö.se:%HTTPPORT/%TESTNUMBER0001
 
 redirect
 </data>
@@ -53,7 +53,7 @@ Redirect following to UTF-8 IDN host name
  </name>
 
  <command>
-http://åäö.se:%HTTPPORT/1448 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --connect-to %HOSTIP:%HTTPPORT:%HOSTIP:%HTTPPORT
+http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --connect-to %HOSTIP:%HTTPPORT:%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://åäö.se:%HTTPPORT/1448 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --c
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1448 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: xn--4cab6c.se:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /14480001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: xn--4cab6c.se:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -78,7 +78,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: http://åäö.se:%HTTPPORT/14480001
+Location: http://åäö.se:%HTTPPORT/%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test1449 b/tests/data/test1449
index 1911b0272..ba24ef912 100644
--- a/tests/data/test1449
+++ b/tests/data/test1449
@@ -21,7 +21,7 @@ ftp
 FTP download range with integer overflow
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1449 -r 36893488147419103232-
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232-
 </command>
 </client>
 
diff --git a/tests/data/test1451 b/tests/data/test1451
index 9337b8b99..cdbd398f3 100644
--- a/tests/data/test1451
+++ b/tests/data/test1451
@@ -26,7 +26,7 @@ smb
 Basic SMB request
 </name>
 <command>
--u 'curltest:curltest' smb://%HOSTIP:%SMBPORT/TESTS/1451
+-u 'curltest:curltest' smb://%HOSTIP:%SMBPORT/TESTS/%TESTNUMBER
 </command>
 <precheck>
 python -c "__import__('pkgutil').find_loader('impacket') or (__import__('sys').stdout.write('Test only works if Python package impacket is installed\n'), __import__('sys').exit(1))"
diff --git a/tests/data/test1452 b/tests/data/test1452
index 6c76ef84a..d1b7fa9cd 100644
--- a/tests/data/test1452
+++ b/tests/data/test1452
@@ -26,7 +26,7 @@ telnet
 Basic TELNET negotiation
  </name>
 <stdin>
-test1452
+test%TESTNUMBER
 </stdin>
  <command>
 telnet://%HOSTIP:%TELNETPORT --upload-file -
@@ -37,7 +37,7 @@ telnet://%HOSTIP:%TELNETPORT --upload-file -
 # Verify data after the test has been "shot"
 <verify>
 <stdout nonewline="yes">
-test1452
+test%TESTNUMBER
 </stdout>
 </verify>
 </testcase>
diff --git a/tests/data/test1455 b/tests/data/test1455
index 10468ba93..23b76ff78 100644
--- a/tests/data/test1455
+++ b/tests/data/test1455
@@ -10,7 +10,7 @@ haproxy
 
 #
 # Server-side
-<reply name="1455">
+<reply name="%TESTNUMBER">
 <data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -37,7 +37,7 @@ http
 HTTP GET when PROXY Protocol enabled
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1455 --haproxy-protocol -H "Testno: 1455"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --haproxy-protocol -H "Testno: %TESTNUMBER"
 </command>
 <features>
 proxy
@@ -52,11 +52,11 @@ s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/
 </strippart>
 <protocol>
 proxy-line
-GET /1455 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Testno: 1455
+Testno: %TESTNUMBER
 
 </protocol>
 </verify>
diff --git a/tests/data/test1456 b/tests/data/test1456
index a633408e1..4aca9ca4e 100644
--- a/tests/data/test1456
+++ b/tests/data/test1456
@@ -40,7 +40,7 @@ http-ipv6
 HTTP-IPv6 GET with PROXY protocol
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1456" --haproxy-protocol
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --haproxy-protocol
 </command>
 <features>
 proxy
@@ -57,7 +57,7 @@ s/PROXY TCP6 ::1 ::1 (\d+) (\d+)/PROXY TCP6 ::1 ::1 $2/
 </strippart>
 <protocol>
 PROXY TCP6 ::1 ::1 %HTTP6PORT
-GET /1456 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1457 b/tests/data/test1457
index 23d7e3759..f34abb7c3 100644
--- a/tests/data/test1457
+++ b/tests/data/test1457
@@ -29,7 +29,7 @@ http
 Check if %{stderr} and %{stdout} switch between stdout and stderr.
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1457 --silent --write-out 'line1%{stderr}line2%{stdout}line3'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --silent --write-out 'line1%{stderr}line2%{stdout}line3'
 </command>
 </client>
 
@@ -49,7 +49,7 @@ line1line3
 line2
 </stderr>
 <protocol>
-GET /1457 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1458 b/tests/data/test1458
index 8e3718b78..785ceae16 100644
--- a/tests/data/test1458
+++ b/tests/data/test1458
@@ -36,7 +36,7 @@ http
 HTTP with wildcard --resolve
 </name>
 <command>
---resolve *:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/1458
+--resolve *:%HTTPPORT:%HOSTIP http://example.com:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP with wildcard --resolve
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1458 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: example.com:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1459 b/tests/data/test1459
index 3e89595e4..fde8bf1d6 100644
--- a/tests/data/test1459
+++ b/tests/data/test1459
@@ -13,7 +13,7 @@ known_hosts
 sftp
 </server>
 <precheck>
-mkdir -p %PWD/log/test1459.dir/.ssh
+mkdir -p %PWD/log/test%TESTNUMBER.dir/.ssh
 </precheck>
 <features>
 sftp
@@ -24,12 +24,12 @@ SFTP with corrupted known_hosts
  <command>
 -u : sftp://%HOSTIP:%SSHPORT/ -l
 </command>
-<file name="log/test1459.dir/.ssh/known_hosts">
+<file name="log/test%TESTNUMBER.dir/.ssh/known_hosts">
 |1|qy29Y1x/+/F39AzdG5515YSSw+c=|iB2WX5jrU3ZTWc+ZfGau7HHEvBc= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAynDN8cDJ3xNzRjTNNGciSHSxpubxhZ6YnkLdp1TkrGW8n\
 R93Ey5VtBeBblYTRlFXBWJgKFcTKBRJ/O4qBZwbUgt10AHj31i6h8NehfT19tR8wG/YCmj3KtYLHmwdzmW1edEL9G2NdX2KiKYv7/zuly3QvmP0QA0NhWkAz0KdWNM=
 </file>
 <setenv>
-CURL_HOME=%PWD/log/test1459.dir
+CURL_HOME=%PWD/log/test%TESTNUMBER.dir
 </setenv>
 </client>
 
diff --git a/tests/data/test146 b/tests/data/test146
index 3cd4bd5aa..f9f01174f 100644
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -23,7 +23,7 @@ ftp
 persistent FTP with different paths
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/first/dir/here/146 ftp://%HOSTIP:%FTPPORT/146
+ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,12 +43,12 @@ CWD dir
 CWD here
 EPSV
 TYPE I
-SIZE 146
-RETR 146
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 CWD /
 EPSV
-SIZE 146
-RETR 146
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1460 b/tests/data/test1460
index 1cc13353e..8f6b5f293 100644
--- a/tests/data/test1460
+++ b/tests/data/test1460
@@ -14,7 +14,7 @@ HTTP/1.1 200 swsclose
   12345
 fooo
 54 3 2 1
-Content-Disposition: filename=name1460; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 
 </data>
 </reply>
@@ -37,9 +37,9 @@ HTTP GET with -Ji and Content-Disposition with existing file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1460 -Ji -O
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Ji -O
 </command>
-<file name="log/name1460">
+<file name="log/name%TESTNUMBER">
 initial content
 </file>
 </client>
@@ -51,7 +51,7 @@ initial content
 <errorcode>
 2
 </errorcode>
-<file name="log/name1460">
+<file name="log/name%TESTNUMBER">
 initial content
 </file>
 
diff --git a/tests/data/test1465 b/tests/data/test1465
index 5a12b94e7..ebbd5d6f1 100644
--- a/tests/data/test1465
+++ b/tests/data/test1465
diff --git a/tests/data/test147 b/tests/data/test147
index 6651df03b..066118648 100644
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -25,7 +25,7 @@ ftp
 FTP with --ftp-create-dirs (failing CWD)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/first/dir/here/147 --ftp-create-dirs
+ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs
 </command>
 </client>
 
@@ -47,8 +47,8 @@ CWD dir
 CWD here
 EPSV
 TYPE I
-SIZE 147
-RETR 147
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test148 b/tests/data/test148
index 540c8fe33..8e9f842d8 100644
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -22,7 +22,7 @@ ftp
 FTP with --ftp-create-dirs (failing MKD)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/148 --ftp-create-dirs
+ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs
 </command>
 </client>
 
diff --git a/tests/data/test149 b/tests/data/test149
index a5d149982..94ca5f793 100644
--- a/tests/data/test149
+++ b/tests/data/test149
@@ -18,9 +18,9 @@ ftp
 FTP with multiple uploads
  </name>
  <command>
--T log/upload149 ftp://%HOSTIP:%FTPPORT/dir1/149 -T log/upload149 ftp://%HOSTIP:%FTPPORT/dir2/149
+-T log/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir1/%TESTNUMBER -T log/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir2/%TESTNUMBER
 </command>
-<file name="log/upload149">
+<file name="log/upload%TESTNUMBER">
 send away this contents
 </file>
 </client>
@@ -39,14 +39,14 @@ PWD
 CWD dir1
 EPSV
 TYPE I
-STOR 149
+STOR %TESTNUMBER
 CWD /
 CWD dir2
 EPSV
-STOR 149
+STOR %TESTNUMBER
 QUIT
 </protocol>
-<file name="log/upload149">
+<file name="log/upload%TESTNUMBER">
 send away this contents
 </file>
 </verify>
diff --git a/tests/data/test15 b/tests/data/test15
index b71588f4e..ad7c06cb3 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -28,7 +28,7 @@ http
 --write-out test
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/15 --write-out "%{url_effective} %{http_code} %{size_download}\n"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --write-out "%{url_effective} %{http_code} %{size_download}\n"
 </command>
 </client>
 
@@ -42,10 +42,10 @@ Fake: yes
 Content-Length: 26
 
 Repeated nonsense-headers
-http://%HOSTIP:%HTTPPORT/want/15 200 26
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER 200 26
 </stdout>
 <protocol>
-GET /want/15 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test150 b/tests/data/test150
index 2179163de..c8bd8632b 100644
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -74,7 +74,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --fail
 </command>
 <precheck>
 chkhostname curlhost
@@ -84,13 +84,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /150 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /150 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1500 b/tests/data/test1500
index 9f0bbe5ac..241f227f9 100644
--- a/tests/data/test1500
+++ b/tests/data/test1500
@@ -31,14 +31,14 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib1500
+lib%TESTNUMBER
 </tool>
 
  <name>
 curl_multi_wait
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1500
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 </testcase>
diff --git a/tests/data/test1501 b/tests/data/test1501
index 8c7e13af7..9a10e0e7d 100644
--- a/tests/data/test1501
+++ b/tests/data/test1501
@@ -24,13 +24,13 @@ DELAY TYPE 2
 ftp
 </server>
 <tool>
-lib1501
+lib%TESTNUMBER
 </tool>
  <name>
 FTP with multi interface and slow LIST response 
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/1501/
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 </command>
 </client>
 # Verify data after the test has been "shot"
@@ -42,7 +42,7 @@ ftp://%HOSTIP:%FTPPORT/1501/
 USER anonymous
 PASS ftp@example.com
 PWD
-CWD 1501
+CWD %TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test1502 b/tests/data/test1502
index b76a14478..859a98fc8 100644
--- a/tests/data/test1502
+++ b/tests/data/test1502
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1502
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence UA
  </name>
  <command>
-http://google.com:%HTTPPORT/1502 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1502 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1502 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: google.com:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1503 b/tests/data/test1503
index 8a49d2078..a093ac3bb 100644
--- a/tests/data/test1503
+++ b/tests/data/test1503
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1503
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence PA
  </name>
  <command>
-http://google.com:%HTTPPORT/1503 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1503 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1503 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: google.com:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1504 b/tests/data/test1504
index 8702e5d36..8dc4f1856 100644
--- a/tests/data/test1504
+++ b/tests/data/test1504
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1504
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence UB
  </name>
  <command>
-http://google.com:%HTTPPORT/1504 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1504 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1504 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: google.com:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1505 b/tests/data/test1505
index 25d4c2e63..9ddac46b8 100644
--- a/tests/data/test1505
+++ b/tests/data/test1505
@@ -32,13 +32,13 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1505
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP multi with CURLOPT_RESOLVE, cleanup sequence PB
  </name>
  <command>
-http://google.com:%HTTPPORT/1505 %HTTPPORT %HOSTIP
+http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://google.com:%HTTPPORT/1505 %HTTPPORT %HOSTIP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1505 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: google.com:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1506 b/tests/data/test1506
index fead56631..07d3aac99 100644
--- a/tests/data/test1506
+++ b/tests/data/test1506
@@ -49,32 +49,32 @@ file contents should appear once for each file
 http
 </server>
 <tool>
-lib1506
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/1506 %HOSTIP %HTTPPORT
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/15060001 HTTP/1.1
+GET /path/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/15060002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/15060003 HTTP/1.1
+GET /path/%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/15060004 HTTP/1.1
+GET /path/%TESTNUMBER0004 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
@@ -82,7 +82,7 @@ Accept: */*
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr1506" mode="text">
+<file name="log/stderr%TESTNUMBER" mode="text">
 * Connection #0 to host server1.example.com left intact
 * Connection #1 to host server2.example.com left intact
 * Connection #2 to host server3.example.com left intact
diff --git a/tests/data/test1507 b/tests/data/test1507
index ab7b47eb3..8208752ad 100644
--- a/tests/data/test1507
+++ b/tests/data/test1507
@@ -18,7 +18,7 @@ multi
 smtp
 </server>
 <tool>
-lib1507
+lib%TESTNUMBER
 </tool>
 
 # based on bug report #1184
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/1507
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,9 +40,9 @@ smtp://%HOSTIP:%SMTPPORT/1507
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1507
-MAIL FROM:<1507-realuser@example.com>
-RCPT TO:<1507-recipient@example.com>
+EHLO %TESTNUMBER
+MAIL FROM:<%TESTNUMBER-realuser@example.com>
+RCPT TO:<%TESTNUMBER-recipient@example.com>
 DATA
 </protocol>
 <upload>
diff --git a/tests/data/test1508 b/tests/data/test1508
index fbdc322a0..02cb90a67 100644
--- a/tests/data/test1508
+++ b/tests/data/test1508
@@ -12,19 +12,19 @@ multi
 none
 </server>
 <tool>
-lib1508
+lib%TESTNUMBER
 </tool>
  <name>
 Close a multi handle without using it
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/path/1508
+http://%HOSTIP:%NOLISTENPORT/path/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/stdout1508">
+<file name="log/stdout%TESTNUMBER">
 We are done
 </file>
 </verify>
diff --git a/tests/data/test1509 b/tests/data/test1509
index dfef1e9dd..baa0a30ca 100644
--- a/tests/data/test1509
+++ b/tests/data/test1509
@@ -51,7 +51,7 @@ http-proxy
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1509
+lib%TESTNUMBER
 </tool>
 <features>
 proxy
@@ -60,9 +60,9 @@ proxy
 simple multi http:// through proxytunnel with authentication info
  </name>
  <command>
-http://the.old.moo.1509:%HTTPPORT/1509 %HOSTIP:%PROXYPORT
+http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
-<file name="log/test1509.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -74,14 +74,14 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1509:%HTTPPORT HTTP/1.1
-Host: the.old.moo.1509:%HTTPPORT
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /1509 HTTP/1.1
-Host: the.old.moo.1509:%HTTPPORT
+GET /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Accept: */*
 
 [DISCONNECT]
diff --git a/tests/data/test151 b/tests/data/test151
index 03a55b4dc..d05c7a000 100644
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -28,14 +28,14 @@ http
 HTTP GET with an error code that might trick authentication
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/151
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /151 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1510 b/tests/data/test1510
index cf1fad7cd..d021dfee6 100644
--- a/tests/data/test1510
+++ b/tests/data/test1510
@@ -49,32 +49,32 @@ file contents should appear once for each file
 http
 </server>
 <tool>
-lib1510
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/1510 %HOSTIP %HTTPPORT
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/15100001 HTTP/1.1
+GET /path/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/15100002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/15100003 HTTP/1.1
+GET /path/%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/15100004 HTTP/1.1
+GET /path/%TESTNUMBER0004 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
@@ -82,7 +82,7 @@ Accept: */*
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr1510" mode="text">
+<file name="log/stderr%TESTNUMBER" mode="text">
 * Connection #0 to host server1.example.com left intact
 * Connection #1 to host server2.example.com left intact
 * Connection #2 to host server3.example.com left intact
diff --git a/tests/data/test1511 b/tests/data/test1511
index e57df7403..094ccf9c6 100644
--- a/tests/data/test1511
+++ b/tests/data/test1511
@@ -50,13 +50,13 @@ http
 http
 </features>
 <tool>
-lib1511
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP GET time conditions in repeated requests
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1511
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1512 b/tests/data/test1512
index 63947e89a..7c04660fe 100644
--- a/tests/data/test1512
+++ b/tests/data/test1512
@@ -48,24 +48,24 @@ file contents should appear once for each file
 http
 </server>
 <tool>
-lib1512
+lib%TESTNUMBER
 </tool>
  <name>
 GLOBAL CACHE test over two easy performs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/1512 %HOSTIP %HTTPPORT
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/15120001 HTTP/1.1
+GET /path/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/15120002 HTTP/1.1
+GET /path/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1513 b/tests/data/test1513
index ba0c18a40..189d3e394 100644
--- a/tests/data/test1513
+++ b/tests/data/test1513
@@ -22,7 +22,7 @@ wait 10
 http
 </server>
 <tool>
-lib1513
+lib%TESTNUMBER
 </tool>
  <name>
 return failure immediately from progress callback
@@ -30,7 +30,7 @@ return failure immediately from progress callback
 
 # this server/host won't be used for real
  <command>
-http://%HOSTIP:%HTTPPORT/1513
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1514 b/tests/data/test1514
index 6c09ae3b0..9990c6bb6 100644
--- a/tests/data/test1514
+++ b/tests/data/test1514
@@ -24,13 +24,13 @@ Connection: close
 http
 </server>
 <tool>
-lib1514
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP POST with read callback and unknown data size
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1514
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/1514
 # Content-Length header is not present
 # Transfer-Encoding header is added automatically
 <protocol>
-POST /1514 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
diff --git a/tests/data/test1515 b/tests/data/test1515
index 741792429..c75671ad0 100644
--- a/tests/data/test1515
+++ b/tests/data/test1515
@@ -43,13 +43,13 @@ hello
 http
 </server>
 <tool>
-lib1515
+lib%TESTNUMBER
 </tool>
 <name>
 caching of manual libcurl DNS entries after DNS cache timeout
 </name>
 <command>
-path/1515 %HOSTIP %HTTPPORT
+path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
diff --git a/tests/data/test1516 b/tests/data/test1516
index bf2cd1511..79f0275f0 100644
--- a/tests/data/test1516
+++ b/tests/data/test1516
@@ -45,7 +45,7 @@ lib1515
 caching of manual libcurl DNS entries after dead connection
 </name>
 <command>
-/path/1516 %HOSTIP %HTTPPORT
+/path/%TESTNUMBER %HOSTIP %HTTPPORT
 </command>
 </client>
 
diff --git a/tests/data/test1517 b/tests/data/test1517
index d0a4aeca3..5150ff6ed 100644
--- a/tests/data/test1517
+++ b/tests/data/test1517
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1517
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP POST, server responds before completed send
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1517
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/1517
 s/^(this is what we post to the silly web server)(\r)?\n//
 </strippart>
 <protocol>
-POST /1517 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 45
diff --git a/tests/data/test1518 b/tests/data/test1518
index 134ea4af6..e1d0d5cec 100644
--- a/tests/data/test1518
+++ b/tests/data/test1518
@@ -29,14 +29,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1518
+lib%TESTNUMBER
 </tool>
 
  <name>
 Extract Location: with broken URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1518
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/1518
 res: 0
 status: 302
 redirects: 0
-effectiveurl: http://%HOSTIP:%HTTPPORT/1518
+effectiveurl: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 redirecturl: http://1.2 .4.5/test
 </stdout>
 <errorcode>
diff --git a/tests/data/test1519 b/tests/data/test1519
index 292a49c65..835ef0806 100644
--- a/tests/data/test1519
+++ b/tests/data/test1519
@@ -36,7 +36,7 @@ lib1518
 Extract Location: with broken absolute URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1519
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/1519
 res: 0
 status: 302
 redirects: 0
-effectiveurl: http://%HOSTIP:%HTTPPORT/1519
+effectiveurl: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 redirecturl: http://%HOSTIP:%HTTPPORT/h%20ttp://1.2.4.5/test
 </stdout>
 <errorcode>
diff --git a/tests/data/test152 b/tests/data/test152
index 2c48b0379..a558ed596 100644
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -29,14 +29,14 @@ http
 HTTP GET with an error code that might trick authentication and --fail
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/152 --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /152 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1520 b/tests/data/test1520
index 5f9344d94..fc031ad00 100644
--- a/tests/data/test1520
+++ b/tests/data/test1520
@@ -13,7 +13,7 @@ SMTP
 smtp
 </server>
 <tool>
-lib1520
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/1520
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/1520
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 1520
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test1521 b/tests/data/test1521
index 791a50dc8..f086243e4 100644
--- a/tests/data/test1521
+++ b/tests/data/test1521
@@ -12,7 +12,7 @@ curl_easy_setopt
 none
 </server>
 <tool>
-lib1521
+lib%TESTNUMBER
 </tool>
 
  <name>
diff --git a/tests/data/test1522 b/tests/data/test1522
index 1b5873a84..07dfb8209 100644
--- a/tests/data/test1522
+++ b/tests/data/test1522
@@ -29,7 +29,7 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib1522
+lib%TESTNUMBER
 </tool>
 
 <name>
@@ -37,7 +37,7 @@ CURLINFO_SIZE_UPLOAD with small SO_SNDBUF
 </name>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1522
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1523 b/tests/data/test1523
index a6bf1d3f5..de31a43c9 100644
--- a/tests/data/test1523
+++ b/tests/data/test1523
@@ -27,7 +27,7 @@ writedelay: 1
 http
 </server>
 <tool>
-lib1523
+lib%TESTNUMBER
 </tool>
 
 <name>
@@ -35,7 +35,7 @@ CURLINFO_LOW_SPEED_LIMIT
 </name>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1523
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <killserver>
 http
diff --git a/tests/data/test1524 b/tests/data/test1524
index 349054020..39da646f5 100644
--- a/tests/data/test1524
+++ b/tests/data/test1524
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/15240002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Connection: close
 
 </data>
@@ -24,7 +24,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 303 OK swsclose
-Location: moo.html&testcase=/15240002
+Location: moo.html&testcase=/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 200 OK swsclose
@@ -45,9 +45,9 @@ http
 HTTP PUT with 303 redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/1524 -L -T log/upload1524.txt
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T log/upload%TESTNUMBER.txt
 </command>
-<file name="log/upload1524.txt">
+<file name="log/upload%TESTNUMBER.txt">
 moo
 </file>
 </client>
@@ -56,7 +56,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-PUT /blah/1524 HTTP/1.1
+PUT /blah/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -64,7 +64,7 @@ Content-Length: 4
 Expect: 100-continue
 
 moo
-GET /blah/moo.html&testcase=/15240002 HTTP/1.1
+GET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1525 b/tests/data/test1525
index 396ba5106..05c686300 100644
--- a/tests/data/test1525
+++ b/tests/data/test1525
@@ -41,13 +41,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1525
+lib%TESTNUMBER
 </tool>
  <name>
 CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED
  </name>
  <command>
- http://the.old.moo.1525:%HTTPPORT/1525 %HOSTIP:%PROXYPORT
+ http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -57,15 +57,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1525:%HTTPPORT HTTP/1.1
-Host: the.old.moo.1525:%HTTPPORT
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Proxy-Connection: Keep-Alive
 User-Agent: Http Agent
 
 </proxy>
 <protocol>
-PUT /1525 HTTP/1.1
-Host: the.old.moo.1525:%HTTPPORT
+PUT /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Accept: */*
 User-Agent: Http Agent
 Content-Length: 13
diff --git a/tests/data/test1526 b/tests/data/test1526
index e0a80fcad..c1204b97e 100644
--- a/tests/data/test1526
+++ b/tests/data/test1526
@@ -43,13 +43,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1526
+lib%TESTNUMBER
 </tool>
  <name>
 CURLOPT_PROXYHEADER: separate host/proxy headers
  </name>
  <command>
- http://the.old.moo.1526:%HTTPPORT/1526 %HOSTIP:%PROXYPORT
+ http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -59,15 +59,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1526:%HTTPPORT HTTP/1.1
-Host: the.old.moo.1526:%HTTPPORT
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Proxy-Connection: Keep-Alive
 User-Agent: Proxy Agent
 
 </proxy>
 <protocol>
-PUT /1526 HTTP/1.1
-Host: the.old.moo.1526:%HTTPPORT
+PUT /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Accept: */*
 User-Agent: Http Agent
 Content-Length: 13
diff --git a/tests/data/test1527 b/tests/data/test1527
index 028dc5984..d50df9056 100644
--- a/tests/data/test1527
+++ b/tests/data/test1527
@@ -42,13 +42,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1527
+lib%TESTNUMBER
 </tool>
  <name>
 Check same headers are generated with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED
  </name>
  <command>
- http://the.old.moo.1527:%HTTPPORT/1527 %HOSTIP:%PROXYPORT
+ http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -58,16 +58,16 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT the.old.moo.1527:%HTTPPORT HTTP/1.1
-Host: the.old.moo.1527:%HTTPPORT
+CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Proxy-Connection: Keep-Alive
 User-Agent: Http Agent
 Expect: 100-continue
 
 </proxy>
 <protocol>
-PUT /1527 HTTP/1.1
-Host: the.old.moo.1527:%HTTPPORT
+PUT /%TESTNUMBER HTTP/1.1
+Host: the.old.moo.%TESTNUMBER:%HTTPPORT
 Accept: */*
 User-Agent: Http Agent
 Expect: 100-continue
diff --git a/tests/data/test1528 b/tests/data/test1528
index 502c2c645..f6449aefe 100644
--- a/tests/data/test1528
+++ b/tests/data/test1528
@@ -35,13 +35,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1528
+lib%TESTNUMBER
 </tool>
  <name>
 Separately specified proxy/server headers sent in a proxy GET
  </name>
  <command>
- http://the.old.moo:%HTTPPORT/1528 %HOSTIP:%PROXYPORT
+ http://the.old.moo:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -51,7 +51,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-GET http://the.old.moo:%HTTPPORT/1528 HTTP/1.1
+GET http://the.old.moo:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: the.old.moo:%HTTPPORT
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test1529 b/tests/data/test1529
index f7be50367..68136aae3 100644
--- a/tests/data/test1529
+++ b/tests/data/test1529
@@ -23,13 +23,13 @@ http
 http-proxy
 </server>
 <tool>
-lib1529
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP request-injection in URL sent over proxy
  </name>
  <command>
- "http://the.old.moo:%HTTPPORT/1529" %HOSTIP:%PROXYPORT
+ "http://the.old.moo:%HTTPPORT/%TESTNUMBER" %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
diff --git a/tests/data/test153 b/tests/data/test153
index a582595ac..c51824fe7 100644
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -81,7 +81,7 @@ crypto
 HTTP with Digest authorization with stale=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/1530002
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 </command>
 </client>
 
@@ -91,31 +91,31 @@ http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H
 ^Authorization.*cnonce
 </strip>
 <protocol>
-GET /1530001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1530001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530001", response="f4f83139396995bac665f24a1f1055c7"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="f4f83139396995bac665f24a1f1055c7"
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1530002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1530002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="f84511b014fdd0ba6494f42871079c32"
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1530002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/1530002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
+Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1530 b/tests/data/test1530
index 8372d29ef..0fbd21cf0 100644
--- a/tests/data/test1530
+++ b/tests/data/test1530
@@ -13,7 +13,7 @@ none
 http
 </features>
 <tool>
-lib1530
+lib%TESTNUMBER
 </tool>
  <name>
 CURLOPT_OPENSOCKETFUNCTION returns bad socket
diff --git a/tests/data/test1531 b/tests/data/test1531
index d58deb6e0..e590af08b 100644
--- a/tests/data/test1531
+++ b/tests/data/test1531
diff --git a/tests/data/test1532 b/tests/data/test1532
index 5b2afc71a..582f05a5b 100644
--- a/tests/data/test1532
+++ b/tests/data/test1532
@@ -23,13 +23,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1532
+lib%TESTNUMBER
 </tool>
 <name>
 Test CURLINFO_RESPONSE_CODE
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1532
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/1532
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1532 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1533 b/tests/data/test1533
index 617e20e7b..7f06d2029 100644
--- a/tests/data/test1533
+++ b/tests/data/test1533
@@ -27,13 +27,13 @@ Early Response
 http
 </server>
 <tool>
-lib1533
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP with CURLOPT_KEEP_SENDING_ON_ERROR and an early error response
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1533
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,25 +44,25 @@ http://%HOSTIP:%HTTPPORT/1533
 120
 </errorcode>
 <protocol nonewline="yes">
-POST /1533 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-POST /1533 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-POST /1533 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-aaaPOST /1533 HTTP/1.1
+aaaPOST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 3
diff --git a/tests/data/test1534 b/tests/data/test1534
index 5ebf57d3a..4672e0bcb 100644
--- a/tests/data/test1534
+++ b/tests/data/test1534
@@ -24,13 +24,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1534
+lib%TESTNUMBER
 </tool>
 <name>
 CURLINFO_FILETIME init and reset
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1534
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1534
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1534 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1535 b/tests/data/test1535
index 226190d05..477f3fac2 100644
--- a/tests/data/test1535
+++ b/tests/data/test1535
@@ -24,13 +24,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1535
+lib%TESTNUMBER
 </tool>
 <name>
 Test CURLINFO_RESPONSE_CODE CURLINFO_PROTOCOL
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1535
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1535
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1535 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1536 b/tests/data/test1536
index a6e5a66cb..ea7ce3966 100644
--- a/tests/data/test1536
+++ b/tests/data/test1536
@@ -24,13 +24,13 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1536
+lib%TESTNUMBER
 </tool>
 <name>
 Test CURLINFO_RESPONSE_CODE CURLINFO_SCHEME
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1536
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/1536
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1536 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1537 b/tests/data/test1537
index 33d8ab3d9..c999e9a6b 100644
--- a/tests/data/test1537
+++ b/tests/data/test1537
@@ -16,7 +16,7 @@ URL escape
 none
 </server>
 <tool>
-lib1537
+lib%TESTNUMBER
 </tool>
 
 <name>
diff --git a/tests/data/test1538 b/tests/data/test1538
index 03481d56e..ec86dd075 100644
--- a/tests/data/test1538
+++ b/tests/data/test1538
@@ -17,7 +17,7 @@ verbose logs
 none
 </server>
 <tool>
-lib1538
+lib%TESTNUMBER
 </tool>
 
 <name>
diff --git a/tests/data/test1539 b/tests/data/test1539
index b8546f270..3ef12fe5e 100644
--- a/tests/data/test1539
+++ b/tests/data/test1539
@@ -24,13 +24,13 @@ Connection: close
 http
 </server>
 <tool>
-lib1539
+lib%TESTNUMBER
 </tool>
 <name>
 HTTP 1.0 POST with read callback and unknown data size
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1539
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test154 b/tests/data/test154
index 616051cbc..c0f76514d 100644
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -70,9 +70,9 @@ crypto
 HTTP PUT with --anyauth authorization (picking Digest)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/154 -T log/put154 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put154">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -83,16 +83,16 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /154 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
 
-PUT /154 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/154", response="b71551e12d1c456e47d8388ecb2edeca"
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="b71551e12d1c456e47d8388ecb2edeca"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
diff --git a/tests/data/test1540 b/tests/data/test1540
index 1c1cf5db5..818cbb68d 100644
--- a/tests/data/test1540
+++ b/tests/data/test1540
@@ -42,20 +42,20 @@ MyCoolTrailerHeader: amazingtrailer
 http
 </server>
 <tool>
-lib1540
+lib%TESTNUMBER
 </tool>
  <name>
 chunked with trailers and pausing the receive
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1540
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1540 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test155 b/tests/data/test155
index 6e19a4f26..1ff91ca1d 100644
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -93,12 +93,12 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/155 -T log/put155 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <precheck>
 chkhostname curlhost
 </precheck>
-<file name="log/put155">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -109,21 +109,21 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /155 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
 
-PUT /155 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 
-PUT /155 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1550 b/tests/data/test1550
index c305dd6f2..bfb80a1ca 100644
--- a/tests/data/test1550
+++ b/tests/data/test1550
@@ -16,14 +16,14 @@ none
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1550
+lib%TESTNUMBER
 </tool>
 
  <name>
 verify setting pipeling blocklisting options
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/1550
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 </testcase>
diff --git a/tests/data/test1551 b/tests/data/test1551
index 87fe43263..4c60db85d 100644
--- a/tests/data/test1551
+++ b/tests/data/test1551
@@ -11,7 +11,7 @@ multi
 HTTP/1.1 302 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 6
-Location: /15510002
+Location: /%TESTNUMBER0002
 
 -foo-
 </data>
@@ -35,32 +35,32 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1551
+lib%TESTNUMBER
 </tool>
 
  <name>
 re-run redirected transfer without setting URL again
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1551
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1551 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /15510002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /1551 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /15510002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1552 b/tests/data/test1552
index 48e55cb51..9468f4133 100644
--- a/tests/data/test1552
+++ b/tests/data/test1552
@@ -36,10 +36,10 @@ IMAP multi transfer error without curl_multi_remove_handle
  </name>
 # tool is what to use instead of 'curl'
 <tool>
-lib1552
+lib%TESTNUMBER
 </tool>
  <command>
-'imap://%HOSTIP:%IMAPPORT/1552/;MAILINDEX=1'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
diff --git a/tests/data/test1553 b/tests/data/test1553
index 5e793b391..bc8303211 100644
--- a/tests/data/test1553
+++ b/tests/data/test1553
@@ -36,12 +36,12 @@ IMAP cleanup before a connection was created
  </name>
 # tool is what to use instead of 'curl'
 <tool>
-lib1553
+lib%TESTNUMBER
 </tool>
 
 # this MUST use a host name that doesn't resolve
 <command>
-imap://non-existing-host.haxx.se:%IMAPPORT/1553
+imap://non-existing-host.haxx.se:%IMAPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1554 b/tests/data/test1554
index 58ec312a7..c16195c17 100644
--- a/tests/data/test1554
+++ b/tests/data/test1554
@@ -92,10 +92,10 @@ http
 HTTP with shared connection cache
 </name>
 <tool>
-lib1554
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1554
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1555 b/tests/data/test1555
index 19512c5f5..547ec39e4 100644
--- a/tests/data/test1555
+++ b/tests/data/test1555
@@ -22,7 +22,7 @@ wait 10
 http
 </server>
 <tool>
-lib1555
+lib%TESTNUMBER
 </tool>
  <name>
 verify api is protected against calls from callbacks
@@ -30,7 +30,7 @@ verify api is protected against calls from callbacks
 
 # this server/host won't be used for real
  <command>
-http://%HOSTIP:%HTTPPORT/1555
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1556 b/tests/data/test1556
index 0e678bbcb..40a2e1244 100644
--- a/tests/data/test1556
+++ b/tests/data/test1556
@@ -33,13 +33,13 @@ Long: %repeat[100001 x A]%
 http
 </server>
 <tool>
-lib1556
+lib%TESTNUMBER
 </tool>
  <name>
 send long HTTP headers to header callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1556
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/1556
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1556 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1557 b/tests/data/test1557
index 16e2a2c47..031809f4e 100644
--- a/tests/data/test1557
+++ b/tests/data/test1557
@@ -14,7 +14,7 @@ crash
 none
 </server>
 <tool>
-lib1557
+lib%TESTNUMBER
 </tool>
 
 <name>
diff --git a/tests/data/test1558 b/tests/data/test1558
index f1538c2a8..26854c2dd 100644
--- a/tests/data/test1558
+++ b/tests/data/test1558
@@ -17,16 +17,16 @@ none
 file
 </features>
 <tool>
-lib1558
+lib%TESTNUMBER
 </tool>
 
 <name>
 CURLINFO_PROTOCOL for file:// transfer
 </name>
 <command>
-file://%FILE_PWD/log/data1558
+file://%FILE_PWD/log/data%TESTNUMBER
 </command>
-<file name="log/data1558">
+<file name="log/data%TESTNUMBER">
 hello
 </file>
 </client>
diff --git a/tests/data/test1559 b/tests/data/test1559
index cbed6fbcc..41fdf3af7 100644
--- a/tests/data/test1559
+++ b/tests/data/test1559
@@ -18,7 +18,7 @@ none
 http
 </features>
 <tool>
-lib1559
+lib%TESTNUMBER
 </tool>
 
 <name>
diff --git a/tests/data/test156 b/tests/data/test156
index fafedc299..94bb3393f 100644
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -28,9 +28,9 @@ http
 HTTP PUT with --anyauth (when the server requires none)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/156 -T log/put156 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put156">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -41,7 +41,7 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /156 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1560 b/tests/data/test1560
index 0a132a1c1..e8767b27b 100644
--- a/tests/data/test1560
+++ b/tests/data/test1560
@@ -28,7 +28,7 @@ ipv6
 URL API
  </name>
 <tool>
-lib1560
+lib%TESTNUMBER
 </tool>
 </client>
 
diff --git a/tests/data/test1561 b/tests/data/test1561
index 8d3ea5485..b6f8f2b66 100644
--- a/tests/data/test1561
+++ b/tests/data/test1561
@@ -16,8 +16,8 @@ HTTP replaced headers
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Set-Cookie: super=secret; domain=example.com; path=/1561; secure;
-Set-Cookie: supersuper=secret; domain=example.com; path=/1561/login/; secure;
+Set-Cookie: super=secret; domain=example.com; path=/%TESTNUMBER; secure;
+Set-Cookie: supersuper=secret; domain=example.com; path=/%TESTNUMBER/login/; secure;
 Set-Cookie: __Secure-SID=12345; Domain=example.com
 Set-Cookie: __Secure-SID=12346; Secure; Domain=example.com
 Set-Cookie: supersupersuper=secret; __Secure-SID=12346; Secure; Domain=example.com
@@ -35,13 +35,13 @@ nomnom
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Set-Cookie: super=secret; domain=example.com; path=/1561; httponly;
-Set-Cookie: super=secret; domain=example.com; path=/1561/; httponly;
+Set-Cookie: super=secret; domain=example.com; path=/%TESTNUMBER; httponly;
+Set-Cookie: super=secret; domain=example.com; path=/%TESTNUMBER/; httponly;
 Set-Cookie: super=secret; domain=example.com; path=/15; httponly;
 Set-Cookie: public=yes; domain=example.com; path=/foo;
-Set-Cookie: supersuper=secret; domain=example.com; path=/1561/login/en;
-Set-Cookie: supersuper=secret; domain=example.com; path=/1561/login;
-Set-Cookie: secureoverhttp=yes; domain=example.com; path=/1561; secure;
+Set-Cookie: supersuper=secret; domain=example.com; path=/%TESTNUMBER/login/en;
+Set-Cookie: supersuper=secret; domain=example.com; path=/%TESTNUMBER/login;
+Set-Cookie: secureoverhttp=yes; domain=example.com; path=/%TESTNUMBER; secure;
 Set-Cookie: __Secure-SID=22345; Domain=example.com
 Set-Cookie: __Secure-SID=22346; Secure; Domain=example.com
 Set-Cookie: __Host-SID=32345
@@ -69,23 +69,23 @@ https
 Cookies set over HTTP can't override secure ones
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/15610001 -L -c log/jar1561.txt -H "Host: www.example.com"  http://%HOSTIP:%HTTPPORT/15610002 -L -c log/jar1561.txt -H "Host: www.example.com"
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -L -c log/jar%TESTNUMBER.txt -H "Host: www.example.com"  http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 -L -c log/jar%TESTNUMBER.txt -H "Host: www.example.com"
 </command>
 </client>
 <verify>
 <protocol>
-GET /15610001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: www.example.com
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /15610002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: www.example.com
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/jar1561.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -94,7 +94,7 @@ Accept: */*
 www.example.com	FALSE	/	TRUE	0	__Host-SID	12346
 .example.com	TRUE	/	TRUE	0	supersupersuper	secret
 .example.com	TRUE	/	TRUE	0	__Secure-SID	12346
-.example.com	TRUE	/1561/login/	TRUE	0	supersuper	secret
+.example.com	TRUE	/%TESTNUMBER/login/	TRUE	0	supersuper	secret
 #HttpOnly_.example.com	TRUE	/15	FALSE	0	super	secret
 </file>
 
diff --git a/tests/data/test1562 b/tests/data/test1562
index ee8d81b8e..b9755aa24 100644
--- a/tests/data/test1562
+++ b/tests/data/test1562
@@ -44,23 +44,23 @@ https
 Expire secure cookies over HTTPS
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/15620001 -H "Host: www.example.com" https://%HOSTIP:%HTTPSPORT/15620002 -b "non-existing" https://%HOSTIP:%HTTPSPORT/15620001
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -H "Host: www.example.com" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0002 -b "non-existing" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001
 </command>
 </client>
 <verify>
 <protocol>
-GET /15620001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: www.example.com
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /15620002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: www.example.com
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: foo=123
 
-GET /15620001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: www.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1563 b/tests/data/test1563
index 56b18c41f..6bf3ad905 100644
--- a/tests/data/test1563
+++ b/tests/data/test1563
@@ -29,7 +29,7 @@ http
 Make sure redirects to CURLPROTO_GOPHER are forbidden by default
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/15630001 -L -H "Host: www.example.com"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L -H "Host: www.example.com"
 </command>
 </client>
 <verify>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/15630001 -L -H "Host: www.example.com"
 1
 </errorcode>
 <protocol>
-GET /15630001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: www.example.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1564 b/tests/data/test1564
index c2760e3a0..59cef7157 100644
--- a/tests/data/test1564
+++ b/tests/data/test1564
@@ -19,7 +19,7 @@ wakeup
 none
 </server>
 <tool>
-lib1564
+lib%TESTNUMBER
 </tool>
 <name>
 wakeup before poll with no easy handles
diff --git a/tests/data/test1565 b/tests/data/test1565
index 7a248883d..15374bf7e 100644
--- a/tests/data/test1565
+++ b/tests/data/test1565
@@ -28,7 +28,7 @@ wakeup
 http
 </server>
 <tool>
-lib1565
+lib%TESTNUMBER
 </tool>
 <name>
 wakeup from another thread
diff --git a/tests/data/test1566 b/tests/data/test1566
index 54226d010..b954c2aea 100644
--- a/tests/data/test1566
+++ b/tests/data/test1566
@@ -32,12 +32,12 @@ http
 --etag-compare that gets a 304 back shouldn't overwrite the file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/1566 -o log/output1566 --etag-compare log/etag1566
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/output%TESTNUMBER --etag-compare log/etag%TESTNUMBER
 </command>
-<file name="log/etag1566">
+<file name="log/etag%TESTNUMBER">
 "123456"
 </file>
-<file1 name="log/output1566">
+<file1 name="log/output%TESTNUMBER">
 downloaded already
 </file1>
 
@@ -47,7 +47,7 @@ downloaded already
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1566 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -56,7 +56,7 @@ If-None-Match: "123456"
 </protocol>
 
 # verify that the target file is untouched
-<file name="log/output1566">
+<file name="log/output%TESTNUMBER">
 downloaded already
 </file>
 </verify>
diff --git a/tests/data/test1567 b/tests/data/test1567
index ff779df08..3e6ce8812 100644
--- a/tests/data/test1567
+++ b/tests/data/test1567
@@ -13,7 +13,7 @@ CURLOPT_FOLLOWLOCATION
 <data>
 HTTP/1.1 302 OK
 Content-Length: 6
-Location: /15670002
+Location: /%TESTNUMBER0002
 
 -foo-
 </data>
@@ -36,32 +36,32 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib1567
+lib%TESTNUMBER
 </tool>
 
  <name>
 re-run redirected transfer without setting CURLU URL again
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1567
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1567 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /15670002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /1567 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /15670002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1568 b/tests/data/test1568
index 62d1132eb..409f11f92 100644
--- a/tests/data/test1568
+++ b/tests/data/test1568
@@ -61,25 +61,25 @@ crypto
 HTTP with Digest authorization on custom CURLOPT_PORT
 </name>
 <tool>
-lib1568
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP/1568 %HTTPPORT
+http://%HOSTIP/%TESTNUMBER %HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1568 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-User-Agent: lib1568
+User-Agent: lib%TESTNUMBER
 Accept: */*
 
-GET /1568 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1568", response="9cbbd857a37e45f2bcad5c7d088191df"
-User-Agent: lib1568
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9cbbd857a37e45f2bcad5c7d088191df"
+User-Agent: lib%TESTNUMBER
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test1569 b/tests/data/test1569
index 78f1dea26..3342f84fc 100644
--- a/tests/data/test1569
+++ b/tests/data/test1569
@@ -30,10 +30,10 @@ ftp
 FTP first type=A then regular URL
  </name>
 <tool>
-lib1569
+lib%TESTNUMBER
 </tool>
 <command>
-"ftp://%HOSTIP:%FTPPORT/1569;type=A" ftp://%HOSTIP:%FTPPORT/1569
+"ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A" ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -47,11 +47,11 @@ PWD
 EPSV
 PASV
 TYPE A
-RETR 1569
+RETR %TESTNUMBER
 PASV
 TYPE I
-SIZE 1569
-RETR 1569
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test157 b/tests/data/test157
index fee7a6a44..63e611c78 100644
--- a/tests/data/test157
+++ b/tests/data/test157
@@ -28,14 +28,14 @@ http
 HTTP GET with --anyauth (when the server requires none)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /157 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1570 b/tests/data/test1570
index fd0c27395..40c87ef40 100644
--- a/tests/data/test1570
+++ b/tests/data/test1570
@@ -33,7 +33,7 @@ FTP first type=D then regular URL
 lib1569
 </tool>
 <command>
-"ftp://%HOSTIP:%FTPPORT/1570;type=D" ftp://%HOSTIP:%FTPPORT/1570
+"ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=D" ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -50,8 +50,8 @@ TYPE A
 NLST
 PASV
 TYPE I
-SIZE 1570
-RETR 1570
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test158 b/tests/data/test158
index 238399a05..2fbaf65c0 100644
--- a/tests/data/test158
+++ b/tests/data/test158
@@ -24,7 +24,7 @@ http
 HTTP multipart formpost with only a 100 reply
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/158 -F name=daniel
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F name=daniel
 </command>
 </client>
 
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/158 -F name=daniel
 ^-----------------------.*
 </strip>
 <protocol>
-POST /158 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test159 b/tests/data/test159
index bb94583bd..05968eb10 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -60,7 +60,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -0
 </command>
 <precheck>
 chkhostname curlhost
@@ -70,7 +70,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /159 HTTP/1.0
+GET /%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1590 b/tests/data/test1590
index b605022af..bfaa7545c 100644
--- a/tests/data/test1590
+++ b/tests/data/test1590
@@ -41,7 +41,7 @@ lib1553
 
 # it is important this uses a host name that resolves successfully
 <command>
-imap://localhost:%IMAPPORT/1590
+imap://localhost:%IMAPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1591 b/tests/data/test1591
index ab19e4e19..738696db1 100644
--- a/tests/data/test1591
+++ b/tests/data/test1591
@@ -28,10 +28,10 @@ http
 HTTP PUT with trailers at the end
 </name>
 <tool>
-lib1591
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/bzz/1591
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER
 </command>
 <stdin>
 more than one byte
@@ -41,7 +41,7 @@ more than one byte
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /bzz/1591 HTTP/1.1
+PUT /bzz/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
diff --git a/tests/data/test1592 b/tests/data/test1592
index d1346e1e3..a2c0f1ca7 100644
--- a/tests/data/test1592
+++ b/tests/data/test1592
@@ -14,14 +14,14 @@ speedcheck
 none
 </server>
 <tool>
-lib1592
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP request, remove handle while resolving, don't block
  </name>
 
  <command>
-http://a-site-never-accessed.example.org/1592
+http://a-site-never-accessed.example.org/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1593 b/tests/data/test1593
index 6719a3261..60d9f0b87 100644
--- a/tests/data/test1593
+++ b/tests/data/test1593
@@ -27,17 +27,17 @@ http
 HTTP custom header overrides CURLOPT_TIMECONDITION
 </name>
 <tool>
-lib1593
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1593
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 # Note here the lack of If-Modified-Since
 <protocol>
-GET /1593 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1594 b/tests/data/test1594
index f29fdd687..5c8505030 100644
--- a/tests/data/test1594
+++ b/tests/data/test1594
@@ -28,16 +28,16 @@ http
 HTTP Retry-After header parsing and extraction
 </name>
 <tool>
-lib1594
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1594
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1594 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1595 b/tests/data/test1595
index 0216788e0..bdc6ce24d 100644
--- a/tests/data/test1595
+++ b/tests/data/test1595
@@ -30,13 +30,13 @@ HTTP Retry-After header extraction (without header)
 lib1594
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1595
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1595 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1596 b/tests/data/test1596
index 62ceab4b8..59121d27e 100644
--- a/tests/data/test1596
+++ b/tests/data/test1596
@@ -28,16 +28,16 @@ http
 HTTP Retry-After header parsing using a date
 </name>
 <tool>
-lib1596
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/1596
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /1596 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test16 b/tests/data/test16
index 92c95774f..240fd379c 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -31,7 +31,7 @@ http
 HTTP with proxy authorization
  </name>
  <command>
- -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/16
+ -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -41,7 +41,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/16 HTTP/1.1
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test160 b/tests/data/test160
index 700fc6e17..778787e69 100644
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -37,7 +37,7 @@ http
 HTTP with delayed close, conn reuse, connection reset and retry
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/160 http://%HOSTIP:%HTTPPORT/wantmore/1600001
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001
 </command>
 </client>
 
@@ -57,12 +57,12 @@ surprise2
 </stdout>
 
 <protocol>
-GET /want/160 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /wantmore/1600001 HTTP/1.1
+GET /wantmore/%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test161 b/tests/data/test161
index 91a3388fc..53508e4b5 100644
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -25,7 +25,7 @@ ftp
 FTP RETR PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/161
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 161
-RETR 161
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 </protocol>
 # CURLE_PARTIAL_FILE = 18
 <errorcode>
diff --git a/tests/data/test1613 b/tests/data/test1613
index ae6cab070..040fae330 100644
--- a/tests/data/test1613
+++ b/tests/data/test1613
@@ -35,7 +35,7 @@ Send "OPTIONS *" with --request-target to a proxy
 proxy
 </features>
 <command>
---request-target '*' -X OPTIONS --proxy http://%HOSTIP:%HTTPPORT/ -H "Testno: 1613" http://www.example.org/
+--request-target '*' -X OPTIONS --proxy http://%HOSTIP:%HTTPPORT/ -H "Testno: %TESTNUMBER" http://www.example.org/
 </command>
 </client>
 
@@ -46,7 +46,7 @@ Host: www.example.org
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
-Testno: 1613
+Testno: %TESTNUMBER
 
 </protocol>
 </verify>
diff --git a/tests/data/test162 b/tests/data/test162
index d15474585..3fa291de5 100644
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -38,14 +38,14 @@ http
 HTTP GET asking for --proxy-ntlm when some other authentication is required
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/162 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test163 b/tests/data/test163
index 5d86f1133..344f1042d 100644
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -27,10 +27,10 @@ http
 HTTP multipart formpost with contents from a file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/163 -F "name=<log/field163" -F tool=curl
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=<log/field%TESTNUMBER" -F tool=curl
 </command>
 # We create this file before the command is invoked!
-<file name="log/field163">
+<file name="log/field%TESTNUMBER">
 contents
 from
 a
@@ -49,7 +49,7 @@ yes please
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/163 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1630 b/tests/data/test1630
index 3b5a2ca5b..4a983a9d5 100644
--- a/tests/data/test1630
+++ b/tests/data/test1630
@@ -32,7 +32,7 @@ https-proxy
 HTTPS-proxy with Basic auth to HTTP without auth
  </name>
  <command>
- -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x https://%HOSTIP:%HTTPSPROXYPORT http://we.want.that.site.com/1630 --proxy-insecure
+ -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x https://%HOSTIP:%HTTPSPROXYPORT http://we.want.that.site.com/%TESTNUMBER --proxy-insecure
 </command>
 <features>
 proxy
@@ -42,7 +42,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-GET http://we.want.that.site.com/1630 HTTP/1.1
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1631 b/tests/data/test1631
index f02486452..4c0598706 100644
--- a/tests/data/test1631
+++ b/tests/data/test1631
@@ -43,7 +43,7 @@ https-proxy
 FTP through HTTPS-proxy
  </name>
  <command>
--p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/1631 --proxy-insecure
+-p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure
 </command>
 <features>
 http
@@ -78,8 +78,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1631
-RETR 1631
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1632 b/tests/data/test1632
index ace0b4b38..eceb6c550 100644
--- a/tests/data/test1632
+++ b/tests/data/test1632
@@ -22,7 +22,7 @@ Content-Length: 0
 
 # This is the FTP server response. The Life and Adventures of Robinson Crusoe
 <data>
-I was born in the year 1632, in the city of York, of a good family, though not
+I was born in the year %TESTNUMBER, in the city of York, of a good family, though not
 of that country, myfather being a foreigner of Bremen, who settled first at
 Hull.  He got a good estate by merchandise,and leaving off his trade, lived
 afterwards at York, from whence he had married my mother, whoserelations were
@@ -52,7 +52,7 @@ https-proxy
 FTP through HTTPS-proxy, with connection re-use
  </name>
  <command>
--p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/1632 --proxy-insecure ftp://ftp.site.thru.https.proxy:%FTPPORT/16320002
+-p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER0002
 </command>
 <features>
 http
@@ -93,11 +93,11 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 1632
-RETR 1632
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 16320002
-RETR 16320002
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1633 b/tests/data/test1633
index 9efd90cb2..5cf89c2b0 100644
--- a/tests/data/test1633
+++ b/tests/data/test1633
@@ -14,7 +14,7 @@ HTTP/1.1 301 OK
 Accept-Ranges: bytes
 Content-Length: 0
 Connection: close
-Location: /16330002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -30,7 +30,7 @@ HTTP/1.1 301 OK
 Accept-Ranges: bytes
 Content-Length: 0
 Connection: close
-Location: /16330002
+Location: /%TESTNUMBER0002
 
 HTTP/1.1 429 too many requests
 Retry-After: 1
@@ -41,7 +41,7 @@ HTTP/1.1 301 OK
 Accept-Ranges: bytes
 Content-Length: 0
 Connection: close
-Location: /16330002
+Location: /%TESTNUMBER0002
 
 HTTP/1.1 429 too many requests
 Retry-After: 1
@@ -61,7 +61,7 @@ http
 --retry with a 429 response and Retry-After:
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1633 -d moo --retry 1 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -d moo --retry 1 -L
 </command>
 </client>
 
@@ -69,26 +69,26 @@ http://%HOSTIP:%HTTPPORT/1633 -d moo --retry 1 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /1633 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-mooGET /16330002 HTTP/1.1
+mooGET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-POST /1633 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
 
-mooGET /16330002 HTTP/1.1
+mooGET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1634 b/tests/data/test1634
index 5c05474dd..f8b1b7bc5 100644
--- a/tests/data/test1634
+++ b/tests/data/test1634
@@ -47,7 +47,7 @@ http
 --retry with a 429 response and Retry-After: and --fail
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1634 --retry 1  --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1  --fail
 </command>
 </client>
 
@@ -55,12 +55,12 @@ http://%HOSTIP:%HTTPPORT/1634 --retry 1  --fail
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1634 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1634 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test164 b/tests/data/test164
index 97e2c5eac..09310a0c2 100644
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -48,14 +48,14 @@ http
 HTTP range with multiple ranges
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 0-10,12-15
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/164 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=0-10,12-15
 User-Agent: curl/%VERSION
diff --git a/tests/data/test165 b/tests/data/test165
index 1e477661a..dfd213157 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -42,7 +42,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 HTTP over proxy with IDN host name
  </name>
  <command>
-http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT http://www.große.de/page/165
+http://www.åäö.se/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT http://www.große.de/page/%TESTNUMBER
 </command>
 </client>
 
@@ -50,13 +50,13 @@ http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT http://www.große.de/page/165
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://www.xn--4cab6c.se/page/165 HTTP/1.1
+GET http://www.xn--4cab6c.se/page/%TESTNUMBER HTTP/1.1
 Host: www.xn--4cab6c.se
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://www.xn--groe-xna.de/page/165 HTTP/1.1
+GET http://www.xn--groe-xna.de/page/%TESTNUMBER HTTP/1.1
 Host: www.xn--groe-xna.de
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1654 b/tests/data/test1654
index f8f90f949..ef6657494 100644
--- a/tests/data/test1654
+++ b/tests/data/test1654
@@ -24,9 +24,9 @@ CURL_TIME=1548369261
 alt-svc
 </name>
 <command>
-log/1654
+log/%TESTNUMBER
 </command>
-<file name="log/1654" mode="text">
+<file name="log/%TESTNUMBER" mode="text">
 h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1
 # a comment
 h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1
@@ -38,7 +38,7 @@ rubbish
 </file>
 </client>
 <verify>
-<file name="log/1654-out" mode="text">
+<file name="log/%TESTNUMBER-out" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1
diff --git a/tests/data/test166 b/tests/data/test166
index 6a5210e00..3ee1d69b6 100644
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -27,10 +27,10 @@ http
 HTTP formpost a file with spaces in name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/166 -F "name=@log/fie ld 166"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@log/fie ld %TESTNUMBER"
 </command>
 # We create this file before the command is invoked!
-<file name="log/fie ld 166">
+<file name="log/fie ld %TESTNUMBER">
 data inside the file
 </file>
 </client>
@@ -41,7 +41,7 @@ data inside the file
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/166 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -49,7 +49,7 @@ Content-Length: 223
 Content-Type: multipart/form-data; boundary=----------------------------b0b3d6d23991
 
 ------------------------------b0b3d6d23991
-Content-Disposition: form-data; name="name"; filename="fie ld 166"
+Content-Disposition: form-data; name="name"; filename="fie ld %TESTNUMBER"
 Content-Type: application/octet-stream
 
 data inside the file
diff --git a/tests/data/test1660 b/tests/data/test1660
index 0e081d7c0..76df04f1e 100644
--- a/tests/data/test1660
+++ b/tests/data/test1660
@@ -15,7 +15,7 @@ unittest
 HSTS
 </features>
 
-<file name="log/input1660">
+<file name="log/input%TESTNUMBER">
 # Your HSTS cache. https://curl.se/docs/hsts.html
 # This file was generated by libcurl! Edit at your own risk.
 .readfrom.example "20211001 04:47:41"
@@ -71,7 +71,7 @@ expire.example [expire.example]: 1548369268
 'expire.example' is not HSTS
 'expire.example' is not HSTS
 </stdout>
-<file name="log/hsts1660">
+<file name="log/hsts%TESTNUMBER">
 # Your HSTS cache. https://curl.se/docs/hsts.html
 # This file was generated by libcurl! Edit at your own risk.
 .example.com "20191001 04:47:41"
diff --git a/tests/data/test167 b/tests/data/test167
index 5067e779a..832cc35a6 100644
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -51,24 +51,24 @@ proxy
 HTTP with proxy-requiring-Basic to site-requiring-Digest
  </name>
  <command>
-http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: Basic Zm9vOmJhcg==
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: Basic Zm9vOmJhcg==
-Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26"
+Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="13c7c02a252cbe1c46d8669898a3be26"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test168 b/tests/data/test168
index ddad8bb77..d552a7133 100644
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -65,30 +65,30 @@ proxy
 HTTP with proxy-requiring-Digest to site-requiring-Digest
  </name>
  <command>
-http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"
-Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416"
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
+Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="ca87f2d768a231e2d637a55698d5c416"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test169 b/tests/data/test169
index 6d30b2ade..adc7e9b1f 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -92,7 +92,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --digest --user digest:alot
 </command>
 <precheck>
 chkhostname curlhost
@@ -102,23 +102,23 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
-Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6"
+Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/%TESTNUMBER", response="95d48591985a03c4b49cb962aa7bd3e6"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test17 b/tests/data/test17
index fe423b334..8e5bf8267 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -37,14 +37,14 @@ request MOOO
 --max-time 180
  </stdin>
  <command>
--K - %HOSTIP:%HTTPPORT/that.site.com/17
+-K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-MOOO /that.site.com/17 HTTP/1.1
+MOOO /that.site.com/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: agent007 license to drill	
 Accept: */*
diff --git a/tests/data/test170 b/tests/data/test170
index 58c2a3fe1..28874a92e 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -27,14 +27,14 @@ proxy
 HTTP POST with --proxy-ntlm and no SSL with no response
  </name>
  <command>
-http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
+http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://a.galaxy.far.far.away/170 HTTP/1.1
+POST http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
 Host: a.galaxy.far.far.away
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test1700 b/tests/data/test1700
index a9f9ae8d0..9cf873928 100644
--- a/tests/data/test1700
+++ b/tests/data/test1700
@@ -46,7 +46,7 @@ http/2
 HTTP/2 GET with Upgrade:
  </name>
  <command>
-http://%HOSTIP:%HTTP2PORT/1700 --http2 http://%HOSTIP:%HTTP2PORT/17000001
+http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -58,12 +58,12 @@ http://%HOSTIP:%HTTP2PORT/1700 --http2 http://%HOSTIP:%HTTP2PORT/17000001
 ^Via:.*
 </strip>
 <protocol>
-GET /1700 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTP2PORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /17000001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTP2PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1701 b/tests/data/test1701
index 50ebd65e0..c4687d911 100644
--- a/tests/data/test1701
+++ b/tests/data/test1701
@@ -37,7 +37,7 @@ http/2
 HTTP/2 POST with Upgrade:
  </name>
  <command>
-http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend"
+http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 -d "datatosend"
 </command>
 </client>
 
@@ -49,7 +49,7 @@ http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend"
 ^Via:.*
 </strip>
 <protocol nonewline="yes">
-POST /1701 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTP2PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1702 b/tests/data/test1702
index c17f5a7cd..b679c7bca 100644
--- a/tests/data/test1702
+++ b/tests/data/test1702
@@ -36,7 +36,7 @@ http/2
 HTTP/2 HEAD with Upgrade:
  </name>
  <command>
-http://%HOSTIP:%HTTP2PORT/1702 --http2 --head
+http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 --head
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTP2PORT/1702 --http2 --head
 ^Via:.*
 </strip>
 <protocol>
-HEAD /1702 HTTP/1.1
+HEAD /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTP2PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1703 b/tests/data/test1703
index ab4f0280f..a6a4d9fe1 100644
--- a/tests/data/test1703
+++ b/tests/data/test1703
@@ -28,9 +28,9 @@ win32
 basic file:// file with UTF-8 characters
 </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/%E3%83%86%E3%82%B9%E3%83%881703.txt
+file://localhost%FILE_PWD/log/%E3%83%86%E3%82%B9%E3%83%88%TESTNUMBER.txt
 </command>
-<file name="log/テスト1703.txt">
+<file name="log/テスト%TESTNUMBER.txt">
 foo
    bar
 bar
diff --git a/tests/data/test171 b/tests/data/test171
index e79e8e03d..c4f5b6c40 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -31,7 +31,7 @@ http
 HTTP, get cookie with dot prefixed full domain
  </name>
  <command>
--c log/jar171 -x %HOSTIP:%HTTPPORT http://z.x.com/171
+-c log/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -41,14 +41,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://z.x.com/171 HTTP/1.1
+GET http://z.x.com/%TESTNUMBER HTTP/1.1
 Host: z.x.com
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
 </protocol>
-<file name="log/jar171" mode="text">
+<file name="log/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test172 b/tests/data/test172
index ca6d3cd73..9dbe64c23 100644
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -27,9 +27,9 @@ http
 HTTP with cookies file and custom added cookie
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b "tool=curl; name=fool"
 </command>
-<file name="log/jar172.txt">
+<file name="log/jar%TESTNUMBER.txt">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/172 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test173 b/tests/data/test173
index b1d01c06c..096861623 100644
--- a/tests/data/test173
+++ b/tests/data/test173
@@ -28,7 +28,7 @@ http
 HTTP RFC1867-formpost a file from stdin with "faked" filename
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/173 -F field1=contents1 -F "fileupload=@-;filename=/dev/null;type=text/x-null;format=x-curl"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F field1=contents1 -F "fileupload=@-;filename=/dev/null;type=text/x-null;format=x-curl"
 </command>
 
 <stdin>
@@ -49,7 +49,7 @@ line8
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/173 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test174 b/tests/data/test174
index e5a9d6fcb..d8090c5d5 100644
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -29,14 +29,14 @@ http
 HTTP POST --anyauth to server not requiring any auth at all
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /174 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test175 b/tests/data/test175
index 8b49a32b5..538543448 100644
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -56,21 +56,21 @@ crypto
 HTTP POST --digest to server not requiring any auth at all
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /175 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /175 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test176 b/tests/data/test176
index 5fe310fac..07ace476d 100644
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -58,14 +58,14 @@ http
 HTTP POST --ntlm to server not requiring any auth at all
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --ntlm -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /176 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
@@ -73,7 +73,7 @@ Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /176 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test177 b/tests/data/test177
index e31f1b7fa..c190f0523 100644
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -13,7 +13,7 @@ followlocation
 <data>
 HTTP/1.1 302 *MOVED* swsclose swsbounce
 Server: Microsoft-IIS/6.0
-Location: /mooooo/177
+Location: /mooooo/%TESTNUMBER
 Content-Type: text/html; charset=iso-8859-1
 
 </data>
@@ -32,14 +32,14 @@ crypto
 HTTP POST --digest to server doing a 302-location response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /177 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test178 b/tests/data/test178
index f479a6e4f..67c68b0a9 100644
--- a/tests/data/test178
+++ b/tests/data/test178
@@ -34,7 +34,7 @@ http
 HTTP response with negative Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/178
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/178
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /178 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test179 b/tests/data/test179
index f1f380fbe..b5aaec2f4 100644
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -31,9 +31,9 @@ http
 HTTP using proxy and cookies with path checks
  </name>
  <command>
-http://supertrooper.fake/c/179 -b log/injar179 -x %HOSTIP:%HTTPPORT
+http://supertrooper.fake/c/%TESTNUMBER -b log/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
-<file name="log/injar179">
+<file name="log/injar%TESTNUMBER">
 supertrooper.fake	FALSE	/a	FALSE	2139150993	mooo	indeed
 supertrooper.fake	FALSE	/b	FALSE	0		moo1	indeed
 supertrooper.fake	FALSE	/c	FALSE	2139150993	moo2	indeed
@@ -46,7 +46,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://supertrooper.fake/c/179 HTTP/1.1
+GET http://supertrooper.fake/c/%TESTNUMBER HTTP/1.1
 Host: supertrooper.fake
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test18 b/tests/data/test18
index 0fe92f79b..11b953ea6 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -41,43 +41,43 @@ http
 multiple requests using {} in URL
  </name>
  <command>
-"%HOSTIP:%HTTPPORT/{18,180002,180003}"
+"%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0002,%TESTNUMBER0003}"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /18 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /180002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /180003 HTTP/1.1
+GET /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 <stdout>
---_curl_--%HOSTIP:%HTTPPORT/18
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4
 
 moo
---_curl_--%HOSTIP:%HTTPPORT/180002
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0002
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4
 
 foo
---_curl_--%HOSTIP:%HTTPPORT/180003
+--_curl_--%HOSTIP:%HTTPPORT/%TESTNUMBER0003
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4
diff --git a/tests/data/test180 b/tests/data/test180
index 395f750e2..32ecd00a9 100644
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -27,9 +27,9 @@ http
 HTTP 1.0 PUT
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/180 -T log/test180.txt --http1.0
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt --http1.0
 </command>
-<file name="log/test180.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -45,7 +45,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/180 HTTP/1.0
+PUT /we/want/%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1800 b/tests/data/test1800
index 0f24c8494..85e247c3c 100644
--- a/tests/data/test1800
+++ b/tests/data/test1800
@@ -33,14 +33,14 @@ http/2
 HTTP/2 upgrade refused
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1800 --http2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </command>
 
 </client>
 
 <verify>
 <protocol>
-GET /1800 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test1801 b/tests/data/test1801
index 285eed539..9494e92d8 100644
--- a/tests/data/test1801
+++ b/tests/data/test1801
@@ -43,14 +43,14 @@ http/2
 HTTP/2 upgrade with lying server
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/1801 --http2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
 </command>
 
 </client>
 
 <verify>
 <protocol>
-GET /1801 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test181 b/tests/data/test181
index df1ffccbf..f496c2946 100644
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -27,9 +27,9 @@ http
 HTTP 1.0 POST
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/181 --data-binary @log/test181.txt --http1.0
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --data-binary @log/test%TESTNUMBER.txt --http1.0
 </command>
-<file name="log/test181.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -45,7 +45,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /we/want/181 HTTP/1.0
+POST /we/want/%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test182 b/tests/data/test182
index f640a0e1a..cb1e4f0c2 100644
--- a/tests/data/test182
+++ b/tests/data/test182
@@ -23,7 +23,7 @@ ftp
 FTP download an empty file
 </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/182
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -35,8 +35,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 182
-RETR 182
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test183 b/tests/data/test183
index 191844157..77d9d04f7 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -28,7 +28,7 @@ http
 HTTP GET two URLs over a single proxy with persistent connection
  </name>
  <command>
-http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy http://%HOSTIP:%HTTPPORT
+http://deathstar.another.galaxy/%TESTNUMBER http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -38,13 +38,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://deathstar.another.galaxy/183 HTTP/1.1
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
 Host: deathstar.another.galaxy
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://a.galaxy.far.far.away/183 HTTP/1.1
+GET http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
 Host: a.galaxy.far.far.away
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test184 b/tests/data/test184
index d6c396b02..9c795a288 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -14,7 +14,7 @@ followlocation
 HTTP/1.1 301 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 4
-Location: http://yet.another.host/184
+Location: http://yet.another.host/%TESTNUMBER
 
 moo
 </data>
@@ -29,7 +29,7 @@ moo
 HTTP/1.1 301 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 4
-Location: http://yet.another.host/184
+Location: http://yet.another.host/%TESTNUMBER
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -48,7 +48,7 @@ http
 HTTP replace Host: when following Location: to new host
  </name>
  <command>
-http://deathstar.another.galaxy/184 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
+http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -58,13 +58,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://deathstar.another.galaxy/184 HTTP/1.1
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://yet.another.host/184 HTTP/1.1
+GET http://yet.another.host/%TESTNUMBER HTTP/1.1
 Host: yet.another.host
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test185 b/tests/data/test185
index 83b66d977..d614c1040 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -14,7 +14,7 @@ followlocation
 HTTP/1.1 301 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 4
-Location: go/west/185
+Location: go/west/%TESTNUMBER
 
 moo
 </data>
@@ -29,7 +29,7 @@ moo
 HTTP/1.1 301 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 4
-Location: go/west/185
+Location: go/west/%TESTNUMBER
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -48,7 +48,7 @@ http
 HTTP replace Host: when following Location: on the same host
  </name>
  <command>
-http://deathstar.another.galaxy/185 -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
+http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -58,13 +58,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://deathstar.another.galaxy/185 HTTP/1.1
+GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1
+GET http://deathstar.another.galaxy/go/west/%TESTNUMBER HTTP/1.1
 Host: another.visitor.stay.a.while.stay.foreeeeeever
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test186 b/tests/data/test186
index f559819a0..35232b82c 100644
--- a/tests/data/test186
+++ b/tests/data/test186
@@ -28,7 +28,7 @@ http
 HTTP RFC1867-type formposting with types on text fields
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <body>hello</body>;type=text/html;charset=verymoo"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=daniel;type=moo/foo" -F "html= <body>hello</body>;type=text/html;charset=verymoo"
 </command>
 # We create this file before the command is invoked!
 </client>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <bo
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/186 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test187 b/tests/data/test187
index 2619d157a..2d5d0a883 100644
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -13,7 +13,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /root/1870002.txt?coolsite=yes
+Location: /root/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -32,7 +32,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: /root/1870002.txt?coolsite=yes
+Location: /root/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -54,19 +54,19 @@ http
 HTTP redirect with bad host name separation and slash in parameters
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L
+http://%HOSTIP:%HTTPPORT?oh=what-weird=test/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?oh=what-weird=test/187 HTTP/1.1
+GET /?oh=what-weird=test/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /root/1870002.txt?coolsite=yes HTTP/1.1
+GET /root/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test188 b/tests/data/test188
index 14e95c8e8..8e8848e65 100644
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -13,7 +13,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsbounce
-Location: /188
+Location: /%TESTNUMBER
 Content-Length: 3
 
 OK
@@ -29,7 +29,7 @@ Actual content
 
 <datacheck>
 HTTP/1.1 301 OK swsbounce
-Location: /188
+Location: /%TESTNUMBER
 Content-Length: 3
 
 HTTP/1.1 200 OK 
@@ -51,20 +51,20 @@ http
 HTTP GET with resume and redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/188 -C 50 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /188 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=50-
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /188 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=50-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test189 b/tests/data/test189
index 3435a52be..e747d3526 100644
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -10,7 +10,7 @@ HTTP GET
 <reply>
 <data>
 HTTP/1.1 301 OK swsbounce
-Location: /189
+Location: /%TESTNUMBER
 Content-Length: 3
 
 OK
@@ -25,7 +25,7 @@ Actual content
 
 <datacheck>
 HTTP/1.1 301 OK swsbounce
-Location: /189
+Location: /%TESTNUMBER
 Content-Length: 3
 
 HTTP/1.1 200 OK 
@@ -45,20 +45,20 @@ http
 HTTP GET with resume and redirect (to a page that doesn't resume)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/189 -C 50 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /189 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=50-
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /189 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=50-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test190 b/tests/data/test190
index 6f5d66adf..3a20ba26a 100644
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -24,7 +24,7 @@ ftp
 FTP download with strict timeout and slow CWD
  </name>
  <command timeout="1">
-ftp://%HOSTIP:%FTPPORT/path/to/file/190 -m %FTPTIME2
+ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER -m %FTPTIME2
 </command>
 </client>
 
diff --git a/tests/data/test1904 b/tests/data/test1904
index f10814239..5254c6379 100644
--- a/tests/data/test1904
+++ b/tests/data/test1904
@@ -51,7 +51,7 @@ http-proxy
 HTTP CONNECT with 204 response
  </name>
  <command>
-http://test.1904:%HTTPPORT/we/want/that/page/1904 -p --proxy %HOSTIP:%PROXYPORT
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -62,15 +62,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.1904:%HTTPPORT HTTP/1.1
-Host: test.1904:%HTTPPORT
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/1904 HTTP/1.1
-Host: test.1904:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test1905 b/tests/data/test1905
index 50354a971..4d04f8183 100644
--- a/tests/data/test1905
+++ b/tests/data/test1905
@@ -30,22 +30,22 @@ http
 CURLOPT_COOKIELIST set to "FLUSH" of a shared cookie object
  </name>
 <tool>
-lib1905
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/we/want/1905
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/1905 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
 </protocol>
-<file name="log/cookies1905" mode="text">
+<file name="log/cookies%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test1906 b/tests/data/test1906
index 68f0ed5d0..c43b0a9be 100644
--- a/tests/data/test1906
+++ b/tests/data/test1906
@@ -27,20 +27,20 @@ http
 CURLOPT_CURLU and CURLOPT_PORT
  </name>
 <tool>
-lib1906
+lib%TESTNUMBER
 </tool>
 
 # The tool does two requesets, the first sets CURLOPT_PORT to 1
 # the second resets the port again and expects that request to work.
 <command>
-http://%HOSTIP:%HTTPPORT/1906
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1906 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test1907 b/tests/data/test1907
index a26cb6f7f..8536addde 100644
--- a/tests/data/test1907
+++ b/tests/data/test1907
@@ -27,24 +27,24 @@ http
 CURLINFO_EFFECTIVE_URL with non-scheme URL
  </name>
 <tool>
-lib1907
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/hello/../1907
+%HOSTIP:%HTTPPORT/hello/../%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1907 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
 </protocol>
 <stdout>
-Effective URL: http://%HOSTIP:%HTTPPORT/1907
+Effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </stdout>
 </verify>
 </testcase>
diff --git a/tests/data/test1908 b/tests/data/test1908
index a1f725fe6..0ac0e8626 100644
--- a/tests/data/test1908
+++ b/tests/data/test1908
@@ -47,22 +47,22 @@ alt-svc cache save after resetting the handle
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <tool>
-lib1908
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/1908
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1908 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /1908 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
@@ -72,7 +72,7 @@ Accept: */*
 # matches
 s/\"([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-1908" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h1 127.0.0.1 %HTTPPORT h2 3dbbdetxoyw4nsp6c3cc456oj2ays6s43ezxzsfxxri3h5xqd.example 443 TIMESTAMP 1 0
diff --git a/tests/data/test1909 b/tests/data/test1909
index ba082529a..64e7b0526 100644
--- a/tests/data/test1909
+++ b/tests/data/test1909
@@ -36,7 +36,7 @@ http
 HTTP GET --retry-all-errors to overcome partial transfer
  </name>
  <command option="no-output,no-include">
---retry 1 --retry-all-errors -o log/outfile1909 http://%HOSTIP:%HTTPPORT/1909
+--retry 1 --retry-all-errors -o log/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,19 +44,19 @@ HTTP GET --retry-all-errors to overcome partial transfer
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1909 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /1909 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 
-<file1 name="log/outfile1909">
+<file1 name="log/outfile%TESTNUMBER">
 data
 </file1>
 
diff --git a/tests/data/test191 b/tests/data/test191
index 86fa29f93..1fde76873 100644
--- a/tests/data/test191
+++ b/tests/data/test191
@@ -21,7 +21,7 @@ ftp
 FTP URL with ?-letters in username and password 
  </name>
  <command>
-"ftp://use%3fr:pass%3fword@%HOSTIP:%FTPPORT/191"
+"ftp://use%3fr:pass%3fword@%HOSTIP:%FTPPORT/%TESTNUMBER"
 </command>
 </client>
 
@@ -33,8 +33,8 @@ PASS pass?word
 PWD
 EPSV
 TYPE I
-SIZE 191
-RETR 191
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test1910 b/tests/data/test1910
index d6ec28fad..67dfff9a9 100644
--- a/tests/data/test1910
+++ b/tests/data/test1910
@@ -15,7 +15,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19100002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -39,23 +39,23 @@ http
 HTTP credentials with newline and redirect
 </name>
 <tool>
-lib1910
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/1910
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /1910 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA==
 Accept: */*
 
-GET /19100002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA==
 Accept: */*
diff --git a/tests/data/test1911 b/tests/data/test1911
index ec5f531af..07e87a64c 100644
--- a/tests/data/test1911
+++ b/tests/data/test1911
@@ -18,7 +18,7 @@ none
 verify that curl_easy_setopt() rejects too long string inputs
 </name>
 <tool>
-lib1911
+lib%TESTNUMBER
 </tool>
 
 </client>
diff --git a/tests/data/test1912 b/tests/data/test1912
index ed6b27b5b..85dca0d6b 100644
--- a/tests/data/test1912
+++ b/tests/data/test1912
@@ -19,7 +19,7 @@ none
 Cross validate that gcc-typecheck macros match the option types.
 </name>
 <tool>
-lib1912
+lib%TESTNUMBER
 </tool>
 
 </client>
diff --git a/tests/data/test1913 b/tests/data/test1913
index daf749025..b9ac2cbdf 100644
--- a/tests/data/test1913
+++ b/tests/data/test1913
@@ -24,11 +24,11 @@ ftp
 FTP with NOBODY set, getting a missing file
 </name>
 <tool>
-lib1913
+lib%TESTNUMBER
 </tool>
 
 <command>
-ftp://%HOSTIP:%FTPPORT/not-there/1913
+ftp://%HOSTIP:%FTPPORT/not-there/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1915 b/tests/data/test1915
index 850213930..c47840adf 100644
--- a/tests/data/test1915
+++ b/tests/data/test1915
@@ -26,11 +26,11 @@ none
 HSTS read/write callbacks
 </name>
 <tool>
-lib1915
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%NOLISTENPORT/not-there/1915
+http://%HOSTIP:%NOLISTENPORT/not-there/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test1916 b/tests/data/test1916
index e3b87bcd4..2e495f1d0 100644
--- a/tests/data/test1916
+++ b/tests/data/test1916
@@ -30,7 +30,7 @@ mqtt
 MQTT PUBLISH with no POSTFIELDSIZE set
 </name>
 <tool>
-lib1916
+lib%TESTNUMBER
 </tool>
 <command option="binary-trace">
 "mqtt://%HOSTIP:%MQTTPORT/ "
diff --git a/tests/data/test1917 b/tests/data/test1917
index f125c46db..22b981a7d 100644
--- a/tests/data/test1917
+++ b/tests/data/test1917
@@ -33,7 +33,7 @@ mqtt
 MQTT PUBLISH with CURLOPT_POST set (no payload)
 </name>
 <tool>
-lib1917
+lib%TESTNUMBER
 </tool>
 <command option="binary-trace">
 "mqtt://%HOSTIP:%MQTTPORT/ "
diff --git a/tests/data/test1918 b/tests/data/test1918
index 32fc39336..e9fe44140 100644
--- a/tests/data/test1918
+++ b/tests/data/test1918
@@ -20,7 +20,7 @@ none
 curl_easy_option_by_name() and curl_easy_option_by_id()
 </name>
 <tool>
-lib1918
+lib%TESTNUMBER
 </tool>
 
 </client>
diff --git a/tests/data/test192 b/tests/data/test192
index 175a5453a..7edf31686 100644
--- a/tests/data/test192
+++ b/tests/data/test192
@@ -29,7 +29,7 @@ http
 HTTP GET -w num_connects with one simple connect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/192 -w "%{num_connects}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>
 
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/192 -w "%{num_connects}\n"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /192 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test193 b/tests/data/test193
index ddf4ab46c..4403b2c5e 100644
--- a/tests/data/test193
+++ b/tests/data/test193
@@ -16,7 +16,7 @@ HTTP/1.1 302 OK swsbounce swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
-Location: ./193
+Location: ./%TESTNUMBER
 
 monster
 </data>
@@ -41,7 +41,7 @@ http
 HTTP GET -w num_connects with redirected fetch (2 connects)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/193 -w "%{num_connects}\n" -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" -L
 </command>
 </client>
 
@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTPPORT/193 -w "%{num_connects}\n" -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /193 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /193 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -66,7 +66,7 @@ HTTP/1.1 302 OK swsbounce swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 8
 Connection: close
-Location: ./193
+Location: ./%TESTNUMBER
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test1933 b/tests/data/test1933
index bc259b9c0..69bcbca42 100644
--- a/tests/data/test1933
+++ b/tests/data/test1933
@@ -14,7 +14,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19330002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with one provider and auth cred via URL
 </name>
 <tool>
-lib1933
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://xxx:yyy@%HOSTIP:%HTTPPORT/1933/testapi/test
+http://xxx:yyy@%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://xxx:yyy@%HOSTIP:%HTTPPORT/1933/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1933/testapi/test HTTP/1.1
+GET /%TESTNUMBER/testapi/test HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=d2c2dff48c59ec49dc31ef94f18c5dc1ac3eae2a70d51633a4342dadc0683664
 X-Xxx-Date: 19700101T000000Z
diff --git a/tests/data/test1934 b/tests/data/test1934
index 15bb92690..a73d7b0ff 100644
--- a/tests/data/test1934
+++ b/tests/data/test1934
@@ -14,7 +14,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19340002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with two providers
 </name>
 <tool>
-lib1934
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1934/testapi/test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/1934/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1934/testapi/test HTTP/1.1
+GET /%TESTNUMBER/testapi/test HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=938937ca7da6bb3dbf15e30928265ec6f061532d035d2afda92fa7cb10feb196
 X-Yyy-Date: 19700101T000000Z
diff --git a/tests/data/test1935 b/tests/data/test1935
index 3744a32d5..b27f0cdbd 100644
--- a/tests/data/test1935
+++ b/tests/data/test1935
@@ -14,7 +14,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19350002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with two providers and region
 </name>
 <tool>
-lib1935
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1935/testapi/test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/1935/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1935/testapi/test HTTP/1.1
+GET /%TESTNUMBER/testapi/test HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=240750deb9263d4c8ece71c016f3919b56e518249390ef075740f94ef8df846f
 X-Yyy-Date: 19700101T000000Z
diff --git a/tests/data/test1936 b/tests/data/test1936
index 61a52db9d..7265e33d1 100644
--- a/tests/data/test1936
+++ b/tests/data/test1936
@@ -14,7 +14,7 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
-Location: /19360002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -43,11 +43,11 @@ crypto
 HTTP AWS_SIGV4 with two providers, region and service
 </name>
 <tool>
-lib1936
+lib%TESTNUMBER
 </tool>
 
 <command>
-http://%HOSTIP:%HTTPPORT/1936/testapi/test
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
 </command>
 </client>
 
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/1936/testapi/test
 ^Accept:.*
 </strip>
 <protocol>
-GET /1936/testapi/test HTTP/1.1
+GET /%TESTNUMBER/testapi/test HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/sss/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=f32cf87977cea5d3274b524b53e5d28f4aac54c372f710ae0cc3a9ececaf169f
 X-Yyy-Date: 19700101T000000Z
diff --git a/tests/data/test194 b/tests/data/test194
index 8c2b863a0..924e9a940 100644
--- a/tests/data/test194
+++ b/tests/data/test194
@@ -50,14 +50,14 @@ http
 HTTP resume transfer with the whole file already downloaded and --fail
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/194 -C 87 --fail
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87 --fail
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/194 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=87-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test195 b/tests/data/test195
index 3059e8d95..920ab8af3 100644
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -21,7 +21,7 @@ ftp
 FTP response 530 after PASS, temporarily not allowed access
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/195
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test196 b/tests/data/test196
index 31f724b84..715a6ce67 100644
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -22,7 +22,7 @@ ftp
 FTP transient error, retry request once
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/196 --retry 1
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --retry 1
 </command>
 </client>
 
diff --git a/tests/data/test197 b/tests/data/test197
index b3e931efa..70198732a 100644
--- a/tests/data/test197
+++ b/tests/data/test197
@@ -37,7 +37,7 @@ http
 HTTP GET --retry on 503 error with output to stdout
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/197 --retry 1000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 </command>
 </client>
 
@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/197 --retry 1000
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /197 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /197 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test198 b/tests/data/test198
index 18ed14e4f..08fafde6c 100644
--- a/tests/data/test198
+++ b/tests/data/test198
@@ -46,7 +46,7 @@ http
 HTTP GET --retry on 503 error with output to file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/198 --retry 1000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
 </command>
 </client>
 
@@ -54,12 +54,12 @@ http://%HOSTIP:%HTTPPORT/198 --retry 1000
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /198 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /198 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test199 b/tests/data/test199
index 40d9f9bf3..b997c5c4b 100644
--- a/tests/data/test199
+++ b/tests/data/test199
@@ -35,7 +35,7 @@ http
 HTTP with -d, -G and {}
  </name>
  <command>
--d "foo=moo&moo=poo" "http://%HOSTIP:%HTTPPORT/{199,199}" -G
+-d "foo=moo&moo=poo" "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}" -G
 </command>
 </client>
 
@@ -43,12 +43,12 @@ HTTP with -d, -G and {}
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /199?foo=moo&moo=poo HTTP/1.1
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /199?foo=moo&moo=poo HTTP/1.1
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2 b/tests/data/test2
index 8d2cf87d8..80e47b082 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -29,7 +29,7 @@ http
 HTTP GET with user and password
  </name>
  <command>
- -u fake:user http://%HOSTIP:%HTTPPORT/2
+ -u fake:user http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,15 +37,12 @@ HTTP GET with user and password
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic ZmFrZTp1c2Vy
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<data>
-[insert full protocol verifiction dump here]
-</data>
 </verify>
 </testcase>
diff --git a/tests/data/test200 b/tests/data/test200
index d8adda7d8..e7c5146f7 100644
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -24,9 +24,9 @@ file
 basic file:// file
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test200.txt
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test200.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
diff --git a/tests/data/test2000 b/tests/data/test2000
index a91dcd2c7..32604c6f3 100644
--- a/tests/data/test2000
+++ b/tests/data/test2000
@@ -32,9 +32,9 @@ file
 FTP RETR followed by FILE
  </name>
 <command option="no-include">
-ftp://%HOSTIP:%FTPPORT/2000 file://localhost%FILE_PWD/log/test2000.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test2000.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -52,8 +52,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 2000
-RETR 2000
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 <stdout>
diff --git a/tests/data/test2001 b/tests/data/test2001
index 964646579..e85fd1ffc 100644
--- a/tests/data/test2001
+++ b/tests/data/test2001
@@ -49,9 +49,9 @@ file
 HTTP GET followed by FTP RETR followed by FILE
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20010001 ftp://%HOSTIP:%FTPPORT/20010002 file://localhost%FILE_PWD/log/test2001.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test2001.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -64,7 +64,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20010001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -74,8 +74,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 20010002
-RETR 20010002
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
 QUIT
 </protocol>
 <stdout>
diff --git a/tests/data/test2002 b/tests/data/test2002
index bbdafe152..68144f8cf 100644
--- a/tests/data/test2002
+++ b/tests/data/test2002
@@ -58,9 +58,9 @@ tftp
 HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20020001 ftp://%HOSTIP:%FTPPORT/20020002 file://localhost%FILE_PWD/log/test2002.txt tftp://%HOSTIP:%TFTPPORT//20020003
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003
 </command>
-<file name="log/test2002.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -73,7 +73,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20020001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -83,14 +83,14 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 20020002
-RETR 20020002
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /20020003
+filename: /%TESTNUMBER0003
 QUIT
 </protocol>
 <stdout>
diff --git a/tests/data/test2003 b/tests/data/test2003
index 1ae68f982..76d85211a 100644
--- a/tests/data/test2003
+++ b/tests/data/test2003
@@ -58,9 +58,9 @@ tftp
 HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ then again in reverse order
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20030001 ftp://%HOSTIP:%FTPPORT/20030002 file://localhost%FILE_PWD/log/test2003.txt tftp://%HOSTIP:%TFTPPORT//20030003 tftp://%HOSTIP:%TFTPPORT//20030003 file://localhost%FILE_PWD/log/test2003.txt ftp://%HOSTIP:%FTPPORT/20030002 http://%HOSTIP:%HTTPPORT/20030001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
-<file name="log/test2003.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -73,7 +73,7 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20030001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -83,24 +83,24 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 20030002
-RETR 20030002
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /20030003
+filename: /%TESTNUMBER0003
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /20030003
+filename: /%TESTNUMBER0003
 EPSV
-SIZE 20030002
-RETR 20030002
-GET /20030001 HTTP/1.1
+SIZE %TESTNUMBER0002
+RETR %TESTNUMBER0002
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2004 b/tests/data/test2004
index f9add83d5..6ef9c6cfd 100644
--- a/tests/data/test2004
+++ b/tests/data/test2004
@@ -30,9 +30,9 @@ sftp
 TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order
  </name>
 <command option="no-include">
---key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//2004 sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt tftp://%HOSTIP:%TFTPPORT//2004 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt file://localhost%FILE_PWD/log/test%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt file://localhost%FILE_PWD/log/test%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --insecure
 </command>
-<file name="log/test2004.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is test data
 for several protocols
 </file>
@@ -47,13 +47,13 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /2004
+filename: /%TESTNUMBER
 opcode: 1
 mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /2004
+filename: /%TESTNUMBER
 </protocol>
 <stdout>
 Test data file
diff --git a/tests/data/test2005 b/tests/data/test2005
index f26bf239a..bbc321b52 100644
--- a/tests/data/test2005
+++ b/tests/data/test2005
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 37
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2005; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data delivered from an HTTP resource
@@ -38,26 +38,26 @@ Metalink
 Metalink local XML file, HTTP resource
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2005.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2005.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2005">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">a430d26389c69b7a245a9ad692cf20b4dc026fb7c2ff8a2c164c49a77130d6d9</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2005</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2005 log/name2005
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -65,24 +65,24 @@ perl %SRCDIR/libtest/notexists.pl log/2005 log/name2005
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2005 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2005">
+<file1 name="log/download%TESTNUMBER">
 Data delivered from an HTTP resource
 </file1>
-<file2 name="log/stdout2005">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
-<file3 name="log/stderr2005" mode="text">
-Metalink: parsing (file://%PWD/log/test2005.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2005.metalink) OK
-Metalink: fetching (log/download2005) from (http://%HOSTIP:%HTTPPORT/2005)...
-Metalink: fetching (log/download2005) from (http://%HOSTIP:%HTTPPORT/2005) OK
-Metalink: validating (log/download2005)...
-Metalink: validating (log/download2005) [sha-256] OK
+<file3 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file3>
 <stripfile3>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2006 b/tests/data/test2006
index addf86f01..d4091b48b 100644
--- a/tests/data/test2006
+++ b/tests/data/test2006
@@ -18,7 +18,7 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2006; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some data delivered from an HTTP resource
@@ -46,27 +46,27 @@ Metalink local XML file, HTTP resource, using -O -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2006.metalink -O -D log/heads2006
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -O -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2006.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2006">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">319cb6be756734b7ff689628ca3265580cdae6a0e38f42d4ac612ff4fba143b0</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2006</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2006 log/name2006
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -74,13 +74,13 @@ perl %SRCDIR/libtest/notexists.pl log/2006 log/name2006
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2006 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2006">
+<file1 name="log/download%TESTNUMBER">
 Some data delivered from an HTTP resource
 </file1>
 
@@ -90,7 +90,7 @@ Some data delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2006">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps
 Accept-ranges: bytes
 
@@ -101,19 +101,19 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2006; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2006">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2006" mode="text">
-Metalink: parsing (file://%PWD/log/test2006.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2006.metalink) OK
-Metalink: fetching (log/download2006) from (http://%HOSTIP:%HTTPPORT/2006)...
-Metalink: fetching (log/download2006) from (http://%HOSTIP:%HTTPPORT/2006) OK
-Metalink: validating (log/download2006)...
-Metalink: validating (log/download2006) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2007 b/tests/data/test2007
index 4c456151a..679de26e1 100644
--- a/tests/data/test2007
+++ b/tests/data/test2007
@@ -19,7 +19,7 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2007; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Something delivered from an HTTP resource
@@ -47,27 +47,27 @@ Metalink local XML file, HTTP resource, using -O -J -D file
 CURL_TESTDIR=%PWD/log
 </setenv>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2007.metalink -J -O -D log/heads2007
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -J -O -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2007.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2007">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">52899e30f80e3490632d505653204e1fb5b02bda141048704ce9a0ed00b8a3f5</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2007</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -75,13 +75,13 @@ perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2007 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2007">
+<file1 name="log/download%TESTNUMBER">
 Something delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -90,7 +90,7 @@ Something delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2007">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps
 Accept-ranges: bytes
 
@@ -101,19 +101,19 @@ Server: test-server/fake
 Content-Length: 42
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2007; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2007">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2007" mode="text">
-Metalink: parsing (file://%PWD/log/test2007.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2007.metalink) OK
-Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007)...
-Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007) OK
-Metalink: validating (log/download2007)...
-Metalink: validating (log/download2007) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2008 b/tests/data/test2008
index ec41adb35..75ed402c7 100644
--- a/tests/data/test2008
+++ b/tests/data/test2008
@@ -18,7 +18,7 @@ Server: test-server/fake
 Content-Length: 43
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2008; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some stuff delivered from an HTTP resource
@@ -39,27 +39,27 @@ http
 Metalink local XML file, HTTP resource, using -o fname -D file
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2008.metalink -o log/outfile2008 -D log/heads2008
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2008.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2008">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">711b1b566b536c5baae9b36f2f5c1830a7c8ff126d1afa2febc5b59f8d0aab54</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2008</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2008 log/name2008 log/outfile2008
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER
 </postcheck>
 </client>
 
@@ -67,13 +67,13 @@ perl %SRCDIR/libtest/notexists.pl log/2008 log/name2008 log/outfile2008
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2008 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2008">
+<file1 name="log/download%TESTNUMBER">
 Some stuff delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -82,7 +82,7 @@ Some stuff delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2008">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps
 Accept-ranges: bytes
 
@@ -93,19 +93,19 @@ Server: test-server/fake
 Content-Length: 43
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2008; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2008">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2008" mode="text">
-Metalink: parsing (file://%PWD/log/test2008.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2008.metalink) OK
-Metalink: fetching (log/download2008) from (http://%HOSTIP:%HTTPPORT/2008)...
-Metalink: fetching (log/download2008) from (http://%HOSTIP:%HTTPPORT/2008) OK
-Metalink: validating (log/download2008)...
-Metalink: validating (log/download2008) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2009 b/tests/data/test2009
index aa71a0ac1..443559a97 100644
--- a/tests/data/test2009
+++ b/tests/data/test2009
@@ -19,7 +19,7 @@ Server: test-server/fake
 Content-Length: 46
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2009; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some contents delivered from an HTTP resource
@@ -40,27 +40,27 @@ http
 Metalink local XML file, HTTP resource, using -o fname -J -D file
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2009.metalink -J -o log/outfile2009 -D log/heads2009
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2009.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2009">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">e4c5b83384ba7d5f8e201d61747a14f29baacd7dfadce0fbd56661db4bba72b2</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2009</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2009 log/name2009 log/outfile2009
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER
 </postcheck>
 </client>
 
@@ -68,13 +68,13 @@ perl %SRCDIR/libtest/notexists.pl log/2009 log/name2009 log/outfile2009
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2009 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2009">
+<file1 name="log/download%TESTNUMBER">
 Some contents delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -83,7 +83,7 @@ Some contents delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2009">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps
 Accept-ranges: bytes
 
@@ -94,19 +94,19 @@ Server: test-server/fake
 Content-Length: 46
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2009; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2009">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2009" mode="text">
-Metalink: parsing (file://%PWD/log/test2009.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2009.metalink) OK
-Metalink: fetching (log/download2009) from (http://%HOSTIP:%HTTPPORT/2009)...
-Metalink: fetching (log/download2009) from (http://%HOSTIP:%HTTPPORT/2009) OK
-Metalink: validating (log/download2009)...
-Metalink: validating (log/download2009) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2010 b/tests/data/test2010
index cd0c48354..11affe9a1 100644
--- a/tests/data/test2010
+++ b/tests/data/test2010
@@ -18,7 +18,7 @@ Server: test-server/fake
 Content-Length: 41
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2010; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Contents delivered from an HTTP resource
@@ -39,27 +39,27 @@ http
 Metalink local XML file, HTTP resource, using -o fname -D file
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2010.metalink -o log/outfile2010 -D log/heads2010
+--metalink file://%PWD/log/test%TESTNUMBER.metalink -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 # local metalink file written before test command runs
-<file name="log/test2010.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2010">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="md5">we-only-check-the-strongest-hash-provided</hash>
     <hash type="sha256">19dcb4e2a99b9cd02c30b1ed6c55869b7ef8cda9f985648909c48a6dbb54356c</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2010</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2010 log/name2010 log/outfile2010
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER
 </postcheck>
 </client>
 
@@ -67,13 +67,13 @@ perl %SRCDIR/libtest/notexists.pl log/2010 log/name2010 log/outfile2010
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2010 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2010">
+<file1 name="log/download%TESTNUMBER">
 Contents delivered from an HTTP resource
 </file1>
 # The Content-Length replace here is to handle with 4/5 digit port number in
@@ -82,7 +82,7 @@ Contents delivered from an HTTP resource
 s/Last-Modified:.*//
 s/Content-Length: 49[67]/Content-Length: yeps/
 </stripfile2>
-<file2 name="log/heads2010">
+<file2 name="log/heads%TESTNUMBER">
 Content-Length: yeps
 Accept-ranges: bytes
 
@@ -93,19 +93,19 @@ Server: test-server/fake
 Content-Length: 41
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2010; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 </file2>
-<file3 name="log/stdout2010">
+<file3 name="log/stdout%TESTNUMBER">
 </file3>
-<file4 name="log/stderr2010" mode="text">
-Metalink: parsing (file://%PWD/log/test2010.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2010.metalink) OK
-Metalink: fetching (log/download2010) from (http://%HOSTIP:%HTTPPORT/2010)...
-Metalink: fetching (log/download2010) from (http://%HOSTIP:%HTTPPORT/2010) OK
-Metalink: validating (log/download2010)...
-Metalink: validating (log/download2010) [sha-256] OK
+<file4 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] OK
 </file4>
 <stripfile4>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2011 b/tests/data/test2011
index 1d081afcb..781697811 100644
--- a/tests/data/test2011
+++ b/tests/data/test2011
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 37
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2011; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data delivered from an HTTP resource
@@ -38,26 +38,26 @@ Metalink
 Metalink local XML file, HTTP resource, hash mismatch
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2011.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2011.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2011">
+  <file name="log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2011</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2011 log/name2011
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -65,24 +65,24 @@ perl %SRCDIR/libtest/notexists.pl log/2011 log/name2011
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2011 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2011">
+<file1 name="log/download%TESTNUMBER">
 Data delivered from an HTTP resource
 </file1>
-<file2 name="log/stdout2011">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
-<file3 name="log/stderr2011" mode="text">
-Metalink: parsing (file://%PWD/log/test2011.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2011.metalink) OK
-Metalink: fetching (log/download2011) from (http://%HOSTIP:%HTTPPORT/2011)...
-Metalink: fetching (log/download2011) from (http://%HOSTIP:%HTTPPORT/2011) OK
-Metalink: validating (log/download2011)...
-Metalink: validating (log/download2011) [sha-256] FAILED (digest mismatch)
+<file3 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) [sha-256] FAILED (digest mismatch)
 </file3>
 <stripfile3>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2012 b/tests/data/test2012
index ae627a9af..b3cfd6146 100644
--- a/tests/data/test2012
+++ b/tests/data/test2012
@@ -12,12 +12,12 @@ HTTP GET
 <reply>
 <data nocheck="yes">
 HTTP/1.1 200 OK
-Date: Wed, 20 Jun 2012 14:49:00 GMT
+Date: Wed, 20 Jun %TESTNUMBER 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 46
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2012; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Some contents delivered from an HTTP resource
@@ -38,25 +38,25 @@ Metalink
 Metalink local XML file, HTTP resource, without hash
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2012.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2012.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2012">
+  <file name="log/download%TESTNUMBER">
    <verification>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2012</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -64,24 +64,24 @@ perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2012 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file1 name="log/download2012">
+<file1 name="log/download%TESTNUMBER">
 Some contents delivered from an HTTP resource
 </file1>
-<file2 name="log/stdout2012">
+<file2 name="log/stdout%TESTNUMBER">
 </file2>
-<file3 name="log/stderr2012" mode="text">
-Metalink: parsing (file://%PWD/log/test2012.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2012.metalink) WARNING (digest missing)
-Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012)...
-Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012) OK
-Metalink: validating (log/download2012)...
-Metalink: validating (log/download2012) FAILED (digest missing)
+<file3 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (digest missing)
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)...
+Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK
+Metalink: validating (log/download%TESTNUMBER)...
+Metalink: validating (log/download%TESTNUMBER) FAILED (digest missing)
 </file3>
 <stripfile3>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2013 b/tests/data/test2013
index f4d0c2475..016a9a4b2 100644
--- a/tests/data/test2013
+++ b/tests/data/test2013
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2013; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix absolute path
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2013.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2013.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="/tmp/download2013">
+  <file name="/tmp/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2013</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2013 log/name2013 /tmp/download2013
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER /tmp/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2013">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2013" mode="text">
-Metalink: parsing (file://%PWD/log/test2013.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2013.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2013.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2014 b/tests/data/test2014
index 65d2ec766..895c9c9c8 100644
--- a/tests/data/test2014
+++ b/tests/data/test2014
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2014; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix path relative to current
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2014.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2014.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="./log/download2014">
+  <file name="./log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2014</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2014 log/name2014 log/download2014
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2014">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2014" mode="text">
-Metalink: parsing (file://%PWD/log/test2014.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2014.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2014.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2015 b/tests/data/test2015
index d356f88bc..a35564703 100644
--- a/tests/data/test2015
+++ b/tests/data/test2015
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2015; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix path relative to upper
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2015.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2015.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="../tests/log/download2015">
+  <file name="../tests/log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2015</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2015 log/name2015 log/download2015
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2015">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2015" mode="text">
-Metalink: parsing (file://%PWD/log/test2015.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2015.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2015.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2016 b/tests/data/test2016
index ff2862d51..51b687f9a 100644
--- a/tests/data/test2016
+++ b/tests/data/test2016
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2016; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix path traversal
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2016.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2016.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/../log/download2016">
+  <file name="log/../log/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2016</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2016 log/name2016 log/download2016
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2016">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2016" mode="text">
-Metalink: parsing (file://%PWD/log/test2016.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2016.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2016.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2017 b/tests/data/test2017
index 11c71c3db..4937c2802 100644
--- a/tests/data/test2017
+++ b/tests/data/test2017
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2017; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix home path traversal
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2017.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2017.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="~/download2017">
+  <file name="~/download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2017</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2017 log/name2017
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2017">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2017" mode="text">
-Metalink: parsing (file://%PWD/log/test2017.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2017.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2017.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2018 b/tests/data/test2018
index 9fb433d94..f43f8c4b5 100644
--- a/tests/data/test2018
+++ b/tests/data/test2018
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2018; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name I
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2018.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2018.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/.download2018">
+  <file name="log/.download%TESTNUMBER">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2018</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2018 log/name2018 log/.download2018
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/.download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2018">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2018" mode="text">
-Metalink: parsing (file://%PWD/log/test2018.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2018.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2018.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2019 b/tests/data/test2019
index abd8cad9a..7123ab376 100644
--- a/tests/data/test2019
+++ b/tests/data/test2019
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2019; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,10 +38,10 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name II
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2019.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2019.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
@@ -50,26 +50,26 @@ Metalink local XML file, attempt Unix questionable file name II
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2019</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2019 log/name2019
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2019">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2019" mode="text">
-Metalink: parsing (file://%PWD/log/test2019.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2019.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2019.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test202 b/tests/data/test202
index ad9d854d5..f5efc0732 100644
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -20,9 +20,9 @@ file
 two file:// URLs to stdout
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test202.txt FILE://localhost%FILE_PWD/log/test202.txt
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt FILE://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test202.txt">
+<file name="log/test%TESTNUMBER.txt">
 contents in a single file
 </file>
 </client>
diff --git a/tests/data/test2020 b/tests/data/test2020
index 584f6df3b..8fd95543e 100644
--- a/tests/data/test2020
+++ b/tests/data/test2020
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2020; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,10 +38,10 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name III
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2020.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2020.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
@@ -50,26 +50,26 @@ Metalink local XML file, attempt Unix questionable file name III
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2020</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2020 log/name2020
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2020">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2020" mode="text">
-Metalink: parsing (file://%PWD/log/test2020.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2020.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2020.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2021 b/tests/data/test2021
index b0921d48a..4919cab59 100644
--- a/tests/data/test2021
+++ b/tests/data/test2021
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2021; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name IV
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2021.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2021.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2021 >/dev/null">
+  <file name="log/download%TESTNUMBER >/dev/null">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2021</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2021 log/name2021 log/download2021
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2021">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2021" mode="text">
-Metalink: parsing (file://%PWD/log/test2021.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2021.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2021.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2022 b/tests/data/test2022
index e9044732a..84735c93c 100644
--- a/tests/data/test2022
+++ b/tests/data/test2022
@@ -17,7 +17,7 @@ Server: test-server/fake
 Content-Length: 56
 Connection: close
 Content-Type: text/html
-Content-Disposition: filename=name2022; charset=funny; option=strange
+Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 Funny-head: yesyes
 
 Data that should not be delivered from an HTTP resource
@@ -38,38 +38,38 @@ Metalink
 Metalink local XML file, attempt Unix questionable file name V
  </name>
 <command option="no-output,no-include">
---metalink file://%PWD/log/test2022.metalink
+--metalink file://%PWD/log/test%TESTNUMBER.metalink
 </command>
 # local metalink file written before test command runs
-<file name="log/test2022.metalink">
+<file name="log/test%TESTNUMBER.metalink">
 <?xml version="1.0" encoding="utf-8"?>
 <metalink version="3.0" xmlns="http://www.metalinker.org/">
  <files>
-  <file name="log/download2022 |/dev/null">
+  <file name="log/download%TESTNUMBER |/dev/null">
    <verification>
     <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash>
    </verification>
    <resources maxconnections="1">
-    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/2022</url>
+    <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url>
    </resources>
   </file>
  </files>
 </metalink>
 </file>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/2022 log/name2022 log/download2022
+perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER
 </postcheck>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file1 name="log/stdout2022">
+<file1 name="log/stdout%TESTNUMBER">
 </file1>
-<file2 name="log/stderr2022" mode="text">
-Metalink: parsing (file://%PWD/log/test2022.metalink) metalink/XML...
-Metalink: parsing (file://%PWD/log/test2022.metalink) WARNING (missing or invalid file name)
-Metalink: parsing (file://%PWD/log/test2022.metalink) FAILED
+<file2 name="log/stderr%TESTNUMBER" mode="text">
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name)
+Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED
 </file2>
 <stripfile2>
 $_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
diff --git a/tests/data/test2023 b/tests/data/test2023
index 0b155b2d2..08fb5cc00 100644
--- a/tests/data/test2023
+++ b/tests/data/test2023
@@ -119,7 +119,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2023 basic basic
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic
 </command>
 <precheck>
 chkhostname curlhost
@@ -129,27 +129,27 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20230100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20230200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
 
-GET /20230300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20230400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20230500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
diff --git a/tests/data/test2024 b/tests/data/test2024
index c062b4c0f..d371e5dcb 100644
--- a/tests/data/test2024
+++ b/tests/data/test2024
@@ -133,7 +133,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2024 basic digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest
 </command>
 <precheck>
 chkhostname curlhost
@@ -143,29 +143,29 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20240100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20240200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20240200", response="ed646c565f79e2dd9fa37cb5a621213c"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0200", response="ed646c565f79e2dd9fa37cb5a621213c"
 Accept: */*
 
-GET /20240300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20240400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/20240400", response="9741ced8caacc6124770187b36f007c5"
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0400", response="9741ced8caacc6124770187b36f007c5"
 Accept: */*
 
-GET /20240500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/20240500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"
+Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test2025 b/tests/data/test2025
index 7a8fff152..5ab8b8582 100644
--- a/tests/data/test2025
+++ b/tests/data/test2025
@@ -215,7 +215,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2025 basic ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -225,42 +225,42 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20250100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20250200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20250200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20250300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20250400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20250400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20250500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20250500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test2026 b/tests/data/test2026
index a505737d7..963587ef2 100644
--- a/tests/data/test2026
+++ b/tests/data/test2026
@@ -169,7 +169,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2026 digest basic
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest basic
 </command>
 <precheck>
 chkhostname curlhost
@@ -179,35 +179,35 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20260100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /20260100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20260100", response="5f992a2e761ab926256419f7c685f85b"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="5f992a2e761ab926256419f7c685f85b"
 Accept: */*
 
-GET /20260200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
 
-GET /20260300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /20260300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/20260300", response="132242e602882251929be93228c830ae"
+Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0300", response="132242e602882251929be93228c830ae"
 Accept: */*
 
-GET /20260400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20260500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
diff --git a/tests/data/test2027 b/tests/data/test2027
index 3983e8854..ecc5a63d8 100644
--- a/tests/data/test2027
+++ b/tests/data/test2027
@@ -192,7 +192,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2027 digest digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest digest
 </command>
 <precheck>
 chkhostname curlhost
@@ -202,42 +202,42 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20270100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /20270100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20270100", response="f7fd60eefaff5225971bf9b3d80d6ba6"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="f7fd60eefaff5225971bf9b3d80d6ba6"
 Accept: */*
 
-GET /20270200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/20270200", response="785ca3ef511999f7e9c178195f5b388c"
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="785ca3ef511999f7e9c178195f5b388c"
 Accept: */*
 
-GET /20270300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /20270300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/20270300", response="4c735d2360fd6848e7cb32a11ae3612b"
+Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="4c735d2360fd6848e7cb32a11ae3612b"
 Accept: */*
 
-GET /20270400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20270400", response="f5906785511fb60a2af8b1cd53008ead"
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
 Accept: */*
 
-GET /20270400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20270400", response="f5906785511fb60a2af8b1cd53008ead"
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
 Accept: */*
 
-GET /20270500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/20270500", response="8ef4d935fd964a46c3965c0863b52cf1"
+Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="8ef4d935fd964a46c3965c0863b52cf1"
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test2028 b/tests/data/test2028
index c7b70c8f2..889561252 100644
--- a/tests/data/test2028
+++ b/tests/data/test2028
@@ -251,7 +251,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2028 digest ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -261,50 +261,50 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20280100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /20280100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/20280100", response="53c80666f5e3a4a55f92a66aaf0078bb"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="53c80666f5e3a4a55f92a66aaf0078bb"
 Accept: */*
 
-GET /20280200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20280200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20280300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /20280300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/20280300", response="1aa5d90da9803ca12d04b24e0f19476e"
+Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="1aa5d90da9803ca12d04b24e0f19476e"
 Accept: */*
 
-GET /20280400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20280400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20280500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20280500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test2029 b/tests/data/test2029
index 67313c414..53b433e83 100644
--- a/tests/data/test2029
+++ b/tests/data/test2029
@@ -188,7 +188,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2029 ntlm basic
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm basic
 </command>
 <precheck>
 chkhostname curlhost
@@ -198,37 +198,37 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20290100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20290100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20290200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
 
-GET /20290300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20290300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20290400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz
 Accept: */*
 
-GET /20290500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
diff --git a/tests/data/test203 b/tests/data/test203
index ee850cb1c..d19356384 100644
--- a/tests/data/test203
+++ b/tests/data/test203
@@ -29,9 +29,9 @@ file:/path URL with a single slash
 MSYS2_ARG_CONV_EXCL=file:
 </setenv>
 <command option="no-include">
-file:%FILE_PWD/log/test203.txt
+file:%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test203.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
diff --git a/tests/data/test2030 b/tests/data/test2030
index 1d281ab9f..dc3dfe855 100644
--- a/tests/data/test2030
+++ b/tests/data/test2030
@@ -240,7 +240,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2030 ntlm digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm digest
 </command>
 <precheck>
 chkhostname curlhost
@@ -250,44 +250,44 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20300100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20300100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20300200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/20300200", response="2f2d784ba53a0a307758a90e98d25c27"
+Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="2f2d784ba53a0a307758a90e98d25c27"
 Accept: */*
 
-GET /20300300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20300300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20300400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20300400", response="d6262e9147db08c62ff2f53b515861e8"
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
 Accept: */*
 
-GET /20300400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/20300400", response="d6262e9147db08c62ff2f53b515861e8"
+Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
 Accept: */*
 
-GET /20300500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/20300500", response="198757e61163a779cf24ed4c49c1ad7d"
+Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="198757e61163a779cf24ed4c49c1ad7d"
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test2031 b/tests/data/test2031
index dabba3749..6a8399546 100644
--- a/tests/data/test2031
+++ b/tests/data/test2031
@@ -254,7 +254,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2031 ntlm ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -264,52 +264,52 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20310100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20310100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20310200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20310200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20310300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20310300 HTTP/1.1
+GET /%TESTNUMBER0300 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20310400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20310400 HTTP/1.1
+GET /%TESTNUMBER0400 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
 
-GET /20310500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20310500 HTTP/1.1
+GET /%TESTNUMBER0500 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test2032 b/tests/data/test2032
index 52574fe77..08ac71515 100644
--- a/tests/data/test2032
+++ b/tests/data/test2032
@@ -86,7 +86,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/2032
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <precheck>
 chkhostname curlhost
@@ -96,22 +96,22 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20320100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
 
-GET /20320100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 Accept: */*
 
-GET /20320200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 
-GET /20320200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test2034 b/tests/data/test2034
index 91551b489..3ddd42024 100644
--- a/tests/data/test2034
+++ b/tests/data/test2034
@@ -34,7 +34,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET with DER public key pinning
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der https://localhost:%HTTPSPORT/2034
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -46,7 +46,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2034 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: localhost:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2035 b/tests/data/test2035
index 7002a5b8e..8380022aa 100644
--- a/tests/data/test2035
+++ b/tests/data/test2035
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 HTTPS wrong DER pinnedpubkey but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.der https://localhost:%HTTPSPORT/2035
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
diff --git a/tests/data/test2037 b/tests/data/test2037
index 8bbed5e71..3f0fbf3f3 100644
--- a/tests/data/test2037
+++ b/tests/data/test2037
@@ -34,7 +34,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET with PEM public key pinning
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem https://localhost:%HTTPSPORT/2037
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -47,7 +47,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 <verify>
 </strip>
 <protocol>
-GET /2037 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: localhost:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2038 b/tests/data/test2038
index 63d935add..d9bf7c643 100644
--- a/tests/data/test2038
+++ b/tests/data/test2038
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 HTTPS wrong PEM pinnedpubkey but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pem https://localhost:%HTTPSPORT/2038
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pem https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
diff --git a/tests/data/test2039 b/tests/data/test2039
index 1595ded05..a10852a7f 100644
--- a/tests/data/test2039
+++ b/tests/data/test2039
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc with 'default' override; no user/pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc2039 ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc2039" >
+<file name="log/netrc%TESTNUMBER" >
 # the following two lines were created while testing curl
 default login userdef password passwddef
 machine %HOSTIP login user1 password passwd1
diff --git a/tests/data/test204 b/tests/data/test204
index 5dad0149c..dcf0bb5bd 100644
--- a/tests/data/test204
+++ b/tests/data/test204
@@ -16,9 +16,9 @@ file
 "upload" with file://
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/result204.txt -T log/upload204.txt
+file://localhost%FILE_PWD/log/result%TESTNUMBER.txt -T log/upload%TESTNUMBER.txt
 </command>
-<file name="log/upload204.txt">
+<file name="log/upload%TESTNUMBER.txt">
 data
 in
 file
@@ -29,7 +29,7 @@ write
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/result204.txt">
+<file name="log/result%TESTNUMBER.txt">
 data
 in
 file
diff --git a/tests/data/test2040 b/tests/data/test2040
index cec8a6bcc..56a617909 100644
--- a/tests/data/test2040
+++ b/tests/data/test2040
@@ -41,20 +41,20 @@ http
 HTTP Basic authorization, then without authorization
 </name>
 <command option="no-output,no-include">
--u testuser:testpass http://%HOSTIP:%HTTPPORT/20400100 --next --no-basic http://%HOSTIP:%HTTPPORT/20400200
+-u testuser:testpass http://%HOSTIP:%HTTPPORT/%TESTNUMBER0100 --next --no-basic http://%HOSTIP:%HTTPPORT/%TESTNUMBER0200
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /20400100 HTTP/1.1
+GET /%TESTNUMBER0100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /20400200 HTTP/1.1
+GET /%TESTNUMBER0200 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2041 b/tests/data/test2041
index 14fab52b0..e4a2391e8 100644
--- a/tests/data/test2041
+++ b/tests/data/test2041
@@ -34,7 +34,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET with base64-sha256 public key pinning
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//+JYNkp2GTGRgrvZMUkOxbFJQQqYpwNE6toGmBjz00D8= https://localhost:%HTTPSPORT/2041
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//+JYNkp2GTGRgrvZMUkOxbFJQQqYpwNE6toGmBjz00D8= https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -46,7 +46,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2041 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: localhost:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2042 b/tests/data/test2042
index 2181e5322..b6b9bcc5a 100644
--- a/tests/data/test2042
+++ b/tests/data/test2042
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 HTTPS wrong base64-sha256 pinnedpubkey but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//bSIggTf+ikMG0CtmDlpMVBd7yi7H1md4URogRPqerso= https://localhost:%HTTPSPORT/2042
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//bSIggTf+ikMG0CtmDlpMVBd7yi7H1md4URogRPqerso= https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
diff --git a/tests/data/test2046 b/tests/data/test2046
index e86320d1e..8845326e8 100644
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -18,7 +18,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20460001
+Location: ./%TESTNUMBER0001
 
 redirect
 </data>
@@ -53,7 +53,7 @@ Connection re-use with IDN host name
  </name>
 
  <command>
-http://åäö.se:%HTTPPORT/2046 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://åäö.se:%HTTPPORT/2046 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2046 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: xn--4cab6c.se:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /20460001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: xn--4cab6c.se:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -78,7 +78,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20460001
+Location: ./%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -89,7 +89,7 @@ OK
 1
 1
 3
-http://åäö.se:%HTTPPORT/20460001
+http://åäö.se:%HTTPPORT/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
diff --git a/tests/data/test2047 b/tests/data/test2047
index cab3f5108..a4ab3911d 100644
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -18,7 +18,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20470001
+Location: ./%TESTNUMBER0001
 
 redirect
 </data>
@@ -54,7 +54,7 @@ Connection re-use with IDN host name over HTTP proxy
  </name>
 
  <command>
-http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
+http://åäö.se/%TESTNUMBER -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L
 </command>
 </client>
 
@@ -62,13 +62,13 @@ http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://xn--4cab6c.se/2047 HTTP/1.1
+GET http://xn--4cab6c.se/%TESTNUMBER HTTP/1.1
 Host: xn--4cab6c.se
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://xn--4cab6c.se/20470001 HTTP/1.1
+GET http://xn--4cab6c.se/%TESTNUMBER0001 HTTP/1.1
 Host: xn--4cab6c.se
 User-Agent: curl/%VERSION
 Accept: */*
@@ -81,7 +81,7 @@ HTTP/1.1 302 OK swsbounce
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 9
 Content-Type: text/plain
-Location: ./20470001
+Location: ./%TESTNUMBER0001
 
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -92,7 +92,7 @@ OK
 1
 1
 3
-http://åäö.se/20470001
+http://åäö.se/%TESTNUMBER0001
 text/plain; charset=us-ascii
 200
 </stdout>
diff --git a/tests/data/test2048 b/tests/data/test2048
index 787f584ef..f14c8fbe8 100644
--- a/tests/data/test2048
+++ b/tests/data/test2048
@@ -26,7 +26,7 @@ https Server-localhost-sv.pem
 pinnedpubkey no-match must fail even when insecure
 </name>
 <command>
---insecure --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost.nn-sv.pub.der https://localhost:%HTTPSPORT/2048
+--insecure --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost.nn-sv.pub.der https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test2049 b/tests/data/test2049
index b6158c4bb..2b0c64508 100644
--- a/tests/data/test2049
+++ b/tests/data/test2049
@@ -31,7 +31,7 @@ Connect to specific host
  </name>
 
  <command>
-http://www1.example.com:8081/2049 --connect-to ::%HOSTIP:%HTTPPORT --next http://www2.example.com:8082/2049 --connect-to :8082:%HOSTIP:%HTTPPORT --next http://www3.example.com:8083/2049 --connect-to www3.example.com::%HOSTIP:%HTTPPORT --next http://www4.example.com:8084/2049 --connect-to www4.example.com:8084:%HOSTIP:%HTTPPORT
+http://www1.example.com:8081/%TESTNUMBER --connect-to ::%HOSTIP:%HTTPPORT --next http://www2.example.com:8082/%TESTNUMBER --connect-to :8082:%HOSTIP:%HTTPPORT --next http://www3.example.com:8083/%TESTNUMBER --connect-to www3.example.com::%HOSTIP:%HTTPPORT --next http://www4.example.com:8084/%TESTNUMBER --connect-to www4.example.com:8084:%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -39,22 +39,22 @@ http://www1.example.com:8081/2049 --connect-to ::%HOSTIP:%HTTPPORT --next http:/
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2049 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www1.example.com:8081
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2049 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www2.example.com:8082
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2049 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www3.example.com:8083
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2049 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www4.example.com:8084
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test205 b/tests/data/test205
index f83c53157..de04997c3 100644
--- a/tests/data/test205
+++ b/tests/data/test205
@@ -17,9 +17,9 @@ file
 "upload" with file://
  </name>
 <command option="no-include">
-file://localhost/%PWD/log/nonexisting/result205.txt -T log/upload205.txt
+file://localhost/%PWD/log/nonexisting/result%TESTNUMBER.txt -T log/upload%TESTNUMBER.txt
 </command>
-<file name="log/upload205.txt">
+<file name="log/upload%TESTNUMBER.txt">
 data
 in
 file
diff --git a/tests/data/test2050 b/tests/data/test2050
index 180ca0a0d..8d63a8d4b 100644
--- a/tests/data/test2050
+++ b/tests/data/test2050
@@ -51,7 +51,7 @@ Connect to specific host via HTTP proxy (switch to tunnel mode automatically)
  </name>
 
  <command>
-http://www.example.com.2050/2050 --connect-to ::connect.example.com.2050:%HTTPPORT -x %HOSTIP:%PROXYPORT
+http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT
 </command>
 <features>
 proxy
@@ -62,15 +62,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT connect.example.com.2050:%HTTPPORT HTTP/1.1
-Host: connect.example.com.2050:%HTTPPORT
+CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: connect.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /2050 HTTP/1.1
-Host: www.example.com.2050
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com.%TESTNUMBER
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2051 b/tests/data/test2051
index 38a0781bc..bd823bfff 100644
--- a/tests/data/test2051
+++ b/tests/data/test2051
@@ -31,7 +31,7 @@ Connect to specific host: Re-use existing connections if possible
  </name>
 
  <command>
-http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next --connect-to ::%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next --connect-to ::%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>
 
@@ -39,17 +39,17 @@ http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next --connect-to ::%HOST
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2051 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2051 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2051 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2052 b/tests/data/test2052
index 7dae17b96..dd04f3260 100644
--- a/tests/data/test2052
+++ b/tests/data/test2052
@@ -32,7 +32,7 @@ Connect to specific host: Do not mix connections with and without a "connect to
  </name>
 
  <command>
-http://www.example.com:%HTTPPORT/2052 --resolve www.example.com:%HTTPPORT:%HOSTIP -w "%{num_connects}\n" --next --resolve -www.example.com:%HTTPPORT --connect-to ::%HOSTIP:%HTTPPORT http://www.example.com:%HTTPPORT/2052 -w "%{num_connects}\n"
+http://www.example.com:%HTTPPORT/%TESTNUMBER --resolve www.example.com:%HTTPPORT:%HOSTIP -w "%{num_connects}\n" --next --resolve -www.example.com:%HTTPPORT --connect-to ::%HOSTIP:%HTTPPORT http://www.example.com:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
 </command>
 </client>
 
@@ -40,12 +40,12 @@ http://www.example.com:%HTTPPORT/2052 --resolve www.example.com:%HTTPPORT:%HOSTI
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2052 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www.example.com:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2052 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www.example.com:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2053 b/tests/data/test2053
index 05b8050a2..41035eb59 100644
--- a/tests/data/test2053
+++ b/tests/data/test2053
@@ -31,7 +31,7 @@ Connect to specific host with IP addresses
  </name>
 
  <command>
-http://10.0.0.1:8081/2053 --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next http://[fc00::1]:8082/2053 --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT
+http://10.0.0.1:8081/%TESTNUMBER --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next http://[fc00::1]:8082/%TESTNUMBER --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -39,12 +39,12 @@ http://10.0.0.1:8081/2053 --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next ht
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2053 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: 10.0.0.1:8081
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2053 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: [fc00::1]:8082
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2054 b/tests/data/test2054
index 50fff5482..022d13229 100644
--- a/tests/data/test2054
+++ b/tests/data/test2054
@@ -31,7 +31,7 @@ Connect to specific host: use the first "connect-to" string that matches
  </name>
 
  <command>
-http://%HOSTIP:%HTTPPORT/2054 --connect-to foo::bar: --connect-to :123::456 --next http://www.example.com:%HTTPPORT/2054 --connect-to www.example.com::%HOSTIP: --connect-to www.example.com::foo: --next http://%HOSTIP:8083/2054 --connect-to :8083::%HTTPPORT --connect-to :8083::123 --next http://www.example.com:8084/2054 --connect-to www.example.com:8084:%HOSTIP:%HTTPPORT --connect-to www.example.com:8084:foo:123
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --connect-to foo::bar: --connect-to :123::456 --next http://www.example.com:%HTTPPORT/%TESTNUMBER --connect-to www.example.com::%HOSTIP: --connect-to www.example.com::foo: --next http://%HOSTIP:8083/%TESTNUMBER --connect-to :8083::%HTTPPORT --connect-to :8083::123 --next http://www.example.com:8084/%TESTNUMBER --connect-to www.example.com:8084:%HOSTIP:%HTTPPORT --connect-to www.example.com:8084:foo:123
 </command>
 </client>
 
@@ -39,22 +39,22 @@ http://%HOSTIP:%HTTPPORT/2054 --connect-to foo::bar: --connect-to :123::456 --ne
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2054 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2054 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www.example.com:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2054 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:8083
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2054 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: www.example.com:8084
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2055 b/tests/data/test2055
index 2fd89dc11..2c62b259b 100644
--- a/tests/data/test2055
+++ b/tests/data/test2055
@@ -55,7 +55,7 @@ Connect to specific host via SOCKS proxy and HTTP proxy (switch to tunnel mode a
 proxy
 </features>
  <command>
-http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT
+http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT
 </command>
 </client>
 
@@ -63,15 +63,15 @@ http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPO
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT connect.example.com.2055:%HTTPPORT HTTP/1.1
-Host: connect.example.com.2055:%HTTPPORT
+CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: connect.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /2055 HTTP/1.1
-Host: www.example.com.2055
+GET /%TESTNUMBER HTTP/1.1
+Host: www.example.com.%TESTNUMBER
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2056 b/tests/data/test2056
index fc3d14773..d262e097d 100644
--- a/tests/data/test2056
+++ b/tests/data/test2056
@@ -47,14 +47,14 @@ LD_PRELOAD=%PWD/libtest/.libs/libstubgss.so
 CURL_STUB_GSS_CREDS="KRB5_Alice"
 </setenv>
 <command>
--u: --negotiate http://%HOSTIP:%HTTPPORT/2056
+-u: --negotiate http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2056 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Negotiate IktSQjVfQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjE6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test2057 b/tests/data/test2057
index f9c379076..c5443cc60 100644
--- a/tests/data/test2057
+++ b/tests/data/test2057
@@ -63,20 +63,20 @@ LD_PRELOAD=%PWD/libtest/.libs/libstubgss.so
 CURL_STUB_GSS_CREDS="NTLM_Alice"
 </setenv>
 <command>
--u: --negotiate http://%HOSTIP:%HTTPPORT/2057
+-u: --negotiate http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2057 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjI6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2057 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjM6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test2058 b/tests/data/test2058
index e1a801466..daff038d7 100644
--- a/tests/data/test2058
+++ b/tests/data/test2058
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT, resumed upload, modified method and SHA-256
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2058 -u auser:apasswd --digest -T log/2058 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/2058">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 
-GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2058", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2059 b/tests/data/test2059
index 4b3ed0f50..7ce80a384 100644
--- a/tests/data/test2059
+++ b/tests/data/test2059
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2059 -u auser:apasswd --digest -T log/2059 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/2059">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 
-GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2059", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm=SHA-512-256, userhash=true
+Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm=SHA-512-256, userhash=true
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test206 b/tests/data/test206
index c3ac6421c..f92ff8357 100644
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -79,26 +79,26 @@ proxy
 HTTP proxy CONNECT auth Digest
  </name>
  <command>
-http://test.remote.haxx.se.206:8990/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.haxx.se.206:8990 HTTP/1.1
-Host: test.remote.haxx.se.206:8990
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.haxx.se.206:8990 HTTP/1.1
-Host: test.remote.haxx.se.206:8990
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"
+CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-GET /path/2060002 HTTP/1.1
-Host: test.remote.haxx.se.206:8990
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.haxx.se.%TESTNUMBER:8990
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2060 b/tests/data/test2060
index dfb4bd5b3..e0b4505ef 100644
--- a/tests/data/test2060
+++ b/tests/data/test2060
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=false
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2060 -u auser:apasswd --digest -T log/2060 -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x  http://%HOSTIP:%HTTPPORT -C 2 -X GET
 </command>
-<file name="log/2060">
+<file name="log/%TESTNUMBER">
 test
 </file>
 </client>
@@ -82,7 +82,7 @@ test
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
@@ -90,9 +90,9 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 
-GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2060", response="3ce1e25ffa611bdbe90e2ab367b9602fa223db9f6de76ac667f0d6157e2178a6", algorithm=SHA-512-256
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="3ce1e25ffa611bdbe90e2ab367b9602fa223db9f6de76ac667f0d6157e2178a6", algorithm=SHA-512-256
 Content-Range: bytes 2-4/5
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2061 b/tests/data/test2061
index 6953423a3..702bc64dd 100644
--- a/tests/data/test2061
+++ b/tests/data/test2061
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 SHA256 Digest authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2061 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2061 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2061 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2061", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2062 b/tests/data/test2062
index 6075263de..e05a42f66 100644
--- a/tests/data/test2062
+++ b/tests/data/test2062
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 SHA-512-256 Digest authorization and userhash=false
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2062 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2062 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2062 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2062", response="2af735ec3508f4dff99248ffbbe9de9002bfd7cc770cfa2b026cb334042a54e3", algorithm=SHA-512-256
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="2af735ec3508f4dff99248ffbbe9de9002bfd7cc770cfa2b026cb334042a54e3", algorithm=SHA-512-256
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2063 b/tests/data/test2063
index 557e59361..0854c8061 100644
--- a/tests/data/test2063
+++ b/tests/data/test2063
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 SHA-512-256 Digest authorization and userhash=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2063 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2063 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2063 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/2063", response="43f7ab531dff687b5dc75617daa59d1fd67d648341d6d2655ca65ef5064cfb51", algorithm=SHA-512-256, userhash=true
+Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="43f7ab531dff687b5dc75617daa59d1fd67d648341d6d2655ca65ef5064cfb51", algorithm=SHA-512-256, userhash=true
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2064 b/tests/data/test2064
index fc196f258..77810ec1d 100644
--- a/tests/data/test2064
+++ b/tests/data/test2064
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 Digest authorization with bad password and SHA256
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2064 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2064 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2064 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2064", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2065 b/tests/data/test2065
index f352e6bcc..3d7afea25 100644
--- a/tests/data/test2065
+++ b/tests/data/test2065
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 Digest authorization with bad password, SHA-512-256 and userhash=false
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2065 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2065 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2065 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2065", response="5a5f20b0e601aeddc6f96422c2332d49ff431c49ab143b5f836ef76e9ac78f5e", algorithm=SHA-512-256
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="5a5f20b0e601aeddc6f96422c2332d49ff431c49ab143b5f836ef76e9ac78f5e", algorithm=SHA-512-256
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2066 b/tests/data/test2066
index 31a143d69..1f8d1982d 100644
--- a/tests/data/test2066
+++ b/tests/data/test2066
@@ -59,21 +59,21 @@ crypto
 HTTP with RFC7616 Digest authorization with bad password, SHA-512-256 and userhash=true
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2066 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2066 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2066 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/2066", response="a2e2ae589f575fb132991d6f550ef14bf7ef697d2fef1242d2498f07eafc77dc", algorithm=SHA-512-256, userhash=true
+Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a2e2ae589f575fb132991d6f550ef14bf7ef697d2fef1242d2498f07eafc77dc", algorithm=SHA-512-256, userhash=true
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2067 b/tests/data/test2067
index 0ae407606..4fdd4dcbb 100644
--- a/tests/data/test2067
+++ b/tests/data/test2067
@@ -60,23 +60,23 @@ HTTP POST --digest with SHA256 and user-specified Content-Length header
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/2067
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /2067 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /2067 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2067", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
diff --git a/tests/data/test2068 b/tests/data/test2068
index 21003bdb2..429e5d566 100644
--- a/tests/data/test2068
+++ b/tests/data/test2068
@@ -60,23 +60,23 @@ HTTP POST --digest with SHA-512-256, userhash=false and user-specified Content-L
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/2068
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /2068 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /2068 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2068", response="4bc9c97a72f1856bcec9b0e1518c6b7ee28773f91357d56840bdc30bd89ca68f", algorithm=SHA-512-256
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="4bc9c97a72f1856bcec9b0e1518c6b7ee28773f91357d56840bdc30bd89ca68f", algorithm=SHA-512-256
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
diff --git a/tests/data/test2069 b/tests/data/test2069
index fb3d15dcd..41a0c744d 100644
--- a/tests/data/test2069
+++ b/tests/data/test2069
@@ -60,23 +60,23 @@ HTTP POST --digest with SHA-512-256, userhash=true and user-specified Content-Le
 # even when there is a user-specified Content-Length header.
 # https://github.com/curl/curl/pull/1242
 <command>
--H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/2069
+-H "Content-Length: 11" -u auser:apasswd --digest -d "junkelijunk" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /2069 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /2069 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2069", response="ff13d977110a471f30de75e747976e4de78d7a3d2425cd23ff46e67f4bc9ead7", algorithm=SHA-512-256, userhash=true
+Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="ff13d977110a471f30de75e747976e4de78d7a3d2425cd23ff46e67f4bc9ead7", algorithm=SHA-512-256, userhash=true
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
diff --git a/tests/data/test207 b/tests/data/test207
index 1ce2338a3..73d363c6e 100644
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -41,7 +41,7 @@ http
 HTTP GET with chunked Transfer-Encoding closed prematurely
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/207
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -49,7 +49,7 @@ http://%HOSTIP:%HTTPPORT/207
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /207 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2070 b/tests/data/test2070
index c359b1cd5..7258638f7 100644
--- a/tests/data/test2070
+++ b/tests/data/test2070
@@ -38,7 +38,7 @@ Ignore certificate revocation "best effort" strategy
 CURL_SSL_BACKEND=schannel
  </setenv>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --ssl-revoke-best-effort https://localhost:%HTTPSPORT/2070
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -50,7 +50,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2070 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: localhost:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2072 b/tests/data/test2072
index 1bab15888..179167068 100644
--- a/tests/data/test2072
+++ b/tests/data/test2072
@@ -24,12 +24,12 @@ file
 file:// with unix path resolution behavior for the case of extra slashes
 </name>
 <command option="no-include">
-file:////%PWD/log/test2072.txt
+file:////%PWD/log/test%TESTNUMBER.txt
 </command>
 <precheck>
 perl -e "print 'Test requires a unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');"
 </precheck>
-<file name="log/test2072.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
diff --git a/tests/data/test2073 b/tests/data/test2073
index 94e137235..dd3641546 100644
--- a/tests/data/test2073
+++ b/tests/data/test2073
@@ -34,7 +34,7 @@ http
 HTTP form posts with handle reset
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2073 -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%HTTPPORT/2073 -F 'name=b;filename=b.jpg'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=b;filename=b.jpg'
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/2073 -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /2073 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -55,7 +55,7 @@ Content-Disposition: form-data; name="name"; filename="a.pdf"
 Content-Type: application/pdf
 
 a
-POST /2073 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test2074 b/tests/data/test2074
index 786091c78..e7b600338 100644
--- a/tests/data/test2074
+++ b/tests/data/test2074
@@ -36,7 +36,7 @@ http
 HTTP GET
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/2074 --oauth2-bearer mF_9.B5f-4.1JqM
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/2074 --oauth2-bearer mF_9.B5f-4.1JqM
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2074 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Bearer mF_9.B5f-4.1JqM
 User-Agent: curl/%VERSION
diff --git a/tests/data/test2076 b/tests/data/test2076
index 5974286f6..646b7dfc8 100644
--- a/tests/data/test2076
+++ b/tests/data/test2076
@@ -51,21 +51,21 @@ crypto
 HTTP with digest auth and URI contains query
 </name>
 <command>
-"http://%HOSTIP:%HTTPPORT/2076?query" -u testuser:testpass --digest
+"http://%HOSTIP:%HTTPPORT/%TESTNUMBER?query" -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /2076?query HTTP/1.1
+GET /%TESTNUMBER?query HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /2076?query HTTP/1.1
+GET /%TESTNUMBER?query HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/2076?query", response="5758bd3bbde7f33236e6ccd278eb59af"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER?query", response="5758bd3bbde7f33236e6ccd278eb59af"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test2077 b/tests/data/test2077
index 0c600f5c3..44a197481 100644
--- a/tests/data/test2077
+++ b/tests/data/test2077
@@ -29,7 +29,7 @@ GSS-API
 curl --fail --negotiate to unauthenticated service fails
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/2077 -u : --fail --negotiate
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u : --fail --negotiate
 </command>
 </client>
 
diff --git a/tests/data/test2078 b/tests/data/test2078
index c881b0499..387352afa 100644
--- a/tests/data/test2078
+++ b/tests/data/test2078
@@ -29,7 +29,7 @@ GSS-API
 curl --negotiate should not send empty POST request only
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u : --negotiate --data name=value
 </command>
 </client>
 
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value
 0
 </errorcode>
 <protocol nonewline="yes">
-POST /2078 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test208 b/tests/data/test208
index 19199e29b..d081b5131 100644
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -33,9 +33,9 @@ proxy
 HTTP PUT to a FTP URL with username+password - over HTTP proxy
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/208 -T log/test208.txt
+-x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test208.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -51,7 +51,7 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1
+PUT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER HTTP/1.1
 Host: host.com:21
 Authorization: Basic ZGFuaWVsOm15c2VjcmV0
 User-Agent: curl/%VERSION
diff --git a/tests/data/test2080 b/tests/data/test2080
index 47e376ecb..9a337031d 100644
--- a/tests/data/test2080
+++ b/tests/data/test2080
diff --git a/tests/data/test209 b/tests/data/test209
index e849869cf..dcead8513 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -92,7 +92,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.209:%HTTPPORT/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel
 </command>
 <precheck>
 chkhostname curlhost
@@ -102,20 +102,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.209:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.209:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-GET /path/2090002 HTTP/1.1
-Host: test.remote.example.com.209:%HTTPPORT
+GET /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test210 b/tests/data/test210
index c6fb70309..170316425 100644
--- a/tests/data/test210
+++ b/tests/data/test210
@@ -23,7 +23,7 @@ ftp
 Get two FTP files from the same remote dir: no second CWD
  </name>
 <command option="no-include">
-ftp://%HOSTIP:%FTPPORT/a/path/210 ftp://%HOSTIP:%FTPPORT/a/path/210
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 <stdout>
 data blobb
@@ -41,11 +41,11 @@ CWD a
 CWD path
 EPSV
 TYPE I
-SIZE 210
-RETR 210
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 210
-RETR 210
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test2100 b/tests/data/test2100
index 07b4a7a9d..39ba19106 100644
--- a/tests/data/test2100
+++ b/tests/data/test2100
diff --git a/tests/data/test211 b/tests/data/test211
index 96d0573f2..0fe6e6f96 100644
--- a/tests/data/test211
+++ b/tests/data/test211
@@ -24,7 +24,7 @@ ftp
 Get two FTP files with no remote EPSV support
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/211 ftp://%HOSTIP:%FTPPORT/a/path/211
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
 </command>
 <stdout>
 data blobb
@@ -43,11 +43,11 @@ CWD path
 EPSV
 PASV
 TYPE I
-SIZE 211
-RETR 211
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 PASV
-SIZE 211
-RETR 211
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test212 b/tests/data/test212
index 444525f18..175759a86 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -29,7 +29,7 @@ ipv6
 Get two FTP files with no remote EPRT support
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/212 ftp://%HOSTIP:%FTPPORT/a/path/212 -P -
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
 </command>
 <stdout>
 data blobb
@@ -53,11 +53,11 @@ CWD path
 EPRT |1|
 PORT 
 TYPE I
-SIZE 212
-RETR 212
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 PORT 
-SIZE 212
-RETR 212
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test213 b/tests/data/test213
index da40b8ce7..994c4026d 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -92,7 +92,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.213:%HTTPPORT/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -102,20 +102,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0
-Host: test.remote.example.com.213:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0
-Host: test.remote.example.com.213:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-POST /path/2130002 HTTP/1.1
-Host: test.remote.example.com.213:%HTTPPORT
+POST /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 6
diff --git a/tests/data/test214 b/tests/data/test214
index ef0a1d897..bb3390f61 100644
--- a/tests/data/test214
+++ b/tests/data/test214
@@ -29,7 +29,7 @@ http
 HTTP URL with escaped { and }
  </name>
 <command>
-"http://%HOSTIP:%HTTPPORT/\{\}\/214"
+"http://%HOSTIP:%HTTPPORT/\{\}\/%TESTNUMBER"
 </command>
 <setenv>
 # Needed for MSYS2 to not convert all backslashes to forward slashes
@@ -41,7 +41,7 @@ MSYS2_ARG_CONV_EXCL=http://
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /{}\/214 HTTP/1.1
+GET /{}\/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test215 b/tests/data/test215
index 987fd990a..5fd8fc656 100644
--- a/tests/data/test215
+++ b/tests/data/test215
@@ -34,7 +34,7 @@ ftp
 Get two FTP dir listings from the same remote dir: no second CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/a/path/215/ ftp://%HOSTIP:%FTPPORT/a/path/215/
+ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/
 </command>
 </client>
 
@@ -46,7 +46,7 @@ PASS ftp@example.com
 PWD
 CWD a
 CWD path
-CWD 215
+CWD %TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test216 b/tests/data/test216
index 404e9c98a..0e74110b1 100644
--- a/tests/data/test216
+++ b/tests/data/test216
@@ -18,9 +18,9 @@ ftp
 FTP upload two files to the same dir
  </name>
  <command>
--T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/ -T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/%2e%2eanotherup.216
+-T log/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ -T log/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/%2e%2eanotherup.%TESTNUMBER
 </command>
-<file name="log/upload.216">
+<file name="log/upload.%TESTNUMBER">
 upload this file twice
 </file>
 </client>
@@ -33,12 +33,12 @@ PASS ftp@example.com
 PWD
 CWD a
 CWD path
-CWD 216
+CWD %TESTNUMBER
 EPSV
 TYPE I
-STOR upload.216
+STOR upload.%TESTNUMBER
 EPSV
-STOR ..anotherup.216
+STOR ..anotherup.%TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test217 b/tests/data/test217
index b06734473..d791416b0 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -32,7 +32,7 @@ http
 HTTP proxy CONNECT to proxy returning 405
  </name>
  <command>
-http://test.remote.example.com.217:%HTTPPORT/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
 </command>
 <features>
 proxy
@@ -42,8 +42,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.217:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.217:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test218 b/tests/data/test218
index 4951c264b..40c68857f 100644
--- a/tests/data/test218
+++ b/tests/data/test218
@@ -29,9 +29,9 @@ http
 HTTP PUT from a file but enforce chunked transfer-encoding
  </name>
  <command>
- -T log/file218 -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/218
+ -T log/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file218">
+<file name="log/file%TESTNUMBER">
 just some tiny teeny contents
 </file>
 </client>
@@ -40,7 +40,7 @@ just some tiny teeny contents
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /218 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test219 b/tests/data/test219
index 2b638950e..74a8551da 100644
--- a/tests/data/test219
+++ b/tests/data/test219
@@ -24,7 +24,7 @@ proxy
 try using proxy with unsupported scheme
  </name>
  <command>
--x foo://%HOSTIP:%NOLISTENPORT/219 http://%HOSTIP:%NOLISTENPORT/219
+-x foo://%HOSTIP:%NOLISTENPORT/%TESTNUMBER http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test22 b/tests/data/test22
index 57dd7ddaa..f5593c435 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -26,14 +26,14 @@ http
 get HTTP with URL > 10000 bytes
  </name>
  <command>
-%HOSTIP:%HTTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22
+%HOSTIP:%HTTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22 HTTP/1.1
+GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test220 b/tests/data/test220
index 67f31f1f4..cfc8cbda7 100644
--- a/tests/data/test220
+++ b/tests/data/test220
@@ -47,7 +47,7 @@ http
 HTTP GET gzip compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/220 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -62,7 +62,7 @@ s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 %endif
 </strippart>
 <protocol>
-GET /220 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test221 b/tests/data/test221
index 3fab37f52..ce80637b1 100644
--- a/tests/data/test221
+++ b/tests/data/test221
@@ -47,7 +47,7 @@ http
 HTTP GET gzip compressed content with broken gzip header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/221 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -58,7 +58,7 @@ http://%HOSTIP:%HTTPPORT/221 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /221 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test222 b/tests/data/test222
index 27d169fed..a06234a08 100644
--- a/tests/data/test222
+++ b/tests/data/test222
@@ -178,7 +178,7 @@ http
 HTTP GET deflate compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/222 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ http://%HOSTIP:%HTTPPORT/222 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /222 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test223 b/tests/data/test223
index 52bbb7c6f..a37645d7d 100644
--- a/tests/data/test223
+++ b/tests/data/test223
@@ -68,7 +68,7 @@ http
 HTTP GET deflate compressed content with broken deflate header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/223 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -79,7 +79,7 @@ http://%HOSTIP:%HTTPPORT/223 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /223 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test224 b/tests/data/test224
index b632ffd29..f98c8eddf 100644
--- a/tests/data/test224
+++ b/tests/data/test224
@@ -83,7 +83,7 @@ http
 HTTP GET gzip compressed content with huge comment and extra field
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/224 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -94,7 +94,7 @@ http://%HOSTIP:%HTTPPORT/224 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /224 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test225 b/tests/data/test225
index a6447125d..5c8efd9d9 100644
--- a/tests/data/test225
+++ b/tests/data/test225
@@ -14,7 +14,7 @@ ftp
 FTP %0a-code in URL's name part
  </name>
  <command>
-ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/225%0a
+ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/%TESTNUMBER%0a
 </command>
 </client>
 
diff --git a/tests/data/test226 b/tests/data/test226
index 9fc4bda3d..939545766 100644
--- a/tests/data/test226
+++ b/tests/data/test226
@@ -15,7 +15,7 @@ ftp
 FTP %0d-code in URL's CWD part
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/226%0d
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER%0d
 </command>
 </client>
 
diff --git a/tests/data/test227 b/tests/data/test227
index 5b6d98cd1..18622df58 100644
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -31,7 +31,7 @@ ftp
 FTP with quote ops
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/227 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD"
 </command>
 </client>
 
@@ -48,8 +48,8 @@ PASV
 TYPE I
 NOOP 2
 FAIL HARD
-SIZE 227
-RETR 227
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 NOOP 3
 QUIT
 </protocol>
diff --git a/tests/data/test228 b/tests/data/test228
index f581583f3..7ac4ca49a 100644
--- a/tests/data/test228
+++ b/tests/data/test228
@@ -30,7 +30,7 @@ ftp
 FTP RETR with ACCT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/228 --ftp-account "one count"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 </command>
 </client>
 
@@ -44,8 +44,8 @@ ACCT one count
 PWD
 EPSV
 TYPE I
-SIZE 228
-RETR 228
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test229 b/tests/data/test229
index d337468ac..75dc10335 100644
--- a/tests/data/test229
+++ b/tests/data/test229
@@ -23,7 +23,7 @@ ftp
 FTP RETR with bad ACCT
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/229 --ftp-account "one count"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"
 </command>
 </client>
 
diff --git a/tests/data/test230 b/tests/data/test230
index eb696da02..ea54f9dd4 100644
--- a/tests/data/test230
+++ b/tests/data/test230
@@ -179,7 +179,7 @@ http
 HTTP GET multiply compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/230 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -190,7 +190,7 @@ http://%HOSTIP:%HTTPPORT/230 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /230 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test231 b/tests/data/test231
index 7254953e1..c925eb151 100644
--- a/tests/data/test231
+++ b/tests/data/test231
@@ -23,9 +23,9 @@ file
 file:// with resume
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test231.txt -C 10
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt -C 10
 </command>
-<file name="log/test231.txt">
+<file name="log/test%TESTNUMBER.txt">
 A01234567
 B01234567
 C01234567
diff --git a/tests/data/test232 b/tests/data/test232
index e0e703422..a856adea2 100644
--- a/tests/data/test232
+++ b/tests/data/test232
@@ -178,7 +178,7 @@ http
 HTTP GET deflate raw-compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/232 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ http://%HOSTIP:%HTTPPORT/232 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /232 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test233 b/tests/data/test233
index 5e42c715f..d08997586 100644
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2330002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -40,7 +40,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2330002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -65,7 +65,7 @@ http
 HTTP, proxy, site+proxy auth and Location: to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/233 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location
 </command>
 <features>
 proxy
@@ -76,7 +76,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/233 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
@@ -84,7 +84,7 @@ User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://goto.second.host.now/2330002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
 Host: goto.second.host.now
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 User-Agent: curl/%VERSION
diff --git a/tests/data/test234 b/tests/data/test234
index 0c1871ea9..5e9258f50 100644
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -19,7 +19,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2340002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -42,7 +42,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/2340002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -67,7 +67,7 @@ http
 HTTP, proxy, site+proxy auth and Location: to new host using location-trusted
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/234 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted
 </command>
 <features>
 proxy
@@ -78,7 +78,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/234 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
@@ -86,7 +86,7 @@ User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://goto.second.host.now/2340002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
 Host: goto.second.host.now
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
diff --git a/tests/data/test235 b/tests/data/test235
index 94abb951c..e1f2a2f1e 100644
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -21,9 +21,9 @@ ftp
 FTP resumed upload but no file present remotely
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/235 -T log/upload235 -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload235">
+<file name="log/upload%TESTNUMBER">
 this is the *****crap******** that we're gonna upload
 
 worx?
@@ -38,8 +38,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 235
-STOR 235
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test236 b/tests/data/test236
index 92e34bc3e..3a89add7f 100644
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -24,9 +24,9 @@ ftp
 FTP resume upload but denied access to remote file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/236 -T log/file236.txt -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/file%TESTNUMBER.txt -C -
 </command>
-<file name="log/file236.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 </file>
 </client>
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 236
-STOR 236
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
 QUIT
 </protocol>
 
diff --git a/tests/data/test237 b/tests/data/test237
index e9147dcd1..18ee6d951 100644
--- a/tests/data/test237
+++ b/tests/data/test237
@@ -21,7 +21,7 @@ ftp
 FTP getting bad host in 227-response to PASV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/237 --disable-epsv
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --disable-epsv
 </command>
 </client>
 
diff --git a/tests/data/test238 b/tests/data/test238
index ea54509a1..748ad46bf 100644
--- a/tests/data/test238
+++ b/tests/data/test238
@@ -21,7 +21,7 @@ ftp
 FTP getting bad port in response to EPSV
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/238
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test239 b/tests/data/test239
index b9e187235..c234e0b68 100644
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -67,7 +67,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/239 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm -d "postit"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -77,7 +77,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
@@ -86,7 +86,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test24 b/tests/data/test24
index 4c9d35e26..bbd5f0394 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -25,14 +25,14 @@ http
 HTTP GET fail silently on HTTP error return
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/24 --fail --silent --show-error
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail --silent --show-error
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /24 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -41,7 +41,7 @@ Accept: */*
 <errorcode>
 22
 </errorcode>
-<file2 name="log/stderr24" mode="text">
+<file2 name="log/stderr%TESTNUMBER" mode="text">
 curl: (22) The requested URL returned error: 404
 </file2>
 </verify>
diff --git a/tests/data/test240 b/tests/data/test240
index 2ddba0157..068a2eb60 100644
--- a/tests/data/test240
+++ b/tests/data/test240
@@ -38,7 +38,7 @@ http-ipv6
 HTTP-IPv6 GET
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/240"
+-g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER"
 </command>
 </client>
 
@@ -46,7 +46,7 @@ HTTP-IPv6 GET
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /240 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test241 b/tests/data/test241
index 7ea7a7af6..8fb619cac 100644
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -33,7 +33,7 @@ http-ipv6
 HTTP-IPv6 GET (using ip6-localhost)
  </name>
  <command>
--g "http://ip6-localhost:%HTTP6PORT/241"
+-g "http://ip6-localhost:%HTTP6PORT/%TESTNUMBER"
 </command>
 <precheck>
 ./server/resolve --ipv6 ip6-localhost
@@ -44,7 +44,7 @@ HTTP-IPv6 GET (using ip6-localhost)
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /241 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: ip6-localhost:%HTTP6PORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test242 b/tests/data/test242
index 03c6cae57..504555923 100644
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -33,7 +33,7 @@ http-ipv6
 HTTP-IPv6 GET with username+password in URL
  </name>
  <command>
--g "http://foobar:barfoo@%HOST6IP:%HTTP6PORT/242"
+-g "http://foobar:barfoo@%HOST6IP:%HTTP6PORT/%TESTNUMBER"
 </command>
 </client>
 
@@ -41,7 +41,7 @@ HTTP-IPv6 GET with username+password in URL
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /242 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
 Authorization: Basic Zm9vYmFyOmJhcmZvbw==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test243 b/tests/data/test243
index 87826a82e..2f61afc24 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -88,7 +88,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/243 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth -d "postit"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-anyauth -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -98,7 +98,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -106,7 +106,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
 
-postitPOST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1
+postitPOST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
@@ -115,7 +115,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1
+POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test244 b/tests/data/test244
index 080163dd1..6755994d5 100644
--- a/tests/data/test244
+++ b/tests/data/test244
@@ -35,7 +35,7 @@ ftp
 FTP dir listing with nocwd and URL encoded path
  </name>
  <command>
---ftp-method nocwd ftp://%HOSTIP:%FTPPORT/fir%23t/th%69rd/244/
+--ftp-method nocwd ftp://%HOSTIP:%FTPPORT/fir%23t/th%69rd/%TESTNUMBER/
 </command>
 </client>
 
@@ -47,7 +47,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE A
-LIST fir#t/third/244
+LIST fir#t/third/%TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test245 b/tests/data/test245
index 5750b4fa3..2d19f0ded 100644
--- a/tests/data/test245
+++ b/tests/data/test245
@@ -57,23 +57,23 @@ crypto
 HTTP POST --digest
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/245 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /245 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /245 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/245", response="379a439b1737ba257c1d2f103914b18b"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="379a439b1737ba257c1d2f103914b18b"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
diff --git a/tests/data/test246 b/tests/data/test246
index b5469f3e5..22b383370 100644
--- a/tests/data/test246
+++ b/tests/data/test246
@@ -67,23 +67,23 @@ crypto
 HTTP POST --digest with server doing a 100 before 401 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/246 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /246 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /246 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/246", response="761e6fc9a760c39d587092e8d840e740"
+Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="761e6fc9a760c39d587092e8d840e740"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
diff --git a/tests/data/test247 b/tests/data/test247
index 2720144ed..7e79d3911 100644
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -19,7 +19,7 @@ ftp
  <name>
 FTP upload time condition evaluates TRUE => skip upload
  </name>
-<file name="log/test247.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/247 -T log/test247.txt -z "apr 1 2005 08:00:00"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00"
 </command>
 </client>
 
@@ -40,7 +40,7 @@ ftp://%HOSTIP:%FTPPORT/247 -T log/test247.txt -z "apr 1 2005 08:00:00"
 USER anonymous
 PASS ftp@example.com
 PWD
-MDTM 247
+MDTM %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test248 b/tests/data/test248
index d254a951e..8881c99d5 100644
--- a/tests/data/test248
+++ b/tests/data/test248
@@ -19,7 +19,7 @@ ftp
  <name>
 FTP upload time condition evaluates FALSE => upload anyway
  </name>
-<file name="log/test248.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/248 -T log/test248.txt -z "apr 1 2005 08:00:00"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00"
 </command>
 </client>
 
@@ -46,10 +46,10 @@ works
 USER anonymous
 PASS ftp@example.com
 PWD
-MDTM 248
+MDTM %TESTNUMBER
 EPSV
 TYPE I
-STOR 248
+STOR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test249 b/tests/data/test249
index 5e5e4754b..4f1ef6aa3 100644
--- a/tests/data/test249
+++ b/tests/data/test249
@@ -32,7 +32,7 @@ http
 HTTP 304 response with "illegal" Content-Length: header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /249 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test25 b/tests/data/test25
index d694cdc75..61080ca39 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -12,7 +12,7 @@ followlocation
 <data>
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -21,37 +21,37 @@ Redirect to the same URL again!
 <datacheck>
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
 HTTP/1.1 301 This is a weirdo text message
 Server: test-server/fake
-Location: data/reply/25
+Location: data/reply/%TESTNUMBER
 Content-Length: 32
 Connection: close
 
@@ -67,39 +67,39 @@ http
 looping HTTP Location: following with --max-redirs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 5
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/25 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/data/reply/25 HTTP/1.1
+GET /want/data/reply/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/data/reply/data/reply/25 HTTP/1.1
+GET /want/data/reply/data/reply/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1
+GET /want/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
+GET /want/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
+GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test256 b/tests/data/test256
index e873d579c..6816bb768 100644
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -29,9 +29,9 @@ http
 HTTP resume request over proxy with auth without server supporting it
  </name>
  <command option="no-output">
--x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - --no-include -o log/fewl256.txt -U daniel:stenberg
+-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o log/fewl%TESTNUMBER.txt -U daniel:stenberg
 </command>
-<file name="log/fewl256.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@@ -46,7 +46,7 @@ proxy
 33
 </errorcode>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/256 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn
 Range: bytes=78-
@@ -57,7 +57,7 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 # the download target file must remain untouched
-<file name="log/fewl256.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
diff --git a/tests/data/test257 b/tests/data/test257
index 18320bfcb..701abb777 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -16,7 +16,7 @@ netrc
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://anotherone.com/2570002
+Location: http://anotherone.com/%TESTNUMBER0002
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -26,7 +26,7 @@ This server reply is for testing a simple Location: following
 HTTP/1.1 302 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://athird.com/2570003
+Location: http://athird.com/%TESTNUMBER0003
 
 If this is received, the location following worked
 
@@ -44,13 +44,13 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://anotherone.com/2570002
+Location: http://anotherone.com/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 302 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: http://athird.com/2570003
+Location: http://athird.com/%TESTNUMBER0003
 
 HTTP/1.1 200 Followed here fine swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -71,13 +71,13 @@ http
 HTTP Location: following with --netrc-optional
  </name>
  <command>
-http://supersite.com/want/257 -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc257
+http://supersite.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc%TESTNUMBER
 </command>
 <features>
 proxy
 </features>
 # netrc auth for two out of three sites:
-<file name="log/netrc257">
+<file name="log/netrc%TESTNUMBER">
 machine supersite.com login user1 password passwd1
 machine anotherone.com login user2 password passwd2
 </file>
@@ -86,21 +86,21 @@ machine anotherone.com login user2 password passwd2
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://supersite.com/want/257 HTTP/1.1
+GET http://supersite.com/want/%TESTNUMBER HTTP/1.1
 Host: supersite.com
 Authorization: Basic dXNlcjE6cGFzc3dkMQ==
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://anotherone.com/2570002 HTTP/1.1
+GET http://anotherone.com/%TESTNUMBER0002 HTTP/1.1
 Host: anotherone.com
 Authorization: Basic dXNlcjI6cGFzc3dkMg==
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://athird.com/2570003 HTTP/1.1
+GET http://athird.com/%TESTNUMBER0003 HTTP/1.1
 Host: athird.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test258 b/tests/data/test258
index e0cd02ef5..c0f8c18c7 100644
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -64,10 +64,10 @@ proxy
 HTTP POST multipart without Expect: header using proxy anyauth (Digest)
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/258 -F name=daniel -F tool=curl -F file=@log/test258.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth
+-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth
 </command>
 # We create this file before the command is invoked!
-<file name="log/test258.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -80,7 +80,7 @@ bar
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST http://remotehost:54321/we/want/258 HTTP/1.1
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1
 Host: remotehost:54321
 User-Agent: curl/%VERSION
 Accept: */*
@@ -97,7 +97,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------7c633d5c27ce
-Content-Disposition: form-data; name="file"; filename="test258.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
@@ -105,9 +105,9 @@ This is a moo-
 bar
 
 ------------------------------7c633d5c27ce--
-POST http://remotehost:54321/we/want/258 HTTP/1.1
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1
 Host: remotehost:54321
-Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd"
+Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/%TESTNUMBER", response="2501654ca391f0b5c8c12a1da77e34cd"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
@@ -123,7 +123,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------7c633d5c27ce
-Content-Disposition: form-data; name="file"; filename="test258.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
diff --git a/tests/data/test259 b/tests/data/test259
index 08f6f1460..4b5deee18 100644
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -60,10 +60,10 @@ proxy
 HTTP POST multipart with Expect: header using proxy anyauth (Digest)
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/259 -F name=daniel -F tool=curl -F file=@log/test259.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue"
+-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue"
 </command>
 # We create this file before the command is invoked!
-<file name="log/test259.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -76,7 +76,7 @@ bar
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST http://remotehost:54321/we/want/259 HTTP/1.1
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1
 Host: remotehost:54321
 User-Agent: curl/%VERSION
 Accept: */*
@@ -94,7 +94,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------7c633d5c27ce
-Content-Disposition: form-data; name="file"; filename="test259.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
@@ -102,9 +102,9 @@ This is a moo-
 bar
 
 ------------------------------7c633d5c27ce--
-POST http://remotehost:54321/we/want/259 HTTP/1.1
+POST http://remotehost:54321/we/want/%TESTNUMBER HTTP/1.1
 Host: remotehost:54321
-Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"
+Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/%TESTNUMBER", response="b479994d13e60f3aa192a67c5892ddc5"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
@@ -121,7 +121,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------7c633d5c27ce
-Content-Disposition: form-data; name="file"; filename="test259.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
diff --git a/tests/data/test26 b/tests/data/test26
index 073fed3d3..cd8ba426c 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -25,14 +25,14 @@ http
 specify more -o than URLs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -o - -o -
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/26 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test260 b/tests/data/test260
index bdb01d2cc..b706e60b5 100644
--- a/tests/data/test260
+++ b/tests/data/test260
@@ -35,7 +35,7 @@ http
 HTTP GET URL without slash but with questionmark
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT?260"
+"http://%HOSTIP:%HTTPPORT?%TESTNUMBER"
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP GET URL without slash but with questionmark
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?260 HTTP/1.1
+GET /?%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test261 b/tests/data/test261
index e3639bfe9..8a68ba9cd 100644
--- a/tests/data/test261
+++ b/tests/data/test261
@@ -27,7 +27,7 @@ ftp
 FTP RETR with 226 response code to TYPE
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/261
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 261
-RETR 261
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test262 b/tests/data/test262
index 3c60cece0..1e03f2772 100644
--- a/tests/data/test262
+++ b/tests/data/test262
diff --git a/tests/data/test263 b/tests/data/test263
index a6d6ee055..7a2bff9ec 100644
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -34,7 +34,7 @@ http-ipv6
 HTTP-IPv6 GET with proxy specified using IPv6-numerical address
  </name>
  <command>
--g -x "http://%HOST6IP:%HTTP6PORT" http://veryveryremotesite.com/263
+-g -x "http://%HOST6IP:%HTTP6PORT" http://veryveryremotesite.com/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://veryveryremotesite.com/263 HTTP/1.1
+GET http://veryveryremotesite.com/%TESTNUMBER HTTP/1.1
 Host: veryveryremotesite.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test264 b/tests/data/test264
index 7ca52e6d3..c4c365299 100644
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -28,7 +28,7 @@ http
 HTTP with proxy string including http:// and user+password
  </name>
  <command>
-http://we.want.that.site.com/264 -x http://f%61ke:user@%HOSTIP:%HTTPPORT
+http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:user@%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -38,7 +38,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/264 HTTP/1.1
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTp1c2Vy
 User-Agent: curl/%VERSION
diff --git a/tests/data/test265 b/tests/data/test265
index 7a2a5e37b..095058af1 100644
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -93,7 +93,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com.265:%HTTPPORT/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --proxytunnel -d "postit"
 </command>
 <precheck>
 chkhostname curlhost
@@ -103,20 +103,20 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.265:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.265:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
-POST /path/2650002 HTTP/1.1
-Host: test.remote.example.com.265:%HTTPPORT
+POST /path/%TESTNUMBER0002 HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 6
diff --git a/tests/data/test266 b/tests/data/test266
index 0997ae7b6..6b5d2e6c7 100644
--- a/tests/data/test266
+++ b/tests/data/test266
@@ -49,7 +49,7 @@ http
 HTTP GET with chunked Transfer-Encoding and chunked trailer
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/266 -D log/heads266
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
 </command>
 </client>
 
@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/266 -D log/heads266
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /266 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/heads266">
+<file name="log/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!
 Server: fakeit/0.9 fakeitbad/1.0
 Transfer-Encoding: chunked
diff --git a/tests/data/test267 b/tests/data/test267
index ed10b22a3..8ad112d41 100644
--- a/tests/data/test267
+++ b/tests/data/test267
@@ -73,7 +73,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/267 -u testuser:testpass --ntlm -d "data" -H "Header1: yes" -H "Header2: no"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -d "data" -H "Header1: yes" -H "Header2: no"
 </command>
 <precheck>
 chkhostname curlhost
@@ -83,7 +83,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /267 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
@@ -93,7 +93,7 @@ Header2: no
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST /267 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test268 b/tests/data/test268
index 70a5a73dd..851af4133 100644
--- a/tests/data/test268
+++ b/tests/data/test268
@@ -35,7 +35,7 @@ http
 HTTP POST a non-existing file
  </name>
  <command>
- -d @nonesuchfile http://%HOSTIP:%HTTPPORT/268
+ -d @nonesuchfile http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP POST a non-existing file
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /268 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test269 b/tests/data/test269
index 1cf2698c1..448d5fbeb 100644
--- a/tests/data/test269
+++ b/tests/data/test269
@@ -33,7 +33,7 @@ http
 HTTP --ignore-content-length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/269 --ignore-content-length
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --ignore-content-length
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/269 --ignore-content-length
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /269 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test27 b/tests/data/test27
index 54b4f8a62..414741363 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -27,25 +27,25 @@ http
 Get same cookie page several times
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT/want/{27,27,27}" -b none
+"http://%HOSTIP:%HTTPPORT/want/{%TESTNUMBER,%TESTNUMBER,%TESTNUMBER}" -b none
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/27 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/27 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: thewinneris=nowayyouwin
 
-GET /want/27 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test270 b/tests/data/test270
index f4eea970e..983e0d2b7 100644
--- a/tests/data/test270
+++ b/tests/data/test270
@@ -30,7 +30,7 @@ ftp
 FTP RETR PASV --ftp-skip-pasv-ip
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/270 --ftp-skip-pasv-ip --disable-epsv
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv
 </command>
 </client>
 
@@ -42,8 +42,8 @@ PASS ftp@example.com
 PWD
 PASV
 TYPE I
-SIZE 270
-RETR 270
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test271 b/tests/data/test271
index 1557fd0f7..a9a44360f 100644
--- a/tests/data/test271
+++ b/tests/data/test271
@@ -27,7 +27,7 @@ tftp
 TFTP retrieve
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//271
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /271
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test272 b/tests/data/test272
index f728a2a8c..c959ff3ae 100644
--- a/tests/data/test272
+++ b/tests/data/test272
@@ -22,7 +22,7 @@ ftp
 FTP timed conditioned get file with identical time stamp 
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/272 -z "2004 jan 1 12:12:12 UTC"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC"
 </command>
 
 </client>
@@ -33,7 +33,7 @@ ftp://%HOSTIP:%FTPPORT/272 -z "2004 jan 1 12:12:12 UTC"
 USER anonymous
 PASS ftp@example.com
 PWD
-MDTM 272
+MDTM %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test273 b/tests/data/test273
index 45c293512..b2b023a60 100644
--- a/tests/data/test273
+++ b/tests/data/test273
@@ -59,21 +59,21 @@ crypto
 HTTP with two Digest authorization headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/273 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /273 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /273 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/273", response="576ae57b1db0039f8c0de43ef58e49e3"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="576ae57b1db0039f8c0de43ef58e49e3"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test274 b/tests/data/test274
index dd1b816de..b0f74b494 100644
--- a/tests/data/test274
+++ b/tests/data/test274
@@ -28,14 +28,14 @@ http
 HTTP Location: following with --max-redirs 0
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/274 -L --max-redirs 0
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 0
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/274 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test275 b/tests/data/test275
index 5db3ec1ce..c6b6b566e 100644
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -54,7 +54,7 @@ http-proxy
 HTTP CONNECT with proxytunnel getting two URLs from the same host
  </name>
  <command>
-http://remotesite.com.275:%HTTPPORT/we/want/that/page/275 -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.275:%HTTPPORT/we/want/that/page/275
+http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -65,22 +65,22 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT remotesite.com.275:%HTTPPORT HTTP/1.1
-Host: remotesite.com.275:%HTTPPORT
+CONNECT remotesite.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/275 HTTP/1.1
-Host: remotesite.com.275:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/want/that/page/275 HTTP/1.1
-Host: remotesite.com.275:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: remotesite.com.%TESTNUMBER:%HTTPPORT
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test276 b/tests/data/test276
index bd7fdc89a..07a1aaed1 100644
--- a/tests/data/test276
+++ b/tests/data/test276
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002
+Location: data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002
+Location: data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 HTTP Location: following with multiple question marks in URLs
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT/want?uri=http://anything/276?secondq/276" -L
+"http://%HOSTIP:%HTTPPORT/want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER" -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want?uri=http://anything/276?secondq/276 HTTP/1.1
+GET /want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002 HTTP/1.1
+GET /data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test277 b/tests/data/test277
index a2a00ead7..466b79374 100644
--- a/tests/data/test277
+++ b/tests/data/test277
@@ -27,7 +27,7 @@ http
 HTTP RFC1867-type formposting with custom Content-Type
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/277 -F name=daniel -H "Content-Type: text/info"
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F name=daniel -H "Content-Type: text/info"
 </command>
 </client>
 
@@ -38,7 +38,7 @@ s/^--------------------------[a-z0-9]*/--------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=------------------------/
 </strippart>
 <protocol>
-POST /want/277 HTTP/1.1
+POST /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test278 b/tests/data/test278
index 575edf14d..7cbd4704b 100644
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -28,7 +28,7 @@ http
 HTTP with proxy string including http:// and user+empty password
  </name>
  <command>
-http://we.want.that.site.com/278 -x http://f%61ke:@%HOSTIP:%HTTPPORT
+http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:@%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -38,7 +38,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/278 HTTP/1.1
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTo=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test279 b/tests/data/test279
index 82ce25244..cc919224d 100644
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -29,7 +29,7 @@ http
 HTTP with proxy string including http:// and user only
  </name>
  <command>
-http://we.want.that.site.com/279 -x http://f%61ke@%HOSTIP:%HTTPPORT
+http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke@%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -39,7 +39,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/279 HTTP/1.1
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTo=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test28 b/tests/data/test28
index 8d26bc9a4..1966cc863 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -11,7 +11,7 @@ HTTP GET
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location:  /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Location:  /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,9 +31,9 @@ HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 %if hyper
-Location: /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Location: /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
 %else
-Location:  /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE
+Location:  /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
 %endif
 Connection: close
 
@@ -56,19 +56,19 @@ http
 HTTP Location: following with extra spaces in header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/28 -L
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/28 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1
+GET /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test280 b/tests/data/test280
index de7534e7b..71c147ce4 100644
--- a/tests/data/test280
+++ b/tests/data/test280
@@ -41,7 +41,7 @@ ftp
 FTP --ftp-alternative-to-user on USER failure
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/280/ --ftp-alternative-to-user "USER replacement"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement"
 </command>
 </client>
 
@@ -53,7 +53,7 @@ USER anonymous
 USER replacement
 PASS ftp@example.com
 PWD
-CWD 280
+CWD %TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test281 b/tests/data/test281
index a5ea8760a..4210f7b8f 100644
--- a/tests/data/test281
+++ b/tests/data/test281
@@ -28,9 +28,9 @@ http
 HTTP PUT from file with 100 + 401 responses and -f without auth given
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/281 -f -T log/test281.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test281.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -44,7 +44,7 @@ Weird
 22
 </errorcode>
 <protocol>
-PUT /we/want/281 HTTP/1.1
+PUT /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test282 b/tests/data/test282
index 578c102a5..4fb9e598e 100644
--- a/tests/data/test282
+++ b/tests/data/test282
@@ -25,7 +25,7 @@ http
 HTTP GET with no response body or headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/282
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/282
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /282 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test284 b/tests/data/test284
index 9b946ecd5..bee74f4c7 100644
--- a/tests/data/test284
+++ b/tests/data/test284
@@ -51,7 +51,7 @@ tftp
 TFTP retrieve of boundary case 512 byte file
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//284
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
 </command>
 </client>
 
@@ -64,7 +64,7 @@ mode: octet
 tsize: 0
 blksize: 512
 timeout: 6
-filename: /284
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test285 b/tests/data/test285
index 09bfe3195..23fe66ef1 100644
--- a/tests/data/test285
+++ b/tests/data/test285
@@ -16,9 +16,9 @@ tftp
 TFTP send
  </name>
  <command>
--T log/test285.txt tftp://%HOSTIP:%TFTPPORT//
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
 </command>
-<file name="log/test285.txt">
+<file name="log/test%TESTNUMBER.txt">
 a chunk of
 data
 sent
@@ -41,7 +41,7 @@ mode: octet
 tsize: 32
 blksize: 512
 timeout: 6
-filename: /test285.txt
+filename: /test%TESTNUMBER.txt
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test286 b/tests/data/test286
index 505352a76..3fa774bd3 100644
--- a/tests/data/test286
+++ b/tests/data/test286
@@ -16,9 +16,9 @@ tftp
 TFTP send of boundary case 512 byte file
  </name>
  <command>
--T log/test286.txt tftp://%HOSTIP:%TFTPPORT//
+-T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
 </command>
-<file name="log/test286.txt">
+<file name="log/test%TESTNUMBER.txt">
 A chunk of data which exactly fits into
 a 512 byte TFTP block, testing a boundary
 condition in the TFTP transmit code.
@@ -89,7 +89,7 @@ mode: octet
 tsize: 512
 blksize: 512
 timeout: 6
-filename: /test286.txt
+filename: /test%TESTNUMBER.txt
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test287 b/tests/data/test287
index 7c29f7f02..71ab8d527 100644
--- a/tests/data/test287
+++ b/tests/data/test287
@@ -28,7 +28,7 @@ http
 HTTP proxy CONNECT with custom User-Agent header
  </name>
  <command>
-http://test.remote.example.com.287:%HTTPPORT/path/287 -H "User-Agent: looser/2015" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel --proxy-header "User-Agent: looser/2007"
+http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER -H "User-Agent: looser/2015" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel --proxy-header "User-Agent: looser/2007"
 </command>
 <features>
 proxy
@@ -38,8 +38,8 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.example.com.287:%HTTPPORT HTTP/1.1
-Host: test.remote.example.com.287:%HTTPPORT
+CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
 Proxy-Connection: Keep-Alive
 User-Agent: looser/2007
 
diff --git a/tests/data/test288 b/tests/data/test288
index 26e1b842a..6ee19d41d 100644
--- a/tests/data/test288
+++ b/tests/data/test288
@@ -31,9 +31,9 @@ file:// with (unsupported) proxy, authentication and range
 all_proxy=http://fake:user@%HOSTIP:%NOLISTENPORT/
 </setenv>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test288.txt
+file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test288.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
diff --git a/tests/data/test289 b/tests/data/test289
index 2720e2e9c..481eacf81 100644
--- a/tests/data/test289
+++ b/tests/data/test289
@@ -17,7 +17,7 @@ ftp
 FTP resume upload but denied access to local file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/289 -T log/illegal-nonexistent-file -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/illegal-nonexistent-file -C -
 </command>
 </client>
 
diff --git a/tests/data/test29 b/tests/data/test29
index 298e76a8d..bb9916e83 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -30,14 +30,14 @@ http
 HTTP with 2 secs timeout
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/29 -m 2
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -m 2
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/29 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test290 b/tests/data/test290
index 6078a2ac7..9e5931152 100644
--- a/tests/data/test290
+++ b/tests/data/test290
@@ -21,7 +21,7 @@ ftp
 FTP download maximum filesize exceeded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/290 --max-filesize 30
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30
 </command>
 </client>
 
@@ -36,7 +36,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 290
+SIZE %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test291 b/tests/data/test291
index 18e039e4f..45f041e2e 100644
--- a/tests/data/test291
+++ b/tests/data/test291
@@ -27,7 +27,7 @@ ftp
 FTP download maximum filesize not exceeded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/291 --max-filesize 100
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100
 </command>
 </client>
 
@@ -39,8 +39,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 291
-RETR 291
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test292 b/tests/data/test292
index f32c5b6b1..91e2d6670 100644
--- a/tests/data/test292
+++ b/tests/data/test292
@@ -36,7 +36,7 @@ http
 HTTP GET with maximum filesize not exceeded
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 1000
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /292 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test293 b/tests/data/test293
index 8c569281e..aaeefc457 100644
--- a/tests/data/test293
+++ b/tests/data/test293
@@ -37,7 +37,7 @@ http
 HTTP GET with maximum filesize exceeded
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
 63
 </errorcode>
 <protocol>
-GET /293 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test294 b/tests/data/test294
index a9752a278..4dc90e368 100644
--- a/tests/data/test294
+++ b/tests/data/test294
@@ -42,7 +42,7 @@ ftp
 FTP --ftp-account on ACCT request
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/294/ --ftp-account "data for acct"
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct"
 </command>
 </client>
 
@@ -54,7 +54,7 @@ USER anonymous
 PASS ftp@example.com
 ACCT data for acct
 PWD
-CWD 294
+CWD %TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test295 b/tests/data/test295
index 5b1ddcf6b..206c1ab74 100644
--- a/tests/data/test295
+++ b/tests/data/test295
@@ -27,7 +27,7 @@ ftp
 FTP ACCT request without --ftp-account
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/295/
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
 </command>
 </client>
 
diff --git a/tests/data/test296 b/tests/data/test296
index 2008c8bfd..3c36a1608 100644
--- a/tests/data/test296
+++ b/tests/data/test296
@@ -25,7 +25,7 @@ ftp
 FTP CWD with --ftp-method multicwd
  </name>
  <command>
---ftp-method multicwd ftp://%HOSTIP:%FTPPORT/first/second/third/296
+--ftp-method multicwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER
 </command>
 </client>
 
@@ -40,8 +40,8 @@ CWD second
 CWD third
 EPSV
 TYPE I
-SIZE 296
-RETR 296
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test297 b/tests/data/test297
index 36573f8b9..e4cdd856c 100644
--- a/tests/data/test297
+++ b/tests/data/test297
@@ -25,7 +25,7 @@ ftp
 FTP CWD with --ftp-method singlecwd
  </name>
  <command>
---ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/first/second/third/297
+--ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER
 </command>
 </client>
 
@@ -38,8 +38,8 @@ PWD
 CWD first/second/third
 EPSV
 TYPE I
-SIZE 297
-RETR 297
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test298 b/tests/data/test298
index 09b127fbf..20c8eccf2 100644
--- a/tests/data/test298
+++ b/tests/data/test298
@@ -25,7 +25,7 @@ ftp
 FTP CWD with --ftp-method nocwd
  </name>
  <command>
---ftp-method nocwd ftp://%HOSTIP:%FTPPORT/first/second/th%69rd/298
+--ftp-method nocwd ftp://%HOSTIP:%FTPPORT/first/second/th%69rd/%TESTNUMBER
 </command>
 </client>
 
@@ -37,8 +37,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE first/second/third/298
-RETR first/second/third/298
+SIZE first/second/third/%TESTNUMBER
+RETR first/second/third/%TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test299 b/tests/data/test299
index bc625350f..9b3fd0c30 100644
--- a/tests/data/test299
+++ b/tests/data/test299
@@ -33,14 +33,14 @@ proxy
 FTP over HTTP proxy with user:pass not in url
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT -u michal:aybabtu ftp://host.com/we/want/299
+-x http://%HOSTIP:%HTTPPORT -u michal:aybabtu ftp://host.com/we/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://michal:aybabtu@host.com/we/want/299 HTTP/1.1
+GET ftp://michal:aybabtu@host.com/we/want/%TESTNUMBER HTTP/1.1
 Host: host.com:21
 Authorization: Basic bWljaGFsOmF5YmFidHU=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test3 b/tests/data/test3
index 0dc3b4618..f28d0ccd4 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -36,7 +36,7 @@ http
 HTTP POST with auth and contents but with content-length set to 0
  </name>
  <command>
- -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/3
+ -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ HTTP POST with auth and contents but with content-length set to 0
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /3 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic ZmFrZTotdXNlcg==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test30 b/tests/data/test30
index ab4425db5..2a84b4c36 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -21,14 +21,14 @@ http
 HTTP with no data in server reply
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/30
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/30 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test300 b/tests/data/test300
index e3bf8adb9..efbf97fe3 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -32,7 +32,7 @@ https
 simple HTTPS GET
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/300
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ simple HTTPS GET
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /300 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test3000 b/tests/data/test3000
index 9d237514e..db5299e5f 100644
--- a/tests/data/test3000
+++ b/tests/data/test3000
@@ -33,7 +33,7 @@ https Server-localhost-firstSAN-sv.pem
 HTTPS GET to localhost, first subject alt name matches, CN does not match
 </name>
 <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/3000
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -45,7 +45,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /3000 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: localhost:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test3001 b/tests/data/test3001
index 7ef9034d9..534a5cded 100644
--- a/tests/data/test3001
+++ b/tests/data/test3001
@@ -33,7 +33,7 @@ https Server-localhost-lastSAN-sv.pem
 HTTPS GET to localhost, last subject alt name matches, CN does not match
 </name>
 <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/3001
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -45,7 +45,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /3001 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: localhost:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test3002 b/tests/data/test3002
index ac6820214..b6c94ec3c 100644
--- a/tests/data/test3002
+++ b/tests/data/test3002
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3002 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3002 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3002
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<invalid.one>
 RCPT TO:<recipient.two@example.com>
diff --git a/tests/data/test3003 b/tests/data/test3003
index 7515affbc..23e86c05e 100644
--- a/tests/data/test3003
+++ b/tests/data/test3003
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3003 --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt invalid.five --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3003 --mail-rcpt-allowfails --mail-rcpt recipient.one@e
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3003
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient.one@example.com>
 RCPT TO:<recipient.two@example.com>
diff --git a/tests/data/test3004 b/tests/data/test3004
index e021cde41..1f646eeab 100644
--- a/tests/data/test3004
+++ b/tests/data/test3004
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3004 --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3004 --mail-rcpt-allowfails --mail-rcpt recipient.one@e
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3004
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient.one@example.com>
 RCPT TO:<recipient.two@example.com>
diff --git a/tests/data/test3005 b/tests/data/test3005
index 256555ac9..ffaa475bd 100644
--- a/tests/data/test3005
+++ b/tests/data/test3005
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3005 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/3005 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 3005
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<invalid.one>
 RCPT TO:<recipient.two@example.com>
diff --git a/tests/data/test3006 b/tests/data/test3006
index f54d71c8d..9753d74fc 100644
--- a/tests/data/test3006
+++ b/tests/data/test3006
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3006 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt invalid.two --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt invalid.two --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/3006 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 55
 </errorcode>
 <protocol>
-EHLO 3006
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<invalid.one>
 RCPT TO:<invalid.two>
diff --git a/tests/data/test3007 b/tests/data/test3007
index b0d690262..74497ed12 100644
--- a/tests/data/test3007
+++ b/tests/data/test3007
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/3007 --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/3007 --mail-rcpt-allowfails --mail-rcpt invalid.one --m
 55
 </errorcode>
 <protocol>
-EHLO 3007
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<invalid.one>
 QUIT
diff --git a/tests/data/test3008 b/tests/data/test3008
index 5fb10247a..31aa4f766 100644
--- a/tests/data/test3008
+++ b/tests/data/test3008
@@ -36,7 +36,7 @@ http
 --output-dir
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3008 -O --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log
 </command>
 </client>
 
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3008 -O --output-dir %PWD/log
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3008 HTTP/1.1
+GET /this/is/the/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/3008">
+<file name="log/%TESTNUMBER">
 -foo-
 </file>
 </verify>
diff --git a/tests/data/test3009 b/tests/data/test3009
index 83becdfa4..213e8ae68 100644
--- a/tests/data/test3009
+++ b/tests/data/test3009
@@ -36,7 +36,7 @@ http
 --output-dir a non-existing directory
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3009 -O --output-dir %PWD/not-there
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/not-there
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3009 -O --output-dir %PWD/not-there
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3009 HTTP/1.1
+GET /this/is/the/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test301 b/tests/data/test301
index 066c14052..167a718ab 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -33,7 +33,7 @@ https
 HTTPS GET with user and password
  </name>
  <command>
--k -u fake:user https://%HOSTIP:%HTTPSPORT/301
+-k -u fake:user https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ HTTPS GET with user and password
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /301 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 Authorization: Basic ZmFrZTp1c2Vy
 User-Agent: curl/%VERSION
diff --git a/tests/data/test3010 b/tests/data/test3010
index 98c8ce7f3..d69b1ae65 100644
--- a/tests/data/test3010
+++ b/tests/data/test3010
@@ -16,7 +16,7 @@ Server: test-server/fake
 Content-Type: text/html
 Content-Length: 0
 Retry-After: 2
-Location: /30100002
+Location: /%TESTNUMBER0002
 
 </data>
 <data2>
@@ -39,11 +39,11 @@ http
 HTTP retry-after reset
 </name>
 <tool>
-lib3010
+lib%TESTNUMBER
 </tool>
 
 <command>
-%HOSTIP:%HTTPPORT/3010
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test3011 b/tests/data/test3011
index 3658acb9d..c282cdb78 100644
--- a/tests/data/test3011
+++ b/tests/data/test3011
@@ -36,7 +36,7 @@ http
 --output-dir with --create-dirs
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3011 -O --output-dir %PWD/log/tmp --create-dirs
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log/tmp --create-dirs
 </command>
 </client>
 
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3011 -O --output-dir %PWD/log/tmp --create-
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3011 HTTP/1.1
+GET /this/is/the/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/tmp/3011">
+<file name="log/tmp/%TESTNUMBER">
 -foo-
 </file>
 </verify>
diff --git a/tests/data/test3012 b/tests/data/test3012
index 7f85825c8..1889c937e 100644
--- a/tests/data/test3012
+++ b/tests/data/test3012
@@ -18,7 +18,7 @@ ETag: "21025-dc7-39462498"
 Accept-Ranges: bytes
 Content-Length: 6
 Connection: close
-Content-Disposition: inline; filename="MMM3012MMM"
+Content-Disposition: inline; filename="MMM%TESTNUMBERMMM"
 Content-Type: text/html
 Funny-head: yesyes
 
@@ -39,7 +39,7 @@ http
 --output-dir with -J
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3012 -OJ --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJ --output-dir %PWD/log
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3012 -OJ --output-dir %PWD/log
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3012 HTTP/1.1
+GET /this/is/the/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/MMM3012MMM">
+<file name="log/MMM%TESTNUMBERMMM">
 -foo-
 </file>
 </verify>
diff --git a/tests/data/test3013 b/tests/data/test3013
index 0dda07797..9c0ce445c 100644
--- a/tests/data/test3013
+++ b/tests/data/test3013
@@ -18,7 +18,7 @@ ETag: "21025-dc7-39462498"
 Accept-Ranges: bytes
 Content-Length: 6
 Connection: close
-Content-Disposition: inline; filename="MMM3013MMM"
+Content-Disposition: inline; filename="MMM%TESTNUMBERMMM"
 Content-Type: text/html
 Funny-head: yesyes
 
@@ -39,7 +39,7 @@ http
 Two --output-dir with --next in between
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/3013 -O --output-dir %PWD/log http://%HOSTIP:%HTTPPORT/another/3013 -o second3013 --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log http://%HOSTIP:%HTTPPORT/another/%TESTNUMBER -o second%TESTNUMBER --output-dir %PWD/log
 </command>
 </client>
 
@@ -47,21 +47,21 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3013 -O --output-dir %PWD/log http://%HOSTI
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /this/is/the/3013 HTTP/1.1
+GET /this/is/the/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /another/3013 HTTP/1.1
+GET /another/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/3013">
+<file name="log/%TESTNUMBER">
 -foo-
 </file>
-<file2 name="log/second3013">
+<file2 name="log/second%TESTNUMBER">
 -foo-
 </file2>
 </verify>
diff --git a/tests/data/test3015 b/tests/data/test3015
index 9c86d024b..523d06a08 100644
--- a/tests/data/test3015
+++ b/tests/data/test3015
@@ -18,7 +18,7 @@ Date: Sun, 13 Sep 2020 15:00 GMT
 Content-Length: 8
 Connection: close
 Content-Type: text/plain
-Location: ./30150001
+Location: ./%TESTNUMBER0001
 
 monster
 </data>
@@ -50,7 +50,7 @@ http
 HTTP GET -w num_headers with redirected fetch (2 connects)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/3015 -w "%{num_headers}\n" -L -o/dev/null
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o/dev/null
 </command>
 </client>
 
@@ -58,12 +58,12 @@ http://%HOSTIP:%HTTPPORT/3015 -w "%{num_headers}\n" -L -o/dev/null
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /3015 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /30150001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test302 b/tests/data/test302
index bdef98eea..755d4b224 100644
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -33,7 +33,7 @@ https
 HTTPS GET over HTTP proxy fails
  </name>
  <command>
--k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:302/slash/302
+-k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:%TESTNUMBER/slash/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test303 b/tests/data/test303
index 953177b7d..318cbe672 100644
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -33,14 +33,14 @@ https
 HTTPS with 8 secs timeout
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/want/303 -m 8
+-k https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER -m 8
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/303 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test304 b/tests/data/test304
index 98cb8091b..b4030725d 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -30,10 +30,10 @@ https
 HTTPS multipart formpost
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/we/want/304 -F name=daniel -F tool=curl -F file=@log/test304.txt
+-k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
-<file name="log/test304.txt">
+<file name="log/test%TESTNUMBER.txt">
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 </file>
 </client>
@@ -44,7 +44,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST /we/want/304 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -60,7 +60,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------c3b2ef7f0bb8
-Content-Disposition: form-data; name="file"; filename="test304.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/tests/data/test305 b/tests/data/test305
index f60226cba..4ca5789ed 100644
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -19,7 +19,7 @@ https
 insecure HTTPS without permission
  </name>
  <command>
-https://%HOSTIP:%HTTPSPORT/want/305 --cacert moooo
+https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER --cacert moooo
 </command>
 </client>
 
diff --git a/tests/data/test306 b/tests/data/test306
index 4833ecce6..ee8870241 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -46,7 +46,7 @@ https
 HTTPS GET, receive no headers only data!
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/306 --http0.9
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -54,7 +54,7 @@ HTTPS GET, receive no headers only data!
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /306 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test307 b/tests/data/test307
index 5fb9faa47..4c004ae1c 100644
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -29,14 +29,14 @@ OpenSSL
 https
 </server>
 <precheck>
-perl %SRCDIR/libtest/test307.pl %CURL
+perl %SRCDIR/libtest/test%TESTNUMBER.pl %CURL
 </precheck>
 
  <name>
 simple HTTPS GET with openssl engine
  </name>
  <command>
---engine openssl -k https://%HOSTIP:%HTTPSPORT/307
+--engine openssl -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ simple HTTPS GET with openssl engine
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /307 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test308 b/tests/data/test308
index 1a3c8ec53..7534ed6ba 100644
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -21,7 +21,7 @@ https
 simple HTTPS GET with invalid crypto engine
  </name>
  <command>
---engine invalid-crypto-engine-xyzzy -k https://%HOSTIP:%HTTPSPORT/308
+--engine invalid-crypto-engine-xyzzy -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test309 b/tests/data/test309
index 0160a2030..0a3b52965 100644
--- a/tests/data/test309
+++ b/tests/data/test309
@@ -14,7 +14,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: https://%HOSTIP:%HTTPSPORT/data/3090002.txt?coolsite=yes
+Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following to HTTPS URL
@@ -33,7 +33,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: https://%HOSTIP:%HTTPSPORT/data/3090002.txt?coolsite=yes
+Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -59,19 +59,19 @@ https
 HTTP Location: redirect to HTTPS URL
  </name>
  <command>
--k http://%HOSTIP:%HTTPPORT/want/309 -L
+-k http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/309 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /data/3090002.txt?coolsite=yes HTTP/1.1
+GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test31 b/tests/data/test31
index e30e8b437..2ccb03254 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -127,7 +127,7 @@ HTTP with weirdly formatted cookies and cookiejar storage
 TZ=GMT
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt
 </command>
 <precheck>
 perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
@@ -137,13 +137,13 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/31 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/jar31.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test310 b/tests/data/test310
index 2202ec101..c31085b87 100644
--- a/tests/data/test310
+++ b/tests/data/test310
@@ -33,7 +33,7 @@ https Server-localhost-sv.pem
 simple HTTPS GET
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/310
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
@@ -45,7 +45,7 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /310 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: localhost:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test311 b/tests/data/test311
index 87f4dddce..0e05b63c0 100644
--- a/tests/data/test311
+++ b/tests/data/test311
@@ -25,7 +25,7 @@ https Server-localhost0h-sv.pem
 HTTPS wrong subjectAltName but right CN
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/311
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
diff --git a/tests/data/test312 b/tests/data/test312
index 6a79f59a7..f013a7cfd 100644
--- a/tests/data/test312
+++ b/tests/data/test312
@@ -25,7 +25,7 @@ https Server-localhost.nn-sv.pem
 HTTPS GET to localhost and null-prefixed CN cert
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/312
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
diff --git a/tests/data/test313 b/tests/data/test313
index c54495a88..d87a46491 100644
--- a/tests/data/test313
+++ b/tests/data/test313
@@ -21,7 +21,7 @@ https Server-localhost-sv.pem
 CRL test
  </name>
  <command>
---cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --crlfile %SRCDIR/certs/Server-localhost-sv.crl https://localhost:%HTTPSPORT/313
+--cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --crlfile %SRCDIR/certs/Server-localhost-sv.crl https://localhost:%HTTPSPORT/%TESTNUMBER
 </command>
 # Ensure that we're running on localhost because we're checking the host name
 <precheck>
diff --git a/tests/data/test314 b/tests/data/test314
index d22038a5b..5080ceabc 100644
--- a/tests/data/test314
+++ b/tests/data/test314
@@ -174,7 +174,7 @@ http
 HTTP GET brotli compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/314 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 %endif
 </strippart>
 <protocol>
-GET /314 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test315 b/tests/data/test315
index 605bb0f2d..62f5b29e5 100644
--- a/tests/data/test315
+++ b/tests/data/test315
@@ -64,7 +64,7 @@ http
 HTTP GET brotli compressed content with broken header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/315 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/315 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /315 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test316 b/tests/data/test316
index 6b95b37fd..5b26a2a9d 100644
--- a/tests/data/test316
+++ b/tests/data/test316
@@ -174,7 +174,7 @@ http
 HTTP GET brotli compressed content of size more than CURL_MAX_WRITE_SIZE
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/316 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -185,7 +185,7 @@ http://%HOSTIP:%HTTPPORT/316 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /316 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test317 b/tests/data/test317
index 70a0b08bd..a8cfd6112 100644
--- a/tests/data/test317
+++ b/tests/data/test317
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -40,7 +40,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -65,7 +65,7 @@ http
 HTTP with custom Authorization: and redirect to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/317 -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location
 </command>
 <features>
 proxy
@@ -76,7 +76,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 User-Agent: curl/%VERSION
@@ -84,7 +84,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: s3cr3t
 
-GET http://goto.second.host.now/3170002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
 Host: goto.second.host.now
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 User-Agent: curl/%VERSION
diff --git a/tests/data/test318 b/tests/data/test318
index 3f20589aa..94a53e8bc 100644
--- a/tests/data/test318
+++ b/tests/data/test318
@@ -17,7 +17,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3180002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -40,7 +40,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3180002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -65,7 +65,7 @@ http
 HTTP with custom Authorization: and redirect to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/318 -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location-trusted
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location-trusted
 </command>
 <features>
 proxy
@@ -76,7 +76,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/318 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: first.host.it.is
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 User-Agent: curl/%VERSION
@@ -84,7 +84,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: s3cr3t
 
-GET http://goto.second.host.now/3180002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
 Host: goto.second.host.now
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 User-Agent: curl/%VERSION
diff --git a/tests/data/test319 b/tests/data/test319
index 855ea3e56..a27c99f82 100644
--- a/tests/data/test319
+++ b/tests/data/test319
@@ -37,7 +37,7 @@ http
 HTTP GET gzip transfer-encoded data in raw mode
  </name>
  <command option="no-include">
-http://%HOSTIP:%HTTPPORT/319 --raw
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
  </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/319 --raw
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /319 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test32 b/tests/data/test32
index 7bd5931b1..d5762f4e2 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -35,7 +35,7 @@ http
 HTTP with -d and -G
  </name>
  <command>
--d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/32 -G
+-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G
 </command>
 </client>
 
@@ -43,7 +43,7 @@ HTTP with -d and -G
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /32?foo=moo&moo=poo HTTP/1.1
+GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test320 b/tests/data/test320
index 87311d4f2..88f99ccde 100644
--- a/tests/data/test320
+++ b/tests/data/test320
@@ -58,7 +58,7 @@ simple TLS-SRP HTTPS GET, check user in response
 <verify>
 <protocol>
 </protocol>
-<file name="log/curl320.out">
+<file name="log/curl%TESTNUMBER.out">
 HTTP/1.0 200 OK
 Content-type: text/html
 
diff --git a/tests/data/test323 b/tests/data/test323
index 6439b4d43..c46c02a38 100644
--- a/tests/data/test323
+++ b/tests/data/test323
@@ -19,7 +19,7 @@ TLS-SRP
 TLS-SRP to non-TLS-SRP server
  </name>
 <command>
---insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPSPORT/want/323
+--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test324 b/tests/data/test324
index 461e54c50..159f36b84 100644
--- a/tests/data/test324
+++ b/tests/data/test324
@@ -19,7 +19,7 @@ TLS-SRP
 TLS-SRP with server cert checking
  </name>
 <command> # no --insecure
---tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/323
+--tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/fails
 </command>
 </client>
 
diff --git a/tests/data/test325 b/tests/data/test325
index 8605f0b86..4bdf2aa31 100644
--- a/tests/data/test325
+++ b/tests/data/test325
@@ -15,7 +15,7 @@ HTTP/1.1 301 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 7
-Location: http://somewhere/325
+Location: http://somewhere/%TESTNUMBER
 
 MooMoo
 </data>
@@ -24,7 +24,7 @@ HTTP/1.1 301 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 7
-Location: http://somewhere/325
+Location: http://somewhere/%TESTNUMBER
 
 </datacheck>
 </reply>
@@ -42,7 +42,7 @@ https
 HTTPS with attempted redirect to denied HTTP
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/325 --proto-redir -http --location
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --proto-redir -http --location
 </command>
 </client>
 
@@ -50,7 +50,7 @@ HTTPS with attempted redirect to denied HTTP
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /325 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test326 b/tests/data/test326
index 09ca9c0ad..25f201eae 100644
--- a/tests/data/test326
+++ b/tests/data/test326
@@ -46,7 +46,7 @@ http
 HTTP GET chunked data in raw mode
  </name>
  <command option="no-include">
-http://%HOSTIP:%HTTPPORT/326 --raw
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
  </command>
 </client>
 
@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/326 --raw
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /326 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test327 b/tests/data/test327
index d6dae18ec..73cedb657 100644
--- a/tests/data/test327
+++ b/tests/data/test327
@@ -43,26 +43,26 @@ http
 HTTP with cookiejar without cookies left
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/327 -b none -c log/cookies327 http://%HOSTIP:%HTTPPORT/we/want/3270002
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/cookies%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/327 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/want/3270002 HTTP/1.1
+GET /we/want/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: foobar=name
 
 </protocol>
-<file name="log/cookies327" mode="text">
+<file name="log/cookies%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test328 b/tests/data/test328
index c1215f2d0..a9b695560 100644
--- a/tests/data/test328
+++ b/tests/data/test328
@@ -35,7 +35,7 @@ libz
 HTTP with "Content-Encoding: none
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/hello/328 --compressed
+http://%HOSTIP:%HTTPPORT/hello/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/hello/328 --compressed
 ^Accept-Encoding:.*
 </strip>
 <protocol>
-GET /hello/328 HTTP/1.1
+GET /hello/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test329 b/tests/data/test329
index 67aac4baa..d25f96890 100644
--- a/tests/data/test329
+++ b/tests/data/test329
@@ -30,10 +30,10 @@ moo
 
 # Client-side
 <client>
-<file name="log/jar329.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 .host.foo.com	TRUE	/we/want/	FALSE	2147483647	test	no
 </file>
-<file name="log/jar329-2.txt" mode="text">
+<file name="log/jar%TESTNUMBER-2.txt" mode="text">
 .host.foo.com	TRUE	/we/want/	FALSE	2147483647	tester	yes
 </file>
 <server>
@@ -49,20 +49,20 @@ HTTP cookie with Max-Age=0
 TZ=GMT
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/329 -b log/jar329.txt -b log/jar329-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/3290002
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b log/jar%TESTNUMBER-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/329 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: host.foo.com
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: tester=yes; test=no
 
-GET /we/want/3290002 HTTP/1.1
+GET /we/want/%TESTNUMBER0002 HTTP/1.1
 Host: host.foo.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test33 b/tests/data/test33
index 6b3c9d72c..1b9c898ef 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -23,7 +23,7 @@ http
  <name>
 HTTP PUT with resume
  </name>
-<file name="log/test33.txt">
+<file name="log/test%TESTNUMBER.txt">
 012345678
 012345678
 012345678
@@ -36,14 +36,14 @@ HTTP PUT with resume
 012345678
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C 50
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /33 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 50-99/100
 User-Agent: curl/%VERSION
diff --git a/tests/data/test330 b/tests/data/test330
index 5104be03a..d145fc07a 100644
--- a/tests/data/test330
+++ b/tests/data/test330
@@ -16,7 +16,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -39,7 +39,7 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
 Content-Type: text/html
 Funny-head: yesyes
-Location: http://goto.second.host.now/3170002
+Location: http://goto.second.host.now/%TESTNUMBER0002
 Content-Length: 8
 Connection: close
 
@@ -64,7 +64,7 @@ http
 HTTP with custom Cookie: and redirect to new host
  </name>
  <command>
-http://first.host.it.is/we/want/that/page/317 -x %HOSTIP:%HTTPPORT -H "Cookie: test=yes" --location
+http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Cookie: test=yes" --location
 </command>
 <features>
 proxy
@@ -75,14 +75,14 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1
+GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: first.host.it.is
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Cookie: test=yes
 
-GET http://goto.second.host.now/3170002 HTTP/1.1
+GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
 Host: goto.second.host.now
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test331 b/tests/data/test331
index 8c9d384de..8fc68984e 100644
--- a/tests/data/test331
+++ b/tests/data/test331
@@ -40,7 +40,7 @@ http
 HTTP with cookie using host name 'moo'
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT http://moo/we/want/331 -b none http://moo/we/want/3310002
+-x http://%HOSTIP:%HTTPPORT http://moo/we/want/%TESTNUMBER -b none http://moo/we/want/%TESTNUMBER0002
 </command>
 <features>
 proxy
@@ -50,13 +50,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://moo/we/want/331 HTTP/1.1
+GET http://moo/we/want/%TESTNUMBER HTTP/1.1
 Host: moo
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://moo/we/want/3310002 HTTP/1.1
+GET http://moo/we/want/%TESTNUMBER0002 HTTP/1.1
 Host: moo
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test332 b/tests/data/test332
index 3688c2b08..4f4c28b5d 100644
--- a/tests/data/test332
+++ b/tests/data/test332
@@ -26,7 +26,7 @@ tftp
 TFTP retrieve with blksize 400
  </name>
  <command>
-tftp://%HOSTIP:%TFTPPORT//332 --tftp-blksize 400
+tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-blksize 400
 </command>
 </client>
 
@@ -39,7 +39,7 @@ mode: octet
 tsize: 0
 blksize: 400
 timeout: 6
-filename: /332
+filename: /%TESTNUMBER
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test333 b/tests/data/test333
index 0fd0591e8..e0fc450d5 100644
--- a/tests/data/test333
+++ b/tests/data/test333
@@ -20,7 +20,7 @@ none
 Try a non-boolean command line option with --no-
  </name>
  <command>
---no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/333
+--no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test334 b/tests/data/test334
index f43af2381..159335093 100644
--- a/tests/data/test334
+++ b/tests/data/test334
@@ -25,14 +25,14 @@ http
 HTTP 204 No content with chunked header
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/want/334
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/334 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test335 b/tests/data/test335
index e3e1950f1..558d2ca77 100644
--- a/tests/data/test335
+++ b/tests/data/test335
@@ -67,30 +67,30 @@ proxy
 HTTP with proxy Digest and site Digest with creds in URLs
  </name>
  <command>
-http://digest:alot@data.from.server.requiring.digest.hohoho.com/335 --proxy http://foo:bar@%HOSTIP:%HTTPPORT --proxy-digest --digest
+http://digest:alot@data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://foo:bar@%HOSTIP:%HTTPPORT --proxy-digest --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
+GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com
-Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"
-Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/335", response="08a2e2e684047f4219a38ddc189ac00c"
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
+Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="08a2e2e684047f4219a38ddc189ac00c"
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test336 b/tests/data/test336
index cba846d4b..89e9bffc0 100644
--- a/tests/data/test336
+++ b/tests/data/test336
@@ -35,7 +35,7 @@ ftp
 FTP range download when SIZE doesn't work
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/336 --range 3-6
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 </command>
 </client>
 
@@ -48,9 +48,9 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 336
+SIZE %TESTNUMBER
 REST 3
-RETR 336
+RETR %TESTNUMBER
 ABOR
 QUIT
 </protocol>
diff --git a/tests/data/test337 b/tests/data/test337
index 9ae4dfac5..f8ca6856e 100644
--- a/tests/data/test337
+++ b/tests/data/test337
@@ -35,7 +35,7 @@ ftp
 FTP range download with SIZE returning extra crap
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/337 --range 3-6
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6
 </command>
 </client>
 
@@ -48,9 +48,9 @@ PWD
 EPSV
 PASV
 TYPE I
-SIZE 337
+SIZE %TESTNUMBER
 REST 3
-RETR 337
+RETR %TESTNUMBER
 ABOR
 QUIT
 </protocol>
diff --git a/tests/data/test338 b/tests/data/test338
index 28515d027..4de597042 100644
--- a/tests/data/test338
+++ b/tests/data/test338
@@ -38,7 +38,7 @@ http
 ANYAUTH connection reuse of non-authed connection
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/338 --next http://%HOSTIP:%HTTPPORT/338 --anyauth -u foo:moo
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u foo:moo
 </command>
 </client>
 
@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/338 --next http://%HOSTIP:%HTTPPORT/338 --anyauth -u fo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /338 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /338 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test339 b/tests/data/test339
index eca35947d..054707a9d 100644
--- a/tests/data/test339
+++ b/tests/data/test339
@@ -39,7 +39,7 @@ http
 Check if --etag-save saved correct etag to a file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/339 --etag-save log/etag339
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/339 --etag-save log/etag339
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /339 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/etag339">
+<file name="log/etag%TESTNUMBER">
 W/"asdf"
 </file>
 </verify>
diff --git a/tests/data/test34 b/tests/data/test34
index fa4928d5c..3119ce22a 100644
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -45,7 +45,7 @@ http
 HTTP GET with chunked Transfer-Encoding
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/34
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/34
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /34 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test340 b/tests/data/test340
index d834d767c..6c15dc190 100644
--- a/tests/data/test340
+++ b/tests/data/test340
@@ -22,7 +22,7 @@ ftp
 FTP using %00 in path with singlecwd
  </name>
  <command>
---ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/%00first/second/third/340
+--ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/%00first/second/third/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test341 b/tests/data/test341
index 726000d16..3c9f72ae5 100644
--- a/tests/data/test341
+++ b/tests/data/test341
@@ -39,7 +39,7 @@ http
 Try to open a non existing file with --etag-compare should return an error
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/341 --etag-compare log/etag341
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test342 b/tests/data/test342
index d4b14a3d0..ca8957a5f 100644
--- a/tests/data/test342
+++ b/tests/data/test342
@@ -33,11 +33,11 @@ http
 <name>
 Check if --etag-compare set correct etag in header
 </name>
-<file name="log/etag342">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/342 --etag-compare log/etag342
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/342 --etag-compare log/etag342
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /342 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test343 b/tests/data/test343
index 091e92586..faf6c9a5e 100644
--- a/tests/data/test343
+++ b/tests/data/test343
@@ -33,11 +33,11 @@ http
 <name>
 Both --etag-compare and --etag-save to save new Etag
 </name>
-<file name="log/etag343">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/343 --etag-compare log/etag343 --etag-save log/out343
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/out%TESTNUMBER
 </command>
 </client>
 
@@ -45,14 +45,14 @@ http://%HOSTIP:%HTTPPORT/343 --etag-compare log/etag343 --etag-save log/out343
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /343 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 If-None-Match: "21025-dc7-39462498"
 
 </protocol>
-<file name="log/out343">
+<file name="log/out%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>
diff --git a/tests/data/test344 b/tests/data/test344
index e84e45923..ec671d492 100644
--- a/tests/data/test344
+++ b/tests/data/test344
@@ -34,7 +34,7 @@ http
 Both --etag-compare and -save store new Etag using non-existing file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/344 --etag-compare log/etag344 --etag-save log/etag344
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -42,14 +42,14 @@ http://%HOSTIP:%HTTPPORT/344 --etag-compare log/etag344 --etag-save log/etag344
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /344 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 If-None-Match: ""
 
 </protocol>
-<file name="log/etag344">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>
diff --git a/tests/data/test345 b/tests/data/test345
index 1dc293a9a..5619d4475 100644
--- a/tests/data/test345
+++ b/tests/data/test345
@@ -33,11 +33,11 @@ http
 <name>
 Both --etag-compare and -save store new Etag using one pre-existing file
 </name>
-<file name="log/etag345">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/345 --etag-compare log/etag345 --etag-save log/etag345
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -45,14 +45,14 @@ http://%HOSTIP:%HTTPPORT/345 --etag-compare log/etag345 --etag-save log/etag345
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /345 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 If-None-Match: "21025-dc7-39462498"
 
 </protocol>
-<file name="log/etag345">
+<file name="log/etag%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>
diff --git a/tests/data/test346 b/tests/data/test346
index bc464f792..c15ae7156 100644
--- a/tests/data/test346
+++ b/tests/data/test346
@@ -38,14 +38,14 @@ http
 HTTP GET over proxy with credentials using blank passwords
 </name>
 <command>
--x http://%HOSTIP:%HTTPPORT/346 -U puser: -u suser: http://remote.example/346
+-x http://%HOSTIP:%HTTPPORT/%TESTNUMBER -U puser: -u suser: http://remote.example/%TESTNUMBER
 </command>
 </client>
 
 #
 <verify>
 <protocol>
-GET http://remote.example/346 HTTP/1.1
+GET http://remote.example/%TESTNUMBER HTTP/1.1
 Host: remote.example
 Proxy-Authorization: Basic cHVzZXI6
 Authorization: Basic c3VzZXI6
diff --git a/tests/data/test347 b/tests/data/test347
index 3d55a5bd2..e6afa7ae9 100644
--- a/tests/data/test347
+++ b/tests/data/test347
@@ -39,7 +39,7 @@ http
 --etag-save with blank incoming header
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/347 --etag-save log/etag347
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER
 </command>
 </client>
 
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/347 --etag-save log/etag347
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /347 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/etag347">
+<file name="log/etag%TESTNUMBER">
 </file>
 </verify>
 
diff --git a/tests/data/test348 b/tests/data/test348
index befd9fb81..8832a3810 100644
--- a/tests/data/test348
+++ b/tests/data/test348
@@ -21,7 +21,7 @@ ftp
  <name>
 FTP upload file with 552 disk full response
  </name>
-<file name="log/test348.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -30,7 +30,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/348 -T log/test348.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -50,7 +50,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 348
+STOR %TESTNUMBER
 QUIT
 </protocol>
 # 70 - CURLE_REMOTE_DISK_FULL
diff --git a/tests/data/test349 b/tests/data/test349
index 472a4dc48..7abd05797 100644
--- a/tests/data/test349
+++ b/tests/data/test349
@@ -25,14 +25,14 @@ http
 HTTP GET --fail-with-body on HTTP error return
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/349 --fail-with-body
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /349 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test35 b/tests/data/test35
index c79822085..b5feb1998 100644
--- a/tests/data/test35
+++ b/tests/data/test35
diff --git a/tests/data/test354 b/tests/data/test354
index a6949328a..cdd827051 100644
--- a/tests/data/test354
+++ b/tests/data/test354
@@ -30,7 +30,7 @@ ftp
 FTP without password
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/354
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -42,8 +42,8 @@ USER anonymous
 PWD
 EPSV
 TYPE I
-SIZE 354
-RETR 354
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test355 b/tests/data/test355
index d554d30b5..98e59079a 100644
--- a/tests/data/test355
+++ b/tests/data/test355
@@ -34,9 +34,9 @@ http
 load Alt-Svc from file and use
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/355 --alt-svc ""
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc ""
 </command>
-<file name="log/altsvc-355">
+<file name="log/altsvc-%TESTNUMBER">
 h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 </file>
 </client>
@@ -45,7 +45,7 @@ h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /355 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test356 b/tests/data/test356
index 2b9df8391..0f8795899 100644
--- a/tests/data/test356
+++ b/tests/data/test356
@@ -40,7 +40,7 @@ parse incoming Alt-Svc and save to file
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/356 --alt-svc "log/altsvc-356"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "log/altsvc-%TESTNUMBER"
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/356 --alt-svc "log/altsvc-356"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /356 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -59,7 +59,7 @@ Accept: */*
 # matches
 s/\"([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-356" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h1 %HOSTIP %HTTPPORT h1 nowhere.foo 81 TIMESTAMP 0 0
diff --git a/tests/data/test357 b/tests/data/test357
index a907f6c6d..8ddcdc90d 100644
--- a/tests/data/test357
+++ b/tests/data/test357
@@ -51,9 +51,9 @@ http
 HTTP PUT with Expect: 100-continue and 417 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/357 -T log/test357.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
-<file name="log/test357.txt">
+<file name="log/test%TESTNUMBER.txt">
 Weird
      file
          to
@@ -69,14 +69,14 @@ the
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/357 HTTP/1.1
+PUT /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 78
 Expect: 100-continue
 
-PUT /we/want/357 HTTP/1.1
+PUT /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test358 b/tests/data/test358
index 15f2993e3..d1ddc1b9e 100644
--- a/tests/data/test358
+++ b/tests/data/test358
@@ -43,9 +43,9 @@ HTTPS GET translated by alt-svc lookup to HTTP/2 GET
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
  <command>
---http2 --alt-svc "log/altsvc-358" "http://%HOSTIP:%HTTPPORT/358" "http://%HOSTIP:%HTTPPORT/358"
+--http2 --alt-svc "log/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER"
 </command>
-<file name="log/altsvc-358">
+<file name="log/altsvc-%TESTNUMBER">
 h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
 </file>
 
@@ -84,7 +84,7 @@ s/^server: nghttpx.*\r?\n//
 # matches
 s/\"2([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-358" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0
diff --git a/tests/data/test359 b/tests/data/test359
index 81f3c86fb..c1b1cb86c 100644
--- a/tests/data/test359
+++ b/tests/data/test359
@@ -43,9 +43,9 @@ HTTPS GET translated by alt-svc lookup to HTTP/2 GET
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
  <command>
---http2 --alt-svc "log/altsvc-359" "http://%HOSTIP:%HTTPSPORT/359" "http://%HOSTIP:%HTTPSPORT/359"
+--http2 --alt-svc "log/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER"
 </command>
-<file name="log/altsvc-359">
+<file name="log/altsvc-%TESTNUMBER">
 h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
 </file>
 
@@ -84,7 +84,7 @@ s/^server: nghttpx.*\r?\n//
 # matches
 s/\"2([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-359" mode="text">
+<file name="log/altsvc-%TESTNUMBER" mode="text">
 # Your alt-svc cache. https://curl.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0
diff --git a/tests/data/test36 b/tests/data/test36
index 91db26ec6..fb4c885eb 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -42,7 +42,7 @@ http
 HTTP GET with bad chunked Transfer-Encoding
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/36
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/36
 56
 </errorcode>
 <protocol>
-GET /36 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test360 b/tests/data/test360
index f466277b2..e67c847ed 100644
--- a/tests/data/test360
+++ b/tests/data/test360
@@ -15,7 +15,7 @@ http
 Error on both --fail-with-body and --fail
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/360 --fail-with-body --fail
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body --fail
 </command>
 </client>
 
diff --git a/tests/data/test361 b/tests/data/test361
index 7d41d9244..ec135866a 100644
--- a/tests/data/test361
+++ b/tests/data/test361
@@ -25,19 +25,19 @@ http
 HTTP GET --fail-with-body on HTTP error return - twice
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/361 http://%HOSTIP:%HTTPPORT/361 --fail-with-body
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /361 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /361 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test362 b/tests/data/test362
index ad585419d..ad852c224 100644
--- a/tests/data/test362
+++ b/tests/data/test362
@@ -15,7 +15,7 @@ ftp
  <name>
 FTP resume upload file with nothing to start from
  </name>
-<file name="log/test362.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -24,7 +24,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/362 -T log/test362.txt --continue-at -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt --continue-at -
 </command>
 </client>
 
@@ -43,8 +43,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 362
-STOR 362
+SIZE %TESTNUMBER
+STOR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test37 b/tests/data/test37
index 1dedfde79..f87985962 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -23,7 +23,7 @@ http
 HTTP GET with nothing returned from server
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/37
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/37
 52
 </errorcode>
 <protocol>
-GET /37 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test38 b/tests/data/test38
index 518aae95b..0558700d1 100644
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -28,9 +28,9 @@ http
 HTTP resume request without server supporting it
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl38.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o log/fewl%TESTNUMBER.txt
 </command>
-<file name="log/fewl38.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@@ -42,7 +42,7 @@ download on.
 33
 </errorcode>
 <protocol>
-GET /want/38 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=78-
 User-Agent: curl/%VERSION
@@ -51,7 +51,7 @@ Accept: */*
 </protocol>
 
 # the download target file must remain untouched
-<file name="log/fewl38.txt">
+<file name="log/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
diff --git a/tests/data/test39 b/tests/data/test39
index e4126ce43..8b00ada8c 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -26,10 +26,10 @@ http
 HTTP RFC1867-type formposting with filename= and type=
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/39 -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test39.txt;type=moo/foobar;filename=fakerfile" -F file2=@log/test39.txt -F "file3=@\"log/test39.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"log/test39.txt"; filename="A\\AA\"\"\\\"ZZZ"'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@log/test%TESTNUMBER.txt -F "file3=@\"log/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"log/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test39.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo bar
 This is a bar foo
 bar
@@ -43,7 +43,7 @@ foo
 ^(Content-Type: multipart/form-data;|-------).*
 </strip>
 <protocol>
-POST /we/want/39 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -76,7 +76,7 @@ bar
 foo
 
 ------------------------------24e78000bd32
-Content-Disposition: form-data; name="file2"; filename="test39.txt"
+Content-Disposition: form-data; name="file2"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo bar
diff --git a/tests/data/test393 b/tests/data/test393
index e39bd82fe..b29d7506c 100644
--- a/tests/data/test393
+++ b/tests/data/test393
@@ -37,7 +37,7 @@ http
 HTTP max-filesize and out-of-range Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/393 --max-filesize 2000000
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/393 --max-filesize 2000000
 63
 </errorcode>
 <protocol>
-GET /393 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test394 b/tests/data/test394
index 9245cb1e4..8b0da04c2 100644
--- a/tests/data/test394
+++ b/tests/data/test394
@@ -36,7 +36,7 @@ http
 HTTP with rubbish in Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/394
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/394
 8
 </errorcode>
 <protocol>
-GET /394 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test395 b/tests/data/test395
index 2b67c9bd4..119eb4738 100644
--- a/tests/data/test395
+++ b/tests/data/test395
@@ -35,7 +35,7 @@ http
 HTTP and out-of-range Content-Length
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/395
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/395
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /395 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test396 b/tests/data/test396
index 01be58ac3..2cd04c389 100644
--- a/tests/data/test396
+++ b/tests/data/test396
@@ -178,7 +178,7 @@ http
 HTTP GET zstd compressed content
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/396 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -189,7 +189,7 @@ http://%HOSTIP:%HTTPPORT/396 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /396 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test397 b/tests/data/test397
index 0afd21c60..9bc65e994 100644
--- a/tests/data/test397
+++ b/tests/data/test397
@@ -174,7 +174,7 @@ http
 HTTP GET zstd compressed content of size more than CURL_MAX_WRITE_SIZE
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/397 --compressed
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
 </command>
 </client>
 
@@ -185,7 +185,7 @@ http://%HOSTIP:%HTTPPORT/397 --compressed
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
-GET /397 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test4 b/tests/data/test4
index 271b1ebe7..c0b4f05d3 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -30,7 +30,7 @@ http
 Replaced internal and added custom HTTP headers
  </name>
  <command>
- -H "extra-header: here" -H "Accept: replaced" -H "X-Custom-Header;" -H "X-Test: foo; " -H "X-Test:" -H "X-Test2: foo;" -H "X-Test3:  " -H "X-Test4;  " -H "X-Test5;ignored" http://%HOSTIP:%HTTPPORT/4 http://%HOSTIP:%HTTPPORT/4
+ -H "extra-header: here" -H "Accept: replaced" -H "X-Custom-Header;" -H "X-Test: foo; " -H "X-Test:" -H "X-Test2: foo;" -H "X-Test3:  " -H "X-Test4;  " -H "X-Test5;ignored" http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -38,7 +38,7 @@ Replaced internal and added custom HTTP headers
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /4 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 extra-header: here
@@ -47,7 +47,7 @@ X-Custom-Header:
 X-Test: foo; 
 X-Test2: foo;
 
-GET /4 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 extra-header: here
diff --git a/tests/data/test40 b/tests/data/test40
index d4daba0f2..ad437d07d 100644
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../moo.html/?name=d a niel&testcase=/400002    
+Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002    
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -27,9 +27,9 @@ body
 <datacheck>
 HTTP/1.1 302 OK swsclose
 %if !hyper
-Location: ../moo.html/?name=d a niel&testcase=/400002    
+Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002    
 %else
-Location: ../moo.html/?name=d a niel&testcase=/400002
+Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002
 %endif
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
@@ -53,7 +53,7 @@ http
 HTTP redirect with whitespace after ? (and conversion)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/40 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 HTTP/1.1
+GET /we/are/all/moo.html/?name=d+a+niel&testcase=/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test401 b/tests/data/test401
index 1bb9fb1f2..ac4af9772 100644
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -19,7 +19,7 @@ ftps
  <name>
 FTPS PASV upload file
  </name>
-<file name="log/test401.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/401 -T log/test401.txt
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -50,7 +50,7 @@ PROT C
 PWD
 EPSV
 TYPE I
-STOR 401
+STOR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test402 b/tests/data/test402
index 3060c997a..5c7bc678e 100644
--- a/tests/data/test402
+++ b/tests/data/test402
@@ -19,7 +19,7 @@ ftp
 FTP SSL required on non-SSL server
  </name>
  <command>
--k --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/402
+-k --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test405 b/tests/data/test405
index 28d8b5724..fc291d1ab 100644
--- a/tests/data/test405
+++ b/tests/data/test405
@@ -19,7 +19,7 @@ ftp
 FTPS operation to FTP port
  </name>
  <command>
--m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/405
+-m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test407 b/tests/data/test407
index ca06838af..4f2591e98 100644
--- a/tests/data/test407
+++ b/tests/data/test407
@@ -29,7 +29,7 @@ ftps
 Get two FTPS files from the same remote dir: no second CWD
  </name>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/407 ftps://%HOSTIP:%FTPSPORT/a/path/407
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER
 </command>
 <stdout>
 data blobb
@@ -49,11 +49,11 @@ CWD a
 CWD path
 EPSV
 TYPE I
-SIZE 407
-RETR 407
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 407
-RETR 407
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test408 b/tests/data/test408
index 68b42b29f..2516fc332 100644
--- a/tests/data/test408
+++ b/tests/data/test408
@@ -25,9 +25,9 @@ ftps
 FTPS PORT upload with CWD
  </name>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/408 -T log/upload408 -P -
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P -
 </command>
-<file name="log/upload408">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -51,7 +51,7 @@ CWD STOR
 CWD RETR
 PORT 127,0,0,1,5,109
 TYPE I
-STOR 408
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test409 b/tests/data/test409
index 00100bced..ea6e79560 100644
--- a/tests/data/test409
+++ b/tests/data/test409
@@ -19,7 +19,7 @@ ftps
  <name>
 FTPS PASV upload file
  </name>
-<file name="log/test409.txt">
+<file name="log/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/409 -T log/test409.txt
+-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
 </command>
 </client>
 
@@ -50,7 +50,7 @@ PROT C
 PWD
 EPSV
 TYPE I
-STOR 409
+STOR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test41 b/tests/data/test41
index 08eca38c9..aaf0ae78b 100644
--- a/tests/data/test41
+++ b/tests/data/test41
@@ -19,7 +19,7 @@ http
 HTTP formpost with missing file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F moo=@boo
 </command>
 </client>
 
diff --git a/tests/data/test410 b/tests/data/test410
index 4d5d66051..06999fbaa 100644
--- a/tests/data/test410
+++ b/tests/data/test410
@@ -32,11 +32,11 @@ https
 HTTPS GET with very long request header
  </name>
 # 14 characters repeated 3500 times makes 49000 bytes
-<file name="log/file410">
+<file name="log/file%TESTNUMBER">
 Long: %repeat[3500 x header content]%
 </file>
  <command>
--k https://%HOSTIP:%HTTPSPORT/410 -H @log/file410
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @log/file%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ Long: %repeat[3500 x header content]%
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /410 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test42 b/tests/data/test42
index deca03c1d..835f18185 100644
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../m o o.html/420002    
+Location: ../m o o.html/%TESTNUMBER0002    
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -27,9 +27,9 @@ body
 <datacheck>
 HTTP/1.1 302 OK swsclose
 %if !hyper
-Location: ../m o o.html/420002    
+Location: ../m o o.html/%TESTNUMBER0002    
 %else
-Location: ../m o o.html/420002
+Location: ../m o o.html/%TESTNUMBER0002
 %endif
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
@@ -53,7 +53,7 @@ http
 HTTP redirect with whitespace in path (and conversion)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/42 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/are/all/m%20o%20o.html/420002 HTTP/1.1
+GET /we/are/all/m%20o%20o.html/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test43 b/tests/data/test43
index 74d9b56a3..4e7408be1 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -13,7 +13,7 @@ HTTP proxy
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/430002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -32,7 +32,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data/430002.txt?coolsite=yes
+Location: data/%TESTNUMBER0002.txt?coolsite=yes
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -54,7 +54,7 @@ http
 HTTP Location: following over HTTP proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -64,13 +64,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test430 b/tests/data/test430
index 4a669ff7e..e3aae0bef 100644
--- a/tests/data/test430
+++ b/tests/data/test430
@@ -37,21 +37,21 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config430-a">
+<file1 name="log/config%TESTNUMBER-a">
 --next
-url = %HOSTIP:%HTTPPORT/4300001
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 </file1>
-<file2 name="log/config430-b">
+<file2 name="log/config%TESTNUMBER-b">
 --next
-url = %HOSTIP:%HTTPPORT/4300002
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
 data = "b"
 </file2>
-<file3 name="log/config430-c">
+<file3 name="log/config%TESTNUMBER-c">
 --next
-url = %HOSTIP:%HTTPPORT/4300003
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0003
 header = "c: c"
 data = "c"
 </file3>
@@ -63,7 +63,7 @@ http
 Three -K uses with --next and --data in each
  </name>
  <command>
--K log/config430-a -K log/config430-b -K log/config430-c
+-K log/config%TESTNUMBER-a -K log/config%TESTNUMBER-b -K log/config%TESTNUMBER-c
 </command>
 </client>
 
@@ -71,7 +71,7 @@ Three -K uses with --next and --data in each
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /4300001 HTTP/1.1
+POST /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -79,7 +79,7 @@ a: a
 Content-Length: 1
 Content-Type: application/x-www-form-urlencoded
 
-aPOST /4300002 HTTP/1.1
+aPOST /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -87,7 +87,7 @@ b: b
 Content-Length: 1
 Content-Type: application/x-www-form-urlencoded
 
-bPOST /4300003 HTTP/1.1
+bPOST /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test431 b/tests/data/test431
index 8f045482b..bebe62017 100644
--- a/tests/data/test431
+++ b/tests/data/test431
@@ -37,15 +37,15 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config431-a">
+<file1 name="log/config%TESTNUMBER-a">
 --next
-url = %HOSTIP:%HTTPPORT/4310001
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 </file1>
-<file2 name="log/config431-b">
+<file2 name="log/config%TESTNUMBER-b">
 --next
-url = %HOSTIP:%HTTPPORT/4310002
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
 data = "b"
 </file2>
@@ -57,7 +57,7 @@ http
 Two -K uses with --next and then one on cmdline
  </name>
  <command>
--K log/config431-a -K log/config431-b --next -d c %HOSTIP:%HTTPPORT/4310003 -H "c: c"
+-K log/config%TESTNUMBER-a -K log/config%TESTNUMBER-b --next -d c %HOSTIP:%HTTPPORT/%TESTNUMBER0003 -H "c: c"
 </command>
 </client>
 
@@ -65,7 +65,7 @@ Two -K uses with --next and then one on cmdline
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /4310001 HTTP/1.1
+POST /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -73,7 +73,7 @@ a: a
 Content-Length: 1
 Content-Type: application/x-www-form-urlencoded
 
-aPOST /4310002 HTTP/1.1
+aPOST /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -81,7 +81,7 @@ b: b
 Content-Length: 1
 Content-Type: application/x-www-form-urlencoded
 
-bPOST /4310003 HTTP/1.1
+bPOST /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test432 b/tests/data/test432
index a7bc37886..e7fe45b37 100644
--- a/tests/data/test432
+++ b/tests/data/test432
@@ -37,20 +37,20 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config432">
+<file1 name="log/config%TESTNUMBER">
 --next
-url = %HOSTIP:%HTTPPORT/4320001
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 --next
-url = %HOSTIP:%HTTPPORT/4320002
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
 data = "b"
-config = "log/config432-c"
+config = "log/config%TESTNUMBER-c"
 </file1>
-<file2 name="log/config432-c">
+<file2 name="log/config%TESTNUMBER-c">
 --next
-url = %HOSTIP:%HTTPPORT/4320003
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER0003
 header = "c: c"
 data = "c"
 </file2>
@@ -62,7 +62,7 @@ http
 Use -K with --next and --config from within
  </name>
  <command>
--K log/config432
+-K log/config%TESTNUMBER
 </command>
 </client>
 
@@ -70,7 +70,7 @@ Use -K with --next and --config from within
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /4320001 HTTP/1.1
+POST /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -78,7 +78,7 @@ a: a
 Content-Length: 1
 Content-Type: application/x-www-form-urlencoded
 
-aPOST /4320002 HTTP/1.1
+aPOST /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -86,7 +86,7 @@ b: b
 Content-Length: 1
 Content-Type: application/x-www-form-urlencoded
 
-bPOST /4320003 HTTP/1.1
+bPOST /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test433 b/tests/data/test433
index 9658ded0b..fd9e26be8 100644
--- a/tests/data/test433
+++ b/tests/data/test433
@@ -37,7 +37,7 @@ CURL_HOME=
 Verify XDG_CONFIG_HOME use to find .curlrc
 </name>
 <command>
-%HOSTIP:%HTTPPORT/433
+%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ Verify XDG_CONFIG_HOME use to find .curlrc
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /433 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test434 b/tests/data/test434
index a2bcc0cbd..6263d5519 100644
--- a/tests/data/test434
+++ b/tests/data/test434
@@ -19,8 +19,8 @@ Content-Type: text/1
 
 #
 <client>
-<file name="log/config434" nonewline="yes">
-url = %HOSTIP:%HTTPPORT/434
+<file name="log/config%TESTNUMBER" nonewline="yes">
+url = %HOSTIP:%HTTPPORT/%TESTNUMBER
 </file>
 <server>
 http
@@ -29,14 +29,14 @@ http
 -K with a single line without newline
 </name>
 <command>
--K log/config434
+-K log/config%TESTNUMBER
 </command>
 </client>
 
 #
 <verify>
 <protocol>
-GET /434 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test44 b/tests/data/test44
index 0678ed5b7..0ec2f4b79 100644
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -27,10 +27,10 @@ http
 HTTP RFC1867-type formposting without Expect: header
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/44 -F name=daniel -F tool=curl -F file=@log/test44.txt -H "Expect:"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -H "Expect:"
 </command>
 # We create this file before the command is invoked!
-<file name="log/test44.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -43,7 +43,7 @@ bar
 ^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
-POST /we/want/44 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -59,7 +59,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------7c633d5c27ce
-Content-Disposition: form-data; name="file"; filename="test44.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
diff --git a/tests/data/test45 b/tests/data/test45
index 4fe6e0142..0368882d6 100644
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -12,7 +12,7 @@ followlocation
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data.cgi?moo=http://&/450002
+Location: data.cgi?moo=http://&/%TESTNUMBER0002
 Connection: close
 
 This server reply is for testing a simple Location: following
@@ -31,7 +31,7 @@ If this is received, the location following worked
 HTTP/1.1 301 This is a weirdo text message swsclose
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: data.cgi?moo=http://&/450002
+Location: data.cgi?moo=http://&/%TESTNUMBER0002
 Connection: close
 
 HTTP/1.1 200 Followed here fine swsclose
@@ -53,19 +53,19 @@ http
 simple HTTP Location: without protocol in initial URL
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/45 -L
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/45 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /want/data.cgi?moo=http://&/450002 HTTP/1.1
+GET /want/data.cgi?moo=http://&/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test46 b/tests/data/test46
index dba69068c..91e24cbaf 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -43,9 +43,9 @@ HTTP with bad domain name, get cookies and store in cookie jar
 TZ=GMT
 </setenv>
  <command>
-domain..tld:%HTTPPORT/want/46 --resolve domain..tld:%HTTPPORT:%HOSTIP -c log/jar46 -b log/injar46
+domain..tld:%HTTPPORT/want/%TESTNUMBER --resolve domain..tld:%HTTPPORT:%HOSTIP -c log/jar%TESTNUMBER -b log/injar%TESTNUMBER
 </command>
-<file name="log/injar46">
+<file name="log/injar%TESTNUMBER">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This is generated by libcurl!  Do not edit.
@@ -61,14 +61,14 @@ domain..tld	FALSE	/want	FALSE	0	empty
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/46 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: domain..tld:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: empty=; mooo2=indeed2; mooo=indeed
 
 </protocol>
-<file name="log/jar46" mode="text">
+<file name="log/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test47 b/tests/data/test47
index cb7684560..e506b346b 100644
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -28,7 +28,7 @@ http
 simple HTTP 1.0 GET
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/47 -0
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0
 </command>
 </client>
 
@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/47 -0
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /47 HTTP/1.0
+GET /%TESTNUMBER HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test48 b/tests/data/test48
index d7fe790c7..c98376834 100644
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -29,7 +29,7 @@ http
 HTTP with -d and -G and -I
  </name>
  <command>
--d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/48 -G -I http://%HOSTIP:%HTTPPORT/48
+-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,12 +37,12 @@ HTTP with -d and -G and -I
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /48?foo=moo&moo=poo HTTP/1.1
+HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-HEAD /48?foo=moo&moo=poo HTTP/1.1
+HEAD /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test49 b/tests/data/test49
index ee5fa91f8..79890d68b 100644
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../moo.html/490002
+Location: ../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ../moo.html/490002
+Location: ../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with ../
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/49 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/are/all/moo.html/490002 HTTP/1.1
+GET /we/are/all/moo.html/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test490 b/tests/data/test490
index 456521599..2d4cf1604 100644
--- a/tests/data/test490
+++ b/tests/data/test490
@@ -35,9 +35,9 @@ http
 Two globbed HTTP PUTs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/490 -T '{log/in490,log/in490}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/in%TESTNUMBER}'
 </command>
-<file name="log/in490">
+<file name="log/in%TESTNUMBER">
 surprise!
 </file>
 </client>
@@ -46,7 +46,7 @@ surprise!
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /490 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -54,7 +54,7 @@ Content-Length: 10
 Expect: 100-continue
 
 surprise!
-PUT /490 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test491 b/tests/data/test491
index f99dbe552..5f2c27d6a 100644
--- a/tests/data/test491
+++ b/tests/data/test491
@@ -35,9 +35,9 @@ http
 Two globbed HTTP PUTs, the second upload file is missing
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/491 -T '{log/in491,log/bad491}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/bad%TESTNUMBER}'
 </command>
-<file name="log/in491">
+<file name="log/in%TESTNUMBER">
 surprise!
 </file>
 </client>
@@ -46,7 +46,7 @@ surprise!
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /491 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test492 b/tests/data/test492
index 63e7bb96f..aedaf5b8a 100644
--- a/tests/data/test492
+++ b/tests/data/test492
@@ -35,13 +35,13 @@ http
 Two globbed HTTP PUTs to two globbed URLs
  </name>
  <command>
-'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{log/first492,log/second492}' -H "Testno: 492"
+'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{log/first%TESTNUMBER,log/second%TESTNUMBER}' -H "Testno: %TESTNUMBER"
 </command>
-<file name="log/first492">
-first 492 contents
+<file name="log/first%TESTNUMBER">
+first %TESTNUMBER contents
 </file>
-<file1 name="log/second492">
-second 492 contents
+<file1 name="log/second%TESTNUMBER">
+second %TESTNUMBER contents
 </file1>
 </client>
 
@@ -49,42 +49,42 @@ second 492 contents
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /one/first492 HTTP/1.1
+PUT /one/first%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Testno: 492
+Testno: %TESTNUMBER
 Content-Length: 19
 Expect: 100-continue
 
-first 492 contents
-PUT /two/first492 HTTP/1.1
+first %TESTNUMBER contents
+PUT /two/first%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Testno: 492
+Testno: %TESTNUMBER
 Content-Length: 19
 Expect: 100-continue
 
-first 492 contents
-PUT /one/second492 HTTP/1.1
+first %TESTNUMBER contents
+PUT /one/second%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Testno: 492
+Testno: %TESTNUMBER
 Content-Length: 20
 Expect: 100-continue
 
-second 492 contents
-PUT /two/second492 HTTP/1.1
+second %TESTNUMBER contents
+PUT /two/second%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
-Testno: 492
+Testno: %TESTNUMBER
 Content-Length: 20
 Expect: 100-continue
 
-second 492 contents
+second %TESTNUMBER contents
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test493 b/tests/data/test493
index ebb9884b2..bb0b5dee7 100644
--- a/tests/data/test493
+++ b/tests/data/test493
@@ -29,7 +29,7 @@ http
 HSTS
 </features>
 
-<file name="log/input493">
+<file name="log/input%TESTNUMBER">
 .hsts.example "20311001 04:47:41"
 </file>
 
@@ -37,7 +37,7 @@ HSTS
 HSTS and %{url_effective} after upgrade
 </name>
 <command>
--x http://%HOSTIP:%HTTPPORT http://this.hsts.example/493 --hsts log/input493 -w '%{url_effective}\n'
+-x http://%HOSTIP:%HTTPPORT http://this.hsts.example/%TESTNUMBER --hsts log/input%TESTNUMBER -w '%{url_effective}\n'
 </command>
 </client>
 
@@ -51,7 +51,7 @@ Proxy-Connection: Keep-Alive
 
 </protocol>
 <stdout>
-https://this.hsts.example/493
+https://this.hsts.example/%TESTNUMBER
 </stdout>
 # Proxy CONNECT aborted
 <errorcode>
diff --git a/tests/data/test5 b/tests/data/test5
index 161fdceb3..4e8cd46ee 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -29,7 +29,7 @@ http
 HTTP over proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/5#5 -x %HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER#5 -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -40,7 +40,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test50 b/tests/data/test50
index b188263ea..308095e38 100644
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../../moo.html/500002
+Location: ../../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ../../moo.html/500002
+Location: ../../moo.html/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with ../../
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/50 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/are/moo.html/500002 HTTP/1.1
+GET /we/are/moo.html/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test500 b/tests/data/test500
index b0c76b2eb..e0d8e93d3 100644
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -38,18 +38,18 @@ lib500
 simple libcurl HTTP GET tool
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/500 log/ip500
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip500">
+<file name="log/ip%TESTNUMBER">
 IP: %HOSTIP
 </file>
 <protocol>
-GET /500 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test501 b/tests/data/test501
index 8b3dac7ed..b86642f6a 100644
--- a/tests/data/test501
+++ b/tests/data/test501
@@ -19,14 +19,14 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib501
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple libcurl attempt operation without URL set
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/501
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test502 b/tests/data/test502
index f8d776b6c..11212572d 100644
--- a/tests/data/test502
+++ b/tests/data/test502
@@ -23,16 +23,16 @@ file
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib502
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple multi file:// get
  </name>
  <command>
-file://%PWD/log/test502.txt
+file://%PWD/log/test%TESTNUMBER.txt
 </command>
-<file name="log/test502.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar swsclose
 bar
diff --git a/tests/data/test503 b/tests/data/test503
index c8fb34e6b..1ad7a552d 100644
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -48,7 +48,7 @@ http-proxy
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib503
+lib%TESTNUMBER
 </tool>
 <features>
 proxy
@@ -57,9 +57,9 @@ proxy
 simple multi http:// through proxytunnel with authentication info
  </name>
  <command>
-http://machine.503:%HTTPPORT/503 %HOSTIP:%PROXYPORT
+http://machine.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
-<file name="log/test503.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo
    bar
 bar
@@ -71,15 +71,15 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT machine.503:%HTTPPORT HTTP/1.1
-Host: machine.503:%HTTPPORT
+CONNECT machine.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: machine.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: Basic dGVzdDppbmc=
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /503 HTTP/1.1
-Host: machine.503:%HTTPPORT
+GET /%TESTNUMBER HTTP/1.1
+Host: machine.%TESTNUMBER:%HTTPPORT
 Authorization: Basic dGVzdDppbmc=
 Accept: */*
 
diff --git a/tests/data/test504 b/tests/data/test504
index 351ae749f..05061e2a8 100644
--- a/tests/data/test504
+++ b/tests/data/test504
@@ -25,14 +25,14 @@ proxy
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib504
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple multi through local proxy without listener
  </name>
  <command>
-http://%HOSTIP:%NOLISTENPORT/504 %HOSTIP:%NOLISTENPORT
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER %HOSTIP:%NOLISTENPORT
 </command>
 </client>
 
diff --git a/tests/data/test505 b/tests/data/test505
index a5e5d31fe..13ddc62d7 100644
--- a/tests/data/test505
+++ b/tests/data/test505
@@ -16,16 +16,16 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib505
+lib%TESTNUMBER
 </tool>
 
  <name>
 FTP upload with rename after transfer
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/505 log/upload505
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload505">
+<file name="log/upload%TESTNUMBER">
 Contents
 of
 a file
@@ -57,9 +57,9 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 505
-RNFR 505
-RNTO 505-forreal
+STOR %TESTNUMBER
+RNFR %TESTNUMBER
+RNTO %TESTNUMBER-forreal
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test506 b/tests/data/test506
index cb756c317..44f3afd22 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -71,10 +71,10 @@ HTTP with shared cookie list (and dns cache)
 TZ=GMT
 </setenv>
 <tool>
-lib506
+lib%TESTNUMBER
 </tool>
 <command>
-http://%HOSTIP:%HTTPPORT/506
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -233,7 +233,7 @@ lock:   share  [Pigs in space]: 98
 unlock: share  [Pigs in space]: 99
 GLOBAL_CLEANUP
 </stdout>
-<file name="log/jar506" mode="text">
+<file name="log/jar%TESTNUMBER" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test507 b/tests/data/test507
index 9549bd986..49d751760 100644
--- a/tests/data/test507
+++ b/tests/data/test507
@@ -21,7 +21,7 @@ http
 multi interface get with non-existing host name
 </name>
 <tool>
-lib507
+lib%TESTNUMBER
 </tool>
 <command>
 http://non-existing-host.haxx.se/
diff --git a/tests/data/test508 b/tests/data/test508
index a4ee1c3a5..143fe3171 100644
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -27,14 +27,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib508
+lib%TESTNUMBER
 </tool>
 
  <name>
 send HTTP POST using read callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/508
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/508
 s/^(this is what we post to the silly web server)\r\n/$1\n/ if($has_charconv)
 </strippart>
 <protocol>
-POST /508 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 45
diff --git a/tests/data/test509 b/tests/data/test509
index 0e0dd212b..4cdbe80db 100644
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -19,7 +19,7 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib509
+lib%TESTNUMBER
 </tool>
 
 <name>
diff --git a/tests/data/test51 b/tests/data/test51
index 27eba3b06..9bb28654c 100644
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ../../../../../../../510002
+Location: ../../../../../../../%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ../../../../../../../510002
+Location: ../../../../../../../%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with excessive ../
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/51 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /510002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test510 b/tests/data/test510
index 5facff04b..415bbae27 100644
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -28,14 +28,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib510
+lib%TESTNUMBER
 </tool>
 
  <name>
 send HTTP POST using read callback, using chunked transfer-encoding
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/510
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/510
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /510 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
diff --git a/tests/data/test511 b/tests/data/test511
index 1a251fd89..994907a9b 100644
--- a/tests/data/test511
+++ b/tests/data/test511
@@ -21,14 +21,14 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib511
+lib%TESTNUMBER
 </tool>
 
  <name>
 FTP with FILETIME and NOBODY but missing file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/511
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -43,7 +43,7 @@ ftp://%HOSTIP:%FTPPORT/511
 USER anonymous
 PASS ftp@example.com
 PWD
-MDTM 511
+MDTM %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test512 b/tests/data/test512
index b5b83395c..6598d3162 100644
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -26,14 +26,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib512
+lib%TESTNUMBER
 </tool>
 
  <name>
 simple curl_easy_duplicate() test
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/512
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/512
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /512 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test513 b/tests/data/test513
index 00e0f77eb..968da4fb7 100644
--- a/tests/data/test513
+++ b/tests/data/test513
@@ -18,7 +18,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib513
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -26,7 +26,7 @@ send HTTP POST using read callback that returns CURL_READFUNC_ABORT
  </name>
 # the 1s post-command delay helps to prevent a spurious failure on s390
  <command delay="1">
-http://%HOSTIP:%HTTPPORT/513
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/513
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /513 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 1
diff --git a/tests/data/test514 b/tests/data/test514
index b95695bc5..1d5f38050 100644
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -30,14 +30,14 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib514
+lib%TESTNUMBER
 </tool>
  <name>
 First set options to POST and then to make HEAD
  </name>
 # the 1s post-command delay helps to prevent a spurious failure on s390
  <command delay="1">
-http://%HOSTIP:%HTTPPORT/514
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/514
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-HEAD /514 HTTP/1.1
+HEAD /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test515 b/tests/data/test515
index 1e7fa1dc5..42d153b03 100644
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -25,14 +25,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib515
+lib%TESTNUMBER
 </tool>
 
  <name>
 make a POSTFIELDS set to NULL with POSTFIELDSIZE set to zero
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/515
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/515
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /515 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
diff --git a/tests/data/test516 b/tests/data/test516
index 837b67eb0..c441cfb2f 100644
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -26,14 +26,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib516
+lib%TESTNUMBER
 </tool>
 
  <name>
 make a HTTPPOST set to NULL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/516
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/516
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /516 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
diff --git a/tests/data/test517 b/tests/data/test517
index f58f4edaa..0152c0f29 100644
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -17,7 +17,7 @@ none
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib517
+lib%TESTNUMBER
 </tool>
 
  <name>
diff --git a/tests/data/test518 b/tests/data/test518
index c9db5b7dc..042b6d767 100644
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -35,19 +35,19 @@ getrlimit
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib518
+lib%TESTNUMBER
 </tool>
 # precheck is a command line to run before the test, to see if we can execute
 # the test or not
 <precheck>
-./libtest/lib518 check
+./libtest/lib%TESTNUMBER check
 </precheck>
 
  <name>
 HTTP GET with more than FD_SETSIZE descriptors open
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/518
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/518
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /518 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test519 b/tests/data/test519
index 19fc38158..9b47ed28c 100644
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -48,14 +48,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib519
+lib%TESTNUMBER
 </tool>
 
  <name>
 GET same URL twice with different users
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/519
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -63,12 +63,12 @@ http://%HOSTIP:%HTTPPORT/519
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /519 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic bW9uc3Rlcjp1bmRlcmJlZA==
 Accept: */*
 
-GET /519 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic YW5vdGhlcm1vbnN0ZXI6aW53YXJkcm9iZQ==
 Accept: */*
diff --git a/tests/data/test52 b/tests/data/test52
index b2ac9e51a..662a4ef33 100644
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -11,7 +11,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: ./520002
+Location: ./%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: ./520002
+Location: ./%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Connection: close
 
@@ -49,7 +49,7 @@ http
 HTTP follow redirect with ./-prefix
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
 </command>
 </client>
 
@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/are/all/twits/52 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /we/are/all/twits/520002 HTTP/1.1
+GET /we/are/all/twits/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test521 b/tests/data/test521
index 90f51b38d..b8b7896a5 100644
--- a/tests/data/test521
+++ b/tests/data/test521
@@ -33,13 +33,13 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 ftp
 </server>
 <tool>
-lib521
+lib%TESTNUMBER
 </tool>
  <name>
 FTP dir list PASV with CURLOPT_PORT
  </name>
  <command>
-ftp://%HOSTIP/521/ %FTPPORT
+ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT
 </command>
 </client>
 
@@ -50,7 +50,7 @@ ftp://%HOSTIP/521/ %FTPPORT
 USER xxx
 PASS yyy
 PWD
-CWD 521
+CWD %TESTNUMBER
 EPSV
 TYPE A
 LIST
diff --git a/tests/data/test522 b/tests/data/test522
index 7a724f3e6..6691a29a1 100644
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -36,7 +36,7 @@ lib521
 HTTP GET with CURLOPT_PORT
  </name>
  <command>
-http://%HOSTIP/522 %HTTPPORT
+http://%HOSTIP/%TESTNUMBER %HTTPPORT
 </command>
 </client>
 
@@ -44,7 +44,7 @@ http://%HOSTIP/522 %HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /522 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic eHh4Onl5eQ==
 Accept: */*
diff --git a/tests/data/test523 b/tests/data/test523
index 3886a4cf8..88cda7a2c 100644
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -32,14 +32,14 @@ hello
 http
 </server>
 <tool>
-lib523
+lib%TESTNUMBER
 </tool>
  <name>
 HTTP GET with proxy and CURLOPT_PORT
  </name>
 # first URL then proxy
  <command>
-http://www.example.com:999/523 http://%HOSTIP:%HTTPPORT
+http://www.example.com:999/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -50,7 +50,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://www.example.com:19999/523 HTTP/1.1
+GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1
 Host: www.example.com:19999
 Authorization: Basic eHh4Onl5eQ==
 Accept: */*
diff --git a/tests/data/test524 b/tests/data/test524
index c60946672..13246e235 100644
--- a/tests/data/test524
+++ b/tests/data/test524
@@ -18,7 +18,7 @@ UPLOAD
 ftp
 </server>
 <tool>
-lib524
+lib%TESTNUMBER
 </tool>
  <name>
 FTP upload with target URL ending with slash
diff --git a/tests/data/test525 b/tests/data/test525
index 7bd494e02..ce37399fc 100644
--- a/tests/data/test525
+++ b/tests/data/test525
@@ -20,15 +20,15 @@ multi
 ftp
 </server>
 <tool>
-lib525
+lib%TESTNUMBER
 </tool>
  <name>
 FTP PORT upload using multi interface
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/525 log/upload525
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload525">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -48,7 +48,7 @@ PWD
 CWD path
 PORT 127,0,0,1,5,109
 TYPE I
-STOR 525
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test526 b/tests/data/test526
index 70e6dcd12..be2e4be80 100644
--- a/tests/data/test526
+++ b/tests/data/test526
@@ -27,13 +27,13 @@ file contents should appear once for each file
 ftp
 </server>
 <tool>
-lib526
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR same file using different handles but same connection
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/526
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -46,17 +46,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 526
-RETR 526
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 526
-RETR 526
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 526
-RETR 526
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 526
-RETR 526
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test527 b/tests/data/test527
index 98892a97e..be2e4be80 100644
--- a/tests/data/test527
+++ b/tests/data/test527
@@ -27,13 +27,13 @@ file contents should appear once for each file
 ftp
 </server>
 <tool>
-lib527
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR same file using different handles but same connection
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/527
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -46,17 +46,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 527
-RETR 527
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 527
-RETR 527
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 527
-RETR 527
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 527
-RETR 527
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test528 b/tests/data/test528
index 89e017420..a55768b33 100644
--- a/tests/data/test528
+++ b/tests/data/test528
@@ -37,26 +37,26 @@ lib526
 HTTP GET same file using different handles but same connection
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/528
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/528 HTTP/1.1
+GET /path/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/528 HTTP/1.1
+GET /path/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/528 HTTP/1.1
+GET /path/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/528 HTTP/1.1
+GET /path/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test529 b/tests/data/test529
index 16147201c..141166c02 100644
--- a/tests/data/test529
+++ b/tests/data/test529
@@ -20,15 +20,15 @@ multi
 ftp
 </server>
 <tool>
-lib529
+lib%TESTNUMBER
 </tool>
  <name>
 FTP PORT upload using multi interface (weird cleanup function sequence)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/529 log/upload529
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload529">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -48,7 +48,7 @@ PWD
 CWD path
 PORT 127,0,0,1,5,109
 TYPE I
-STOR 529
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test53 b/tests/data/test53
index bffd063e5..e3b9ec962 100644
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -29,9 +29,9 @@ http
 HTTP, junk session cookies
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/53 -b log/injar53 -j
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -b log/injar%TESTNUMBER -j
 </command>
-<file name="log/injar53">
+<file name="log/injar%TESTNUMBER">
 %HOSTIP	FALSE	/	FALSE	2139150993	mooo	indeed
 %HOSTIP	FALSE	/	FALSE	0		moo1	indeed
 %HOSTIP	FALSE	/	FALSE	1		moo2	indeed
@@ -41,7 +41,7 @@ HTTP, junk session cookies
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/53 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test531 b/tests/data/test531
index 8a7cee50a..17ccf68e2 100644
--- a/tests/data/test531
+++ b/tests/data/test531
@@ -29,9 +29,9 @@ lib525
 FTP PORT upload using multi interface and get 425 response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/531 log/upload531
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload531">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
 don't upload this
 </file>
@@ -51,7 +51,7 @@ PWD
 CWD path
 PORT 127,0,0,1,5,109
 TYPE I
-STOR 531
+STOR %TESTNUMBER
 QUIT
 </protocol>
 
diff --git a/tests/data/test532 b/tests/data/test532
index dc45db1d2..f36d0440c 100644
--- a/tests/data/test532
+++ b/tests/data/test532
@@ -27,13 +27,13 @@ file contents should appear once for each file
 ftp
 </server>
 <tool>
-lib532
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR same file using reset handles between each transfer
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/532
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -46,17 +46,17 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 532
-RETR 532
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 532
-RETR 532
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 532
-RETR 532
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 532
-RETR 532
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test533 b/tests/data/test533
index a67c8c824..4e94f88eb 100644
--- a/tests/data/test533
+++ b/tests/data/test533
@@ -25,13 +25,13 @@ REPLY SIZE 500 Can't check for file existence
 ftp
 </server>
 <tool>
-lib533
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR a non-existing file twice using the multi interface
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/533 ftp://%HOSTIP:%FTPPORT/path/533
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -44,11 +44,11 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 533
-RETR 533
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 533
-RETR 533
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test534 b/tests/data/test534
index ba3f721e7..764fe6647 100644
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -32,7 +32,7 @@ lib533
 FTP RETR twice using multi: non-existing host and non-existing file
  </name>
  <command>
-ftp://non-existing-host.haxx.se/path/534 ftp://%HOSTIP:%FTPPORT/path/534
+ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -45,8 +45,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 534
-RETR 534
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test535 b/tests/data/test535
index bf914c272..f9e6c390a 100644
--- a/tests/data/test535
+++ b/tests/data/test535
@@ -48,7 +48,7 @@ lib533
 HTTP GET multi two files with FAILONERROR
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/535 http://%HOSTIP:%HTTPPORT/5350001
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 
@@ -56,11 +56,11 @@ http://%HOSTIP:%HTTPPORT/535 http://%HOSTIP:%HTTPPORT/5350001
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /535 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /5350001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test537 b/tests/data/test537
index b8e22a5b3..ab718fd29 100644
--- a/tests/data/test537
+++ b/tests/data/test537
@@ -35,19 +35,19 @@ getrlimit
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib537
+lib%TESTNUMBER
 </tool>
 # precheck is a command line to run before the test, to see if we can execute
 # the test or not
 <precheck>
-./libtest/lib537 check
+./libtest/lib%TESTNUMBER check
 </precheck>
 
  <name>
 HTTP GET with a HUGE number of file descriptors open
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/537
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/537
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /537 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test538 b/tests/data/test538
index d2fecd353..ff53a8ed6 100644
--- a/tests/data/test538
+++ b/tests/data/test538
@@ -27,7 +27,7 @@ lib504
 FTP multi-interface download, failed login: PASS not valid
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/538
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test539 b/tests/data/test539
index a69834012..12f04e921 100644
--- a/tests/data/test539
+++ b/tests/data/test539
@@ -37,14 +37,14 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib539
+lib%TESTNUMBER
 </tool>
 
  <name>
 Two FTP fetches using different CURLOPT_FTP_FILEMETHOD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/to/the/file/539
+ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER
 </command>
 </client>
 
@@ -58,13 +58,13 @@ PWD
 CWD path/to/the/file
 EPSV
 TYPE I
-SIZE 539
-RETR 539
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 SYST
 CWD /
 EPSV
 TYPE A
-LIST path/to/the/file/539.
+LIST path/to/the/file/%TESTNUMBER.
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test54 b/tests/data/test54
index 3878d53dc..a9efc2929 100644
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -26,14 +26,14 @@ http
 HTTP with blank Location:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/54 -L
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/54 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test540 b/tests/data/test540
index 8f53b072c..3e240488e 100644
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -62,7 +62,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib540
+lib%TESTNUMBER
 </tool>
 <features>
 !SSPI
@@ -73,32 +73,32 @@ proxy
 HTTP proxy auth Digest multi API re-using connection
  </name>
  <command>
-http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://test.remote.example.com/path/540 HTTP/1.1
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: custom.set.host.name
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.example.com/path/540 HTTP/1.1
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: custom.set.host.name
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.example.com/path/540 HTTP/1.1
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: custom.set.host.name
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.example.com/path/540 HTTP/1.1
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: custom.set.host.name
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/%TESTNUMBER", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test541 b/tests/data/test541
index 622daa0f8..2dc75f8a4 100644
--- a/tests/data/test541
+++ b/tests/data/test541
@@ -16,16 +16,16 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib541
+lib%TESTNUMBER
 </tool>
 
  <name>
 FTP upload and upload same file again without rewind
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/541 log/upload541
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload541">
+<file name="log/upload%TESTNUMBER">
 Contents
 of
 a file
@@ -48,9 +48,9 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-STOR 541
+STOR %TESTNUMBER
 EPSV
-STOR 541
+STOR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test542 b/tests/data/test542
index 5afe12470..0d918fbcd 100644
--- a/tests/data/test542
+++ b/tests/data/test542
@@ -28,13 +28,13 @@ Accept-ranges: bytes
 ftp
 </server>
 <tool>
-lib542
+lib%TESTNUMBER
 </tool>
  <name>
 FTP a file with NOBODY yes and HEADER no
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/542
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 
 </client>
@@ -49,7 +49,7 @@ USER anonymous
 PASS ftp@example.com
 PWD
 TYPE I
-SIZE 542
+SIZE %TESTNUMBER
 REST 0
 QUIT
 </protocol>
diff --git a/tests/data/test543 b/tests/data/test543
index f7e687c46..2abaa6962 100644
--- a/tests/data/test543
+++ b/tests/data/test543
@@ -12,7 +12,7 @@ curl_easy_escape
 none
 </server>
 <tool>
-lib543
+lib%TESTNUMBER
 </tool>
  <name>
 curl_easy_escape
diff --git a/tests/data/test544 b/tests/data/test544
index 8eaef17f6..390489706 100644
--- a/tests/data/test544
+++ b/tests/data/test544
@@ -26,14 +26,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib544
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP POST text data using CURLOPT_COPYPOSTFIELDS
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/544
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/544
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /544 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 4
diff --git a/tests/data/test545 b/tests/data/test545
index 725e8e9df..a06b8ebb6 100644
--- a/tests/data/test545
+++ b/tests/data/test545
diff --git a/tests/data/test546 b/tests/data/test546
index 00dca99fa..6db456f16 100644
--- a/tests/data/test546
+++ b/tests/data/test546
@@ -38,7 +38,7 @@ lib533
 FTP RETR a non-existing file then a found one using the multi interface
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/546 ftp://%HOSTIP:%FTPPORT/path/546
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
@@ -51,11 +51,11 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 546
-RETR 546
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 EPSV
-SIZE 546
-RETR 546
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 <stdout>
diff --git a/tests/data/test547 b/tests/data/test547
index 5401e06c8..376ddbae9 100644
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -72,7 +72,7 @@ http
 </server>
 # tool to use
 <tool>
-lib547
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -91,7 +91,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/547 http://%HOSTIP:%HTTPPORT testuser:testpass
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -101,7 +101,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/547 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
@@ -109,7 +109,7 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/547 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
@@ -117,7 +117,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.example.com/path/547 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test548 b/tests/data/test548
index 3ce5ae1ea..3df4ec3ae 100644
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -72,7 +72,7 @@ http
 </server>
 # tool to use
 <tool>
-lib548
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -91,7 +91,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/548 http://%HOSTIP:%HTTPPORT testuser:testpass
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -101,7 +101,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/548 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
@@ -109,7 +109,7 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/548 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
@@ -117,7 +117,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.example.com/path/548 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test549 b/tests/data/test549
index 71a421328..9f6ade6fd 100644
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -35,14 +35,14 @@ ftp
 proxy
 </features>
 <tool>
-lib549
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE
  </name>
 # first URL then proxy
  <command>
-ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT 
+ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT 
 </command>
 </client>
 
@@ -50,7 +50,7 @@ ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://www.example.com/moo/549;type=i HTTP/1.1
+GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
 Host: www.example.com:21
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test55 b/tests/data/test55
index 8863700e2..8786d40b2 100644
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -9,7 +9,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK swsclose
-Location: 550002
+Location: %TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -23,7 +23,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK swsclose
-Location: 550002
+Location: %TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:50:00 GMT
 Connection: close
 
@@ -43,18 +43,18 @@ http
 HTTP follow redirect with single slash in path
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/55 -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /55 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /550002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test550 b/tests/data/test550
index 68f42de20..233546b6a 100644
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -42,7 +42,7 @@ FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
  </name>
 # first URL then proxy
  <command>
-ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
+ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>
 
@@ -50,7 +50,7 @@ ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://www.example.com/moo/550;type=a HTTP/1.1
+GET ftp://www.example.com/moo/%TESTNUMBER;type=a HTTP/1.1
 Host: www.example.com:21
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test551 b/tests/data/test551
index 30c0ed940..2a6b1f5d5 100644
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -69,14 +69,14 @@ proxy
 HTTP proxy auth Digest with POST data from read callback
  </name>
  <command>
-http://test.remote.example.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/551 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
@@ -84,9 +84,9 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/551 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
-Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/551", response="3325240726fbdaf1e61f3a0dd40b930c"
+Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/%TESTNUMBER", response="3325240726fbdaf1e61f3a0dd40b930c"
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test552 b/tests/data/test552
index 9ad37bd7e..15d531c16 100644
--- a/tests/data/test552
+++ b/tests/data/test552
@@ -51,7 +51,7 @@ http
 </server>
 # tool to use
 <tool>
-lib552
+lib%TESTNUMBER
 </tool>
 <features>
 !SSPI
@@ -62,23 +62,23 @@ proxy
 HTTP proxy auth Digest with 70K POST data from read callback
  </name>
  <command>
-http://test.remote.example.com/path/552 http://s1lly:pers0n@%HOSTIP:%HTTPPORT/
+http://test.remote.example.com/path/%TESTNUMBER http://s1lly:pers0n@%HOSTIP:%HTTPPORT/
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST http://test.remote.example.com/path/552 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 70000
 Content-Type: application/x-www-form-urlencoded
 
-%repeat[7000 x test data%00]%POST http://test.remote.example.com/path/552 HTTP/1.1
+%repeat[7000 x test data%00]%POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
-Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/552", response="be7aedc47d821b6d847c445ded782c43"
+Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/%TESTNUMBER", response="be7aedc47d821b6d847c445ded782c43"
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 70000
diff --git a/tests/data/test553 b/tests/data/test553
index 3ddb53295..f640ba4d0 100644
--- a/tests/data/test553
+++ b/tests/data/test553
@@ -27,7 +27,7 @@ http
 </server>
 # tool to use
 <tool>
-lib553
+lib%TESTNUMBER
 </tool>
 <features>
 </features>
@@ -35,14 +35,14 @@ lib553
 HTTP post with huge request headers and post data from callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/path/553
+http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /path/553 HTTP/1.1
+POST /path/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Header0: %repeat[5000 x A]%
diff --git a/tests/data/test554 b/tests/data/test554
index 2b6693a20..8488be60b 100644
--- a/tests/data/test554
+++ b/tests/data/test554
@@ -43,14 +43,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib554
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part formpost using read callback for the file part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/554
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -65,7 +65,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /554 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 744
@@ -96,7 +96,7 @@ Content-Type: text/plain
 
 blah blah
 --------------------------------
-POST /554 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 758
diff --git a/tests/data/test555 b/tests/data/test555
index 506cbb4a0..72eb81d4b 100644
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -77,7 +77,7 @@ http
 </server>
 # tool to use
 <tool>
-lib555
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -96,7 +96,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/555 http://%HOSTIP:%HTTPPORT testuser:testpass
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -106,7 +106,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST http://test.remote.example.com/path/555 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
@@ -114,7 +114,7 @@ Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.example.com/path/555 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
@@ -122,7 +122,7 @@ Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.example.com/path/555 HTTP/1.1
+POST http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test556 b/tests/data/test556
index 3ce0d7e23..6384084d4 100644
--- a/tests/data/test556
+++ b/tests/data/test556
@@ -25,7 +25,7 @@ Connection: close
 http
 </server>
 <tool>
-lib556
+lib%TESTNUMBER
 </tool>
  <name>
 send and recv HTTP
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /556 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: ninja
 
 </protocol>
diff --git a/tests/data/test557 b/tests/data/test557
index ad9350f6e..196377494 100644
--- a/tests/data/test557
+++ b/tests/data/test557
@@ -17,7 +17,7 @@ none
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib557
+lib%TESTNUMBER
 </tool>
 
 <name>
diff --git a/tests/data/test558 b/tests/data/test558
index d1ff65608..6df79887a 100644
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -21,7 +21,7 @@ ipv6
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib558
+lib%TESTNUMBER
 </tool>
 
 <name>
@@ -37,8 +37,8 @@ nothing
 <verify>
 <file name="log/memdump">
 MEM easy.c: malloc()
-MEM lib558.c: malloc()
-MEM lib558.c: free()
+MEM lib%TESTNUMBER.c: malloc()
+MEM lib%TESTNUMBER.c: free()
 MEM dynbuf.c: realloc()
 MEM dynbuf.c: realloc()
 MEM escape.c: free()
diff --git a/tests/data/test559 b/tests/data/test559
index 7e9f6a57d..878fe2bc8 100644
--- a/tests/data/test559
+++ b/tests/data/test559
@@ -31,14 +31,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib559
+lib%TESTNUMBER
 </tool>
 
 <name>
 use tiny CURLOPT_BUFFERSIZE
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/559
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test56 b/tests/data/test56
index ee21c9d21..b0701194d 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -38,14 +38,14 @@ header "Transfer-Encoding: chunked"
 #
  </stdin>
  <command>
--K - %HOSTIP:%HTTPPORT/that.site.com/56
+-K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /that.site.com/56 HTTP/1.1
+POST /that.site.com/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: %repeat[99999 x a]%
 Accept: */*
diff --git a/tests/data/test560 b/tests/data/test560
index 299883850..0f9befb54 100644
--- a/tests/data/test560
+++ b/tests/data/test560
@@ -30,13 +30,13 @@ SSL
 https
 </server>
 <tool>
-lib560
+lib%TESTNUMBER
 </tool>
  <name>
 simple HTTPS GET with multi interface
  </name>
  <command>
-https://%HOSTIP:%HTTPSPORT/560
+https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -44,7 +44,7 @@ https://%HOSTIP:%HTTPSPORT/560
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /560 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPSPORT
 Accept: */*
 
diff --git a/tests/data/test561 b/tests/data/test561
index bc5fb999f..a630185b4 100644
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -43,7 +43,7 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
  </name>
 # first URL then proxy
  <command>
-"ftp://www.example.com/moo/561;type=i" http://%HOSTIP:%HTTPPORT ascii
+"ftp://www.example.com/moo/%TESTNUMBER;type=i" http://%HOSTIP:%HTTPPORT ascii
 </command>
 </client>
 
@@ -51,7 +51,7 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://www.example.com/moo/561;type=i HTTP/1.1
+GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
 Host: www.example.com:21
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test562 b/tests/data/test562
index 35f4f53d7..f442a63e5 100644
--- a/tests/data/test562
+++ b/tests/data/test562
@@ -20,7 +20,7 @@ over FTP
 ftp
 </server>
 <tool>
-lib562
+lib%TESTNUMBER
 </tool>
  <name>
 FTP a type=A URL and CURLOPT_PORT set
@@ -29,7 +29,7 @@ FTP a type=A URL and CURLOPT_PORT set
 # note that we need quotes around the URL below to make sure the shell doesn't
 # treat the semicolon as a separator!
  <command>
-'ftp://%HOSTIP:23456/562;type=A' %FTPPORT
+'ftp://%HOSTIP:23456/%TESTNUMBER;type=A' %FTPPORT
 </command>
 
 </client>
@@ -45,7 +45,7 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE A
-RETR 562
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test563 b/tests/data/test563
index 290087b75..c19b9026a 100644
--- a/tests/data/test563
+++ b/tests/data/test563
@@ -41,7 +41,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 # note that we need quotes around the URL below to make sure the shell doesn't
 # treat the semicolon as a separator!
  <command>
-"ftp://%HOSTIP:23456/563;type=A" %FTPPORT
+"ftp://%HOSTIP:23456/%TESTNUMBER;type=A" %FTPPORT
 </command>
 
 </client>
@@ -49,7 +49,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%FTPPORT/563;type=A HTTP/1.1
+GET ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A HTTP/1.1
 Host: %HOSTIP:%FTPPORT
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test564 b/tests/data/test564
index 3078e2d08..3d866f283 100644
--- a/tests/data/test564
+++ b/tests/data/test564
@@ -30,13 +30,13 @@ ftp
 socks4
 </server>
 <tool>
-lib564
+lib%TESTNUMBER
 </tool>
  <name>
 FTP RETR a file over a SOCKS proxy using the multi interface
  </name>
 <command>
-ftp://%HOSTIP:%FTPPORT/path/564 %HOSTIP:%SOCKSPORT
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %HOSTIP:%SOCKSPORT
 </command>
 <features>
 proxy
@@ -52,8 +52,8 @@ PWD
 CWD path
 EPSV
 TYPE I
-SIZE 564
-RETR 564
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 <stdout>
diff --git a/tests/data/test565 b/tests/data/test565
index ae8518c76..37f70c932 100644
--- a/tests/data/test565
+++ b/tests/data/test565
@@ -63,14 +63,14 @@ crypto
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib565
+lib%TESTNUMBER
 </tool>
 
  <name>
 send HTTP POST using read callback, chunked transfer-encoding and Digest
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/565
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/565
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /565 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
@@ -86,9 +86,9 @@ Content-Type: application/x-www-form-urlencoded
 
 0
 
-POST /565 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/565", response="877424f750af047634dbd94f9933217b"
+Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="877424f750af047634dbd94f9933217b"
 Accept: */*
 Transfer-Encoding: chunked
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test566 b/tests/data/test566
index 6bf7f1400..14052fb31 100644
--- a/tests/data/test566
+++ b/tests/data/test566
@@ -30,25 +30,25 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib566
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP GET with CURLINFO_CONTENT_LENGTH_DOWNLOAD and 0 bytes transfer
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/566 log/ip566
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client> 
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip566">
+<file name="log/ip%TESTNUMBER">
 CL: 0
 </file>
 <protocol>
-GET /566 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test567 b/tests/data/test567
index 4f91c85f0..f6cdec42a 100644
--- a/tests/data/test567
+++ b/tests/data/test567
@@ -25,23 +25,23 @@ Curl-Private: swsclose
 rtsp
 </server>
 <tool>
-lib567
+lib%TESTNUMBER
 </tool>
 
 <name>
 simple RTSP OPTIONS command
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/567
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/567 RTSP/1.0
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
 CSeq: 1
-User-Agent: test567
-Test-Number: 567
+User-Agent: test%TESTNUMBER
+Test-Number: %TESTNUMBER
 
 </protocol>
 </verify>
diff --git a/tests/data/test568 b/tests/data/test568
index 372866dca..7dd23ca48 100644
--- a/tests/data/test568
+++ b/tests/data/test568
@@ -51,17 +51,17 @@ Informational: Empty Options Response
 rtsp
 </server>
 <tool>
-lib568
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP Announce (PUT and POST style) test
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/568
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 # file written before test command runs
-<file name="log/file568.txt">
+<file name="log/file%TESTNUMBER.txt">
 v=0
 o=mhandley 2890844526 2890845468 IN IP4 126.16.64.4
 s=SDP Seminar
@@ -81,7 +81,7 @@ m=video 2232 RTP/AVP 31
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/5680001 RTSP/1.0
+ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
 CSeq: 1
 Content-Length: 306
 Content-Type: application/sdp
@@ -97,17 +97,17 @@ t=2873397496 2873404696
 a=recvonly
 m=audio 3456 RTP/AVP 0
 m=video 2232 RTP/AVP 31
-DESCRIBE rtsp://%HOSTIP:%RTSPPORT/5680002 RTSP/1.0
+DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
 CSeq: 2
 Accept: application/sdp
 
-ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/5680003 RTSP/1.0
+ANNOUNCE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
 CSeq: 3
 Content-Type: posty goodness
 Content-Length: 35
 
 postyfield=postystuff&project=curl
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/5680004 RTSP/1.0
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
 CSeq: 4
 
 </protocol>
diff --git a/tests/data/test569 b/tests/data/test569
index 924832c11..043c2445d 100644
--- a/tests/data/test569
+++ b/tests/data/test569
@@ -59,14 +59,14 @@ CSeq: 6
 rtsp
 </server>
 <tool>
-lib569
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP Session ID parsing
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/569 log/idfile569.txt
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/idfile%TESTNUMBER.txt
 </command>
 </client>
 
@@ -75,32 +75,32 @@ rtsp://%HOSTIP:%RTSPPORT/569 log/idfile569.txt
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-SETUP rtsp://%HOSTIP:%RTSPPORT/5690001 RTSP/1.0
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
 CSeq: 1
 Transport: Fake/NotReal/JustATest;foo=baz
 
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/5690002 RTSP/1.0
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
 CSeq: 2
 Session: 00.+1-am-aSe55ion_id\$yes-i-am\$
 
-SETUP rtsp://%HOSTIP:%RTSPPORT/5690003 RTSP/1.0
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
 CSeq: 3
 Transport: Fake/NotReal/JustATest;foo=baz
 
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/5690004 RTSP/1.0
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
 CSeq: 4
 Session: \$extraspaces
 
-SETUP rtsp://%HOSTIP:%RTSPPORT/5690005 RTSP/1.0
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0
 CSeq: 5
 Transport: Fake/NotReal/JustATest;foo=baz
 
-TEARDOWN rtsp://%HOSTIP:%RTSPPORT/5690006 RTSP/1.0
+TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0006 RTSP/1.0
 CSeq: 6
 Session: A
 
 </protocol>
-<file name="log/idfile569.txt">
+<file name="log/idfile%TESTNUMBER.txt">
 Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$]
 Got Session ID: [\$extraspaces]
 Got Session ID: [A]
diff --git a/tests/data/test57 b/tests/data/test57
index 5011e6eb0..f379d7488 100644
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -26,7 +26,7 @@ http
 HTTP content-type with spaces in
  </name>
  <command>
--w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/57 -o log/out57
+-w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/out%TESTNUMBER
 </command>
 </client>
 
@@ -36,7 +36,7 @@ HTTP content-type with spaces in
 text/html; charset=ISO-8859-4
 </stdout>
 <protocol>
-GET /57 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test570 b/tests/data/test570
index 431c79afc..c1a034855 100644
--- a/tests/data/test570
+++ b/tests/data/test570
@@ -43,14 +43,14 @@ CSeq: 1000
 rtsp
 </server>
 <tool>
-lib570
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP CSeq and Session Mismatch checks
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/570
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -59,14 +59,14 @@ rtsp://%HOSTIP:%RTSPPORT/570
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/5700001 RTSP/1.0
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
 CSeq: 1
 
-SETUP rtsp://%HOSTIP:%RTSPPORT/5700002 RTSP/1.0
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
 CSeq: 999
 Transport: RAW/RAW/UDP;unicast;client_port=3056-3057
 
-PLAY rtsp://%HOSTIP:%RTSPPORT/5700003 RTSP/1.0
+PLAY rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
 CSeq: 1000
 Session: asdf
 
diff --git a/tests/data/test571 b/tests/data/test571
index 842410ad6..3cc1b98b5 100644
--- a/tests/data/test571
+++ b/tests/data/test571
@@ -71,14 +71,14 @@ rtp: part 4 channel 1 size 24
 rtsp
 </server>
 <tool>
-lib571
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP RTP Interleaving Test
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/571 log/protofile571.txt
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/protofile%TESTNUMBER.txt
 </command>
 </client>
 
@@ -99,7 +99,7 @@ RTP: message size 85, channel 0
 RTP: message size 24, channel 1
 </stdout>
 
-<file name="log/protofile571.txt">
+<file name="log/protofile%TESTNUMBER.txt">
 $99
 </file>
 </verify>
diff --git a/tests/data/test572 b/tests/data/test572
index 7f044478d..0a470559b 100644
--- a/tests/data/test572
+++ b/tests/data/test572
@@ -66,17 +66,17 @@ Informational: Empty Options Response
 rtsp
 </server>
 <tool>
-lib572
+lib%TESTNUMBER
 </tool>
 
 <name>
 RTSP GET_PARAMETER (Put/Heartbeat/Post)
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/572
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 # file written before test command runs
-<file name="log/file572.txt">
+<file name="log/file%TESTNUMBER.txt">
 scale
 speed
 </file>
@@ -87,11 +87,11 @@ speed
 ^If-Modified-Since:.*
 </strip>
 <protocol>
-SETUP rtsp://%HOSTIP:%RTSPPORT/5720001 RTSP/1.0
+SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
 CSeq: 1
 Transport: Planes/Trains/Automobiles
 
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/5720002 RTSP/1.0
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
 CSeq: 2
 Session: getparams-test
 Content-Length: 12
@@ -99,11 +99,11 @@ Content-Type: text/parameters
 
 scale
 speed
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/5720003 RTSP/1.0
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
 CSeq: 3
 Session: getparams-test
 
-GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/5720004 RTSP/1.0
+GET_PARAMETER rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
 CSeq: 4
 Session: getparams-test
 Content-Length: 24
@@ -111,7 +111,7 @@ Content-Type: text/parameters
 
 packets_received
 jitter
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/5720005 RTSP/1.0
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0
 CSeq: 5
 Session: getparams-test
 
diff --git a/tests/data/test573 b/tests/data/test573
index fb9c859f7..cab270bb6 100644
--- a/tests/data/test573
+++ b/tests/data/test573
@@ -32,21 +32,21 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib573
+lib%TESTNUMBER
 </tool>
 
  <name>
 verify connect time with multi interface
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/573
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /573 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test574 b/tests/data/test574
index cb41f03ec..436e1828b 100644
--- a/tests/data/test574
+++ b/tests/data/test574
@@ -22,7 +22,7 @@ ftplistparser
 ftp
 </server>
 <tool>
-lib574
+lib%TESTNUMBER
 </tool>
 <name>
 FTP wildcard download - changed fnmatch, 2x perform (Unix LIST response)
diff --git a/tests/data/test575 b/tests/data/test575
index 813383456..e84a39f05 100644
--- a/tests/data/test575
+++ b/tests/data/test575
@@ -21,7 +21,7 @@ ftplistparser
 ftp
 </server>
 <tool>
-lib575
+lib%TESTNUMBER
 </tool>
  <name>
 FTP wildcard download - dup_handle and multi interface
diff --git a/tests/data/test576 b/tests/data/test576
index 74a3aedd1..2a1b9419c 100644
--- a/tests/data/test576
+++ b/tests/data/test576
@@ -19,7 +19,7 @@ ftplistparser
 ftp
 </server>
 <tool>
-lib576
+lib%TESTNUMBER
 </tool>
  <name>
 FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (Unix)
diff --git a/tests/data/test577 b/tests/data/test577
index 525549264..d880f282d 100644
--- a/tests/data/test577
+++ b/tests/data/test577
@@ -34,13 +34,13 @@ lib567
 Funny RTSP version in response
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/577
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-OPTIONS rtsp://%HOSTIP:%RTSPPORT/577 RTSP/1.0
+OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
 CSeq: 1
 User-Agent: test567
 Test-Number: 567
diff --git a/tests/data/test578 b/tests/data/test578
index 7c2e205c4..2ff8a1f1b 100644
--- a/tests/data/test578
+++ b/tests/data/test578
@@ -31,21 +31,21 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib578
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP POST lower than MAX_INITIAL_POST_SIZE with progress callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/578 log/ip578
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip578">
+<file name="log/ip%TESTNUMBER">
 PASSED, UL data matched data size
 </file>
 </verify>
diff --git a/tests/data/test579 b/tests/data/test579
index e352e3d60..e4b072bc2 100644
--- a/tests/data/test579
+++ b/tests/data/test579
@@ -61,21 +61,21 @@ crypto
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib579
+lib%TESTNUMBER
 </tool>
 
  <name>
 small chunked HTTP POSTs with digest auth. and progress callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/579 log/ip579
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip579">
+<file name="log/ip%TESTNUMBER">
 Progress callback called with UL 0 out of 0
 Progress callback called with UL 8 out of 0
 Progress callback called with UL 16 out of 0
diff --git a/tests/data/test58 b/tests/data/test58
index 0ca34b117..01d7189a8 100644
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -26,9 +26,9 @@ http
 HTTP PUT from file with weird letters
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/ -T log/58te[]st.txt -g
+http://%HOSTIP:%HTTPPORT/we/want/ -T log/%TESTNUMBERte[]st.txt -g
 </command>
-<file name="log/58te[]st.txt">
+<file name="log/%TESTNUMBERte[]st.txt">
 a few bytes
 </file>
 </client>
@@ -36,7 +36,7 @@ a few bytes
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /we/want/58te%5B%5Dst.txt HTTP/1.1
+PUT /we/want/%TESTNUMBERte%5B%5Dst.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test580 b/tests/data/test580
index a3811a2f3..c19a52a30 100644
--- a/tests/data/test580
+++ b/tests/data/test580
@@ -39,14 +39,14 @@ lib507
 multi interface, multiple Location: headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/580
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /580 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test581 b/tests/data/test581
index bcfb6dce9..50b99e391 100644
--- a/tests/data/test581
+++ b/tests/data/test581
@@ -39,14 +39,14 @@ lib507
 multi interface, multiple Content-Type: headers
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/581
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /581 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test582 b/tests/data/test582
index 8ac6bc86a..ddf17e3e3 100644
--- a/tests/data/test582
+++ b/tests/data/test582
@@ -18,15 +18,15 @@ multi
 sftp
 </server>
 <tool>
-lib582
+lib%TESTNUMBER
 </tool>
  <name>
 SFTP upload using multi interface
  </name>
  <command>
-Sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload582.txt %PWD/log/file582.txt %USER:
+Sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload%TESTNUMBER.txt %PWD/log/file%TESTNUMBER.txt %USER:
 </command>
-<file name="log/file582.txt">
+<file name="log/file%TESTNUMBER.txt">
 Moooooooooooo
  upload this
 </file>
@@ -41,7 +41,7 @@ disable
 </strip>
 <protocol>
 </protocol>
-<file name="log/file582.txt">
+<file name="log/file%TESTNUMBER.txt">
 Moooooooooooo
  upload this
 </file>
diff --git a/tests/data/test583 b/tests/data/test583
index e7d95960b..029cdac32 100644
--- a/tests/data/test583
+++ b/tests/data/test583
@@ -18,7 +18,7 @@ multi
 sftp
 </server>
 <tool>
-lib583
+lib%TESTNUMBER
 </tool>
  <name>
 SFTP with multi interface, remove handle early
@@ -29,7 +29,7 @@ SFTP with multi interface, remove handle early
 # name resolve will cause it to return rather quickly and thus we could trigger
 # the problem we're looking to verify.
  <command>
-sftp://localhost:%SSHPORT%SSH_PWD/log/upload583.txt %USER:
+sftp://localhost:%SSHPORT%SSH_PWD/log/upload%TESTNUMBER.txt %USER:
 </command>
 </client>
 
diff --git a/tests/data/test584 b/tests/data/test584
index 680856137..fb234440b 100644
--- a/tests/data/test584
+++ b/tests/data/test584
@@ -41,14 +41,14 @@ http
 </server>
 # tool to invoke
 <tool>
-lib584
+lib%TESTNUMBER
 </tool>
 
  <name>
 CURLOPT_MIMEPOST first set then set to NULL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/584
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -60,7 +60,7 @@ s/^--------------------------[a-z0-9]*/--------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=------------------------/
 </strippart>
 <protocol>
-POST /584 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 144
@@ -71,7 +71,7 @@ Content-Disposition: form-data; name="fake"
 
 party
 ----------------------------
-POST /584 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
diff --git a/tests/data/test585 b/tests/data/test585
index 64f5567d4..213edef2c 100644
--- a/tests/data/test585
+++ b/tests/data/test585
@@ -43,21 +43,21 @@ http
 </features>
 # tool is what to use instead of 'curl'
 <tool>
-lib585
+lib%TESTNUMBER
 </tool>
 
  <name>
 socket open/close callbacks
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/585
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /585 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test586 b/tests/data/test586
index c0857bdd8..18d614b5d 100644
--- a/tests/data/test586
+++ b/tests/data/test586
@@ -38,7 +38,7 @@ lib585
 FTP and open/close socket callbacks
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/586
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -51,8 +51,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 586
-RETR 586
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test587 b/tests/data/test587
index 0d9530e93..a40e4bf80 100644
--- a/tests/data/test587
+++ b/tests/data/test587
@@ -21,14 +21,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib587
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part formpost with aborted read callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/587
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -40,7 +40,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /587 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 744
diff --git a/tests/data/test588 b/tests/data/test588
index b30828c14..1eb262f5c 100644
--- a/tests/data/test588
+++ b/tests/data/test588
@@ -35,9 +35,9 @@ lib525
 FTP PORT upload using multi interface, EPRT doesn't work
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/588 log/upload588
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
 </command>
-<file name="log/upload588">
+<file name="log/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>
@@ -58,7 +58,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I
-STOR 588
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <upload>
diff --git a/tests/data/test589 b/tests/data/test589
index 3111070e3..02fe54315 100644
--- a/tests/data/test589
+++ b/tests/data/test589
@@ -27,14 +27,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib589
+lib%TESTNUMBER
 </tool>
 
  <name>
 make a HTTP MIME POST set to NULL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/589
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/589
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-POST /589 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
diff --git a/tests/data/test59 b/tests/data/test59
index 4056e5234..809e4723d 100644
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -27,7 +27,7 @@ http
 HTTP URL with slash but with "parameter"
  </name>
  <command>
-"http://%HOSTIP:%HTTPPORT?mooo/59"
+"http://%HOSTIP:%HTTPPORT?mooo/%TESTNUMBER"
 </command>
 </client>
 
@@ -35,7 +35,7 @@ HTTP URL with slash but with "parameter"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /?mooo/59 HTTP/1.1
+GET /?mooo/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test590 b/tests/data/test590
index cb24cbb56..94516da4b 100644
--- a/tests/data/test590
+++ b/tests/data/test590
@@ -70,7 +70,7 @@ http
 </server>
 # tool to use
 <tool>
-lib590
+lib%TESTNUMBER
 </tool>
 <features>
 NTLM
@@ -89,7 +89,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://test.remote.example.com/path/590 http://%HOSTIP:%HTTPPORT
+http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT
 </command>
 <precheck>
 chkhostname curlhost
@@ -100,18 +100,18 @@ chkhostname curlhost
 <verify>
 
 <protocol>
-GET http://test.remote.example.com/path/590 HTTP/1.1
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.example.com/path/590 HTTP/1.1
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://test.remote.example.com/path/590 HTTP/1.1
+GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
 Host: test.remote.example.com
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAAIAAgAcgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAIWYOdZV0iKA8ytf+dU+Bz9TpMJ4mBKu221lY3VybGhvc3Q=
 Accept: */*
diff --git a/tests/data/test591 b/tests/data/test591
index e1dfcd374..843ddb397 100644
--- a/tests/data/test591
+++ b/tests/data/test591
@@ -1,7 +1,7 @@
 <testcase>
 #
 # For this test the server rejects the EPRT command,
-# code in lib591 makes use of curl_multi_timeout()
+# code in lib%TESTNUMBER makes use of curl_multi_timeout()
 # and server does not establish data connection.
 #
 <info>
@@ -31,16 +31,16 @@ REPLY EPRT 500 we don't like EPRT now
 ftp
 </server>
 <tool>
-lib591
+lib%TESTNUMBER
 </tool>
  <name>
 FTP multi PORT and 425 on upload
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/591 %FTPTIME2 log/upload591
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload591">
-Moooooooooooo for 591
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -60,7 +60,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I
-STOR 591
+STOR %TESTNUMBER
 QUIT
 </protocol>
 # CURLE_FTP_ACCEPT_FAILED = 10
diff --git a/tests/data/test592 b/tests/data/test592
index 6151ccc43..fc9f15d1d 100644
--- a/tests/data/test592
+++ b/tests/data/test592
@@ -37,10 +37,10 @@ lib591
 FTP multi PORT and 421 on upload
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/592 %FTPTIME2 log/upload592
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload592">
-Moooooooooooo for 592
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -61,7 +61,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I
-STOR 592
+STOR %TESTNUMBER
 QUIT
 </protocol>
 # CURLE_FTP_ACCEPT_FAILED = 10
diff --git a/tests/data/test593 b/tests/data/test593
index a136000be..47c1d9434 100644
--- a/tests/data/test593
+++ b/tests/data/test593
@@ -37,10 +37,10 @@ lib591
 FTP multi PORT upload, no data conn and no transient neg. reply
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/593 %FTPTIME2 log/upload593
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload593">
-Moooooooooooo for 593
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -60,7 +60,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I
-STOR 593
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <errorcode>
diff --git a/tests/data/test594 b/tests/data/test594
index d6144ae6b..5a4645092 100644
--- a/tests/data/test594
+++ b/tests/data/test594
@@ -37,10 +37,10 @@ lib591
 FTP multi PORT upload, no data conn and no positive prelim. reply
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/594 %FTPTIME2 log/upload594
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
 </command>
-<file name="log/upload594">
-Moooooooooooo for 594
+<file name="log/upload%TESTNUMBER">
+Moooooooooooo for %TESTNUMBER
  upload this
 </file>
 </client>
@@ -60,7 +60,7 @@ CWD path
 EPRT |1|
 PORT
 TYPE I
-STOR 594
+STOR %TESTNUMBER
 QUIT
 </protocol>
 <errorcode>
diff --git a/tests/data/test595 b/tests/data/test595
index 0099a857c..4d2f62b6d 100644
--- a/tests/data/test595
+++ b/tests/data/test595
@@ -36,7 +36,7 @@ lib585
 verify close callbacks with passive FTP
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/595 log/ip595
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
@@ -49,8 +49,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 595
-RETR 595
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test596 b/tests/data/test596
index 9377289dc..64bd52b57 100644
--- a/tests/data/test596
+++ b/tests/data/test596
@@ -36,7 +36,7 @@ lib585
 verify close callbacks with active FTP
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/596 log/ip596 activeftp
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER activeftp
 </command>
 </client>
 
@@ -52,8 +52,8 @@ PASS ftp@example.com
 PWD
 EPRT |1|
 TYPE I
-SIZE 596
-RETR 596
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test597 b/tests/data/test597
index 3eb9ed8b8..6ab578877 100644
--- a/tests/data/test597
+++ b/tests/data/test597
@@ -12,7 +12,7 @@ CONNECT_ONLY
 ftp
 </server>
 <tool>
-lib597
+lib%TESTNUMBER
 </tool>
  <name>
 FTP connect only option
diff --git a/tests/data/test598 b/tests/data/test598
index 3082a8cf5..5e52315eb 100644
--- a/tests/data/test598
+++ b/tests/data/test598
@@ -49,14 +49,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib598
+lib%TESTNUMBER
 </tool>
 
  <name>
 curl_easy_reset with referer and other strings set
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/598
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -64,14 +64,14 @@ http://%HOSTIP:%HTTPPORT/598
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /598 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: the-moo agent next generation
 Accept: */*
 Referer: http://example.com/the-moo
 Cookie: name=moo
 
-GET /598 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test599 b/tests/data/test599
index 9e7083cfb..269b8c663 100644
--- a/tests/data/test599
+++ b/tests/data/test599
@@ -13,7 +13,7 @@ chunked Transfer-Encoding
 HTTP/1.1 302 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: 5990001
+Location: %TESTNUMBER0001
 Content-Length: 6
 Connection: close
 Content-Type: text/html
@@ -39,7 +39,7 @@ this data is slightly larger than the first piece
 HTTP/1.1 302 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
-Location: 5990001
+Location: %TESTNUMBER0001
 Content-Length: 6
 Connection: close
 Content-Type: text/html
@@ -63,7 +63,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib599
+lib%TESTNUMBER
 </tool>
 
 # Bug 3510057 pointed out that when following a location to a larger chunked
@@ -72,14 +72,14 @@ lib599
 HTTP GET with progress callback and redirects changing content sizes
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/599 log/ip599
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip599">
+<file name="log/ip%TESTNUMBER">
 CL: -1
 </file>
 </verify>
diff --git a/tests/data/test6 b/tests/data/test6
index bbd67cbf8..d8231cbdb 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -29,14 +29,14 @@ http
 HTTP with simple cookie send
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2" -b name3=content3
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -b "name=contents;name2=content2" -b name3=content3
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/that/page/6 HTTP/1.1
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test60 b/tests/data/test60
index 4c9db5109..d23918ba8 100644
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -28,7 +28,7 @@ http
 HTTP PUT from stdin with wrong content-length
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/bzz/60 -T - -H "Content-Length: 1"
+http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -H "Content-Length: 1"
 </command>
 <stdin>
 more than one byte
@@ -38,7 +38,7 @@ more than one byte
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /bzz/60 HTTP/1.1
+PUT /bzz/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test600 b/tests/data/test600
index f9415e0e0..88a6055c3 100644
--- a/tests/data/test600
+++ b/tests/data/test600
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file600.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file600.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test601 b/tests/data/test601
index c89b64535..cadeeafe0 100644
--- a/tests/data/test601
+++ b/tests/data/test601
@@ -24,9 +24,9 @@ scp
 SCP retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file601.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file601.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test602 b/tests/data/test602
index dd300c74d..56d2747f2 100644
--- a/tests/data/test602
+++ b/tests/data/test602
@@ -21,9 +21,9 @@ sftp
 SFTP put
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file602.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.602 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER --insecure
 </command>
-<file name="log/file602.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
diff --git a/tests/data/test603 b/tests/data/test603
index b96c4057f..b873f1587 100644
--- a/tests/data/test603
+++ b/tests/data/test603
@@ -21,9 +21,9 @@ scp
 SCP upload
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file603.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.603 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER --insecure
 </command>
-<file name="log/file603.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
diff --git a/tests/data/test608 b/tests/data/test608
index b4d010556..f919e9c73 100644
--- a/tests/data/test608
+++ b/tests/data/test608
@@ -24,14 +24,14 @@ sftp
 SFTP post-quote rename
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file608.txt %PWD/log/file608-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file608.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file%TESTNUMBER.txt %PWD/log/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 # Verify that the file was renamed properly, then rename the file back to what
 # it was so the verify section works and the file can be cleaned up.
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/file608.txt move %PWD/log/file608-renamed.txt %PWD/log/file608.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/log/file%TESTNUMBER.txt move %PWD/log/file%TESTNUMBER-renamed.txt %PWD/log/file%TESTNUMBER.txt
 </postcheck>
-<file name="log/file608.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 </client>
@@ -39,7 +39,7 @@ Test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/file608.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 <valgrind>
diff --git a/tests/data/test609 b/tests/data/test609
index 5aa9eecfc..66057d255 100644
--- a/tests/data/test609
+++ b/tests/data/test609
@@ -25,9 +25,9 @@ sftp
 SFTP post-quote mkdir failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file609.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file609.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file609.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for mkdir test
 </file>
 </client>
diff --git a/tests/data/test61 b/tests/data/test61
index 20a0f898b..6d98ba770 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -45,20 +45,20 @@ HTTP with various cookies and custom Host:
 TZ=GMT
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: www.host.foo.com"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/61 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: www.host.foo.com
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/jar61.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test610 b/tests/data/test610
index d09742151..d9eb2e6be 100644
--- a/tests/data/test610
+++ b/tests/data/test610
@@ -21,18 +21,18 @@ Dummy test file for rmdir test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test610.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rmdir
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/log/test610.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file610.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/log/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test610.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file610.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rmdir test
 </file>
 </client>
diff --git a/tests/data/test611 b/tests/data/test611
index 6362002e3..ee2a185b1 100644
--- a/tests/data/test611
+++ b/tests/data/test611
@@ -21,18 +21,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test611.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/test611.dir %PWD/log/test611.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file611.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/test%TESTNUMBER.dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test611.new
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new
 </postcheck>
-<file name="log/file611.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>
diff --git a/tests/data/test612 b/tests/data/test612
index ae18afbc1..1d6fadec8 100644
--- a/tests/data/test612
+++ b/tests/data/test612
@@ -24,12 +24,12 @@ sftp
 SFTP post-quote remove file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file612.txt -Q "-rm %PWD/log/file612.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.612  --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt -Q "-rm %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER  --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test612.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt
 </postcheck>
-<file name="log/file612.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
 </client>
diff --git a/tests/data/test613 b/tests/data/test613
index 0383987e5..d02e3bbec 100644
--- a/tests/data/test613
+++ b/tests/data/test613
@@ -23,16 +23,16 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test613.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP directory retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test613.dir/ --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/ --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test613.dir %PWD/log/curl613.out
+perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/log/test%TESTNUMBER.dir %PWD/log/curl%TESTNUMBER.out
 </postcheck>
 </client>
 
diff --git a/tests/data/test614 b/tests/data/test614
index c6fe4919d..c0af2630a 100644
--- a/tests/data/test614
+++ b/tests/data/test614
@@ -24,16 +24,16 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test614.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP pre-quote chmod
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/log/test614.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test614.dir/ --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/log/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/ --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test614.dir %PWD/log/curl614.out
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir %PWD/log/curl%TESTNUMBER.out
 </postcheck>
 </client>
 
diff --git a/tests/data/test615 b/tests/data/test615
index 5f4859c2f..09a825b03 100644
--- a/tests/data/test615
+++ b/tests/data/test615
@@ -14,18 +14,18 @@ FAILURE
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test615.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP put remote failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file615.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test615.dir/rofile.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/rofile.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test615.dir
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file615.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
diff --git a/tests/data/test616 b/tests/data/test616
index 14c3d3376..ec03c31ba 100644
--- a/tests/data/test616
+++ b/tests/data/test616
@@ -23,9 +23,9 @@ sftp
 SFTP retrieval of empty file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file616.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file616.txt">
+<file name="log/file%TESTNUMBER.txt">
 </file>
 </client>
 
diff --git a/tests/data/test617 b/tests/data/test617
index 67f0c9a16..3c067e399 100644
--- a/tests/data/test617
+++ b/tests/data/test617
@@ -23,9 +23,9 @@ scp
 SCP retrieval of empty file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file617.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file617.txt">
+<file name="log/file%TESTNUMBER.txt">
 </file>
 </client>
 
diff --git a/tests/data/test618 b/tests/data/test618
index feb095ebe..f5e2c7b33 100644
--- a/tests/data/test618
+++ b/tests/data/test618
@@ -15,9 +15,9 @@ sftp
 SFTP retrieval of two files
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file618.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file618.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file618.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test619 b/tests/data/test619
index 6c1273c04..0f86d8a54 100644
--- a/tests/data/test619
+++ b/tests/data/test619
@@ -15,9 +15,9 @@ scp
 SCP retrieval of two files
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file619.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file619.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file619.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test62 b/tests/data/test62
index 6bc793f13..92396d9f6 100644
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -29,9 +29,9 @@ http
 HTTP, send cookies when using custom Host:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/62 http://%HOSTIP:%HTTPPORT/we/want/62?hoge=fuga -b log/jar62.txt -H "Host: www.host.foo.com"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?hoge=fuga -b log/jar%TESTNUMBER.txt -H "Host: www.host.foo.com"
 </command>
-<file name="log/jar62.txt">
+<file name="log/jar%TESTNUMBER.txt">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/we/want/62 http://%HOSTIP:%HTTPPORT/we/want/62?hoge=fug
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/62 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: www.host.foo.com
 User-Agent: curl/%VERSION
 Accept: */*
 Cookie: test2=yes; test=yes
 
-GET /we/want/62?hoge=fuga HTTP/1.1
+GET /we/want/%TESTNUMBER?hoge=fuga HTTP/1.1
 Host: www.host.foo.com
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test620 b/tests/data/test620
index 463825513..fea44acf3 100644
--- a/tests/data/test620
+++ b/tests/data/test620
@@ -16,9 +16,9 @@ sftp
 SFTP retrieval of missing file followed by good file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file620.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file620.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test621 b/tests/data/test621
index f0ac9b728..368baf6a0 100644
--- a/tests/data/test621
+++ b/tests/data/test621
@@ -16,9 +16,9 @@ scp
 SCP retrieval of missing file followed by good file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file621.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file621.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test622 b/tests/data/test622
index 7b5fd5b2e..c4f8508d3 100644
--- a/tests/data/test622
+++ b/tests/data/test622
@@ -22,9 +22,9 @@ sftp
 SFTP put failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file622.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
 </command>
-<file name="log/file622.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
diff --git a/tests/data/test623 b/tests/data/test623
index e2914c9d0..d1afb405f 100644
--- a/tests/data/test623
+++ b/tests/data/test623
@@ -22,9 +22,9 @@ scp
 SCP upload failure
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file623.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure
 </command>
-<file name="log/file623.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
diff --git a/tests/data/test624 b/tests/data/test624
index 8aaf527e5..8daa93530 100644
--- a/tests/data/test624
+++ b/tests/data/test624
@@ -22,12 +22,12 @@ sftp
 SFTP put with --ftp-create-dirs
  </name>
  <command>
---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file624.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test624.dir/upload.624 --insecure
+--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl move %PWD/log/test624.dir/upload.624 %PWD/log/upload.624 rmdir %PWD/log/test624.dir
+perl %SRCDIR/libtest/test610.pl move %PWD/log/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/log/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file624.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
diff --git a/tests/data/test625 b/tests/data/test625
index 1fe9b55c0..e6f0d77f0 100644
--- a/tests/data/test625
+++ b/tests/data/test625
@@ -22,12 +22,12 @@ sftp
 SFTP put with --ftp-create-dirs twice
  </name>
  <command>
---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file625.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test625.a/upload.625 -T log/file625.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test625.b/upload.625 --insecure
+--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.a/upload.%TESTNUMBER -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl move %PWD/log/test625.a/upload.625 %PWD/log/upload.625 rmdir %PWD/log/test625.a rm %PWD/log/test625.b/upload.625 rmdir %PWD/log/test625.b
+perl %SRCDIR/libtest/test610.pl move %PWD/log/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/log/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.a rm %PWD/log/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.b
 </postcheck>
-<file name="log/file625.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>
diff --git a/tests/data/test626 b/tests/data/test626
index edf2aa520..0580f535b 100644
--- a/tests/data/test626
+++ b/tests/data/test626
@@ -22,9 +22,9 @@ sftp
 SFTP invalid quote command
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file626.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file626.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 </client>
diff --git a/tests/data/test627 b/tests/data/test627
index 01c5221ac..60b830e92 100644
--- a/tests/data/test627
+++ b/tests/data/test627
@@ -24,12 +24,12 @@ sftp
 SFTP quote remove file with NOBODY
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -I -Q "rm %PWD/log/file627.txt" sftp://%HOSTIP:%SSHPORT --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -I -Q "rm %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test627.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt
 </postcheck>
-<file name="log/file627.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
 </client>
diff --git a/tests/data/test63 b/tests/data/test63
index 4270da700..bf8ebfcf8 100644
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -31,7 +31,7 @@ HTTP with proxy authorization set in environment
 http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
 </setenv>
  <command>
-http://we.want.that.site.com/63
+http://we.want.that.site.com/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -41,7 +41,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://we.want.that.site.com/63 HTTP/1.1
+GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
 Host: we.want.that.site.com
 Proxy-Authorization: Basic ZmFrZTp1c2Vy
 User-Agent: curl/%VERSION
diff --git a/tests/data/test633 b/tests/data/test633
index 913d981f5..f9ad869f1 100644
--- a/tests/data/test633
+++ b/tests/data/test633
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval with byte range
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file633.txt -r 5-9 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5-9 --insecure
 </command>
-<file name="log/file633.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test634 b/tests/data/test634
index fc250f9c9..9cf9320fe 100644
--- a/tests/data/test634
+++ b/tests/data/test634
@@ -25,9 +25,9 @@ sftp
 SFTP retrieval with byte range past end of file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file634.txt -r 5-99 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5-99 --insecure
 </command>
-<file name="log/file634.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test635 b/tests/data/test635
index 16ef66c0f..5974ee8d3 100644
--- a/tests/data/test635
+++ b/tests/data/test635
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval with byte range relative to end of file
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file635.txt -r -9 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r -9 --insecure
 </command>
-<file name="log/file635.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test636 b/tests/data/test636
index 0ea350904..6bce35b90 100644
--- a/tests/data/test636
+++ b/tests/data/test636
@@ -25,9 +25,9 @@ sftp
 SFTP retrieval with X- byte range
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file636.txt -r 5- --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5- --insecure
 </command>
-<file name="log/file636.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test637 b/tests/data/test637
index 71b81268b..542506749 100644
--- a/tests/data/test637
+++ b/tests/data/test637
@@ -23,9 +23,9 @@ sftp
 SFTP retrieval with invalid X- range
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file637.txt -r 99- --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 99- --insecure
 </command>
-<file name="log/file637.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test638 b/tests/data/test638
index fdc140c6f..85d59096f 100644
--- a/tests/data/test638
+++ b/tests/data/test638
@@ -23,18 +23,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test638.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename * asterisk accept-fail
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test638.dir %PWD/log/test638.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file638.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test%TESTNUMBER.dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test638.new
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new
 </postcheck>
-<file name="log/file638.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>
diff --git a/tests/data/test639 b/tests/data/test639
index d80c8c14c..e63cdf61f 100644
--- a/tests/data/test639
+++ b/tests/data/test639
@@ -23,18 +23,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test639.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename * asterisk accept-fail
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test639-not-exists-dir %PWD/log/test639.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file639.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test%TESTNUMBER-not-exists-dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test639.dir
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file639.txt">
+<file name="log/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>
diff --git a/tests/data/test64 b/tests/data/test64
index 1e7a96eed..8067f1a85 100644
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /64 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /64 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="c55f7f30d83d774a3d2dcacf725abaca"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test640 b/tests/data/test640
index 9d1ade4c0..2046dabd8 100644
--- a/tests/data/test640
+++ b/tests/data/test640
@@ -23,9 +23,9 @@ sftp
 SFTP --head retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file640.txt --insecure --head
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure --head
 </command>
-<file name="log/file640.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test641 b/tests/data/test641
index 9f168aaef..df1788a0b 100644
--- a/tests/data/test641
+++ b/tests/data/test641
@@ -23,9 +23,9 @@ scp
 SCP --head retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file641.txt --insecure --head
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure --head
 </command>
-<file name="log/file641.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test642 b/tests/data/test642
index 6ae52bb82..4fa5282c9 100644
--- a/tests/data/test642
+++ b/tests/data/test642
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval
  </name>
  <command>
---key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file642.txt --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure
 </command>
-<file name="log/file642.txt">
+<file name="log/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>
diff --git a/tests/data/test643 b/tests/data/test643
index 5778fbffb..65bb99059 100644
--- a/tests/data/test643
+++ b/tests/data/test643
@@ -44,14 +44,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib643
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part mimepost using read callback for the file part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/643
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -66,7 +66,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /643 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 640
@@ -96,7 +96,7 @@ Content-Type: text/plain
 
 blah blah
 --------------------------------
-POST /643 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 654
diff --git a/tests/data/test644 b/tests/data/test644
index 99337ae0f..3a3b1c1ce 100644
--- a/tests/data/test644
+++ b/tests/data/test644
@@ -22,14 +22,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib644
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part formpost with aborted read callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/644
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -41,7 +41,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /644 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 640
diff --git a/tests/data/test645 b/tests/data/test645
index 8e8a209a5..10b6bef16 100644
--- a/tests/data/test645
+++ b/tests/data/test645
@@ -44,14 +44,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib645
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP multi-part chunked mimepost using read callback for the file part
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/645
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -66,7 +66,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /645 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
@@ -127,7 +127,7 @@ blah blah
 
 0
 
-POST /645 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
diff --git a/tests/data/test646 b/tests/data/test646
index a53c34090..4c4297c92 100644
--- a/tests/data/test646
+++ b/tests/data/test646
@@ -27,14 +27,14 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/646 --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@log/headers646" -F "=)" -F "=@log/test646.txt;headers=<log/headers646" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@log/headers%TESTNUMBER" -F "=)" -F "=@log/test%TESTNUMBER.txt;headers=<log/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>"
 </command>
-<file1 name="log/test646.txt">
+<file1 name="log/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data.
 </file1>
-<file2 name="log/headers646">
+<file2 name="log/headers%TESTNUMBER">
 # This line is a comment
 X-fileheader1: This is a header from a file 
 
@@ -52,7 +52,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 646
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
@@ -83,7 +83,7 @@ This is the plain text version
 --------------------------------
 
 ------------------------------
-Content-Disposition: attachment; filename="test646.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 X-fileheader1: This is a header from a file
 X-fileheader2: This is #a folded header
 
diff --git a/tests/data/test647 b/tests/data/test647
index de2b467fc..a609ad97d 100644
--- a/tests/data/test647
+++ b/tests/data/test647
@@ -22,9 +22,9 @@ imap
 IMAP APPEND multipart using mime API
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/647 -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@log/test647.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@log/test%TESTNUMBER.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret
 </command>
-<file name="log/test647.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data.
@@ -41,7 +41,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 APPEND 647 (\Seen) {892}
+A003 APPEND %TESTNUMBER (\Seen) {892}
 A004 LOGOUT
 </protocol>
 <upload>
@@ -67,7 +67,7 @@ This is the plain text version
 --------------------------------
 
 ------------------------------
-Content-Disposition: attachment; filename="test647.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 
 This is an attached file.
 
diff --git a/tests/data/test648 b/tests/data/test648
index a2b227bcf..15a75e7cd 100644
--- a/tests/data/test648
+++ b/tests/data/test648
@@ -27,9 +27,9 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/648 --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the e-mail inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@log/test648.txt;encoder=base64" -H "From: different" -H "To: another"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the e-mail inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@log/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another"
 </command>
-<file name="log/test648.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data and will be encoded in base64 for transfer.
@@ -44,7 +44,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 648
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
@@ -63,7 +63,7 @@ Content-disposition: "inline"
 This is the e-mail inline text with a very long line containing the special=
  character =3D and that should be split by encoder.
 ------------------------------
-Content-Disposition: attachment; filename="test648.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Transfer-Encoding: base64
 
 VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2YgZGF0
diff --git a/tests/data/test649 b/tests/data/test649
index 46c01cd00..0f759f0de 100644
--- a/tests/data/test649
+++ b/tests/data/test649
@@ -27,9 +27,9 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/649 --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@log/test649.txt;encoder=7bit" -H "From: different" -H "To: another"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@log/test%TESTNUMBER.txt;encoder=7bit" -H "From: different" -H "To: another"
 </command>
-<file name="log/test649.txt">
+<file name="log/test%TESTNUMBER.txt">
 This is an attached file (in french: pièce jointe).
 
 It contains at least an 8-bit byte value.
@@ -44,7 +44,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 649
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
@@ -60,7 +60,7 @@ Content-Transfer-Encoding: 7bit
 
 This is valid
 ------------------------------
-Content-Disposition: attachment; filename="test649.txt"
+Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
 Content-Transfer-Encoding: 7bit
 
 This is an attached file (in french: pi
diff --git a/tests/data/test65 b/tests/data/test65
index 606523183..f1ce72bb2 100644
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -59,21 +59,21 @@ crypto
 HTTP with Digest authorization with bad password
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /65 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /65 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b"
+Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="66d68d3251f1839576ba7c766cf9205b"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test650 b/tests/data/test650
index 19cc10a4a..7045d3626 100644
--- a/tests/data/test650
+++ b/tests/data/test650
@@ -28,7 +28,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib650
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -38,9 +38,9 @@ HTTP formpost using form API
  Some data from stdin
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/650 log/test650.filedata
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata
 </command>
-<file name="log/test650.filedata">
+<file name="log/test%TESTNUMBER.filedata">
 This is data from a file.
 </file>
 </client>
@@ -56,7 +56,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /650 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
@@ -80,13 +80,13 @@ Content-Disposition: form-data; name="multifile"
 Content-Type: multipart/mixed; boundary=----------------------------
 
 ------------------------------
-Content-Disposition: attachment; filename="test650.filedata"
+Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
 Content-Type: application/octet-stream
 
 This is data from a file.
 
 ------------------------------
-Content-Disposition: attachment; filename="test650.filedata"
+Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
 Content-Type: text/whatever
 
 
@@ -94,7 +94,7 @@ a5
 This is data from a file.
 
 ------------------------------
-Content-Disposition: attachment; filename="test650.filedata"
+Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
 Content-Type: text/whatever
 
 
diff --git a/tests/data/test651 b/tests/data/test651
index fd370f24d..be2cbe405 100644
--- a/tests/data/test651
+++ b/tests/data/test651
@@ -28,7 +28,7 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib651
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -38,9 +38,9 @@ curl_formadd with huge COPYCONTENTS
  Some data from stdin
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/651 log/test651.filedata
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata
 </command>
-<file name="log/test651.filedata">
+<file name="log/test%TESTNUMBER.filedata">
 This is data from a file.
 </file>
 </client>
@@ -56,7 +56,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /651 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 17139
diff --git a/tests/data/test652 b/tests/data/test652
index c91dcf2fe..f4b997216 100644
--- a/tests/data/test652
+++ b/tests/data/test652
@@ -18,14 +18,14 @@ MIME
 smtp
 </server>
 <tool>
-lib652
+lib%TESTNUMBER
 </tool>
 
  <name>
 SMTP with encoded huge mime data contents
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/652
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-EHLO 652
+EHLO %TESTNUMBER
 MAIL FROM:<somebody@example.com>
 RCPT TO:<someone@example.com>
 DATA
diff --git a/tests/data/test653 b/tests/data/test653
index 86516c469..db62c985b 100644
--- a/tests/data/test653
+++ b/tests/data/test653
@@ -44,14 +44,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib653
+lib%TESTNUMBER
 </tool>
 
  <name>
 Reuse of handle after altering mime data
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/653
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -66,7 +66,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /653 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 150
@@ -77,7 +77,7 @@ Content-Disposition: form-data; name="name"
 
 short value
 --------------------------------
-POST /653 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 167
diff --git a/tests/data/test654 b/tests/data/test654
index a4623fbe5..4de65d07b 100644
--- a/tests/data/test654
+++ b/tests/data/test654
@@ -44,16 +44,16 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib654
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP duplicate easy handle with mime data
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/654
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file654.txt">
+<file name="log/file%TESTNUMBER.txt">
 This is data from a file
 </file>
 </client>
@@ -69,12 +69,12 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /654 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
 
-POST /654 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
@@ -86,11 +86,11 @@ Expect: 100-continue
 Content-Disposition: form-data; name="greeting"
 Content-Type: application/X-Greeting
 Content-Transfer-Encoding: base64
-X-Test-Number: 654
+X-Test-Number: %TESTNUMBER
 
 aGVsbG8=
 ------------------------------
-Content-Disposition: form-data; filename="file654.txt"
+Content-Disposition: form-data; filename="file%TESTNUMBER.txt"
 Content-Type: text/plain
 
 This is data from a file
diff --git a/tests/data/test655 b/tests/data/test655
index 3f5019fdf..3f9bc785f 100644
--- a/tests/data/test655
+++ b/tests/data/test655
@@ -29,14 +29,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib655
+lib%TESTNUMBER
 </tool>
 
  <name>
 resolver start callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/655
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test658 b/tests/data/test658
index c004ee3a6..df5be763f 100644
--- a/tests/data/test658
+++ b/tests/data/test658
@@ -27,19 +27,19 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib658
+lib%TESTNUMBER
 </tool>
 <name>
 Pass URL to libcurl with CURLOPT_CURLU
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/658
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /658 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test659 b/tests/data/test659
index ab89756cf..476edcc4c 100644
--- a/tests/data/test659
+++ b/tests/data/test659
@@ -28,7 +28,7 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib659
+lib%TESTNUMBER
 </tool>
 <name>
 CURLOPT_CURLU without the path set - over proxy
diff --git a/tests/data/test66 b/tests/data/test66
index 8fa725ece..0e66289bb 100644
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -25,7 +25,7 @@ http
 HTTP GET without headers in the response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/66 --http0.9
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 
@@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/66 --http0.9
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /66 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test660 b/tests/data/test660
index 0847375dc..3b1964b90 100644
--- a/tests/data/test660
+++ b/tests/data/test660
@@ -19,7 +19,7 @@ IMAP CONNECT_ONLY option
  </name>
 
 <command>
-imap://%HOSTIP:%IMAPPORT/660
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER
 </command>
 
 </client>
diff --git a/tests/data/test661 b/tests/data/test661
index 067612be5..ccfdf41ff 100644
--- a/tests/data/test661
+++ b/tests/data/test661
@@ -19,7 +19,7 @@ ftp
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib661
+lib%TESTNUMBER
 </tool>
 
  <name>
@@ -40,22 +40,22 @@ PWD
 CWD /folderA
 EPSV
 TYPE I
-RETR 661
+RETR %TESTNUMBER
 CWD /folderB
 EPSV
-RETR 661
+RETR %TESTNUMBER
 QUIT
 USER anonymous
 PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-RETR /folderA/661
+RETR /folderA/%TESTNUMBER
 CWD /folderB
 EPSV
-RETR 661
+RETR %TESTNUMBER
 EPSV
-RETR /folderA/661
+RETR /folderA/%TESTNUMBER
 QUIT
 USER anonymous
 PASS ftp@example.com
diff --git a/tests/data/test662 b/tests/data/test662
index b680b864d..5edaf05e7 100644
--- a/tests/data/test662
+++ b/tests/data/test662
@@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK
-Location: http://example.net/tes t case=/6620002
+Location: http://example.net/tes t case=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
 
@@ -27,7 +27,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK
-Location: http://example.net/tes t case=/6620002
+Location: http://example.net/tes t case=/%TESTNUMBER0002
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
 
@@ -50,7 +50,7 @@ http
 HTTP redirect with whitespace in absolute Location: URL
  </name>
  <command>
-http://example.com/please/gimme/662 -L -x http://%HOSTIP:%HTTPPORT
+http://example.com/please/gimme/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -61,13 +61,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.com/please/gimme/662 HTTP/1.1
+GET http://example.com/please/gimme/%TESTNUMBER HTTP/1.1
 Host: example.com
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://example.net/tes%20t%20case=/6620002 HTTP/1.1
+GET http://example.net/tes%20t%20case=/%TESTNUMBER0002 HTTP/1.1
 Host: example.net
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test663 b/tests/data/test663
index e654450e4..72692585f 100644
--- a/tests/data/test663
+++ b/tests/data/test663
@@ -16,7 +16,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 302 OK
-Location: http://example.net/there/it/is/../../tes t case=/6630002? yes no
+Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
 
@@ -31,7 +31,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 302 OK
-Location: http://example.net/there/it/is/../../tes t case=/6630002? yes no
+Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 0
 
@@ -54,7 +54,7 @@ http
 HTTP redirect with dotdots and whitespaces in absolute Location: URL
  </name>
  <command>
-http://example.com/please/../gimme/663?foobar#hello -L -x http://%HOSTIP:%HTTPPORT
+http://example.com/please/../gimme/%TESTNUMBER?foobar#hello -L -x http://%HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -65,13 +65,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://example.com/gimme/663?foobar HTTP/1.1
+GET http://example.com/gimme/%TESTNUMBER?foobar HTTP/1.1
 Host: example.com
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://example.net/there/tes%20t%20case=/6630002?+yes+no HTTP/1.1
+GET http://example.net/there/tes%20t%20case=/%TESTNUMBER0002?+yes+no HTTP/1.1
 Host: example.net
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test664 b/tests/data/test664
index 6bea4ed1a..69a75df3f 100644
--- a/tests/data/test664
+++ b/tests/data/test664
@@ -24,9 +24,9 @@ sftp
 SFTP correct host key
  </name>
  <command>
---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file664.txt
+--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt
 </command>
-<file name="log/file664.txt">
+<file name="log/file%TESTNUMBER.txt">
 test
 </file>
 </client>
diff --git a/tests/data/test665 b/tests/data/test665
index 689fa31b6..aa20bbfe1 100644
--- a/tests/data/test665
+++ b/tests/data/test665
@@ -24,9 +24,9 @@ scp
 SCP correct host key
  </name>
  <command>
---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file665.txt
+--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt
 </command>
-<file name="log/file665.txt">
+<file name="log/file%TESTNUMBER.txt">
 test
 </file>
 </client>
diff --git a/tests/data/test666 b/tests/data/test666
index 2f6f4284b..d8b3356bc 100644
--- a/tests/data/test666
+++ b/tests/data/test666
@@ -36,14 +36,14 @@ OK
 http
 </server>
 <tool>
-lib666
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP mime post with binary-encoded huge data contents
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/666
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /666 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 17225
diff --git a/tests/data/test667 b/tests/data/test667
index c6e290fac..8ae4fd597 100644
--- a/tests/data/test667
+++ b/tests/data/test667
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib667
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP chunked mimepost using single-byte read callback with encoder
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/667
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -59,7 +59,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /667 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
diff --git a/tests/data/test668 b/tests/data/test668
index a9c14a5f5..dfb9347e8 100644
--- a/tests/data/test668
+++ b/tests/data/test668
@@ -37,16 +37,16 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib668
+lib%TESTNUMBER
 </tool>
 
  <name>
 HTTP mimepost early end of data detection
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/668
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file668.txt">
+<file name="log/file%TESTNUMBER.txt">
 This is data from a file
 </file>
 </client>
@@ -62,7 +62,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 # boundary string and since 5 of them are in the body contents, we see
 # (5*12) == 60 bytes less
 <protocol>
-POST /668 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
@@ -83,7 +83,7 @@ dummy
 91
 
 ------------------------------
-Content-Disposition: form-data; name="field3"; filename="file668.txt"
+Content-Disposition: form-data; name="field3"; filename="file%TESTNUMBER.txt"
 Content-Type: text/plain
 
 
diff --git a/tests/data/test669 b/tests/data/test669
index 603671f43..20c02a638 100644
--- a/tests/data/test669
+++ b/tests/data/test669
@@ -28,7 +28,7 @@ http
 HTTP custom Content-Type with parameter
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/669 -H 'Content-type: multipart/form-data; charset=utf-8' -F name=daniel -F tool=curl
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -H 'Content-type: multipart/form-data; charset=utf-8' -F name=daniel -F tool=curl
 </command>
 </client>
 
@@ -39,7 +39,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /we/want/669 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test67 b/tests/data/test67
index 8138c7418..c842cf773 100644
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -73,7 +73,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -83,13 +83,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /67 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /67 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test670 b/tests/data/test670
index 2234f0c19..4d1056c55 100644
--- a/tests/data/test670
+++ b/tests/data/test670
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib670
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from mime read callback: multi
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/670
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /670 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 142
diff --git a/tests/data/test671 b/tests/data/test671
index 46946abf9..b6550aa3d 100644
--- a/tests/data/test671
+++ b/tests/data/test671
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib671
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from mime read callback: easy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/671
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /671 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 142
diff --git a/tests/data/test672 b/tests/data/test672
index e22b8bf22..43d183e2d 100644
--- a/tests/data/test672
+++ b/tests/data/test672
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib672
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from form read callback: multi
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/672
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /672 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 142
diff --git a/tests/data/test673 b/tests/data/test673
index 975277909..e263810fd 100644
--- a/tests/data/test673
+++ b/tests/data/test673
@@ -37,14 +37,14 @@ http
 </server>
 # tool is what to use instead of 'curl'
 <tool>
-lib673
+lib%TESTNUMBER
 </tool>
 
  <name>
 Request pause from form read callback: easy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/673
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -56,7 +56,7 @@ s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
-POST /673 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 142
diff --git a/tests/data/test674 b/tests/data/test674
index ae737ef29..1afe1f695 100644
--- a/tests/data/test674
+++ b/tests/data/test674
@@ -28,23 +28,23 @@ Funny-head: yesyes
 http
 </server>
 <tool>
-lib674
+lib%TESTNUMBER
 </tool>
 <name>
 Set CURLOPT_CURLU and dupe the handle
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/674
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
 <protocol>
-GET /674 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /674 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
diff --git a/tests/data/test675 b/tests/data/test675
index 19549dd69..b0933bede 100644
--- a/tests/data/test675
+++ b/tests/data/test675
@@ -28,7 +28,7 @@ HTTP connection re-use and different credentials
  </name>
 
 <command>
-http://user1:foo1@%HOSTIP:%HTTPPORT/user1/675 http://user2:foo2@%HOSTIP:%HTTPPORT/user2/675
+http://user1:foo1@%HOSTIP:%HTTPPORT/user1/%TESTNUMBER http://user2:foo2@%HOSTIP:%HTTPPORT/user2/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -38,13 +38,13 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /user1/675 HTTP/1.1
+GET /user1/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjE6Zm9vMQ==
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /user2/675 HTTP/1.1
+GET /user2/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjI6Zm9vMg==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test68 b/tests/data/test68
index 57ab2580c..c26f4c6b8 100644
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -72,7 +72,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -82,13 +82,13 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /68 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /68 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test69 b/tests/data/test69
index cc3178a6c..f4cd06f25 100644
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -89,7 +89,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 <precheck>
 chkhostname curlhost
@@ -99,18 +99,18 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /69 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /69 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /69 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test7 b/tests/data/test7
index 92ff46f5f..06df71d3c 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -32,20 +32,20 @@ http
 HTTP with cookie parser and header recording
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D log/heads%TESTNUMBER.txt
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/7 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/heads7.txt">
+<file name="log/heads%TESTNUMBER.txt">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test70 b/tests/data/test70
index 7057153e9..622b9a9c5 100644
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -62,21 +62,21 @@ http
 HTTP with Digest *OR* NTLM authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /70 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /70 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="2c9a6f00af0d86497b177b90e90c688a"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test700 b/tests/data/test700
index af17b8060..23e003766 100644
--- a/tests/data/test700
+++ b/tests/data/test700
@@ -37,7 +37,7 @@ socks4
 HTTP GET via SOCKS4 proxy
  </name>
  <command>
---socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/700
+--socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ HTTP GET via SOCKS4 proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /700 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test701 b/tests/data/test701
index 0e8195379..db22d668e 100644
--- a/tests/data/test701
+++ b/tests/data/test701
@@ -37,7 +37,7 @@ socks5
 HTTP GET via SOCKS5 proxy
  </name>
  <command>
---socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/701
+--socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -45,7 +45,7 @@ HTTP GET via SOCKS5 proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /701 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test704 b/tests/data/test704
index 9e821c608..b9abc45e1 100644
--- a/tests/data/test704
+++ b/tests/data/test704
@@ -23,7 +23,7 @@ http
 Attempt connect to non-listening SOCKS4 proxy
  </name>
  <command>
---socks4 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/704
+--socks4 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <features>
 proxy
diff --git a/tests/data/test705 b/tests/data/test705
index e7ba01220..5d3692dc4 100644
--- a/tests/data/test705
+++ b/tests/data/test705
@@ -23,7 +23,7 @@ http
 Attempt connect to non-listening SOCKS5 proxy
  </name>
  <command>
---socks5 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/705
+--socks5 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <features>
 proxy
diff --git a/tests/data/test708 b/tests/data/test708
index 0b88728b5..ff5b91444 100644
--- a/tests/data/test708
+++ b/tests/data/test708
@@ -40,7 +40,7 @@ all_proxy=socks4://%HOSTIP:%SOCKSPORT
 HTTP GET via SOCKS4 proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/708
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/708
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /708 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test709 b/tests/data/test709
index 9e9da1302..9d43c7521 100644
--- a/tests/data/test709
+++ b/tests/data/test709
@@ -40,7 +40,7 @@ http_proxy=socks5://%HOSTIP:%SOCKSPORT
 HTTP GET via SOCKS5 set in http_proxy environment variable
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/709
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/709
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /709 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test71 b/tests/data/test71
index fe06e9cff..7f8b049b2 100644
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -30,14 +30,14 @@ HTTP and -F upload in config file
 <stdin>
 -F name=daniel
 -F tool=curl
--F file=@log/test71.txt
+-F file=@log/test%TESTNUMBER.txt
 user-agent = ""
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/71 -K -
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -K -
 </command>
 # We create this file before the command is invoked!
-<file name="log/test71.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -50,7 +50,7 @@ bar
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/71 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 408
@@ -65,7 +65,7 @@ Content-Disposition: form-data; name="tool"
 
 curl
 ------------------------------9ef8d6205763
-Content-Disposition: form-data; name="file"; filename="test71.txt"
+Content-Disposition: form-data; name="file"; filename="test%TESTNUMBER.txt"
 Content-Type: text/plain
 
 foo-
diff --git a/tests/data/test710 b/tests/data/test710
index ba803cbce..5302022fe 100644
--- a/tests/data/test710
+++ b/tests/data/test710
@@ -37,7 +37,7 @@ socks5
 HTTP GET via SOCKS5 set with --proxy
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/710 --proxy socks5://%HOSTIP:%SOCKSPORT 
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/710 --proxy socks5://%HOSTIP:%SOCKSPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /710 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test711 b/tests/data/test711
index 3efbb7977..a70631a08 100644
--- a/tests/data/test711
+++ b/tests/data/test711
@@ -33,7 +33,7 @@ all_proxy=socks5://%HOSTIP:%SOCKSPORT
 FTP fetch with all_proxy set to socks5
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/711
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -46,8 +46,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 711
-RETR 711
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test712 b/tests/data/test712
index 252c9ef0e..0c6a64338 100644
--- a/tests/data/test712
+++ b/tests/data/test712
@@ -27,7 +27,7 @@ socks5
 FTP fetch with --proxy set to socks5://
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/712 --proxy socks5://%HOSTIP:%SOCKSPORT 
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -40,8 +40,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 712
-RETR 712
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test713 b/tests/data/test713
index bb79994f5..1803f8e9e 100644
--- a/tests/data/test713
+++ b/tests/data/test713
@@ -28,7 +28,7 @@ socks5
 FTP fetch with --proxy set to socks5:// and with --connect-to
  </name>
  <command>
-ftp://ftp.example.com/713 --connect-to ::%HOSTIP:%FTPPORT --proxy socks5://%HOSTIP:%SOCKSPORT 
+ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -41,8 +41,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 713
-RETR 713
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test714 b/tests/data/test714
index 776d8b292..b405bcd96 100644
--- a/tests/data/test714
+++ b/tests/data/test714
@@ -47,7 +47,7 @@ proxy
 FTP fetch with --proxy set to http:// and with --connect-to
  </name>
  <command>
-ftp://ftp.example.com.714/714 --connect-to ::connect.example.com.714:%FTPPORT --proxytunnel --proxy http://%HOSTIP:%PROXYPORT 
+ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy http://%HOSTIP:%PROXYPORT 
 </command>
 </client>
 
@@ -60,8 +60,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 714
-RETR 714
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test715 b/tests/data/test715
index 85372ca24..1bbceb790 100644
--- a/tests/data/test715
+++ b/tests/data/test715
@@ -49,7 +49,7 @@ proxy
 FTP fetch with --preproxy, --proxy and --connect-to
  </name>
  <command>
-ftp://ftp.example.com.715/715 --connect-to ::connect.example.com.715:%FTPPORT --proxytunnel --proxy %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT 
+ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT 
 </command>
 </client>
 
@@ -62,8 +62,8 @@ PASS ftp@example.com
 PWD
 EPSV
 TYPE I
-SIZE 715
-RETR 715
+SIZE %TESTNUMBER
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test716 b/tests/data/test716
index 531e272fa..4de1cd95f 100644
--- a/tests/data/test716
+++ b/tests/data/test716
@@ -31,7 +31,7 @@ SOCKS5 proxy with too long user name
 
 # it should never connect to the target server
  <command>
-http://hohoho.example.com:99/716 -x socks5://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:b@%HOSTIP:%SOCKSPORT
+http://hohoho.example.com:99/%TESTNUMBER -x socks5://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:b@%HOSTIP:%SOCKSPORT
 </command>
 </client>
 
diff --git a/tests/data/test717 b/tests/data/test717
index b84a50e9c..bbbc9ed3f 100644
--- a/tests/data/test717
+++ b/tests/data/test717
@@ -45,7 +45,7 @@ SOCKS5 proxy auth
 
 # target a port that won't work without the SOCKS magic
  <command>
-http://%HOSTIP:1/717 -x socks5://uz3r:p4ssworm@%HOSTIP:%SOCKSPORT
+http://%HOSTIP:1/%TESTNUMBER -x socks5://uz3r:p4ssworm@%HOSTIP:%SOCKSPORT
 </command>
 <features>
 proxy
@@ -56,7 +56,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /717 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:1
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test72 b/tests/data/test72
index 1160121b2..00c4c6421 100644
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -61,21 +61,21 @@ crypto
 HTTP with Digest *OR* Basic authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /72 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /72 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="9fcd1330377365a09bbcb33b2cbb25bd"
 User-Agent: curl/%VERSION
 Accept: */*
 
diff --git a/tests/data/test73 b/tests/data/test73
index 80208dba7..e211f2148 100644
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -29,20 +29,20 @@ http
 HTTP, receive cookies when using custom Host:, domain using only two dots
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSED.se"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se"
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/73 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: host.NOT_DISCLOSED.se
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/jar73.txt" mode="text">
+<file name="log/jar%TESTNUMBER.txt" mode="text">
 # Netscape HTTP Cookie File
 # https://curl.se/docs/http-cookies.html
 # This file was generated by libcurl! Edit at your own risk.
diff --git a/tests/data/test74 b/tests/data/test74
index 556f8cc1d..524a70eb8 100644
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -43,7 +43,7 @@ http
 HTTP, urlglob {}-retrieval and -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/{74,740001}" -o "log/dumpit#1.dump"
+"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "log/dumpit#1.dump"
 </command>
 </client>
 
@@ -51,18 +51,18 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /74 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /740001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/dumpit740001.dump">
+<file name="log/dumpit%TESTNUMBER0001.dump">
 HTTP/1.0 200 OK
 Content-Type: text/html
 Funny-head: swsclose
diff --git a/tests/data/test76 b/tests/data/test76
index fc4a30d03..8aae75aec 100644
--- a/tests/data/test76
+++ b/tests/data/test76
@@ -22,7 +22,7 @@ http
 HTTP, -O with no file name part in the URL
  </name>
  <command option="no-output">
-http://%HOSTIP:%NOLISTENPORT/76/ -O
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER/ -O
 </command>
 </client>
 
diff --git a/tests/data/test77 b/tests/data/test77
index 9720a5e1a..d7cce4035 100644
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -35,7 +35,7 @@ http
 HTTP with -z "older date"
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
 </command>
 </client>
 
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /77 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test78 b/tests/data/test78
index d7f7d0fb0..60c4029b7 100644
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -47,7 +47,7 @@ http
 HTTP with -z "newer date"
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT"
 </command>
 </client>
 
@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /78 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test79 b/tests/data/test79
index 7e22ca6b4..88e9b78e4 100644
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -35,7 +35,7 @@ proxy
 FTP over HTTP proxy
  </name>
  <command>
-ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
+ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -43,7 +43,7 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 HTTP/1.1
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test8 b/tests/data/test8
index 439e8cd45..a8548e6c2 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -25,11 +25,11 @@ http
 HTTP with cookie parsing from header file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/8 -b log/heads8.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/heads%TESTNUMBER.txt
 </command>
 
 # We create this file before the command is invoked!
-<file name="log/heads8.txt">
+<file name="log/heads%TESTNUMBER.txt">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -56,7 +56,7 @@ perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs endi
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /we/want/8 HTTP/1.1
+GET /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test80 b/tests/data/test80
index c947dcdbd..ef62f5228 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -53,7 +53,7 @@ http-proxy
 HTTP 1.0 CONNECT with proxytunnel and proxy+host Basic authentication
  </name>
  <command>
-http://test.80:%HTTPPORT/we/want/that/page/80 -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself
 </command>
 <features>
 proxy
@@ -64,16 +64,16 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.80:%HTTPPORT HTTP/1.0
-Host: test.80:%HTTPPORT
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.0
+Host: test.%TESTNUMBER:%HTTPPORT
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/80 HTTP/1.1
-Host: test.80:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test800 b/tests/data/test800
index 6b74da90f..9f961ebc9 100644
--- a/tests/data/test800
+++ b/tests/data/test800
@@ -31,7 +31,7 @@ imap
 IMAP FETCH message
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/800/;MAILINDEX=1' -u '"user:sec"ret{'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{'
 </command>
 </client>
 
@@ -41,7 +41,7 @@ IMAP FETCH message
 <protocol>
 A001 CAPABILITY
 A002 LOGIN "\"user" "sec\"ret{"
-A003 SELECT 800
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test801 b/tests/data/test801
index 90766f79f..dcfa18cf6 100644
--- a/tests/data/test801
+++ b/tests/data/test801
@@ -28,7 +28,7 @@ imap
 IMAP FETCH message by MAILINDEX and SECTION
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/801/;MAILINDEX=123/;SECTION=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret
 </command>
 </client>
 
@@ -38,7 +38,7 @@ IMAP FETCH message by MAILINDEX and SECTION
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 801
+A003 SELECT %TESTNUMBER
 A004 FETCH 123 BODY[1]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test802 b/tests/data/test802
index 19206a75d..76ede9e9d 100644
--- a/tests/data/test802
+++ b/tests/data/test802
@@ -29,7 +29,7 @@ imap
 IMAP SELECT UIDVALIDITY Success
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/802;UIDVALIDITY=3857529045/;MAILINDEX=123/;SECTION=TEXT' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=3857529045/;MAILINDEX=123/;SECTION=TEXT' -u user:secret
 </command>
 </client>
 
@@ -39,7 +39,7 @@ IMAP SELECT UIDVALIDITY Success
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 802
+A003 SELECT %TESTNUMBER
 A004 FETCH 123 BODY[TEXT]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test803 b/tests/data/test803
index 834e4211d..f16a419aa 100644
--- a/tests/data/test803
+++ b/tests/data/test803
@@ -24,7 +24,7 @@ imap
 IMAP SELECT UIDVALIDITY Failure
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/803;UIDVALIDITY=12345/;MAILINDEX=123' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=12345/;MAILINDEX=123' -u user:secret
 </command>
 </client>
 
@@ -38,7 +38,7 @@ IMAP SELECT UIDVALIDITY Failure
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 803
+A003 SELECT %TESTNUMBER
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test804 b/tests/data/test804
index 90635c22c..1626cf88c 100644
--- a/tests/data/test804
+++ b/tests/data/test804
@@ -28,7 +28,7 @@ imap
 IMAP doesn't perform SELECT if re-using the same mailbox
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/804/;MAILINDEX=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/804/;MAILINDEX=456/;SECTION=2.3' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=456/;SECTION=2.3' -u user:secret
 </command>
 </client>
 
@@ -38,7 +38,7 @@ IMAP doesn't perform SELECT if re-using the same mailbox
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 804
+A003 SELECT %TESTNUMBER
 A004 FETCH 123 BODY[1]
 A005 FETCH 456 BODY[2.3]
 A006 LOGOUT
diff --git a/tests/data/test805 b/tests/data/test805
index e70c1a667..5ce64a791 100644
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -23,9 +23,9 @@ imap
 IMAP APPEND message
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/805 -T log/upload805 -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -u user:secret
 </command>
-<file name="log/upload805">
+<file name="log/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
 From: Fred Foobar <foobar@example.COM>
 Subject: afternoon meeting
@@ -44,7 +44,7 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 APPEND 805 (\Seen) {295}
+A003 APPEND %TESTNUMBER (\Seen) {295}
 A004 LOGOUT
 </protocol>
 <upload>
diff --git a/tests/data/test806 b/tests/data/test806
index 37822a47f..128ad85bc 100644
--- a/tests/data/test806
+++ b/tests/data/test806
@@ -11,9 +11,9 @@ LIST
 # Server-side
 <reply>
 <data>
-* LIST () "/" /806/blurdybloop
-* LIST (\Noselect) "/" /806/foo
-* LIST () "/" /806/foo/bar
+* LIST () "/" /%TESTNUMBER/blurdybloop
+* LIST (\Noselect) "/" /%TESTNUMBER/foo
+* LIST () "/" /%TESTNUMBER/foo/bar
 </data>
 </reply>
 
@@ -27,7 +27,7 @@ imap
 IMAP LIST mailbox
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/806 -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -37,7 +37,7 @@ imap://%HOSTIP:%IMAPPORT/806 -u user:secret
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 LIST "806" *
+A003 LIST "%TESTNUMBER" *
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test807 b/tests/data/test807
index 1271b6d64..59c12eb28 100644
--- a/tests/data/test807
+++ b/tests/data/test807
@@ -12,9 +12,9 @@ CUSTOMREQUEST
 # Server-side
 <reply>
 <data>
-* LSUB () "/" /807/blurdybloop
-* LSUB (\Noselect) "/" /807/foo
-* LSUB () "/" /807/foo/bar
+* LSUB () "/" /%TESTNUMBER/blurdybloop
+* LSUB (\Noselect) "/" /%TESTNUMBER/foo
+* LSUB () "/" /%TESTNUMBER/foo/bar
 </data>
 </reply>
 
@@ -28,7 +28,7 @@ imap
 IMAP LSUB mailbox
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "807" *'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "%TESTNUMBER" *'
 </command>
 </client>
 
@@ -38,7 +38,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "807" *'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 LSUB "807" *
+A003 LSUB "%TESTNUMBER" *
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test808 b/tests/data/test808
index 30c8bdfd2..a77589a7c 100644
--- a/tests/data/test808
+++ b/tests/data/test808
@@ -32,7 +32,7 @@ imap
 IMAP EXAMINE mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE 808'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE %TESTNUMBER'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE 808'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 EXAMINE 808
+A003 EXAMINE %TESTNUMBER
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test809 b/tests/data/test809
index 4283179d7..8122eaf69 100644
--- a/tests/data/test809
+++ b/tests/data/test809
@@ -12,7 +12,7 @@ CUSTOMREQUEST
 # Server-side
 <reply>
 <data>
-* STATUS 809 (MESSAGES 231 UIDNEXT 44292)
+* STATUS %TESTNUMBER (MESSAGES 231 UIDNEXT 44292)
 </data>
 </reply>
 
@@ -26,7 +26,7 @@ imap
 IMAP mailbox STATUS (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS 809 (UIDNEXT MESSAGES)'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS %TESTNUMBER (UIDNEXT MESSAGES)'
 </command>
 </client>
 
@@ -36,7 +36,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS 809 (UIDNEXT MESSAGES)'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 STATUS 809 (UIDNEXT MESSAGES)
+A003 STATUS %TESTNUMBER (UIDNEXT MESSAGES)
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test81 b/tests/data/test81
index 6a4912557..3392ec3f5 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -73,7 +73,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm
 </command>
 <precheck>
 chkhostname curlhost
@@ -83,14 +83,14 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 
-GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test810 b/tests/data/test810
index 6b4d243fd..80aac560e 100644
--- a/tests/data/test810
+++ b/tests/data/test810
@@ -11,7 +11,7 @@ SEARCH
 # Server-side
 <reply>
 <data>
-* SEARCH 1 123 456 810
+* SEARCH 1 123 456 %TESTNUMBER
 </data>
 </reply>
 
@@ -25,7 +25,7 @@ imap
 IMAP SEARCH for NEW messages
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/810?NEW -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER?NEW -u user:secret
 </command>
 </client>
 
@@ -35,7 +35,7 @@ imap://%HOSTIP:%IMAPPORT/810?NEW -u user:secret
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 810
+A003 SELECT %TESTNUMBER
 A004 SEARCH NEW
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test811 b/tests/data/test811
index 8fb3aa7a7..f0938be11 100644
--- a/tests/data/test811
+++ b/tests/data/test811
@@ -23,7 +23,7 @@ imap
 IMAP CREATE mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE 811'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE 811'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 CREATE 811
+A003 CREATE %TESTNUMBER
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test812 b/tests/data/test812
index 6d1b42df9..8374ea093 100644
--- a/tests/data/test812
+++ b/tests/data/test812
@@ -23,7 +23,7 @@ imap
 IMAP DELETE mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE 812'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE 812'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 DELETE 812
+A003 DELETE %TESTNUMBER
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test813 b/tests/data/test813
index 3544da670..2e8c42d0c 100644
--- a/tests/data/test813
+++ b/tests/data/test813
@@ -23,7 +23,7 @@ imap
 IMAP RENAME mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 813'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 813'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 RENAME 666 813
+A003 RENAME 666 %TESTNUMBER
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test814 b/tests/data/test814
index 0b90e5bcb..c673c4355 100644
--- a/tests/data/test814
+++ b/tests/data/test814
@@ -23,7 +23,7 @@ imap
 IMAP CHECK mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/814 -u user:secret -X 'CHECK'
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret -X 'CHECK'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT/814 -u user:secret -X 'CHECK'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 814
+A003 SELECT %TESTNUMBER
 A004 CHECK
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test815 b/tests/data/test815
index 6ebe5bf65..4ac24f3ad 100644
--- a/tests/data/test815
+++ b/tests/data/test815
@@ -27,7 +27,7 @@ imap
 IMAP STORE - delete message (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X CLOSE -u user:secret
 </command>
 </client>
 
@@ -37,7 +37,7 @@ imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: im
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 815
+A003 SELECT %TESTNUMBER
 A004 STORE 123 +Flags \Deleted
 A005 CLOSE
 A006 LOGOUT
diff --git a/tests/data/test816 b/tests/data/test816
index 6df9b7dfa..cf4702d14 100644
--- a/tests/data/test816
+++ b/tests/data/test816
@@ -30,7 +30,7 @@ imap
 IMAP STORE - delete message with confirmation (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X EXPUNGE -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: im
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 816
+A003 SELECT %TESTNUMBER
 A004 STORE 123 +Flags \Deleted
 A005 EXPUNGE
 A006 LOGOUT
diff --git a/tests/data/test817 b/tests/data/test817
index 9b44ae9b1..9efa06d46 100644
--- a/tests/data/test817
+++ b/tests/data/test817
@@ -23,7 +23,7 @@ imap
 IMAP COPY message to mailbox (CUSTOMREQUEST)
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 817'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 %TESTNUMBER'
 </command>
 </client>
 
@@ -33,7 +33,7 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 817'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 COPY 123 817
+A003 COPY 123 %TESTNUMBER
 A004 LOGOUT
 </protocol>
 </verify>
diff --git a/tests/data/test819 b/tests/data/test819
index 4213e3ea6..d2f0db201 100644
--- a/tests/data/test819
+++ b/tests/data/test819
@@ -37,7 +37,7 @@ imap
 IMAP plain authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/819/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP plain authentication
 A001 CAPABILITY
 A002 AUTHENTICATE PLAIN
 AHVzZXIAc2VjcmV0
-A003 SELECT 819
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test82 b/tests/data/test82
index 138c8ee40..913983323 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -35,14 +35,14 @@ http
 HTTP with proxy requiring NTLM, but we send Basic
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/82 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test820 b/tests/data/test820
index 0fe9bf2d6..8b684acad 100644
--- a/tests/data/test820
+++ b/tests/data/test820
@@ -37,7 +37,7 @@ imap
 IMAP login authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/820/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -49,7 +49,7 @@ A001 CAPABILITY
 A002 AUTHENTICATE LOGIN
 dXNlcg==
 c2VjcmV0
-A003 SELECT 820
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test821 b/tests/data/test821
index 6c511c1ef..179574bee 100644
--- a/tests/data/test821
+++ b/tests/data/test821
@@ -40,7 +40,7 @@ crypto
 IMAP CRAM-MD5 authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/821/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -51,7 +51,7 @@ IMAP CRAM-MD5 authentication
 A001 CAPABILITY
 A002 AUTHENTICATE CRAM-MD5
 dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
-A003 SELECT 821
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test822 b/tests/data/test822
index aa264edd6..2e2f6f14e 100644
--- a/tests/data/test822
+++ b/tests/data/test822
@@ -49,7 +49,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/822/;MAILINDEX=1' -u testuser:testpass
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -64,7 +64,7 @@ A001 CAPABILITY
 A002 AUTHENTICATE NTLM
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-A003 SELECT 822
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test823 b/tests/data/test823
index 32bd9d189..b179a1807 100644
--- a/tests/data/test823
+++ b/tests/data/test823
@@ -43,7 +43,7 @@ crypto
 IMAP DIGEST-MD5 authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/823/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -55,7 +55,7 @@ A001 CAPABILITY
 A002 AUTHENTICATE DIGEST-MD5
 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJpbWFwL2N1cmwiLHJlc3BvbnNlPTVlNzk5N2ZhZDZjMzNiZWJmZjk3OWJkY2I4ZmU3MTZiLHFvcD1hdXRo
 
-A003 SELECT 823
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test824 b/tests/data/test824
index 96c8e87b9..28630e480 100644
--- a/tests/data/test824
+++ b/tests/data/test824
@@ -37,7 +37,7 @@ imap
 IMAP OAuth 2.0 (XOAUTH2) authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/824/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP OAuth 2.0 (XOAUTH2) authentication
 A001 CAPABILITY
 A002 AUTHENTICATE XOAUTH2
 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-A003 SELECT 824
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test825 b/tests/data/test825
index d28b6a519..fd4e047a3 100644
--- a/tests/data/test825
+++ b/tests/data/test825
@@ -38,7 +38,7 @@ imap
 IMAP plain authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/825/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP plain authentication with initial response
 <protocol>
 A001 CAPABILITY
 A002 AUTHENTICATE PLAIN AHVzZXIAc2VjcmV0
-A003 SELECT 825
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test826 b/tests/data/test826
index a1125e2f4..19247f0ec 100644
--- a/tests/data/test826
+++ b/tests/data/test826
@@ -38,7 +38,7 @@ imap
 IMAP login authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/826/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -49,7 +49,7 @@ IMAP login authentication with initial response
 A001 CAPABILITY
 A002 AUTHENTICATE LOGIN dXNlcg==
 c2VjcmV0
-A003 SELECT 826
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test827 b/tests/data/test827
index 9cefb5005..b828c9bf3 100644
--- a/tests/data/test827
+++ b/tests/data/test827
@@ -50,7 +50,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/827/;MAILINDEX=1' -u testuser:testpass
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -64,7 +64,7 @@ chkhostname curlhost
 A001 CAPABILITY
 A002 AUTHENTICATE NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-A003 SELECT 827
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test828 b/tests/data/test828
index 912aeff3d..40f2b1252 100644
--- a/tests/data/test828
+++ b/tests/data/test828
@@ -38,7 +38,7 @@ imap
 IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/828/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
 <protocol>
 A001 CAPABILITY
 A002 AUTHENTICATE XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-A003 SELECT 828
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test829 b/tests/data/test829
index cefba0d79..46ff4e165 100644
--- a/tests/data/test829
+++ b/tests/data/test829
@@ -15,7 +15,7 @@ imap
 IMAP with URL-encoded CR LF in the URL
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/%0d%0a/829
+imap://%HOSTIP:%IMAPPORT/%0d%0a/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test83 b/tests/data/test83
index dead5db3f..dffdb92a5 100644
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -50,7 +50,7 @@ http-proxy
 HTTP over proxy-tunnel with site authentication
  </name>
  <command>
-http://test.83:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self'
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self'
 </command>
 <features>
 proxy
@@ -61,15 +61,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.83:%HTTPPORT HTTP/1.1
-Host: test.83:%HTTPPORT
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol>
-GET /we/want/that/page/83 HTTP/1.1
-Host: test.83:%HTTPPORT
+GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 Authorization: Basic aWFtOm15OjtzZWxm
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test830 b/tests/data/test830
index c7812b794..d02ed6b08 100644
--- a/tests/data/test830
+++ b/tests/data/test830
@@ -33,7 +33,7 @@ crypto
 IMAP CRAM-MD5 graceful cancellation
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/830/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
diff --git a/tests/data/test831 b/tests/data/test831
index eae10f048..99e0fa4b2 100644
--- a/tests/data/test831
+++ b/tests/data/test831
@@ -41,7 +41,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/831/;MAILINDEX=1' -u testuser:testpass
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
diff --git a/tests/data/test832 b/tests/data/test832
index 360654ab0..dc15aa716 100644
--- a/tests/data/test832
+++ b/tests/data/test832
@@ -35,7 +35,7 @@ crypto
 IMAP DIGEST-MD5 graceful cancellation
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/832/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
diff --git a/tests/data/test833 b/tests/data/test833
index 2c694adcc..5784c4164 100644
--- a/tests/data/test833
+++ b/tests/data/test833
@@ -44,7 +44,7 @@ crypto
 IMAP CRAM-MD5 authentication with SASL downgrade
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/833/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -57,7 +57,7 @@ A002 AUTHENTICATE CRAM-MD5
 *
 A003 AUTHENTICATE PLAIN
 AHVzZXIAc2VjcmV0
-A004 SELECT 833
+A004 SELECT %TESTNUMBER
 A005 FETCH 1 BODY[]
 A006 LOGOUT
 </protocol>
diff --git a/tests/data/test834 b/tests/data/test834
index 8ecc22322..f99d9dd5d 100644
--- a/tests/data/test834
+++ b/tests/data/test834
@@ -52,7 +52,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-'imap://%HOSTIP:%IMAPPORT/834/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 <precheck>
 chkhostname curlhost
@@ -69,7 +69,7 @@ TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 *
 A003 AUTHENTICATE PLAIN
 AHVzZXIAc2VjcmV0
-A004 SELECT 834
+A004 SELECT %TESTNUMBER
 A005 FETCH 1 BODY[]
 A006 LOGOUT
 </protocol>
diff --git a/tests/data/test835 b/tests/data/test835
index b44e877ec..fd6badde1 100644
--- a/tests/data/test835
+++ b/tests/data/test835
@@ -46,7 +46,7 @@ crypto
 IMAP DIGEST-MD5 authentication with SASL downgrade
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/835/;MAILINDEX=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret
 </command>
 </client>
 
@@ -59,7 +59,7 @@ A002 AUTHENTICATE DIGEST-MD5
 *
 A003 AUTHENTICATE PLAIN
 AHVzZXIAc2VjcmV0
-A004 SELECT 835
+A004 SELECT %TESTNUMBER
 A005 FETCH 1 BODY[]
 A006 LOGOUT
 </protocol>
diff --git a/tests/data/test836 b/tests/data/test836
index 9478042ed..36c5166e5 100644
--- a/tests/data/test836
+++ b/tests/data/test836
@@ -36,7 +36,7 @@ imap
 IMAP multiple connection authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/836/;MAILINDEX=1' -u user.one:secret -: 'imap://%HOSTIP:%IMAPPORT/836/;UID=2' -u user.two:secret
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user.one:secret -: 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=2' -u user.two:secret
 </command>
 </client>
 
@@ -46,12 +46,12 @@ IMAP multiple connection authentication
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user.one secret
-A003 SELECT 836
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 B001 CAPABILITY
 B002 LOGIN user.two secret
-B003 SELECT 836
+B003 SELECT %TESTNUMBER
 B004 FETCH 2 BODY[]
 B005 LOGOUT
 </protocol>
diff --git a/tests/data/test837 b/tests/data/test837
index 032726681..2e46be622 100644
--- a/tests/data/test837
+++ b/tests/data/test837
@@ -37,7 +37,7 @@ imap
 IMAP external authentication
  </name>
  <command>
-'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/837/;MAILINDEX=1'
+'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication
 A001 CAPABILITY
 A002 AUTHENTICATE EXTERNAL
 dXNlcg==
-A003 SELECT 837
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test838 b/tests/data/test838
index f5378fb40..11ed7aaf0 100644
--- a/tests/data/test838
+++ b/tests/data/test838
@@ -37,7 +37,7 @@ imap
 IMAP external authentication without credentials
  </name>
  <command>
-'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/838/;MAILINDEX=1'
+'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication without credentials
 A001 CAPABILITY
 A002 AUTHENTICATE EXTERNAL
 =
-A003 SELECT 838
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test839 b/tests/data/test839
index 508fb8e57..8240bf397 100644
--- a/tests/data/test839
+++ b/tests/data/test839
@@ -38,7 +38,7 @@ imap
 IMAP external authentication with initial response
  </name>
  <command>
-'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/839/;MAILINDEX=1'
+'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication with initial response
 <protocol>
 A001 CAPABILITY
 A002 AUTHENTICATE EXTERNAL dXNlcg==
-A003 SELECT 839
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test84 b/tests/data/test84
index 178244bea..cc7626294 100644
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -31,7 +31,7 @@ http
 HTTP over proxy with site authentication
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/84 -x %HOSTIP:%HTTPPORT --user iam:myself
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself
 </command>
 <features>
 proxy
@@ -42,7 +42,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/84 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic aWFtOm15c2VsZg==
 User-Agent: curl/%VERSION
diff --git a/tests/data/test840 b/tests/data/test840
index 1e85af396..551005359 100644
--- a/tests/data/test840
+++ b/tests/data/test840
@@ -38,7 +38,7 @@ imap
 IMAP external authentication with initial response without credentials
  </name>
  <command>
-'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/840/;MAILINDEX=1'
+'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP external authentication with initial response without credentials
 <protocol>
 A001 CAPABILITY
 A002 AUTHENTICATE EXTERNAL =
-A003 SELECT 840
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test841 b/tests/data/test841
index 839bfe3d0..c5258c920 100644
--- a/tests/data/test841
+++ b/tests/data/test841
@@ -33,7 +33,7 @@ imap
 IMAP custom request doesn't check continuation data
  </name>
  <command>
- imap://%HOSTIP:%IMAPPORT/841/ -u user:secret -X 'FETCH 123 BODY[1]'
+ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/ -u user:secret -X 'FETCH 123 BODY[1]'
 </command>
 </client>
 
@@ -43,7 +43,7 @@ IMAP custom request doesn't check continuation data
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 841
+A003 SELECT %TESTNUMBER
 A004 FETCH 123 BODY[1]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test842 b/tests/data/test842
index 2b5ae1c18..42148d03e 100644
--- a/tests/data/test842
+++ b/tests/data/test842
@@ -38,7 +38,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) authentication
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/842/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 # The protocol section doesn't support ways of specifying the raw data in the
 # base64 encoded message so we must assert this
@@ -51,7 +51,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
 A001 CAPABILITY
 A002 AUTHENTICATE OAUTHBEARER
 %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-A003 SELECT 842
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test843 b/tests/data/test843
index 131188933..dcf5c1be4 100644
--- a/tests/data/test843
+++ b/tests/data/test843
@@ -39,7 +39,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/843/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -49,7 +49,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
 <protocol>
 A001 CAPABILITY
 A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-A003 SELECT 843
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test844 b/tests/data/test844
index 8573bc2fd..83dff8e59 100644
--- a/tests/data/test844
+++ b/tests/data/test844
@@ -29,7 +29,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/844/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
diff --git a/tests/data/test845 b/tests/data/test845
index 449eef353..d622f0cdc 100644
--- a/tests/data/test845
+++ b/tests/data/test845
@@ -31,7 +31,7 @@ imap
 IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/845/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
diff --git a/tests/data/test846 b/tests/data/test846
index 8d4d3c5fc..b04561b89 100644
--- a/tests/data/test846
+++ b/tests/data/test846
@@ -33,7 +33,7 @@ imap
 IMAP PREAUTH response
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/846/;MAILINDEX=1' -u notused:still-provided
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u notused:still-provided
 </command>
 </client>
 
@@ -42,7 +42,7 @@ IMAP PREAUTH response
 <verify>
 <protocol>
 A001 CAPABILITY
-A002 SELECT 846
+A002 SELECT %TESTNUMBER
 A003 FETCH 1 BODY[]
 A004 LOGOUT
 </protocol>
diff --git a/tests/data/test847 b/tests/data/test847
index d4c104332..5a68f1c6e 100644
--- a/tests/data/test847
+++ b/tests/data/test847
@@ -31,7 +31,7 @@ imap
 IMAP FETCH message
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/847/;UID=1' -u '"user:sec"ret{'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=1' -u '"user:sec"ret{'
 </command>
 </client>
 
@@ -41,7 +41,7 @@ IMAP FETCH message
 <protocol>
 A001 CAPABILITY
 A002 LOGIN "\"user" "sec\"ret{"
-A003 SELECT 847
+A003 SELECT %TESTNUMBER
 A004 UID FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test848 b/tests/data/test848
index 2b4a30b2a..27efe8ae0 100644
--- a/tests/data/test848
+++ b/tests/data/test848
@@ -37,7 +37,7 @@ imap
 IMAP plain authentication with alternative authorization identity
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/848/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox
 </command>
 </client>
 
@@ -48,7 +48,7 @@ IMAP plain authentication with alternative authorization identity
 A001 CAPABILITY
 A002 AUTHENTICATE PLAIN
 c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-A003 SELECT 848
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test849 b/tests/data/test849
index 8a4b39c00..20fca6b94 100644
--- a/tests/data/test849
+++ b/tests/data/test849
@@ -28,7 +28,7 @@ imap
 IMAP plain authentication with alternative authorization identity (Not authorized)
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/849/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel
 </command>
 </client>
 
diff --git a/tests/data/test85 b/tests/data/test85
index 6b91a1906..afddd9ca6 100644
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -34,7 +34,7 @@ http
 HTTP over proxy with site and proxy authentication
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/85 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
+http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this
 </command>
 <features>
 proxy
@@ -45,7 +45,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/we/want/that/page/85 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz
 Authorization: Basic aWFtOm15c2VsZg==
diff --git a/tests/data/test850 b/tests/data/test850
index 617610157..5b6a20f1c 100644
--- a/tests/data/test850
+++ b/tests/data/test850
@@ -31,7 +31,7 @@ pop3
 POP3 RETR message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/850 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -42,7 +42,7 @@ pop3://%HOSTIP:%POP3PORT/850 -u user:secret
 CAPA
 USER user
 PASS secret
-RETR 850
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test851 b/tests/data/test851
index 6269dd776..e47517f36 100644
--- a/tests/data/test851
+++ b/tests/data/test851
@@ -12,7 +12,7 @@ LIST
 <reply>
 <servercmd>
 # include the '.\r\n' 3-byte trailer to end the transfer properly!
-REPLY LIST +OK 851 100\r\n.
+REPLY LIST +OK %TESTNUMBER 100\r\n.
 </servercmd>
 </reply>
 
@@ -26,7 +26,7 @@ pop3
 POP3 LIST one message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/851 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 </command>
 </client>
 
@@ -37,7 +37,7 @@ pop3://%HOSTIP:%POP3PORT/851 -l -u user:secret
 CAPA
 USER user
 PASS secret
-LIST 851
+LIST %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test852 b/tests/data/test852
index de9fbe2f0..8e608eb57 100644
--- a/tests/data/test852
+++ b/tests/data/test852
@@ -26,7 +26,7 @@ pop3
 POP3 LIST invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/852 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ pop3://%HOSTIP:%POP3PORT/852 -l -u user:secret
 CAPA
 USER user
 PASS secret
-LIST 852
+LIST %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test855 b/tests/data/test855
index 87fe744fd..24b1166c6 100644
--- a/tests/data/test855
+++ b/tests/data/test855
@@ -26,7 +26,7 @@ pop3
 POP3 RETR invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/855 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ pop3://%HOSTIP:%POP3PORT/855 -u user:secret
 CAPA
 USER user
 PASS secret
-RETR 855
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test856 b/tests/data/test856
index dcb07c5a9..efff9d0aa 100644
--- a/tests/data/test856
+++ b/tests/data/test856
@@ -25,7 +25,7 @@ pop3
 POP3 invalid login
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/856 -u user:wrong
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong
 </command>
 </client>
 
diff --git a/tests/data/test857 b/tests/data/test857
index 055e35cf8..15cc4c805 100644
--- a/tests/data/test857
+++ b/tests/data/test857
@@ -42,7 +42,7 @@ pop3
 POP3 RETR message with dot-prefixed line
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/857 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -53,7 +53,7 @@ pop3://%HOSTIP:%POP3PORT/857 -u user:secret
 CAPA
 USER user
 PASS secret
-RETR 857
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test858 b/tests/data/test858
index 926dcd9e9..c4af2f7dd 100644
--- a/tests/data/test858
+++ b/tests/data/test858
@@ -23,7 +23,7 @@ pop3
 POP3 DELE message (CUSTOMREQUEST)
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/858 -u user:secret -X DELE -I
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret -X DELE -I
 </command>
 </client>
 
@@ -34,7 +34,7 @@ pop3://%HOSTIP:%POP3PORT/858 -u user:secret -X DELE -I
 CAPA
 USER user
 PASS secret
-DELE 858
+DELE %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test86 b/tests/data/test86
index 00afd9b71..5d4399c71 100644
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -57,7 +57,7 @@ http
 HTTP, urlglob []-retrieval and -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/[860001-860003]" -o "log/dumpit#1.dump"
+"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "log/dumpit#1.dump"
 </command>
 </client>
 
@@ -65,17 +65,17 @@ HTTP, urlglob []-retrieval and -o #[num] usage
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /860001 HTTP/1.1
+GET /%TESTNUMBER0001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /860002 HTTP/1.1
+GET /%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /860003 HTTP/1.1
+GET /%TESTNUMBER0003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
@@ -83,7 +83,7 @@ Accept: */*
 </protocol>
 
 # we check the second file
-<file name="log/dumpit860002.dump">
+<file name="log/dumpit%TESTNUMBER0002.dump">
 HTTP/1.0 200 OK
 Content-Type: text/html
 Funny-head: swsclose
diff --git a/tests/data/test862 b/tests/data/test862
index a21b51440..47b37bba7 100644
--- a/tests/data/test862
+++ b/tests/data/test862
@@ -32,7 +32,7 @@ pop3
 POP3 retrieve message header (CUSTOMREQUEST)
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP 862 0'
+pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP %TESTNUMBER 0'
 </command>
 </client>
 
@@ -43,7 +43,7 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP 862 0'
 CAPA
 USER user
 PASS secret
-TOP 862 0
+TOP %TESTNUMBER 0
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test864 b/tests/data/test864
index ebdebd671..9f2ba125b 100644
--- a/tests/data/test864
+++ b/tests/data/test864
@@ -37,7 +37,7 @@ crypto
 POP3 APOP authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/864 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -47,7 +47,7 @@ pop3://%HOSTIP:%POP3PORT/864 -u user:secret
 <protocol>
 CAPA
 APOP user 7501b4cdc224d469940e65e7b5e4d6eb
-RETR 864
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test865 b/tests/data/test865
index 8a262fcc5..9d931b53a 100644
--- a/tests/data/test865
+++ b/tests/data/test865
@@ -39,7 +39,7 @@ pop3
 POP3 plain authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/865 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/865 -u user:secret
 CAPA
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
-RETR 865
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test866 b/tests/data/test866
index 8fee23ab0..72e5c0339 100644
--- a/tests/data/test866
+++ b/tests/data/test866
@@ -39,7 +39,7 @@ pop3
 POP3 login authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/866 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -51,7 +51,7 @@ CAPA
 AUTH LOGIN
 dXNlcg==
 c2VjcmV0
-RETR 866
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test867 b/tests/data/test867
index 139b467de..5d59aa97c 100644
--- a/tests/data/test867
+++ b/tests/data/test867
@@ -42,7 +42,7 @@ crypto
 POP3 CRAM-MD5 authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/867 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -53,7 +53,7 @@ pop3://%HOSTIP:%POP3PORT/867 -u user:secret
 CAPA
 AUTH CRAM-MD5
 dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
-RETR 867
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test868 b/tests/data/test868
index 2fa2405ad..00045d348 100644
--- a/tests/data/test868
+++ b/tests/data/test868
@@ -51,7 +51,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/868 -u testuser:testpass
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
@@ -66,7 +66,7 @@ CAPA
 AUTH NTLM
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-RETR 868
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test869 b/tests/data/test869
index ecc422cab..96d8c837a 100644
--- a/tests/data/test869
+++ b/tests/data/test869
@@ -45,7 +45,7 @@ crypto
 POP3 DIGEST-MD5 authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/869 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -57,7 +57,7 @@ CAPA
 AUTH DIGEST-MD5
 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YzNhMGFiZTc5NDYyNTIyNGY5Njg3YTYzMTc3ZmRhNWIscW9wPWF1dGg=
 
-RETR 869
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test87 b/tests/data/test87
index ee5be78cb..ff702dc47 100644
--- a/tests/data/test87
+++ b/tests/data/test87
@@ -40,7 +40,7 @@ http
 urlglob with out of range -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/[870001-870002]" -o "log/dumpit87-#2.dump"
+"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "log/dumpit%TESTNUMBER-#2.dump"
 </command>
 </client>
 
@@ -50,7 +50,7 @@ urlglob with out of range -o #[num] usage
 # survives
 #
 <verify>
-<file name="log/dumpit87-#2.dump">
+<file name="log/dumpit%TESTNUMBER-#2.dump">
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 16
diff --git a/tests/data/test870 b/tests/data/test870
index f6333f7e0..30f3586c8 100644
--- a/tests/data/test870
+++ b/tests/data/test870
@@ -39,7 +39,7 @@ pop3
 POP3 OAuth 2.0 (XOAUTH2) authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/870 -u user --oauth2-bearer mF_9.B5f-4.1JqM
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/870 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 CAPA
 AUTH XOAUTH2
 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-RETR 870
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test871 b/tests/data/test871
index 27cc2a4b3..00adefd38 100644
--- a/tests/data/test871
+++ b/tests/data/test871
@@ -39,7 +39,7 @@ pop3
 POP3 plain authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/871 -u user:secret --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ pop3://%HOSTIP:%POP3PORT/871 -u user:secret --sasl-ir
 <protocol>
 CAPA
 AUTH PLAIN AHVzZXIAc2VjcmV0
-RETR 871
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test872 b/tests/data/test872
index 05cb2a206..19cd49a97 100644
--- a/tests/data/test872
+++ b/tests/data/test872
@@ -39,7 +39,7 @@ pop3
 POP3 login authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/872 -u user:secret --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/872 -u user:secret --sasl-ir
 CAPA
 AUTH LOGIN dXNlcg==
 c2VjcmV0
-RETR 872
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test873 b/tests/data/test873
index 2cabf1f63..533d232a1 100644
--- a/tests/data/test873
+++ b/tests/data/test873
@@ -51,7 +51,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/873 -u testuser:testpass --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass --sasl-ir
 </command>
 <precheck>
 chkhostname curlhost
@@ -65,7 +65,7 @@ chkhostname curlhost
 CAPA
 AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-RETR 873
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test874 b/tests/data/test874
index d1030da2e..1f19c5c0f 100644
--- a/tests/data/test874
+++ b/tests/data/test874
@@ -39,7 +39,7 @@ pop3
 POP3 OAuth 2.0 (XOAUTH2) authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/874 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ pop3://%HOSTIP:%POP3PORT/874 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 <protocol>
 CAPA
 AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-RETR 874
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test875 b/tests/data/test875
index 53e994087..8850fab05 100644
--- a/tests/data/test875
+++ b/tests/data/test875
@@ -15,7 +15,7 @@ pop3
 POP3 with URL-encoded CR LF in the URL
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/%0d%0a/875
+pop3://%HOSTIP:%POP3PORT/%0d%0a/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test876 b/tests/data/test876
index 6d30e538b..ae5ea07a1 100644
--- a/tests/data/test876
+++ b/tests/data/test876
@@ -34,7 +34,7 @@ crypto
 POP3 CRAM-MD5 graceful cancellation
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/876 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
diff --git a/tests/data/test877 b/tests/data/test877
index 114707aad..65070d099 100644
--- a/tests/data/test877
+++ b/tests/data/test877
@@ -42,7 +42,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/877 -u testuser:testpass
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
 </command>
 <precheck>
 chkhostname curlhost
diff --git a/tests/data/test878 b/tests/data/test878
index 98961fbe7..28bd44a7b 100644
--- a/tests/data/test878
+++ b/tests/data/test878
@@ -36,7 +36,7 @@ crypto
 POP3 DIGEST-MD5 graceful cancellation
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/878 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
diff --git a/tests/data/test879 b/tests/data/test879
index 0d45aaa20..1b7ca564b 100644
--- a/tests/data/test879
+++ b/tests/data/test879
@@ -46,7 +46,7 @@ crypto
 POP3 CRAM-MD5 authentication with SASL downgrade
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/879 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -59,7 +59,7 @@ AUTH CRAM-MD5
 *
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
-RETR 879
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test88 b/tests/data/test88
index 40b0e8f4d..b7c620762 100644
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -63,9 +63,9 @@ crypto
 HTTP PUT with Digest authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/88 -T log/put88 -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --digest
 </command>
-<file name="log/put88">
+<file name="log/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three
@@ -76,15 +76,15 @@ four is the number of lines
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /88 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 
-PUT /88 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71"
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="78a49fa53d0c228778297687d4168e71"
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
diff --git a/tests/data/test880 b/tests/data/test880
index e0609bbdc..9dc00c0f6 100644
--- a/tests/data/test880
+++ b/tests/data/test880
@@ -54,7 +54,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-pop3://%HOSTIP:%POP3PORT/880 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 <precheck>
 chkhostname curlhost
@@ -71,7 +71,7 @@ TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 *
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
-RETR 880
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test881 b/tests/data/test881
index ccb906d9d..69e31a431 100644
--- a/tests/data/test881
+++ b/tests/data/test881
@@ -48,7 +48,7 @@ crypto
 POP3 DIGEST-MD5 authentication with SASL downgrade
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/881 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
@@ -61,7 +61,7 @@ AUTH DIGEST-MD5
 *
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
-RETR 881
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test882 b/tests/data/test882
index 1e321ff1d..77a57c89c 100644
--- a/tests/data/test882
+++ b/tests/data/test882
@@ -35,7 +35,7 @@ pop3
 POP3 multiple connection authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/882001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/882002 -u user.two:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/%TESTNUMBER002 -u user.two:secret
 </command>
 </client>
 
@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/882001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/8
 CAPA
 USER user.one
 PASS secret
-RETR 882001
+RETR %TESTNUMBER001
 QUIT
 CAPA
 USER user.two
 PASS secret
-RETR 882002
+RETR %TESTNUMBER002
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test883 b/tests/data/test883
index 5d5a756a9..6d5900c20 100644
--- a/tests/data/test883
+++ b/tests/data/test883
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication
  </name>
  <command>
-'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/883'
+'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER'
 </command>
 </client>
 
@@ -50,7 +50,7 @@ POP3 external authentication
 CAPA
 AUTH EXTERNAL
 dXNlcg==
-RETR 883
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test884 b/tests/data/test884
index 34fd94d13..f0744bf28 100644
--- a/tests/data/test884
+++ b/tests/data/test884
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication without credentials
  </name>
  <command>
-'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/884'
+'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER'
 </command>
 </client>
 
@@ -50,7 +50,7 @@ POP3 external authentication without credentials
 CAPA
 AUTH EXTERNAL
 =
-RETR 884
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test885 b/tests/data/test885
index 581e9b24f..7131f16b1 100644
--- a/tests/data/test885
+++ b/tests/data/test885
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication with initial response
  </name>
  <command>
-'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/885' --sasl-ir
+'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ POP3 external authentication with initial response
 <protocol>
 CAPA
 AUTH EXTERNAL dXNlcg==
-RETR 885
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test886 b/tests/data/test886
index 3aca2f18f..f777abbae 100644
--- a/tests/data/test886
+++ b/tests/data/test886
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication with initial response without credentials
  </name>
  <command>
-'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/886' --sasl-ir
+'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ POP3 external authentication with initial response without credentials
 <protocol>
 CAPA
 AUTH EXTERNAL =
-RETR 886
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test887 b/tests/data/test887
index ccf364955..2d0f535df 100644
--- a/tests/data/test887
+++ b/tests/data/test887
@@ -40,7 +40,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) authentication
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
@@ -51,7 +51,7 @@ pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 CAPA
 AUTH OAUTHBEARER
 %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-RETR 887
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test888 b/tests/data/test888
index 465a2d0ce..b35b9d61c 100644
--- a/tests/data/test888
+++ b/tests/data/test888
@@ -40,7 +40,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 <protocol>
 CAPA
 AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-RETR 888
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test889 b/tests/data/test889
index 9658d386c..155268b98 100644
--- a/tests/data/test889
+++ b/tests/data/test889
@@ -32,7 +32,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/889 -u user --oauth2-bearer mF_9.B5f-4.1JqM
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
 </client>
 
diff --git a/tests/data/test89 b/tests/data/test89
index 0537fa5d4..c09f9b83b 100644
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -31,7 +31,7 @@ This is not the real page either!
 HTTP/1.1 301 Things are fine in server land swsclose
 Server: Microsoft-IIS/5.0
 Connection: close
-Location: /you/890010
+Location: /you/%TESTNUMBER0010
 
 </data1002>
 
@@ -67,7 +67,7 @@ WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4Ab
 HTTP/1.1 301 Things are fine in server land swsclose
 Server: Microsoft-IIS/5.0
 Connection: close
-Location: /you/890010
+Location: /you/%TESTNUMBER0010
 
 HTTP/1.1 401 Now gimme that second round of crap
 Server: Microsoft-IIS/5.0
@@ -106,7 +106,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L
 </command>
 <precheck>
 chkhostname curlhost
@@ -116,25 +116,25 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /89 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /89 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /you/890010 HTTP/1.1
+GET /you/%TESTNUMBER0010 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /you/890010 HTTP/1.1
+GET /you/%TESTNUMBER0010 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test890 b/tests/data/test890
index 4d6701ab0..e625fcac1 100644
--- a/tests/data/test890
+++ b/tests/data/test890
@@ -32,7 +32,7 @@ pop3
 POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/890 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
 </client>
 
diff --git a/tests/data/test891 b/tests/data/test891
index 61eae10c0..b2496f816 100644
--- a/tests/data/test891
+++ b/tests/data/test891
@@ -27,7 +27,7 @@ crypto
 POP3 with short authentication response
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/891 -u user:secret
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
 </command>
 </client>
 
diff --git a/tests/data/test892 b/tests/data/test892
index 4b8318292..5a6a7fd7c 100644
--- a/tests/data/test892
+++ b/tests/data/test892
@@ -39,7 +39,7 @@ pop3
 POP3 plain authentication with alternative authorization identity
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-authzid shared-mailbox
 </command>
 </client>
 
@@ -50,7 +50,7 @@ pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox
 CAPA
 AUTH PLAIN
 c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-RETR 892
+RETR %TESTNUMBER
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test893 b/tests/data/test893
index 2a762fc21..ca68dd042 100644
--- a/tests/data/test893
+++ b/tests/data/test893
@@ -30,7 +30,7 @@ pop3
 POP3 plain authentication with alternative authorization identity (Not authorized)
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/893 -u kurt:xipj3plmq --sasl-authzid ursel
+pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel
 </command>
 </client>
 
diff --git a/tests/data/test894 b/tests/data/test894
index db79830ca..f9866580b 100644
--- a/tests/data/test894
+++ b/tests/data/test894
@@ -22,7 +22,7 @@ pop3
 POP3 with CR in username
  </name>
  <command>
-pop3://user%0dFRIGGING_cmd:secret@%HOSTIP:%POP3PORT/894
+pop3://user%0dFRIGGING_cmd:secret@%HOSTIP:%POP3PORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test895 b/tests/data/test895
index 78d48c475..520e09410 100644
--- a/tests/data/test895
+++ b/tests/data/test895
@@ -32,7 +32,7 @@ imap
 IMAP with --login-options 'AUTH=*'
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/895/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=*'
+'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=*'
 </command>
 </client>
 
@@ -42,7 +42,7 @@ IMAP with --login-options 'AUTH=*'
 <protocol>
 A001 CAPABILITY
 A002 LOGIN "\"user" "sec\"ret{"
-A003 SELECT 895
+A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test9 b/tests/data/test9
index b7c561d92..e3aa2b6af 100644
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -27,10 +27,10 @@ http
 HTTP RFC1867-type formposting
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/9 -F name=daniel -F tool=curl -F file=@log/test9.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
-<file name="log/test9.txt">
+<file name="log/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar
@@ -43,7 +43,7 @@ bar
 ^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
-POST /we/want/9 HTTP/1.1
+POST /we/want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test90 b/tests/data/test90
index 91d569d08..fc5ff14cc 100644
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -41,7 +41,7 @@ This is not the real page either!
 HTTP/1.1 301 Things are fine in server land swsclose
 Server: Microsoft-IIS/5.0
 Connection: close
-Location: /you/900010
+Location: /you/%TESTNUMBER0010
 
 </data1002>
 
@@ -97,7 +97,7 @@ WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4Ab
 HTTP/1.1 301 Things are fine in server land swsclose
 Server: Microsoft-IIS/5.0
 Connection: close
-Location: /you/900010
+Location: /you/%TESTNUMBER0010
 
 HTTP/1.1 401 Authorization Required swsclose
 Server: Apache/1.3.27 (Darwin) PHP/4.1.2
@@ -144,7 +144,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -L
 </command>
 <precheck>
 chkhostname curlhost
@@ -154,35 +154,35 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /90 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /90 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /90 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /you/900010 HTTP/1.1
+GET /you/%TESTNUMBER0010 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /you/900010 HTTP/1.1
+GET /you/%TESTNUMBER0010 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /you/900010 HTTP/1.1
+GET /you/%TESTNUMBER0010 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test900 b/tests/data/test900
index 0dd7f5273..a4fc8aa03 100644
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/900 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/900 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 900
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test901 b/tests/data/test901
index 8148b29e4..787365bf0 100644
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/901 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/901 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 901
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test902 b/tests/data/test902
index 8ee105f7a..4f651a83b 100644
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -31,7 +31,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/902 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -39,8 +39,8 @@ smtp://%HOSTIP:%SMTPPORT/902 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 902
-HELO 902
+EHLO %TESTNUMBER
+HELO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test903 b/tests/data/test903
index 8a766e56d..8fe3174d3 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -32,7 +32,7 @@ SMTP plain authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/903 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 903
+EHLO %TESTNUMBER
 AUTH PLAIN
 AHVzZXIAc2VjcmV0
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test904 b/tests/data/test904
index dd3dad09b..07914970d 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -32,7 +32,7 @@ SMTP login authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/904 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 904
+EHLO %TESTNUMBER
 AUTH LOGIN
 dXNlcg==
 c2VjcmV0
diff --git a/tests/data/test905 b/tests/data/test905
index 565b04136..d29e9a835 100644
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -35,7 +35,7 @@ SMTP CRAM-MD5 authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/905 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/905 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 905
+EHLO %TESTNUMBER
 AUTH CRAM-MD5
 dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test906 b/tests/data/test906
index 6ec59c7b1..8b45b56e1 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -44,7 +44,7 @@ LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/906 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -55,7 +55,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 906
+EHLO %TESTNUMBER
 AUTH NTLM
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
diff --git a/tests/data/test907 b/tests/data/test907
index c19e1e11e..b2af26b23 100644
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -38,7 +38,7 @@ SMTP DIGEST-MD5 authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -46,7 +46,7 @@ smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 907
+EHLO %TESTNUMBER
 AUTH DIGEST-MD5
 dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwL2N1cmwiLHJlc3BvbnNlPTk0M2YxNjk1OWYxY2M2ZjA3ZTZmMDk0ZjVkYmQ0NzNlLHFvcD1hdXRo
 
diff --git a/tests/data/test908 b/tests/data/test908
index bf0b45a18..b87c4387b 100644
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -32,7 +32,7 @@ SMTP OAuth 2.0 (XOAUTH2) authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 908
+EHLO %TESTNUMBER
 AUTH XOAUTH2
 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test909 b/tests/data/test909
index e3e907ac5..d50ab8131 100644
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -19,14 +19,14 @@ smtp
  <name>
 SMTP without SIZE support
  </name>
-<file name="log/test909.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different
 To: another
 
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/909 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test909.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/909 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 909
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test91 b/tests/data/test91
index 314a65514..08f4a203a 100644
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -90,7 +90,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret
 </command>
 <precheck>
 chkhostname curlhost
@@ -100,18 +100,18 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /91 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /91 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/%VERSION
 Accept: */*
 
-GET /91 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAAIAAgAfgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAKBS3rdGYZEGsqW8otYHWXWBxC5mCuFmYm15ZG9tYWlubXlzZWxmY3VybGhvc3Q=
 User-Agent: curl/%VERSION
diff --git a/tests/data/test910 b/tests/data/test910
index c1b84ac06..8787cc060 100644
--- a/tests/data/test910
+++ b/tests/data/test910
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/910 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/910 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 910
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test911 b/tests/data/test911
index f4c545830..88631cd3d 100644
--- a/tests/data/test911
+++ b/tests/data/test911
@@ -25,7 +25,7 @@ SMTP with no mail data
 </stdin>
 
  <command>
-smtp://%HOSTIP:%SMTPPORT/911 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -33,7 +33,7 @@ smtp://%HOSTIP:%SMTPPORT/911 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 911
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test912 b/tests/data/test912
index 8970c3f1e..4a3f6d16f 100644
--- a/tests/data/test912
+++ b/tests/data/test912
@@ -23,14 +23,14 @@ smtp
  <name>
 SMTP with SIZE support
  </name>
-<file name="log/test912.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different
 To: another
 
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/912 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test912.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/912 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 912
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com> SIZE=38
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test913 b/tests/data/test913
index d13a11ae8..9c19eb2dc 100644
--- a/tests/data/test913
+++ b/tests/data/test913
@@ -23,14 +23,14 @@ smtp
  <name>
 SMTP with large message SIZE
  </name>
-<file name="log/test913.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different
 To: another
 
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/913 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test913.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/913 --mail-rcpt recipient@example.com --mail-from sende
 55
 </errorcode>
 <protocol>
-EHLO 913
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com> SIZE=38
 QUIT
 </protocol>
diff --git a/tests/data/test914 b/tests/data/test914
index 0124b7671..ab895d2cd 100644
--- a/tests/data/test914
+++ b/tests/data/test914
@@ -22,14 +22,14 @@ smtp
  <name>
 SMTP invalid --mail-from
  </name>
-<file name="log/test914.eml">
+<file name="log/test%TESTNUMBER.eml">
 From: different
 To: another
 
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/914 --mail-rcpt recipient@example.com --mail-from invalid -T log/test914.eml
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from invalid -T log/test%TESTNUMBER.eml
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/914 --mail-rcpt recipient@example.com --mail-from inval
 55
 </errorcode>
 <protocol>
-EHLO 914
+EHLO %TESTNUMBER
 MAIL FROM:<invalid>
 QUIT
 </protocol>
diff --git a/tests/data/test915 b/tests/data/test915
index 4d31db3c1..5d8944221 100644
--- a/tests/data/test915
+++ b/tests/data/test915
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/915 --mail-rcpt recipient@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/915 --mail-rcpt recipient@example.com -T -
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 915
+EHLO %TESTNUMBER
 MAIL FROM:<>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test916 b/tests/data/test916
index 00211550a..2c375ee2e 100644
--- a/tests/data/test916
+++ b/tests/data/test916
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/916 --mail-rcpt invalid --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/916 --mail-rcpt invalid --mail-from sender@example.com
 55
 </errorcode>
 <protocol>
-EHLO 916
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<invalid>
 QUIT
diff --git a/tests/data/test917 b/tests/data/test917
index cc75da3aa..fcf21ddac 100644
--- a/tests/data/test917
+++ b/tests/data/test917
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/917 --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/917 --mail-rcpt recipient.one@example.com --mail-rcpt r
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 917
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient.one@example.com>
 RCPT TO:<recipient.two@example.com>
diff --git a/tests/data/test918 b/tests/data/test918
index 3756edd75..817674fb8 100644
--- a/tests/data/test918
+++ b/tests/data/test918
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/918 --mail-rcpt recipient.one@example.com --mail-rcpt invalid --mail-rcpt recipient.three@example.com --mail-rcpt sTrAnGe --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt invalid --mail-rcpt recipient.three@example.com --mail-rcpt sTrAnGe --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/918 --mail-rcpt recipient.one@example.com --mail-rcpt i
 55
 </errorcode>
 <protocol>
-EHLO 918
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient.one@example.com>
 RCPT TO:<invalid>
diff --git a/tests/data/test919 b/tests/data/test919
index 39794e30b..8c49abd26 100644
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -32,7 +32,7 @@ SMTP plain authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 919
+EHLO %TESTNUMBER
 AUTH PLAIN AHVzZXIAc2VjcmV0
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
diff --git a/tests/data/test92 b/tests/data/test92
index 7e03f0a12..1c09e97bf 100644
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -48,14 +48,14 @@ http
 HTTP resume transfer with the whole file already downloaded
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/92 -C 87
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /want/92 HTTP/1.1
+GET /want/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=87-
 User-Agent: curl/%VERSION
diff --git a/tests/data/test920 b/tests/data/test920
index 82f6c5601..26255188f 100644
--- a/tests/data/test920
+++ b/tests/data/test920
@@ -32,7 +32,7 @@ SMTP login authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 920
+EHLO %TESTNUMBER
 AUTH LOGIN dXNlcg==
 c2VjcmV0
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test921 b/tests/data/test921
index f9e56736d..2d90e73da 100644
--- a/tests/data/test921
+++ b/tests/data/test921
@@ -44,7 +44,7 @@ LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/921 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass --sasl-ir -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -55,7 +55,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 921
+EHLO %TESTNUMBER
 AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test922 b/tests/data/test922
index aacd684e6..8c16e4311 100644
--- a/tests/data/test922
+++ b/tests/data/test922
@@ -32,7 +32,7 @@ SMTP OAuth 2.0 (XOAUTH2) authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/922 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/922 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 922
+EHLO %TESTNUMBER
 AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
diff --git a/tests/data/test923 b/tests/data/test923
index 9d9722f9a..68a013839 100644
--- a/tests/data/test923
+++ b/tests/data/test923
@@ -21,7 +21,7 @@ smtp
 SMTP VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/923 --mail-rcpt recipient
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 </command>
 </client>
 
@@ -29,7 +29,7 @@ smtp://%HOSTIP:%SMTPPORT/923 --mail-rcpt recipient
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 923
+EHLO %TESTNUMBER
 VRFY recipient
 QUIT
 </protocol>
diff --git a/tests/data/test924 b/tests/data/test924
index 51e373c7e..c87b2a9d5 100644
--- a/tests/data/test924
+++ b/tests/data/test924
@@ -27,7 +27,7 @@ smtp
 SMTP ambiguous VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/924 --mail-rcpt smith
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt smith
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/924 --mail-rcpt smith
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 924
+EHLO %TESTNUMBER
 VRFY smith
 QUIT
 </protocol>
diff --git a/tests/data/test925 b/tests/data/test925
index 2d53100df..3b1801b0c 100644
--- a/tests/data/test925
+++ b/tests/data/test925
@@ -24,7 +24,7 @@ smtp
 SMTP external VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/925 --mail-rcpt user@example.net
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@example.net
 </command>
 </client>
 
@@ -32,7 +32,7 @@ smtp://%HOSTIP:%SMTPPORT/925 --mail-rcpt user@example.net
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 925
+EHLO %TESTNUMBER
 VRFY user@example.net
 QUIT
 </protocol>
diff --git a/tests/data/test926 b/tests/data/test926
index 4c4576c89..aed6f4b8d 100644
--- a/tests/data/test926
+++ b/tests/data/test926
@@ -24,7 +24,7 @@ smtp
 SMTP unknown user VRFY
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/926 --mail-rcpt recipient
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
 </command>
 </client>
 
@@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/926 --mail-rcpt recipient
 56
 </errorcode>
 <protocol>
-EHLO 926
+EHLO %TESTNUMBER
 VRFY recipient
 QUIT
 </protocol>
diff --git a/tests/data/test927 b/tests/data/test927
index b1997102e..a982d147a 100644
--- a/tests/data/test927
+++ b/tests/data/test927
@@ -27,7 +27,7 @@ smtp
 SMTP mailing list EXPN (CUSTOMREQUEST)
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/927 --mail-rcpt Friends -X EXPN
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/927 --mail-rcpt Friends -X EXPN
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 927
+EHLO %TESTNUMBER
 EXPN Friends
 QUIT
 </protocol>
diff --git a/tests/data/test928 b/tests/data/test928
index 81bbdc2fa..3ed097957 100644
--- a/tests/data/test928
+++ b/tests/data/test928
@@ -25,7 +25,7 @@ smtp
 SMTP HELP
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/928
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -33,7 +33,7 @@ smtp://%HOSTIP:%SMTPPORT/928
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 928
+EHLO %TESTNUMBER
 HELP
 QUIT
 </protocol>
diff --git a/tests/data/test929 b/tests/data/test929
index 3761ab5ae..be2632829 100644
--- a/tests/data/test929
+++ b/tests/data/test929
@@ -22,7 +22,7 @@ smtp
 SMTP NOOP (CUSTOMREQUEST)
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/929 -X NOOP -I
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X NOOP -I
 </command>
 </client>
 
@@ -30,7 +30,7 @@ smtp://%HOSTIP:%SMTPPORT/929 -X NOOP -I
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 929
+EHLO %TESTNUMBER
 NOOP
 QUIT
 </protocol>
diff --git a/tests/data/test93 b/tests/data/test93
index 684e56cd4..e0266e68c 100644
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -29,7 +29,7 @@ http
 HTTP GET with failed proxy auth
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
 <features>
 proxy
@@ -40,7 +40,7 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test930 b/tests/data/test930
index be633c1fa..ebde938c5 100644
--- a/tests/data/test930
+++ b/tests/data/test930
@@ -22,7 +22,7 @@ smtp
 SMTP RSET (CUSTOMREQUEST)
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/930 -X RSET -I
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X RSET -I
 </command>
 </client>
 
@@ -30,7 +30,7 @@ smtp://%HOSTIP:%SMTPPORT/930 -X RSET -I
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 930
+EHLO %TESTNUMBER
 RSET
 QUIT
 </protocol>
diff --git a/tests/data/test931 b/tests/data/test931
index 722aa0222..226f2dd2d 100644
--- a/tests/data/test931
+++ b/tests/data/test931
@@ -15,7 +15,7 @@ smtp
 SMTP with URL-encoded CR LF in the URL
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/%0d%0a/931
+smtp://%HOSTIP:%SMTPPORT/%0d%0a/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test932 b/tests/data/test932
index 13ab790d6..b6f828cfb 100644
--- a/tests/data/test932
+++ b/tests/data/test932
@@ -33,7 +33,7 @@ crypto
 SMTP CRAM-MD5 graceful cancellation
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/932 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -48,7 +48,7 @@ smtp://%HOSTIP:%SMTPPORT/932 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 932
+EHLO %TESTNUMBER
 AUTH CRAM-MD5
 *
 </protocol>
diff --git a/tests/data/test933 b/tests/data/test933
index e091de395..518a9b157 100644
--- a/tests/data/test933
+++ b/tests/data/test933
@@ -41,7 +41,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-smtp://%HOSTIP:%SMTPPORT/933 --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -59,7 +59,7 @@ chkhostname curlhost
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 933
+EHLO %TESTNUMBER
 AUTH NTLM
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 *
diff --git a/tests/data/test934 b/tests/data/test934
index 1794d81d8..87b8571d7 100644
--- a/tests/data/test934
+++ b/tests/data/test934
@@ -35,7 +35,7 @@ crypto
 SMTP DIGEST-MD5 graceful cancellation
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/934 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -50,7 +50,7 @@ smtp://%HOSTIP:%SMTPPORT/934 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 934
+EHLO %TESTNUMBER
 AUTH DIGEST-MD5
 *
 </protocol>
diff --git a/tests/data/test935 b/tests/data/test935
index 946611477..fe106f8bd 100644
--- a/tests/data/test935
+++ b/tests/data/test935
@@ -39,7 +39,7 @@ SMTP CRAM-MD5 authentication with SASL downgrade
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/935 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://%HOSTIP:%SMTPPORT/935 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 935
+EHLO %TESTNUMBER
 AUTH CRAM-MD5
 *
 AUTH PLAIN
diff --git a/tests/data/test936 b/tests/data/test936
index b12349968..6d8074f2e 100644
--- a/tests/data/test936
+++ b/tests/data/test936
@@ -47,7 +47,7 @@ CURL_GETHOSTNAME=curlhost
 LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
-smtp://%HOSTIP:%SMTPPORT/936 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 <precheck>
 chkhostname curlhost
@@ -58,7 +58,7 @@ chkhostname curlhost
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 936
+EHLO %TESTNUMBER
 AUTH NTLM
 TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 *
diff --git a/tests/data/test937 b/tests/data/test937
index 5e729e308..c2a195ab1 100644
--- a/tests/data/test937
+++ b/tests/data/test937
@@ -41,7 +41,7 @@ SMTP DIGEST-MD5 authentication with SASL downgrade
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/937 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/937 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 937
+EHLO %TESTNUMBER
 AUTH DIGEST-MD5
 *
 AUTH PLAIN
diff --git a/tests/data/test938 b/tests/data/test938
index 7931d0aaa..ec19998c0 100644
--- a/tests/data/test938
+++ b/tests/data/test938
@@ -30,11 +30,11 @@ smtp
  <name>
 SMTP multiple connection authentication
  </name>
-<file name="log/upload938">
+<file name="log/upload%TESTNUMBER">
 mail body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/938001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T log/upload938 -: smtp://%HOSTIP:%SMTPPORT/938002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T log/upload938
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T log/upload%TESTNUMBER -: smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T log/upload%TESTNUMBER
 </command>
 </client>
 
@@ -42,14 +42,14 @@ smtp://%HOSTIP:%SMTPPORT/938001 --mail-rcpt recipient@example.com --mail-from se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 938001
+EHLO %TESTNUMBER001
 AUTH PLAIN
 dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
 QUIT
-EHLO 938002
+EHLO %TESTNUMBER002
 AUTH PLAIN
 dXNlci50d28AdXNlci50d28Ac2VjcmV0
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test939 b/tests/data/test939
index 34ba8a0eb..b385798b6 100644
--- a/tests/data/test939
+++ b/tests/data/test939
@@ -27,7 +27,7 @@ RFC821-only SMTP with username and password
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/939 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -35,8 +35,8 @@ smtp://%HOSTIP:%SMTPPORT/939 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 939
-HELO 939
+EHLO %TESTNUMBER
+HELO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test94 b/tests/data/test94
index 6d54e7870..87b65d13a 100644
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -35,7 +35,7 @@ proxy
 HTTPS GET with failed proxy auth (CONNECT 1.0)
  </name>
  <command>
-https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
+https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT
 </command>
 </client>
 
@@ -46,8 +46,8 @@ https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
 56
 </errorcode>
 <protocol>
-CONNECT test.anything.really.com:94 HTTP/1.0
-Host: test.anything.really.com:94
+CONNECT test.anything.really.com:%TESTNUMBER HTTP/1.0
+Host: test.anything.really.com:%TESTNUMBER
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
diff --git a/tests/data/test940 b/tests/data/test940
index 4dfb72cad..baa0c9894 100644
--- a/tests/data/test940
+++ b/tests/data/test940
@@ -23,7 +23,7 @@ SMTP with username and password but no AUTH capability
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/940 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T -
 </command>
 </client>
 
@@ -31,7 +31,7 @@ smtp://%HOSTIP:%SMTPPORT/940 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 940
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test941 b/tests/data/test941
index fd69b8732..f4dc34fae 100644
--- a/tests/data/test941
+++ b/tests/data/test941
@@ -20,7 +20,7 @@ smtp
  <name>
 SMTP with --crlf
  </name>
-<file name="log/upload941">
+<file name="log/upload%TESTNUMBER">
 From: different
 To: another
 
@@ -34,7 +34,7 @@ the
 --crlf option
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/941 --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/upload941 --crlf
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/upload%TESTNUMBER --crlf
 </command>
 </client>
 
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/941 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 941
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test942 b/tests/data/test942
index 26740f7b6..ae30a9c6e 100644
--- a/tests/data/test942
+++ b/tests/data/test942
@@ -32,7 +32,7 @@ SMTP external authentication
 mail body
 </stdin>
  <command>
-'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/942' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 942
+EHLO %TESTNUMBER
 AUTH EXTERNAL
 dXNlcg==
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test943 b/tests/data/test943
index aef2c6228..4f403cdff 100644
--- a/tests/data/test943
+++ b/tests/data/test943
@@ -32,7 +32,7 @@ SMTP external authentication without credentials
 mail body
 </stdin>
  <command>
-'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/943' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 943
+EHLO %TESTNUMBER
 AUTH EXTERNAL
 =
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test944 b/tests/data/test944
index 4b60f120f..0539a8ae1 100644
--- a/tests/data/test944
+++ b/tests/data/test944
@@ -32,7 +32,7 @@ SMTP external authentication with initial response
 mail body
 </stdin>
  <command>
-'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/944' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
+'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 944
+EHLO %TESTNUMBER
 AUTH EXTERNAL dXNlcg==
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
diff --git a/tests/data/test945 b/tests/data/test945
index 3526408d3..5a3fb4937 100644
--- a/tests/data/test945
+++ b/tests/data/test945
@@ -32,7 +32,7 @@ SMTP external authentication with initial response without credentials
 mail body
 </stdin>
  <command>
-'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/945' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
+'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ mail body
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 945
+EHLO %TESTNUMBER
 AUTH EXTERNAL =
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
diff --git a/tests/data/test946 b/tests/data/test946
index aa88364fa..ea6569380 100644
--- a/tests/data/test946
+++ b/tests/data/test946
@@ -33,7 +33,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) authentication
 mail body
 </stdin>
  <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 -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/946 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 946
+EHLO %TESTNUMBER
 AUTH OAUTHBEARER
 %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test947 b/tests/data/test947
index d2622be8d..290da7114 100644
--- a/tests/data/test947
+++ b/tests/data/test947
@@ -33,7 +33,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) authentication with initial response
 mail body
 </stdin>
  <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 -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/947 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 947
+EHLO %TESTNUMBER
 AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
diff --git a/tests/data/test948 b/tests/data/test948
index a6eadf5fa..59a492f17 100644
--- a/tests/data/test948
+++ b/tests/data/test948
@@ -34,7 +34,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation
 mail body
 </stdin>
  <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 -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/948 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 948
+EHLO %TESTNUMBER
 AUTH OAUTHBEARER
 %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
 AQ==
diff --git a/tests/data/test949 b/tests/data/test949
index 82064f19a..0c9007495 100644
--- a/tests/data/test949
+++ b/tests/data/test949
@@ -34,7 +34,7 @@ SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
 mail body
 </stdin>
  <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 -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/949 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 949
+EHLO %TESTNUMBER
 AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
 AQ==
 </protocol>
diff --git a/tests/data/test95 b/tests/data/test95
index 4e3c1ff4e..bc82f162f 100644
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -50,7 +50,7 @@ http-proxy
 HTTP over proxytunnel using POST
  </name>
  <command>
-http://test.95:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes"
+http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes"
 </command>
 <features>
 proxy
@@ -61,15 +61,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT test.95:%HTTPPORT HTTP/1.1
-Host: test.95:%HTTPPORT
+CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive
 
 </proxy>
 <protocol nonewline="yes">
-POST /we/want/that/page/95 HTTP/1.1
-Host: test.95:%HTTPPORT
+POST /we/want/that/page/%TESTNUMBER HTTP/1.1
+Host: test.%TESTNUMBER:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 27
diff --git a/tests/data/test950 b/tests/data/test950
index 295f8b877..3198ab214 100644
--- a/tests/data/test950
+++ b/tests/data/test950
@@ -27,7 +27,7 @@ SMTP VRFY with custom request
 
 # the custom request just does it lowercase to remain the same command
 <command>
-smtp://%HOSTIP:%SMTPPORT/950 --mail-rcpt recipient --request "vrfy"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy"
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/950 --mail-rcpt recipient --request "vrfy"
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 950
+EHLO %TESTNUMBER
 vrfy recipient
 QUIT
 </protocol>
diff --git a/tests/data/test951 b/tests/data/test951
index 7d2e17b1b..3a3626f7e 100644
--- a/tests/data/test951
+++ b/tests/data/test951
@@ -23,7 +23,7 @@ SMTP data with dot as first character
 .This first line starts with a dot
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/951 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -31,7 +31,7 @@ smtp://%HOSTIP:%SMTPPORT/951 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 951
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test952 b/tests/data/test952
index 54334b21e..39b9f7608 100644
--- a/tests/data/test952
+++ b/tests/data/test952
@@ -23,7 +23,7 @@ SMTP data with single dot-only line
 .
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/952 --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -31,7 +31,7 @@ smtp://%HOSTIP:%SMTPPORT/952 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 952
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test953 b/tests/data/test953
index 4a70e1f31..e4d0328a6 100644
--- a/tests/data/test953
+++ b/tests/data/test953
@@ -32,7 +32,7 @@ SMTP plain authentication with alternative authorization identity
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 953
+EHLO %TESTNUMBER
 AUTH PLAIN
 dXJzZWwAa3VydAB4aXBqM3BsbXE=
 MAIL FROM:<sender@example.com>
diff --git a/tests/data/test954 b/tests/data/test954
index a5e6bb0d3..fa2d59185 100644
--- a/tests/data/test954
+++ b/tests/data/test954
@@ -5,7 +5,7 @@ SMTP
 SASL
 SASL AUTH PLAIN
 RFC4616
-RFC4954
+RFC4%TESTNUMBER
 </keywords>
 </info>
 
@@ -32,7 +32,7 @@ SMTP plain authentication with alternative authorization identity (Not authorize
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 954
+EHLO %TESTNUMBER
 AUTH PLAIN
 dXJzZWwAa3VydAB4aXBqM3BsbXE=
 </protocol>
diff --git a/tests/data/test955 b/tests/data/test955
index 97ef29561..6525baab3 100644
--- a/tests/data/test955
+++ b/tests/data/test955
@@ -39,7 +39,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/955 --mail-rcpt recipient@example.com --mail-from Avsändaren@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from Avsändaren@example.com -T -
 </command>
 </client>
 
@@ -51,7 +51,7 @@ smtp://%HOSTIP:%SMTPPORT/955 --mail-rcpt recipient@example.com --mail-from Avsä
 55
 </errorcode>
 <protocol>
-EHLO 955
+EHLO %TESTNUMBER
 MAIL FROM:<Avsändaren@example.com>
 QUIT
 </protocol>
diff --git a/tests/data/test956 b/tests/data/test956
index 7fc9bc9af..52d2454a2 100644
--- a/tests/data/test956
+++ b/tests/data/test956
@@ -36,7 +36,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/956 --mail-rcpt Stödmottagaren@example.com --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Stödmottagaren@example.com --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -48,7 +48,7 @@ smtp://%HOSTIP:%SMTPPORT/956 --mail-rcpt Stödmottagaren@example.com --mail-from
 55
 </errorcode>
 <protocol>
-EHLO 956
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<Stödmottagaren@example.com>
 QUIT
diff --git a/tests/data/test957 b/tests/data/test957
index 28c9c478a..5859f92fc 100644
--- a/tests/data/test957
+++ b/tests/data/test957
@@ -31,7 +31,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/957 --mail-rcpt Användaren
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/957 --mail-rcpt Användaren
 56
 </errorcode>
 <protocol>
-EHLO 957
+EHLO %TESTNUMBER
 VRFY Användaren
 QUIT
 </protocol>
diff --git a/tests/data/test958 b/tests/data/test958
index 66ba414cb..ce3de3342 100644
--- a/tests/data/test958
+++ b/tests/data/test958
@@ -31,7 +31,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/958 --mail-rcpt Användaren@example.com
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@example.com
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/958 --mail-rcpt Användaren@example.com
 56
 </errorcode>
 <protocol>
-EHLO 958
+EHLO %TESTNUMBER
 VRFY Användaren@example.com
 QUIT
 </protocol>
diff --git a/tests/data/test959 b/tests/data/test959
index 1b2d65842..8bebe40ad 100644
--- a/tests/data/test959
+++ b/tests/data/test959
@@ -40,7 +40,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/959 --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
 </command>
 </client>
 
@@ -52,7 +52,7 @@ smtp://%HOSTIP:%SMTPPORT/959 --mail-rcpt recipient@example.com --mail-from sende
 55
 </errorcode>
 <protocol>
-EHLO 959
+EHLO %TESTNUMBER
 MAIL FROM:<sender@åäö.se>
 QUIT
 </protocol>
diff --git a/tests/data/test960 b/tests/data/test960
index 32834cda0..68d8eda72 100644
--- a/tests/data/test960
+++ b/tests/data/test960
@@ -37,7 +37,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/960 --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/960 --mail-rcpt recipient@åäö.se --mail-from sender@
 55
 </errorcode>
 <protocol>
-EHLO 960
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@åäö.se>
 QUIT
diff --git a/tests/data/test961 b/tests/data/test961
index 2148a0ce5..02e265353 100644
--- a/tests/data/test961
+++ b/tests/data/test961
@@ -32,7 +32,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (host part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/961 --mail-rcpt user@åäö.se
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se
 </command>
 </client>
 
@@ -44,7 +44,7 @@ smtp://%HOSTIP:%SMTPPORT/961 --mail-rcpt user@åäö.se
 56
 </errorcode>
 <protocol>
-EHLO 961
+EHLO %TESTNUMBER
 VRFY user@åäö.se
 QUIT
 </protocol>
diff --git a/tests/data/test962 b/tests/data/test962
index 35b368cfd..0977ab326 100644
--- a/tests/data/test962
+++ b/tests/data/test962
@@ -38,7 +38,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/962 --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
 </command>
 </client>
 
@@ -46,7 +46,7 @@ smtp://%HOSTIP:%SMTPPORT/962 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 962
+EHLO %TESTNUMBER
 MAIL FROM:<sender@xn--4cab6c.se>
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test963 b/tests/data/test963
index 7ea121507..22b252a96 100644
--- a/tests/data/test963
+++ b/tests/data/test963
@@ -38,7 +38,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/963 --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -46,7 +46,7 @@ smtp://%HOSTIP:%SMTPPORT/963 --mail-rcpt recipient@åäö.se --mail-from sender@
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 963
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@xn--4cab6c.se>
 DATA
diff --git a/tests/data/test964 b/tests/data/test964
index 5448d0f21..7901e0aeb 100644
--- a/tests/data/test964
+++ b/tests/data/test964
@@ -33,7 +33,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only)
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/964 --mail-rcpt user@åäö.se
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/964 --mail-rcpt user@åäö.se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 964
+EHLO %TESTNUMBER
 VRFY user@xn--4cab6c.se
 QUIT
 </protocol>
diff --git a/tests/data/test965 b/tests/data/test965
index 8c93bc0c8..ada2d8e70 100644
--- a/tests/data/test965
+++ b/tests/data/test965
@@ -41,7 +41,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/965 --mail-rcpt recipient@example.com --mail-from Avsändaren@åäö.se -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from Avsändaren@åäö.se -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/965 --mail-rcpt recipient@example.com --mail-from Avsä
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 965
+EHLO %TESTNUMBER
 MAIL FROM:<Avsändaren@xn--4cab6c.se> SMTPUTF8
 RCPT TO:<recipient@example.com>
 DATA
diff --git a/tests/data/test966 b/tests/data/test966
index 499fdda61..d2eb7c17c 100644
--- a/tests/data/test966
+++ b/tests/data/test966
@@ -41,7 +41,7 @@ To: another
 body
 </stdin>
 <command>
-smtp://%HOSTIP:%SMTPPORT/966 --mail-rcpt Stödmottagaren@åäö.se --mail-from sender@example.com -T -
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Stödmottagaren@åäö.se --mail-from sender@example.com -T -
 </command>
 </client>
 
@@ -49,7 +49,7 @@ smtp://%HOSTIP:%SMTPPORT/966 --mail-rcpt Stödmottagaren@åäö.se --mail-from s
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 966
+EHLO %TESTNUMBER
 MAIL FROM:<sender@example.com> SMTPUTF8
 RCPT TO:<Stödmottagaren@xn--4cab6c.se>
 DATA
diff --git a/tests/data/test967 b/tests/data/test967
index 2813f508b..87a37ae05 100644
--- a/tests/data/test967
+++ b/tests/data/test967
@@ -39,7 +39,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP external VRFY with SMTPUTF8 support
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/967 --mail-rcpt Användaren@åäö.se
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@åäö.se
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://%HOSTIP:%SMTPPORT/967 --mail-rcpt Användaren@åäö.se
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 967
+EHLO %TESTNUMBER
 VRFY Användaren@xn--4cab6c.se SMTPUTF8
 QUIT
 </protocol>
diff --git a/tests/data/test968 b/tests/data/test968
index ca58970c2..89b543ae4 100644
--- a/tests/data/test968
+++ b/tests/data/test968
@@ -36,7 +36,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan
 SMTP VRFY with SMTPUTF8 support
  </name>
 <command>
-smtp://%HOSTIP:%SMTPPORT/968 --mail-rcpt Användaren
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren
 </command>
 </client>
 
@@ -44,7 +44,7 @@ smtp://%HOSTIP:%SMTPPORT/968 --mail-rcpt Användaren
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 968
+EHLO %TESTNUMBER
 VRFY Användaren SMTPUTF8
 QUIT
 </protocol>
diff --git a/tests/data/test969 b/tests/data/test969
index 9d3fa93e8..860c9d47b 100644
--- a/tests/data/test969
+++ b/tests/data/test969
@@ -35,7 +35,7 @@ idn
 SMTP mailing list EXPN (CUSTOMREQUEST) with SMTPUTF8 support
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/969 --mail-rcpt Friends -X EXPN
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
 </command>
 </client>
 
@@ -43,7 +43,7 @@ smtp://%HOSTIP:%SMTPPORT/969 --mail-rcpt Friends -X EXPN
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 969
+EHLO %TESTNUMBER
 EXPN Friends SMTPUTF8
 QUIT
 </protocol>
diff --git a/tests/data/test97 b/tests/data/test97
index d76941196..db36eeb70 100644
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -29,7 +29,7 @@ http
 HTTP POST with custom content-type
  </name>
  <command>
- -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/97
+ -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
@@ -37,7 +37,7 @@ HTTP POST with custom content-type
 # Verify data after the test has been "shot"
 <verify>
 <protocol nonewline="yes">
-POST /97 HTTP/1.1
+POST /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test970 b/tests/data/test970
index 44c640c94..d052e809d 100644
--- a/tests/data/test970
+++ b/tests/data/test970
@@ -44,7 +44,7 @@ CURL_VERSION=curl-unit-test-fake-version
 HTTP GET with JSON output
 </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/970 --write-out '%{json}' -o log/out970
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o log/out%TESTNUMBER
 </command>
 </client>
 
@@ -52,14 +52,14 @@ http://%HOSTIP:%HTTPPORT/970 --write-out '%{json}' -o log/out970
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /970 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
 <stdout nonewline="yes">
-{"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out970","ftp_entry_path":null,"http_code":200,"http_connect":000,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/970","url_effective":"http://%HOSTIP:%HTTPPORT/970","urlnum":0,"curl_version":"curl-unit-test-fake-version"}
+{"content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":000,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"}
 </stdout>
 </verify>
 </testcase>
diff --git a/tests/data/test98 b/tests/data/test98
index ef0cded2f..1d89c34fe 100644
--- a/tests/data/test98
+++ b/tests/data/test98
@@ -29,7 +29,7 @@ http
 HTTP PUT from stdin with set size, disabling chunked transfer-encoding
  </name>
  <command>
- -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HTTPPORT/98
+ -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 <stdin>
 data on stdin
@@ -40,7 +40,7 @@ data on stdin
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-PUT /98 HTTP/1.1
+PUT /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/data/test99 b/tests/data/test99
index cc7b8d765..1ed74b0ba 100644
--- a/tests/data/test99
+++ b/tests/data/test99
@@ -44,7 +44,7 @@ http
 HTTP GET with large-file resume point and failed resume
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/99 -C 9999999999
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999
 </command>
 </client>
 
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/99 -C 9999999999
 33
 </errorcode>
 <protocol>
-GET /99 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=9999999999-
 User-Agent: curl/%VERSION