diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6ae7a97af..b1fc25b0f8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,21 +22,35 @@
 #
 ###########################################################################
 
-HTMLPAGES = testcurl.html runtests.html
-PDFPAGES = testcurl.pdf runtests.pdf
 MANDISTPAGES = runtests.1.dist testcurl.1.dist
 
-EXTRA_DIST = appveyor.pm azure.pm badsymbols.pl check-deprecated.pl           \
- CMakeLists.txt devtest.pl dictserver.py directories.pm disable-scan.pl       \
- error-codes.pl extern-scan.pl FILEFORMAT.md processhelp.pm ftpserver.pl      \
- getpart.pm globalconfig.pm http-server.pl http2-server.pl http3-server.pl    \
- manpage-scan.pl manpage-syntax.pl markdown-uppercase.pl mem-include-scan.pl  \
- memanalyze.pl negtelnetserver.py nroff-scan.pl option-check.pl               \
- options-scan.pl pathhelp.pm README.md rtspserver.pl runner.pm runtests.1     \
- runtests.pl secureserver.pl serverhelp.pm servers.pm smbserver.py sshhelp.pm \
- sshserver.pl stunnel.pem symbol-scan.pl testcurl.1 testcurl.pl testutil.pm   \
- tftpserver.pl util.py valgrind.pm valgrind.supp version-scan.pl              \
- check-translatable-options.pl errorcodes.pl
+# scripts used in test cases
+TESTSCRIPTS = \
+ test1119.pl  \
+ test1132.pl  \
+ test1135.pl  \
+ test1139.pl  \
+ test1140.pl  \
+ test1165.pl  \
+ test1167.pl  \
+ test1173.pl  \
+ test1175.pl  \
+ test1177.pl  \
+ test1222.pl  \
+ test1275.pl  \
+ test1276.pl  \
+ test1477.pl  \
+ test1544.pl  \
+ test971.pl
+
+EXTRA_DIST = appveyor.pm azure.pm CMakeLists.txt devtest.pl             \
+ dictserver.py directories.pm FILEFORMAT.md processhelp.pm ftpserver.pl \
+ getpart.pm globalconfig.pm http-server.pl http2-server.pl              \
+ http3-server.pl memanalyze.pl negtelnetserver.py pathhelp.pm README.md \
+ rtspserver.pl runner.pm runtests.1 runtests.pl secureserver.pl         \
+ serverhelp.pm servers.pm smbserver.py sshhelp.pm sshserver.pl          \
+ stunnel.pem testcurl.1 testcurl.pl testutil.pm tftpserver.pl util.py   \
+ valgrind.pm valgrind.supp $(TESTSCRIPTS)
 
 DISTCLEANFILES = configurehelp.pm
 
diff --git a/tests/data/test1119 b/tests/data/test1119
index 41f6dba2c1..1a73439e60 100644
--- a/tests/data/test1119
+++ b/tests/data/test1119
@@ -18,7 +18,7 @@ Verify that symbols-in-versions and headers are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl
+%SRCDIR/test1119.pl %SRCDIR/.. ../include/curl
 </command>
 </client>
 
diff --git a/tests/data/test1132 b/tests/data/test1132
index 613031bac8..e7a802a71a 100644
--- a/tests/data/test1132
+++ b/tests/data/test1132
@@ -18,7 +18,7 @@ Verify memory #include files in libcurl's C source files
 </name>
 
 <command type="perl">
-%SRCDIR/mem-include-scan.pl %SRCDIR/../lib
+%SRCDIR/test1132.pl %SRCDIR/../lib
 </command>
 </client>
 
diff --git a/tests/data/test1135 b/tests/data/test1135
index d188989ed6..de028a0c9a 100644
--- a/tests/data/test1135
+++ b/tests/data/test1135
@@ -22,7 +22,7 @@ Verify CURL_EXTERN order
 </name>
 
 <command type="perl">
-%SRCDIR/extern-scan.pl %SRCDIR/..
+%SRCDIR/test1135.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1139 b/tests/data/test1139
index b5267b012d..2704e0a217 100644
--- a/tests/data/test1139
+++ b/tests/data/test1139
@@ -20,7 +20,7 @@ Verify that all libcurl options have man pages
 </name>
 
 <command type="perl">
-%SRCDIR/manpage-scan.pl %SRCDIR/.. %PWD/..
+%SRCDIR/test1139.pl %SRCDIR/.. %PWD/..
 </command>
 </client>
 
diff --git a/tests/data/test1140 b/tests/data/test1140
index 5aa997e789..fc2a08d014 100644
--- a/tests/data/test1140
+++ b/tests/data/test1140
@@ -19,7 +19,7 @@ Verify the nroff of man pages
 </name>
 
 <command type="perl">
-%SRCDIR/nroff-scan.pl %SRCDIR/../docs/ %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3 %SRCDIR/../docs/*.1
+%SRCDIR/test1140.pl %SRCDIR/../docs/ %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3 %SRCDIR/../docs/*.1
 </command>
 </client>
 
diff --git a/tests/data/test1165 b/tests/data/test1165
index de4283af22..89f02d719c 100644
--- a/tests/data/test1165
+++ b/tests/data/test1165
@@ -18,7 +18,7 @@ Verify configure.ac and source code CURL_DISABLE_-sync
 </name>
 
 <command type="perl">
-%SRCDIR/disable-scan.pl %SRCDIR/..
+%SRCDIR/test1165.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1167 b/tests/data/test1167
index 3c2fb1a5f1..76777f81b7 100644
--- a/tests/data/test1167
+++ b/tests/data/test1167
@@ -17,7 +17,7 @@ Verify curl prefix of public symbols in header files
 </name>
 
 <command type="perl">
-%SRCDIR/badsymbols.pl %SRCDIR/..
+%SRCDIR/test1167.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1173 b/tests/data/test1173
index b5dafbb3b8..c1dc5c22a8 100644
--- a/tests/data/test1173
+++ b/tests/data/test1173
@@ -19,7 +19,7 @@ Man page syntax checks
 </name>
 
 <command type="perl">
-%SRCDIR/manpage-syntax.pl %SRCDIR/../docs/libcurl/symbols-in-versions %SRCDIR/../docs/*.1  %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3
+%SRCDIR/test1173.pl %SRCDIR/../docs/libcurl/symbols-in-versions %SRCDIR/../docs/*.1  %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3
 </command>
 </client>
 
diff --git a/tests/data/test1175 b/tests/data/test1175
index 5190dbe2ac..6e99a616ee 100644
--- a/tests/data/test1175
+++ b/tests/data/test1175
@@ -18,7 +18,7 @@ Verify that symbols-in-versions and libcurl-errors.3 are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/error-codes.pl %SRCDIR
+%SRCDIR/test1175.pl %SRCDIR
 </command>
 </client>
 
diff --git a/tests/data/test1177 b/tests/data/test1177
index 66fe49767b..75af5b4c72 100644
--- a/tests/data/test1177
+++ b/tests/data/test1177
@@ -18,7 +18,7 @@ Verify that feature names and CURL_VERSION_* in lib and docs are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h %SRCDIR/../lib/version.c
+%SRCDIR/test1177.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h %SRCDIR/../lib/version.c
 </command>
 </client>
 
diff --git a/tests/data/test1222 b/tests/data/test1222
index b56cf6879a..b46fd11563 100644
--- a/tests/data/test1222
+++ b/tests/data/test1222
@@ -17,7 +17,7 @@ Verify deprecation statuses and versions
 </name>
 
 <command type="perl">
-%SRCDIR/check-deprecated.pl %SRCDIR/..
+%SRCDIR/test1222.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1275 b/tests/data/test1275
index d1cb223b8b..31893f7ba7 100644
--- a/tests/data/test1275
+++ b/tests/data/test1275
@@ -18,7 +18,7 @@ Verify capital letters after period in markdown files
 </name>
 
 <command type="perl">
-%SRCDIR/markdown-uppercase.pl %SRCDIR/..
+%SRCDIR/test1275.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1276 b/tests/data/test1276
index 3961bf4cb1..b365f800af 100644
--- a/tests/data/test1276
+++ b/tests/data/test1276
@@ -18,7 +18,7 @@ Verify lib/optiontable.pl
 </name>
 
 <command type="perl">
-%SRCDIR/option-check.pl %SRCDIR/..
+%SRCDIR/test1276.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1279 b/tests/data/test1279
index fd3b34bd30..041f5449b4 100644
--- a/tests/data/test1279
+++ b/tests/data/test1279
@@ -19,7 +19,7 @@ Verify libcurl.def against CURL_EXTERN declarations
 </name>
 
 <command type="perl">
-%SRCDIR/extern-scan.pl --heading=EXPORTS --sort %SRCDIR/..
+%SRCDIR/test1135.pl --heading=EXPORTS --sort %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1477 b/tests/data/test1477
index 2771d7f1d3..554ac141f1 100644
--- a/tests/data/test1477
+++ b/tests/data/test1477
@@ -17,7 +17,7 @@ Verify that error codes in headers and libcurl-errors.3 are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/errorcodes.pl %SRCDIR/..
+%SRCDIR/test1477.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test1544 b/tests/data/test1544
index f658f5a749..037caa0ac6 100644
--- a/tests/data/test1544
+++ b/tests/data/test1544
@@ -17,7 +17,7 @@ Verify all string options are translated by OS/400 wrapper
 </name>
 
 <command type="perl">
-%SRCDIR/check-translatable-options.pl %SRCDIR/..
+%SRCDIR/test1544.pl %SRCDIR/..
 </command>
 </client>
 
diff --git a/tests/data/test971 b/tests/data/test971
index 19260dfdfe..6c6b950589 100644
--- a/tests/data/test971
+++ b/tests/data/test971
@@ -18,7 +18,7 @@ Verify that options-in-versions and docs/cmdline-opts are in sync
 </name>
 
 <command type="perl">
-%SRCDIR/options-scan.pl %SRCDIR/../docs/options-in-versions %SRCDIR/../docs/cmdline-opts
+%SRCDIR/test971.pl %SRCDIR/../docs/options-in-versions %SRCDIR/../docs/cmdline-opts
 </command>
 </client>
 
diff --git a/tests/symbol-scan.pl b/tests/test1119.pl
similarity index 100%
rename from tests/symbol-scan.pl
rename to tests/test1119.pl
diff --git a/tests/mem-include-scan.pl b/tests/test1132.pl
similarity index 100%
rename from tests/mem-include-scan.pl
rename to tests/test1132.pl
diff --git a/tests/extern-scan.pl b/tests/test1135.pl
similarity index 100%
rename from tests/extern-scan.pl
rename to tests/test1135.pl
diff --git a/tests/manpage-scan.pl b/tests/test1139.pl
similarity index 100%
rename from tests/manpage-scan.pl
rename to tests/test1139.pl
diff --git a/tests/nroff-scan.pl b/tests/test1140.pl
similarity index 100%
rename from tests/nroff-scan.pl
rename to tests/test1140.pl
diff --git a/tests/disable-scan.pl b/tests/test1165.pl
similarity index 100%
rename from tests/disable-scan.pl
rename to tests/test1165.pl
diff --git a/tests/badsymbols.pl b/tests/test1167.pl
similarity index 100%
rename from tests/badsymbols.pl
rename to tests/test1167.pl
diff --git a/tests/manpage-syntax.pl b/tests/test1173.pl
similarity index 100%
rename from tests/manpage-syntax.pl
rename to tests/test1173.pl
diff --git a/tests/error-codes.pl b/tests/test1175.pl
similarity index 100%
rename from tests/error-codes.pl
rename to tests/test1175.pl
diff --git a/tests/version-scan.pl b/tests/test1177.pl
similarity index 100%
rename from tests/version-scan.pl
rename to tests/test1177.pl
diff --git a/tests/check-deprecated.pl b/tests/test1222.pl
similarity index 100%
rename from tests/check-deprecated.pl
rename to tests/test1222.pl
diff --git a/tests/markdown-uppercase.pl b/tests/test1275.pl
similarity index 100%
rename from tests/markdown-uppercase.pl
rename to tests/test1275.pl
diff --git a/tests/option-check.pl b/tests/test1276.pl
similarity index 100%
rename from tests/option-check.pl
rename to tests/test1276.pl
diff --git a/tests/errorcodes.pl b/tests/test1477.pl
similarity index 100%
rename from tests/errorcodes.pl
rename to tests/test1477.pl
diff --git a/tests/check-translatable-options.pl b/tests/test1544.pl
similarity index 100%
rename from tests/check-translatable-options.pl
rename to tests/test1544.pl
diff --git a/tests/options-scan.pl b/tests/test971.pl
similarity index 100%
rename from tests/options-scan.pl
rename to tests/test971.pl