diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6bb5764958..bc129326d0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,15 +26,14 @@ HTMLPAGES = testcurl.html runtests.html
 PDFPAGES = testcurl.pdf runtests.pdf
 MANDISTPAGES = runtests.1.dist testcurl.1.dist
 
-EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl           \
- getpart.pm FILEFORMAT.md README.md stunnel.pem memanalyze.pl testcurl.pl     \
- valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1 \
- serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl      \
- CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl              \
- manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py                  \
- negtelnetserver.py smbserver.py util.py disable-scan.pl manpage-syntax.pl    \
- error-codes.pl badsymbols.pl azure.pm appveyor.pm version-scan.pl            \
- options-scan.pl markdown-uppercase.pl check-deprecated.pl option-check.pl
+EXTRA_DIST = appveyor.pm azure.pm badsymbols.pl check-deprecated.pl CMakeLists.txt \
+ dictserver.py directories.pm disable-scan.pl error-codes.pl extern-scan.pl \
+ FILEFORMAT.md ftp.pm ftpserver.pl getpart.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 runtests.1 runtests.pl secureserver.pl \
+ serverhelp.pm smbserver.py sshhelp.pm sshserver.pl stunnel.pem symbol-scan.pl \
+ testcurl.1 testcurl.pl tftpserver.pl util.py valgrind.pm valgrind.supp version-scan.pl 
 
 DISTCLEANFILES = configurehelp.pm
 
diff --git a/tests/httpserver.pl b/tests/http-server.pl
similarity index 100%
rename from tests/httpserver.pl
rename to tests/http-server.pl
diff --git a/tests/http2-server.pl b/tests/http2-server.pl
index 224e74600d..bbfaf47754 100755
--- a/tests/http2-server.pl
+++ b/tests/http2-server.pl
@@ -27,6 +27,7 @@
 # nghttpx runs as a proxy in front of our "actual" HTTP/1 server.
 use Cwd;
 use Cwd 'abs_path';
+use File::Basename;
 
 my $pidfile = "log/nghttpx.pid";
 my $logfile = "log/http2.log";
@@ -93,8 +94,7 @@ while(@ARGV) {
     shift @ARGV;
 }
 
-my $path   = getcwd();
-my $srcdir = $path;
+my $srcdir = dirname(__FILE__);
 $certfile = "$srcdir/certs/$cert.pem";
 $keyfile = "$srcdir/certs/$cert.key";
 $certfile = abs_path($certfile);
diff --git a/tests/http3-server.pl b/tests/http3-server.pl
index 839cd8d83e..0c562fba3b 100755
--- a/tests/http3-server.pl
+++ b/tests/http3-server.pl
@@ -28,6 +28,7 @@
 
 use Cwd;
 use Cwd 'abs_path';
+use File::Basename;
 
 my $pidfile = "log/nghttpx.pid";
 my $logfile = "log/http3.log";
@@ -93,8 +94,7 @@ while(@ARGV) {
     shift @ARGV;
 }
 
-my $path   = getcwd();
-my $srcdir = $path;
+my $srcdir = dirname(__FILE__);
 $certfile = "$srcdir/certs/$cert.pem";
 $keyfile = "$srcdir/certs/$cert.key";
 $certfile = abs_path($certfile);
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 1510527e3c..8de211bc5c 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -1677,7 +1677,7 @@ sub runhttpserver {
     my $pidfile;
     my $logfile;
     my $flags = "";
-    my $exe = "$perl $srcdir/httpserver.pl";
+    my $exe = "$perl $srcdir/http-server.pl";
     my $verbose_flag = "--verbose ";
 
     if($alt eq "ipv6") {