diff --git a/tests/data/test1330 b/tests/data/test1330
index 4e97162b54..93b8604614 100644
--- a/tests/data/test1330
+++ b/tests/data/test1330
@@ -23,9 +23,6 @@ TrackMemory
 <name>
 unit tests memory tracking operational
 </name>
-<command>
-nothing
-</command>
 </client>
 
 #
diff --git a/tests/data/test1506 b/tests/data/test1506
index d3cec05780..ed95e3be6f 100644
--- a/tests/data/test1506
+++ b/tests/data/test1506
@@ -55,7 +55,7 @@ lib%TESTNUMBER
 HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS)
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
+- %HOSTIP %HTTPPORT
 </command>
 </client>
 
diff --git a/tests/data/test1508 b/tests/data/test1508
index 9b210ec0f3..65345df7b9 100644
--- a/tests/data/test1508
+++ b/tests/data/test1508
@@ -17,9 +17,6 @@ lib%TESTNUMBER
 <name>
 Close a multi handle without using it
 </name>
-<command>
-http://%HOSTIP:%NOLISTENPORT/path/%TESTNUMBER
-</command>
 </client>
 
 # Verify data after the test has been "shot"
diff --git a/tests/data/test1510 b/tests/data/test1510
index 236fbde3d9..4a80b7a1d2 100644
--- a/tests/data/test1510
+++ b/tests/data/test1510
@@ -55,7 +55,7 @@ lib%TESTNUMBER
 HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
+- %HOSTIP %HTTPPORT
 </command>
 </client>
 
diff --git a/tests/data/test1512 b/tests/data/test1512
index c0c23467b2..a0e321432b 100644
--- a/tests/data/test1512
+++ b/tests/data/test1512
@@ -54,7 +54,7 @@ lib%TESTNUMBER
 GLOBAL CACHE test over two easy performs
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT
+- %HOSTIP %HTTPPORT
 </command>
 </client>
 
diff --git a/tests/data/test1521 b/tests/data/test1521
index f62f58c5f9..a6319e3f36 100644
--- a/tests/data/test1521
+++ b/tests/data/test1521
@@ -18,9 +18,6 @@ lib%TESTNUMBER
 <name>
 Test all curl_easy_setopt and curl_easy_getinfo options
 </name>
-<command>
-unused
-</command>
 </client>
 
 #
diff --git a/tests/data/test1537 b/tests/data/test1537
index c999e9a6bf..9e585b7a23 100644
--- a/tests/data/test1537
+++ b/tests/data/test1537
@@ -22,9 +22,6 @@ lib%TESTNUMBER
 <name>
 libcurl URL escape/unescape tests
 </name>
-<command>
-nothing
-</command>
 </client>
 
 #
diff --git a/tests/data/test1538 b/tests/data/test1538
index 0615a9a4ca..02f8bc431b 100644
--- a/tests/data/test1538
+++ b/tests/data/test1538
@@ -23,9 +23,6 @@ lib%TESTNUMBER
 <name>
 libcurl strerror API call tests
 </name>
-<command>
-nothing
-</command>
 </client>
 
 #
diff --git a/tests/data/test1550 b/tests/data/test1550
index 3d747792fe..8fd36f72e7 100644
--- a/tests/data/test1550
+++ b/tests/data/test1550
@@ -22,8 +22,5 @@ lib%TESTNUMBER
 <name>
 verify setting pipelining blocklisting options
 </name>
-<command>
-http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
-</command>
 </client>
 </testcase>
diff --git a/tests/data/test1557 b/tests/data/test1557
index ae4ac42a2c..738a58dab7 100644
--- a/tests/data/test1557
+++ b/tests/data/test1557
@@ -21,7 +21,7 @@ lib%TESTNUMBER
 Remove easy handle in pending connections doesn't leave dangling entry
 </name>
 <command>
-nothing
+hostname.invalid
 </command>
 </client>
 
diff --git a/tests/data/test1564 b/tests/data/test1564
index 59cef7157b..e690674507 100644
--- a/tests/data/test1564
+++ b/tests/data/test1564
@@ -24,8 +24,6 @@ lib%TESTNUMBER
 <name>
 wakeup before poll with no easy handles
 </name>
-<command>
-</command>
 </client>
 
 # Verify data after the test has been "shot"
diff --git a/tests/data/test1597 b/tests/data/test1597
index 047bf7bd80..0becf616ca 100644
--- a/tests/data/test1597
+++ b/tests/data/test1597
@@ -19,9 +19,6 @@ CURLOPT_PROTOCOLS_STR
 <tool>
 lib%TESTNUMBER
 </tool>
-<command>
--
-</command>
 </client>
 
 <verify>
diff --git a/tests/data/test2402 b/tests/data/test2402
index 563443171a..4e08e45ac4 100644
--- a/tests/data/test2402
+++ b/tests/data/test2402
@@ -60,7 +60,7 @@ lib%TESTNUMBER
 HTTP GET multiple files over HTTP/2 using HTTPS
 </name>
 <command>
-https://%HOSTIP:%HTTP2TLSPORT/path/%TESTNUMBER %HOSTIP %HTTP2TLSPORT
+- %HOSTIP %HTTP2TLSPORT
 </command>
 </client>
 
diff --git a/tests/data/test2404 b/tests/data/test2404
index 4ebcceac81..13e48c8be5 100644
--- a/tests/data/test2404
+++ b/tests/data/test2404
@@ -60,7 +60,7 @@ lib%TESTNUMBER
 HTTP/2 using STREAM_WEIGHTs
 </name>
 <command>
-https://%HOSTIP:%HTTP2TLSPORT/path/%TESTNUMBER %HOSTIP %HTTP2TLSPORT
+- %HOSTIP %HTTP2TLSPORT
 </command>
 </client>
 
diff --git a/tests/data/test2502 b/tests/data/test2502
index 311b23deff..f7822e8c26 100644
--- a/tests/data/test2502
+++ b/tests/data/test2502
@@ -59,7 +59,7 @@ lib%TESTNUMBER
 HTTP GET multiple over HTTP/3
 </name>
 <command>
-https://%HOSTIP:%HTTP3PORT/path/%TESTNUMBER %HOSTIP %HTTP3PORT %CERTDIR/certs/test-ca.cacert
+- %HOSTIP %HTTP3PORT %CERTDIR/certs/test-ca.cacert
 </command>
 </client>
 
diff --git a/tests/data/test3026 b/tests/data/test3026
index ee9b30678b..08d74c4d9f 100644
--- a/tests/data/test3026
+++ b/tests/data/test3026
@@ -30,9 +30,6 @@ curl_global_init thread-safety
 <tool>
 lib%TESTNUMBER
 </tool>
-<command>
-none
-</command>
 </client>
 
 #
diff --git a/tests/data/test501 b/tests/data/test501
index fb115cba64..3661351eae 100644
--- a/tests/data/test501
+++ b/tests/data/test501
@@ -25,9 +25,6 @@ lib%TESTNUMBER
 <name>
 simple libcurl attempt operation without URL set
 </name>
-<command>
-http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
-</command>
 </client>
 
 #
diff --git a/tests/data/test509 b/tests/data/test509
index 4cdbe80dba..4990f3738a 100644
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -25,9 +25,6 @@ lib%TESTNUMBER
 <name>
 initialization with memory callbacks and actual usage
 </name>
-<command>
-nothing
-</command>
 </client>
 
 #
diff --git a/tests/data/test517 b/tests/data/test517
index ef18e3395a..fb57f4a4be 100644
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -23,9 +23,6 @@ lib%TESTNUMBER
 <name>
 curl_getdate() testing
 </name>
-<command>
-nothing
-</command>
 </client>
 
 #
diff --git a/tests/data/test543 b/tests/data/test543
index e3ac13bd2f..2ec9ff863f 100644
--- a/tests/data/test543
+++ b/tests/data/test543
@@ -17,10 +17,6 @@ lib%TESTNUMBER
 <name>
 curl_easy_escape
 </name>
-<command>
--
-</command>
-
 </client>
 
 # Verify data after the test has been "shot"
diff --git a/tests/data/test557 b/tests/data/test557
index 9d86c0ac21..08394d229f 100644
--- a/tests/data/test557
+++ b/tests/data/test557
@@ -23,9 +23,6 @@ lib%TESTNUMBER
 <name>
 curl_mprintf() testing
 </name>
-<command>
-nothing
-</command>
 </client>
 
 #
diff --git a/tests/data/test558 b/tests/data/test558
index a7d6129e92..2dcf270bf8 100644
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -27,9 +27,6 @@ lib%TESTNUMBER
 <name>
 libtest memory tracking operational
 </name>
-<command>
-nothing
-</command>
 </client>
 
 #
diff --git a/tests/data/test751 b/tests/data/test751
index 21a3df2507..49c6b67b19 100644
--- a/tests/data/test751
+++ b/tests/data/test751
@@ -22,9 +22,6 @@ lib%TESTNUMBER
 <name>
 multi - add many easy handles
 </name>
-<command>
-</command>
-</file>
 </client>
 
 # 1000 easy handles needs memory