diff --git a/tests/Makefile b/tests/Makefile
index 576dd028ae..dd1db98825 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,7 +17,7 @@ LIBAV_REFFILE=$(SRC_PATH)/tests/libav.regression.ref
 all: test libavtest test-server
 
 test-server: vsynth1/0.pgm asynth1.sw
-	@$(SRC_PATH)/tests/server-regression.sh $(SERVER_REFFILE)
+	@$(SRC_PATH)/tests/server-regression.sh $(SERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
 # fast regression tests for all codecs
 test mpeg4 mpeg: vsynth1/0.pgm vsynth2/0.pgm asynth1.sw tiny_psnr
diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index 0e612716dd..9e05edb773 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -10,7 +10,7 @@ fi
 # Make sure that the data directory exists
 mkdir -p data
 
-cp test.conf data/test.conf
+cp "$2" data/test.conf
 perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
 perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf