diff --git a/tests/admin.test b/tests/admin.test
index a6bed4c3..eb789f24 100755
--- a/tests/admin.test
+++ b/tests/admin.test
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 testdir=$(dirname "$0")
-test -n "$testdir" && cd "$testdir" || exit
 
 ICECAST_BASE_URL="http://localhost:8000/"
 counter=1
@@ -21,7 +20,7 @@ command -v ffmpeg >/dev/null 2>&1 || {
 }
 
 echo "# Starting Icecast"
-../src/icecast -c ./icecast.xml 2> /dev/null &
+../src/icecast -c "$testdir/icecast.xml" 2> /dev/null &
 ICECAST_PID=$!
 sleep 5
 
diff --git a/tests/startup.test b/tests/startup.test
index 720a9c08..ec91fb92 100755
--- a/tests/startup.test
+++ b/tests/startup.test
@@ -1,5 +1,8 @@
 #!/bin/sh
-../src/icecast -c ./icecast.xml 2> /dev/null &
+
+testdir=$(dirname "$0")
+
+../src/icecast -c "$testdir/icecast.xml" 2> /dev/null &
 ICECAST_PID=$!
 echo 'ok 1 - Icecast started'
 sleep 3