diff --git a/src/fst/test/run-lexicon-yaml-testcases.sh b/src/fst/test/run-lexicon-yaml-testcases.sh
index 311606e..0067da2 100755
--- a/src/fst/test/run-lexicon-yaml-testcases.sh
+++ b/src/fst/test/run-lexicon-yaml-testcases.sh
@@ -20,11 +20,11 @@ yaml_file_subdir=lexicon-yamls
 
 ####### Include/source helper script from dir above - DO NOT CHANGE: ########
 # Relative path from test script to test runner:
-testrunner="../run-yaml-testcases.sh"
+testrunner="../../../test/run-yaml-testcases.sh"
 
 # Make symlink of lexicon.hfst in the src directory
-pushd ../../src/
+pushd ../ || exit 1
 ln -s fst/lexicon.hfst generator-lexicon.hfst
-popd
+popd || exit 1
 
-source $testrunner $transducer $yaml_file_subdir $halftest
+source $testrunner $transducer $yaml_file_subdir ../../../test $halftest