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