diff --git a/tests/data/test1565 b/tests/data/test1565
index 15374bf7e6..42bbcdf6f7 100644
--- a/tests/data/test1565
+++ b/tests/data/test1565
@@ -34,7 +34,7 @@ lib%TESTNUMBER
 wakeup from another thread
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
diff --git a/tests/data/test3014 b/tests/data/test3014
index e1e6471a4a..10ad554da3 100644
--- a/tests/data/test3014
+++ b/tests/data/test3014
@@ -29,7 +29,7 @@ http
 Check if %{num_headers} returns correct number of headers
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/1439 --write-out '%{num_headers}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{num_headers}'
 </command>
 </client>
 
@@ -46,7 +46,7 @@ testdata
 4
 </stdout>
 <protocol crlf="headers">
-GET /1439 HTTP/1.1
+GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 User-Agent: curl/%VERSION
 Accept: */*
diff --git a/tests/server/util.c b/tests/server/util.c
index 5abd308738..0e34f4ab21 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -200,12 +200,6 @@ FILE *test2fopen(long testno, const char *logdir2)
   /* first try the alternative, preprocessed, file */
   snprintf(filename, sizeof(filename), "%s/test%ld", logdir2, testno);
   stream = fopen(filename, "rb");
-  if(stream)
-    return stream;
-
-  /* then try the source version */
-  snprintf(filename, sizeof(filename), "%s/data/test%ld", srcpath, testno);
-  stream = fopen(filename, "rb");
 
   return stream;
 }