diff --git a/test/run-morph-tester.sh.in b/test/run-morph-tester.sh.in
index e5cdaaf4..aae0dfc5 100755
--- a/test/run-morph-tester.sh.in
+++ b/test/run-morph-tester.sh.in
@@ -62,7 +62,7 @@ abs_srcdir=$(cd $srcdir && pwd)
 # remaining intervening dirs equals the path to the fst dir as long as the
 # directory structure within $GTLANG/test/ mirrors the structure of the other
 # directories - this mirroring thus becomes imperative for the yaml testing:
-fstdir=${abs_srcdir:${#roottestdir}:${#roottestdir}}
+fstdir=${abs_srcdir:${#roottestdir}:${#roottestdir}}/fst/
 
 # The analyser files are built $relpath relative to the test dir, one further
 # dir up, and then in the identified fst dir (see above):
diff --git a/test/src/morphology/generate-adjective-lemmas.sh.in b/test/src/morphology/generate-adjective-lemmas.sh.in
index 20fe9137..4d50c5da 100644
--- a/test/src/morphology/generate-adjective-lemmas.sh.in
+++ b/test/src/morphology/generate-adjective-lemmas.sh.in
@@ -23,8 +23,8 @@
 POS=adjectives
 ### in ###
 source_file=${srcdir}/../../../src/fst/morphology/stems/${POS}.lexc
-generator_file=./../../../src/generator-gt-norm
-analyser_file=./../../../src/analyser-gt-norm
+generator_file=./../../../src/fst/generator-gt-norm
+analyser_file=./../../../src/fst/analyser-gt-norm
 
 ### out ###
 # Temporary files:
diff --git a/test/src/morphology/generate-noun-lemmas.sh.in b/test/src/morphology/generate-noun-lemmas.sh.in
index 143bfb9f..6e07ab6d 100755
--- a/test/src/morphology/generate-noun-lemmas.sh.in
+++ b/test/src/morphology/generate-noun-lemmas.sh.in
@@ -23,8 +23,8 @@
 POS=nouns
 ### in ###
 source_file=${srcdir}/../../../src/fst/morphology/stems/${POS}.lexc
-generator_file=./../../../src/generator-gt-norm
-analyser_file=./../../../src/analyser-gt-norm
+generator_file=./../../../src/fst/generator-gt-norm
+analyser_file=./../../../src/fst/analyser-gt-norm
 
 ### out ###
 # Temporary files:
diff --git a/test/src/morphology/generate-verb-lemmas.sh.in b/test/src/morphology/generate-verb-lemmas.sh.in
index d0dfc907..00e0f48d 100644
--- a/test/src/morphology/generate-verb-lemmas.sh.in
+++ b/test/src/morphology/generate-verb-lemmas.sh.in
@@ -23,8 +23,8 @@
 POS=verbs
 ### in ###
 source_file=${srcdir}/../../../src/fst/morphology/stems/${POS}.lexc
-generator_file=./../../../src/generator-gt-norm
-analyser_file=./../../../src/analyser-gt-norm
+generator_file=./../../../src/fst/generator-gt-norm
+analyser_file=./../../../src/fst/analyser-gt-norm
 
 ### out ###
 # Temporary files: