diff --git a/autotest.sh b/autotest.sh
index 83a20699d0..abed4a8908 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -227,7 +227,11 @@ if [ -z "$1" ]
 		execute_tests $DBCONFIG
 	done
 else
-	execute_tests "$1" "$2" "$3"
+	FILENAME="$2"
+	if [ ! -f "tests/$FILENAME" ]; then
+		FILENAME="../$FILENAME"
+	fi
+	execute_tests "$1" "$FILENAME" "$3"
 fi
 
 cd "$BASEDIR"