diff --git a/Makefile b/Makefile
index 2a48a59234..1aace00436 100644
--- a/Makefile
+++ b/Makefile
@@ -282,7 +282,7 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
 	@echo "Unfortunately ffserver is broken and therefore its regression"
 	@echo "test fails randomly. Treat the results accordingly."
 	@echo
-	$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
+	$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
 
 tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
 	mkdir -p tests/vsynth1
diff --git a/tests/test.conf b/tests/ffserver.conf
similarity index 99%
rename from tests/test.conf
rename to tests/ffserver.conf
index 13b597f7f0..1e6994aa1c 100644
--- a/tests/test.conf
+++ b/tests/ffserver.conf
@@ -1,6 +1,6 @@
 #
 # This is a test configuration file. You can invoke it with
-# ../ffserver -f test.conf
+# ../ffserver -f ffserver.conf
 # when in the tests directory and once the vsynth1 subdirectory
 # has been populated. Then point your browser at http://whatever:9999/teststat.html
 # and you can look at the streams
diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index 2f8a7a8f41..a0a1ecf651 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -3,8 +3,8 @@
 # Make sure that the data directory exists
 mkdir -p tests/data
 
-#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf
-#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf
+#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
+#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
 
 FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`