diff --git a/tests/Test--httpsonly-r.px b/tests/Test--httpsonly-r.px
index e0c30578..69d8c60b 100755
--- a/tests/Test--httpsonly-r.px
+++ b/tests/Test--httpsonly-r.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--no-content-disposition-trivial.px b/tests/Test--no-content-disposition-trivial.px
index d94b94f4..cf89b4a9 100755
--- a/tests/Test--no-content-disposition-trivial.px
+++ b/tests/Test--no-content-disposition-trivial.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--no-content-disposition.px b/tests/Test--no-content-disposition.px
index c36f9ed5..94f4d505 100755
--- a/tests/Test--no-content-disposition.px
+++ b/tests/Test--no-content-disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--post-file.px b/tests/Test--post-file.px
index 5f0f88a3..9c866b62 100755
--- a/tests/Test--post-file.px
+++ b/tests/Test--post-file.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--spider-fail.px b/tests/Test--spider-fail.px
index 0acf8071..d0dfad63 100755
--- a/tests/Test--spider-fail.px
+++ b/tests/Test--spider-fail.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--spider-r--no-content-disposition-trivial.px b/tests/Test--spider-r--no-content-disposition-trivial.px
index fae61e8d..0f28685e 100755
--- a/tests/Test--spider-r--no-content-disposition-trivial.px
+++ b/tests/Test--spider-r--no-content-disposition-trivial.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--spider-r--no-content-disposition.px b/tests/Test--spider-r--no-content-disposition.px
index 64deb552..53fb7a2b 100755
--- a/tests/Test--spider-r--no-content-disposition.px
+++ b/tests/Test--spider-r--no-content-disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--spider-r-HTTP-Content-Disposition.px b/tests/Test--spider-r-HTTP-Content-Disposition.px
index 0963a925..963003ed 100755
--- a/tests/Test--spider-r-HTTP-Content-Disposition.px
+++ b/tests/Test--spider-r-HTTP-Content-Disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--spider-r.px b/tests/Test--spider-r.px
index 8a309d61..dbafe2e3 100755
--- a/tests/Test--spider-r.px
+++ b/tests/Test--spider-r.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--spider.px b/tests/Test--spider.px
index 64e85091..2443c954 100755
--- a/tests/Test--spider.px
+++ b/tests/Test--spider.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--start-pos--continue.px b/tests/Test--start-pos--continue.px
index 0748e631..a821a788 100755
--- a/tests/Test--start-pos--continue.px
+++ b/tests/Test--start-pos--continue.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test--start-pos.px b/tests/Test--start-pos.px
index 9cd0df30..5c887abd 100755
--- a/tests/Test--start-pos.px
+++ b/tests/Test--start-pos.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-204.px b/tests/Test-204.px
index 0ad36c99..e9eea1a6 100755
--- a/tests/Test-204.px
+++ b/tests/Test-204.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-E-k-K.px b/tests/Test-E-k-K.px
index e6d196c9..aaae6fe6 100755
--- a/tests/Test-E-k-K.px
+++ b/tests/Test-E-k-K.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-E-k.px b/tests/Test-E-k.px
index 634b0dbd..dc1031b1 100755
--- a/tests/Test-E-k.px
+++ b/tests/Test-E-k.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-HTTP-Content-Disposition-1.px b/tests/Test-HTTP-Content-Disposition-1.px
index 5796fe09..343258c1 100755
--- a/tests/Test-HTTP-Content-Disposition-1.px
+++ b/tests/Test-HTTP-Content-Disposition-1.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-HTTP-Content-Disposition-2.px b/tests/Test-HTTP-Content-Disposition-2.px
index 88c2b453..e7a27034 100755
--- a/tests/Test-HTTP-Content-Disposition-2.px
+++ b/tests/Test-HTTP-Content-Disposition-2.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-HTTP-Content-Disposition.px b/tests/Test-HTTP-Content-Disposition.px
index f0487af6..29f56d11 100755
--- a/tests/Test-HTTP-Content-Disposition.px
+++ b/tests/Test-HTTP-Content-Disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N--no-content-disposition-trivial.px b/tests/Test-N--no-content-disposition-trivial.px
index cbb44994..8abff7b8 100755
--- a/tests/Test-N--no-content-disposition-trivial.px
+++ b/tests/Test-N--no-content-disposition-trivial.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N--no-content-disposition.px b/tests/Test-N--no-content-disposition.px
index 3e5e8885..7ece995d 100755
--- a/tests/Test-N--no-content-disposition.px
+++ b/tests/Test-N--no-content-disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N-HTTP-Content-Disposition.px b/tests/Test-N-HTTP-Content-Disposition.px
index 2f07c86f..de4609b3 100755
--- a/tests/Test-N-HTTP-Content-Disposition.px
+++ b/tests/Test-N-HTTP-Content-Disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N-current.px b/tests/Test-N-current.px
index bf1022c0..a8decdba 100755
--- a/tests/Test-N-current.px
+++ b/tests/Test-N-current.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N-no-info.px b/tests/Test-N-no-info.px
index 54774845..3c772a51 100755
--- a/tests/Test-N-no-info.px
+++ b/tests/Test-N-no-info.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N-old.px b/tests/Test-N-old.px
index a0145e34..6bb18cb9 100755
--- a/tests/Test-N-old.px
+++ b/tests/Test-N-old.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N-smaller.px b/tests/Test-N-smaller.px
index f1ec585e..34d4cd9a 100755
--- a/tests/Test-N-smaller.px
+++ b/tests/Test-N-smaller.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-N.px b/tests/Test-N.px
index ae7e8fa6..65cc33f6 100755
--- a/tests/Test-N.px
+++ b/tests/Test-N.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-O--no-content-disposition-trivial.px b/tests/Test-O--no-content-disposition-trivial.px
index e3c16de0..cef3caa1 100755
--- a/tests/Test-O--no-content-disposition-trivial.px
+++ b/tests/Test-O--no-content-disposition-trivial.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-O--no-content-disposition.px b/tests/Test-O--no-content-disposition.px
index c131a52e..9d2bf419 100755
--- a/tests/Test-O--no-content-disposition.px
+++ b/tests/Test-O--no-content-disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-O-HTTP-Content-Disposition.px b/tests/Test-O-HTTP-Content-Disposition.px
index c6a6134a..d7a7f760 100755
--- a/tests/Test-O-HTTP-Content-Disposition.px
+++ b/tests/Test-O-HTTP-Content-Disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-O-nc.px b/tests/Test-O-nc.px
index 5b0dd092..171bf163 100755
--- a/tests/Test-O-nc.px
+++ b/tests/Test-O-nc.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-O-nonexisting.px b/tests/Test-O-nonexisting.px
index 2057d00f..d663b651 100755
--- a/tests/Test-O-nonexisting.px
+++ b/tests/Test-O-nonexisting.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-O.px b/tests/Test-O.px
index 3a7fc3fa..7e4024c9 100755
--- a/tests/Test-O.px
+++ b/tests/Test-O.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-Restrict-Lowercase.px b/tests/Test-Restrict-Lowercase.px
index 5becd55d..a6759898 100755
--- a/tests/Test-Restrict-Lowercase.px
+++ b/tests/Test-Restrict-Lowercase.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-Restrict-Uppercase.px b/tests/Test-Restrict-Uppercase.px
index e474a7f8..64e8a472 100755
--- a/tests/Test-Restrict-Uppercase.px
+++ b/tests/Test-Restrict-Uppercase.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-auth-basic.px b/tests/Test-auth-basic.px
index 552e13fc..ce9100d4 100755
--- a/tests/Test-auth-basic.px
+++ b/tests/Test-auth-basic.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-auth-no-challenge-url.px b/tests/Test-auth-no-challenge-url.px
index 6384a9ff..204e9a0f 100755
--- a/tests/Test-auth-no-challenge-url.px
+++ b/tests/Test-auth-no-challenge-url.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-auth-no-challenge.px b/tests/Test-auth-no-challenge.px
index dcd6a3ef..0794eceb 100755
--- a/tests/Test-auth-no-challenge.px
+++ b/tests/Test-auth-no-challenge.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-auth-retcode.px b/tests/Test-auth-retcode.px
index 40f7a35a..bc1ea8fc 100755
--- a/tests/Test-auth-retcode.px
+++ b/tests/Test-auth-retcode.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-auth-with-content-disposition.px b/tests/Test-auth-with-content-disposition.px
index 5badcdd3..7e252a34 100755
--- a/tests/Test-auth-with-content-disposition.px
+++ b/tests/Test-auth-with-content-disposition.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-c-full.px b/tests/Test-c-full.px
index bc2d2454..973f885e 100755
--- a/tests/Test-c-full.px
+++ b/tests/Test-c-full.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-c-partial.px b/tests/Test-c-partial.px
index b36447b0..2aca2475 100755
--- a/tests/Test-c-partial.px
+++ b/tests/Test-c-partial.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-c-shorter.px b/tests/Test-c-shorter.px
index 30c4edab..888ead06 100755
--- a/tests/Test-c-shorter.px
+++ b/tests/Test-c-shorter.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-c.px b/tests/Test-c.px
index 4ece983b..48d55ae0 100755
--- a/tests/Test-c.px
+++ b/tests/Test-c.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-cookies-401.px b/tests/Test-cookies-401.px
index 2426c55b..7226c2ff 100755
--- a/tests/Test-cookies-401.px
+++ b/tests/Test-cookies-401.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-cookies.px b/tests/Test-cookies.px
index 9b8f7935..99fda8f7 100755
--- a/tests/Test-cookies.px
+++ b/tests/Test-cookies.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp--start-pos.px b/tests/Test-ftp--start-pos.px
index cd2732ad..00a9a00c 100755
--- a/tests/Test-ftp--start-pos.px
+++ b/tests/Test-ftp--start-pos.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-bad-list.px b/tests/Test-ftp-bad-list.px
index 55cd91bd..78afd775 100755
--- a/tests/Test-ftp-bad-list.px
+++ b/tests/Test-ftp-bad-list.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-iri-disabled.px b/tests/Test-ftp-iri-disabled.px
index 072df59b..4b4772f0 100755
--- a/tests/Test-ftp-iri-disabled.px
+++ b/tests/Test-ftp-iri-disabled.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-iri-fallback.px b/tests/Test-ftp-iri-fallback.px
index 8d764166..36c22c70 100755
--- a/tests/Test-ftp-iri-fallback.px
+++ b/tests/Test-ftp-iri-fallback.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-iri-recursive.px b/tests/Test-ftp-iri-recursive.px
index 22a3dbf9..b487f70d 100755
--- a/tests/Test-ftp-iri-recursive.px
+++ b/tests/Test-ftp-iri-recursive.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-iri.px b/tests/Test-ftp-iri.px
index b3a3fdbc..42e0eca5 100755
--- a/tests/Test-ftp-iri.px
+++ b/tests/Test-ftp-iri.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-list-Multinet.px b/tests/Test-ftp-list-Multinet.px
index 8af64d0f..e21b2a45 100755
--- a/tests/Test-ftp-list-Multinet.px
+++ b/tests/Test-ftp-list-Multinet.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 
 # 2013-10-17 Andrea Urbani (matfanjol)
diff --git a/tests/Test-ftp-list-UNIX-hidden.px b/tests/Test-ftp-list-UNIX-hidden.px
index 36e8ec33..d90d9f88 100755
--- a/tests/Test-ftp-list-UNIX-hidden.px
+++ b/tests/Test-ftp-list-UNIX-hidden.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 # 2013-10-17 Andrea Urbani (matfanjol)
 # In this ftp test:
diff --git a/tests/Test-ftp-list-Unknown-a.px b/tests/Test-ftp-list-Unknown-a.px
index 3e67e9e1..5360122b 100755
--- a/tests/Test-ftp-list-Unknown-a.px
+++ b/tests/Test-ftp-list-Unknown-a.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 # 2013-10-17 Andrea Urbani (matfanjol)
 # In this ftp test:
diff --git a/tests/Test-ftp-list-Unknown-hidden.px b/tests/Test-ftp-list-Unknown-hidden.px
index eed980fa..c300761c 100755
--- a/tests/Test-ftp-list-Unknown-hidden.px
+++ b/tests/Test-ftp-list-Unknown-hidden.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 # 2013-10-17 Andrea Urbani (matfanjol)
 # In this ftp test:
diff --git a/tests/Test-ftp-list-Unknown-list-a-fails.px b/tests/Test-ftp-list-Unknown-list-a-fails.px
index 33c366da..e52b36a5 100755
--- a/tests/Test-ftp-list-Unknown-list-a-fails.px
+++ b/tests/Test-ftp-list-Unknown-list-a-fails.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 
 # 2013-10-17 Andrea Urbani (matfanjol)
diff --git a/tests/Test-ftp-list-Unknown.px b/tests/Test-ftp-list-Unknown.px
index b1c23635..71e43620 100755
--- a/tests/Test-ftp-list-Unknown.px
+++ b/tests/Test-ftp-list-Unknown.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 
 # 2013-10-17 Andrea Urbani (matfanjol)
diff --git a/tests/Test-ftp-pasv-fail.px b/tests/Test-ftp-pasv-fail.px
index cc9cb9c9..f050fdd5 100755
--- a/tests/Test-ftp-pasv-fail.px
+++ b/tests/Test-ftp-pasv-fail.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-pasv-not-supported.px b/tests/Test-ftp-pasv-not-supported.px
index 133814e6..1a473ad1 100755
--- a/tests/Test-ftp-pasv-not-supported.px
+++ b/tests/Test-ftp-pasv-not-supported.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp-recursive.px b/tests/Test-ftp-recursive.px
index b2c9b1d8..88fb85ee 100755
--- a/tests/Test-ftp-recursive.px
+++ b/tests/Test-ftp-recursive.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-ftp.px b/tests/Test-ftp.px
index 85b5f564..fdedfbc9 100755
--- a/tests/Test-ftp.px
+++ b/tests/Test-ftp.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-badcerts.px b/tests/Test-https-badcerts.px
old mode 100755
new mode 100644
index b6ce3de3..4ea91d7a
--- a/tests/Test-https-badcerts.px
+++ b/tests/Test-https-badcerts.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-clientcert.px b/tests/Test-https-clientcert.px
index e2a4188d..77dd3e9a 100755
--- a/tests/Test-https-clientcert.px
+++ b/tests/Test-https-clientcert.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-crl.px b/tests/Test-https-crl.px
index 329f035e..655b3a8f 100755
--- a/tests/Test-https-crl.px
+++ b/tests/Test-https-crl.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-pfs.px b/tests/Test-https-pfs.px
index bc140ebb..0a3bb96e 100755
--- a/tests/Test-https-pfs.px
+++ b/tests/Test-https-pfs.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-selfsigned.px b/tests/Test-https-selfsigned.px
index 330f6486..0586c638 100755
--- a/tests/Test-https-selfsigned.px
+++ b/tests/Test-https-selfsigned.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-tlsv1.px b/tests/Test-https-tlsv1.px
index e148a139..e19b135e 100755
--- a/tests/Test-https-tlsv1.px
+++ b/tests/Test-https-tlsv1.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-tlsv1x.px b/tests/Test-https-tlsv1x.px
index 7fbfcac0..2a24c443 100755
--- a/tests/Test-https-tlsv1x.px
+++ b/tests/Test-https-tlsv1x.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-https-weboftrust.px b/tests/Test-https-weboftrust.px
index 38d61bc4..d792ca2f 100755
--- a/tests/Test-https-weboftrust.px
+++ b/tests/Test-https-weboftrust.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-i-ftp.px b/tests/Test-i-ftp.px
index bac35478..6fd2c05d 100755
--- a/tests/Test-i-ftp.px
+++ b/tests/Test-i-ftp.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-i-http.px b/tests/Test-i-http.px
index 5f18b273..a0769731 100755
--- a/tests/Test-i-http.px
+++ b/tests/Test-i-http.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-idn-cmd-utf8.px b/tests/Test-idn-cmd-utf8.px
index e1f20b52..42e43182 100755
--- a/tests/Test-idn-cmd-utf8.px
+++ b/tests/Test-idn-cmd-utf8.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-idn-cmd.px b/tests/Test-idn-cmd.px
index 2a7e2e95..3098419c 100755
--- a/tests/Test-idn-cmd.px
+++ b/tests/Test-idn-cmd.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-idn-headers.px b/tests/Test-idn-headers.px
index 40b5e493..6b0c6144 100755
--- a/tests/Test-idn-headers.px
+++ b/tests/Test-idn-headers.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-idn-meta.px b/tests/Test-idn-meta.px
index e7b28454..db5c016f 100755
--- a/tests/Test-idn-meta.px
+++ b/tests/Test-idn-meta.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-idn-robots-utf8.px b/tests/Test-idn-robots-utf8.px
index 7961b41d..1d1bface 100755
--- a/tests/Test-idn-robots-utf8.px
+++ b/tests/Test-idn-robots-utf8.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-idn-robots.px b/tests/Test-idn-robots.px
index 2e375222..888fcdf9 100755
--- a/tests/Test-idn-robots.px
+++ b/tests/Test-idn-robots.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-iri-disabled.px b/tests/Test-iri-disabled.px
index 0d3a97c2..e019d4fa 100755
--- a/tests/Test-iri-disabled.px
+++ b/tests/Test-iri-disabled.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-iri-forced-remote.px b/tests/Test-iri-forced-remote.px
index eae202c4..7908de84 100755
--- a/tests/Test-iri-forced-remote.px
+++ b/tests/Test-iri-forced-remote.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-iri-list.px b/tests/Test-iri-list.px
index 961efcc7..5e560721 100755
--- a/tests/Test-iri-list.px
+++ b/tests/Test-iri-list.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-iri-percent.px b/tests/Test-iri-percent.px
index 65fa4d3a..7c4f4c87 100755
--- a/tests/Test-iri-percent.px
+++ b/tests/Test-iri-percent.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-iri.px b/tests/Test-iri.px
index 83cfbeb8..eb23b630 100755
--- a/tests/Test-iri.px
+++ b/tests/Test-iri.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-k.px b/tests/Test-k.px
index 30925f55..ce114d7a 100755
--- a/tests/Test-k.px
+++ b/tests/Test-k.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-meta-robots.px b/tests/Test-meta-robots.px
index f7e5f911..4a90338c 100755
--- a/tests/Test-meta-robots.px
+++ b/tests/Test-meta-robots.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-nonexisting-quiet.px b/tests/Test-nonexisting-quiet.px
index c8fd111f..9f680818 100755
--- a/tests/Test-nonexisting-quiet.px
+++ b/tests/Test-nonexisting-quiet.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-noop.px b/tests/Test-noop.px
index cf3515d0..d08cbcd6 100755
--- a/tests/Test-noop.px
+++ b/tests/Test-noop.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-np.px b/tests/Test-np.px
index ed8b30b9..1253c5df 100755
--- a/tests/Test-np.px
+++ b/tests/Test-np.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-proxied-https-auth-keepalive.px b/tests/Test-proxied-https-auth-keepalive.px
index cae10557..2a18ccfd 100755
--- a/tests/Test-proxied-https-auth-keepalive.px
+++ b/tests/Test-proxied-https-auth-keepalive.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 # Simulate a tunneling proxy to a HTTPS URL that needs authentication.
 # Use a persistent connection (Connection: keep-alive)
 
diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
index 7c79f9fd..878114e7 100755
--- a/tests/Test-proxied-https-auth.px
+++ b/tests/Test-proxied-https-auth.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 # Simulate a tunneling proxy to a HTTPS URL that needs authentication.
 # Use two connections (Connection: close)
 
diff --git a/tests/Test-proxy-auth-basic.px b/tests/Test-proxy-auth-basic.px
index defa594b..4c2dee80 100755
--- a/tests/Test-proxy-auth-basic.px
+++ b/tests/Test-proxy-auth-basic.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-restrict-ascii.px b/tests/Test-restrict-ascii.px
index a6730124..ecde3840 100755
--- a/tests/Test-restrict-ascii.px
+++ b/tests/Test-restrict-ascii.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;
diff --git a/tests/Test-stdouterr.px b/tests/Test-stdouterr.px
index 5151cc16..7bcfed97 100755
--- a/tests/Test-stdouterr.px
+++ b/tests/Test-stdouterr.px
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -I .
+#!/usr/bin/env perl
 
 use strict;
 use warnings;