diff --git a/.gitignore b/.gitignore
index a7a8470..e35d079 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,12 @@
*.zhfst
*.zip
*.zpipe
+*.py.log
+*.py.trs
*.sh.log
*.sh.trs
+*.yaml.log
+*.yaml.trs
.DS_Store
.bundle
.~lock.*#
@@ -79,6 +83,7 @@
/src/fst/phonetics/tests/tests/*.sh
/test/run-morph-tester.sh
/test/run-yaml-testcases.sh
+/src/fst/morphology/test/*-adjective.txt
/src/fst/morphology/test/all*.txt
/src/fst/morphology/test/analysed*.txt
/src/fst/morphology/test/filtered*
diff --git a/Makefile.am b/Makefile.am
index 1cb40b3..f38e8cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,3 +29,4 @@ dev:
# Remove html tables created by some of the developer tools:
clean-local:
rm -f *.html
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1763a9f..05ef7f4 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,3 +5,4 @@
# The generated docs are automatically detected by the automake script
include $(top_srcdir)/../giella-core/am-shared/docs-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/Makefile.am b/src/Makefile.am
index a7d279f..4d092cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,3 +12,4 @@ SUBDIRS = fst cg3
##################################################################
include $(top_srcdir)/../giella-core/am-shared/src-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/cg3/Makefile.am b/src/cg3/Makefile.am
index 7e390d7..6dc264f 100644
--- a/src/cg3/Makefile.am
+++ b/src/cg3/Makefile.am
@@ -39,3 +39,4 @@ clean-local:
####### Build rules via include: ########
include $(top_srcdir)/../giella-core/am-shared/src-syntax-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/cg3/test/Makefile.am b/src/cg3/test/Makefile.am
index 4d59abf..cb987cb 100644
--- a/src/cg3/test/Makefile.am
+++ b/src/cg3/test/Makefile.am
@@ -8,3 +8,4 @@
# List tests that are presently (expected) failures here, ie things that should
# be fixed *later*, but is not critical at the moment:
# XFAIL_TESTS=
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/Makefile.am b/src/fst/Makefile.am
index c2844c7..9291b83 100644
--- a/src/fst/Makefile.am
+++ b/src/fst/Makefile.am
@@ -84,3 +84,4 @@ endif # CAN_FOMA
##################################################################
include $(top_srcdir)/../giella-core/am-shared/src-fst-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/filters/Makefile.am b/src/fst/filters/Makefile.am
index 4724b67..ff3d062 100644
--- a/src/fst/filters/Makefile.am
+++ b/src/fst/filters/Makefile.am
@@ -55,3 +55,4 @@ EXTRA_SRCS=
include $(top_srcdir)/../giella-core/am-shared/src-filters-dir-include.am
# vim: set ft=automake:
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/morphology/Makefile.am b/src/fst/morphology/Makefile.am
index e74b031..c04f00b 100644
--- a/src/fst/morphology/Makefile.am
+++ b/src/fst/morphology/Makefile.am
@@ -118,3 +118,4 @@ include $(srcdir)/Makefile.modifications-phon.am
include $(top_srcdir)/../giella-core/am-shared/src-morphology-dir-include.am
# vim: set ft=automake:
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/morphology/test/Makefile.am b/src/fst/morphology/test/Makefile.am
index 25f7711..e45f035 100644
--- a/src/fst/morphology/test/Makefile.am
+++ b/src/fst/morphology/test/Makefile.am
@@ -40,3 +40,4 @@ EXTRA_DIST=$(TESTS) $(GENERATION_TESTS_IN)
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/morphology/test/phonology/Makefile.am b/src/fst/morphology/test/phonology/Makefile.am
index da519ed..7e8b4ef 100644
--- a/src/fst/morphology/test/phonology/Makefile.am
+++ b/src/fst/morphology/test/phonology/Makefile.am
@@ -27,3 +27,4 @@ EXTRA_DIST=pair-test-positive.sh.in \
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/orthography/Makefile.am b/src/fst/orthography/Makefile.am
index e69afb7..ac7e7e7 100644
--- a/src/fst/orthography/Makefile.am
+++ b/src/fst/orthography/Makefile.am
@@ -29,3 +29,4 @@ GIELLA_ORTH_EXTRA_TARGETS=
# General build rules included from here:
include $(top_srcdir)/../giella-core/am-shared/src-orthography-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/orthography/test/Makefile.am b/src/fst/orthography/test/Makefile.am
index fdf5264..556ed95 100644
--- a/src/fst/orthography/test/Makefile.am
+++ b/src/fst/orthography/test/Makefile.am
@@ -36,3 +36,4 @@ EXTRA_DIST=$(OTHER_TEST_RUNNERS) \
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/phonetics/Makefile.am b/src/fst/phonetics/Makefile.am
index 2cd0307..e666bbd 100644
--- a/src/fst/phonetics/Makefile.am
+++ b/src/fst/phonetics/Makefile.am
@@ -30,3 +30,4 @@ GT_PHONETICS_SUPPLEMENTS=
include $(top_srcdir)/../giella-core/am-shared/src-phonetics-dir-include.am
# vim: set ft=automake:
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/phonetics/tests/Makefile.am b/src/fst/phonetics/tests/Makefile.am
index dc17381..05af6ad 100644
--- a/src/fst/phonetics/tests/Makefile.am
+++ b/src/fst/phonetics/tests/Makefile.am
@@ -17,3 +17,4 @@ endif # WANT_PHONETIC
#### Do NOT edit below here: ####
include $(top_srcdir)/../giella-core/am-shared/src-phonetics-tests-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/tagsets/Makefile.am b/src/fst/tagsets/Makefile.am
index 917951a..92cda3a 100644
--- a/src/fst/tagsets/Makefile.am
+++ b/src/fst/tagsets/Makefile.am
@@ -33,3 +33,4 @@ clean-local:
include $(top_srcdir)/../giella-core/am-shared/src-tagsets-dir-include.am
# vim: set ft=automake:
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/test/Makefile.am b/src/fst/test/Makefile.am
index 3e7b2de..a97d1da 100644
--- a/src/fst/test/Makefile.am
+++ b/src/fst/test/Makefile.am
@@ -53,3 +53,4 @@ XFAIL_TESTS=run-dict-gt-desc-anayaml-testcases.sh \
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/src/fst/transcriptions/Makefile.am b/src/fst/transcriptions/Makefile.am
index 5582ff0..0a84db0 100644
--- a/src/fst/transcriptions/Makefile.am
+++ b/src/fst/transcriptions/Makefile.am
@@ -39,3 +39,4 @@ GT_CUSTOM_TARGETS=
include $(top_srcdir)/../giella-core/am-shared/src-transcriptions-dir-include.am
# vim: set ft=automake:
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/test/Makefile.am b/test/Makefile.am
index aafe873..490d43e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,3 +2,4 @@
## Copyright: Sámediggi/Divvun/UiT
## Licence: GPL v3+
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e67d1be..c98ef6b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,3 +4,4 @@
SUBDIRS = tokenisers analysers shellscripts \
spellcheckers hyphenators grammarcheckers mt tts
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/analysers/Makefile.am b/tools/analysers/Makefile.am
index 7656d61..2816ee8 100644
--- a/tools/analysers/Makefile.am
+++ b/tools/analysers/Makefile.am
@@ -25,3 +25,4 @@ LOCAL_ANL_ZIP_FILES=
#### Do NOT edit below here: ####
include $(top_srcdir)/../giella-core/am-shared/tools-analysers-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/grammarcheckers/Makefile.am b/tools/grammarcheckers/Makefile.am
index 26eb37c..6745cd8 100644
--- a/tools/grammarcheckers/Makefile.am
+++ b/tools/grammarcheckers/Makefile.am
@@ -30,3 +30,4 @@ LOCAL_GC_ZIP_FILES=
#### Do NOT edit below here: ####
include $(top_srcdir)/../giella-core/am-shared/tools-grammarcheckers-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/grammarcheckers/filters/Makefile.am b/tools/grammarcheckers/filters/Makefile.am
index 92c1c69..d052002 100644
--- a/tools/grammarcheckers/filters/Makefile.am
+++ b/tools/grammarcheckers/filters/Makefile.am
@@ -31,3 +31,4 @@ clean-local:
-rm -f *fst *.txt *.regex $(GT_LOCAL_COPY_FILTER_SRCS)
include $(top_srcdir)/../giella-core/am-shared/tools-grammarcheckers-filters-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/grammarcheckers/tests/Makefile.am b/tools/grammarcheckers/tests/Makefile.am
index cf030fd..028d4d7 100644
--- a/tools/grammarcheckers/tests/Makefile.am
+++ b/tools/grammarcheckers/tests/Makefile.am
@@ -17,3 +17,4 @@ endif # WANT_GRAMCHECK
#### Do NOT edit below here: ####
include $(top_srcdir)/../giella-core/am-shared/tools-grammarcheckers-tests-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/hyphenators/Makefile.am b/tools/hyphenators/Makefile.am
index 1d99a44..11d0007 100644
--- a/tools/hyphenators/Makefile.am
+++ b/tools/hyphenators/Makefile.am
@@ -38,3 +38,4 @@ SUBDIRS = filters . test
include $(srcdir)/Makefile.modification-fst.am
include $(srcdir)/Makefile.modification-pattern.am
include $(top_srcdir)/../giella-core/am-shared/tools-hyphenators-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/hyphenators/filters/Makefile.am b/tools/hyphenators/filters/Makefile.am
index c3bb809..1d6718c 100644
--- a/tools/hyphenators/filters/Makefile.am
+++ b/tools/hyphenators/filters/Makefile.am
@@ -31,3 +31,4 @@ clean-local:
-rm -f *.hfst *.xfst *.foma
include $(top_srcdir)/../giella-core/am-shared/tools-hyphenators-filters-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/hyphenators/test/Makefile.am b/tools/hyphenators/test/Makefile.am
index ea4fd5d..5e6d4a4 100644
--- a/tools/hyphenators/test/Makefile.am
+++ b/tools/hyphenators/test/Makefile.am
@@ -3,3 +3,4 @@
## Licence: GPL v3+
SUBDIRS = fstbased patternbased
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/hyphenators/test/fstbased/Makefile.am b/tools/hyphenators/test/fstbased/Makefile.am
index aafe873..490d43e 100644
--- a/tools/hyphenators/test/fstbased/Makefile.am
+++ b/tools/hyphenators/test/fstbased/Makefile.am
@@ -2,3 +2,4 @@
## Copyright: Sámediggi/Divvun/UiT
## Licence: GPL v3+
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/hyphenators/test/patternbased/Makefile.am b/tools/hyphenators/test/patternbased/Makefile.am
index aafe873..490d43e 100644
--- a/tools/hyphenators/test/patternbased/Makefile.am
+++ b/tools/hyphenators/test/patternbased/Makefile.am
@@ -2,3 +2,4 @@
## Copyright: Sámediggi/Divvun/UiT
## Licence: GPL v3+
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/mt/Makefile.am b/tools/mt/Makefile.am
index af415bf..d32e58b 100644
--- a/tools/mt/Makefile.am
+++ b/tools/mt/Makefile.am
@@ -43,3 +43,4 @@ CLEAN_FILES=
# Includes:
include $(srcdir)/Makefile.modifications.am
include $(top_srcdir)/../giella-core/am-shared/tools-mt-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/mt/apertium/Makefile.am b/tools/mt/apertium/Makefile.am
index 1e6156a..912b128 100644
--- a/tools/mt/apertium/Makefile.am
+++ b/tools/mt/apertium/Makefile.am
@@ -53,3 +53,4 @@ CLEAN_FILES=
# Includes:
include $(srcdir)/Makefile.modifications.am
include $(top_srcdir)/../giella-core/am-shared/tools-mt-apertium-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/mt/apertium/filters/Makefile.am b/tools/mt/apertium/filters/Makefile.am
index 4bdcefc..18ef0eb 100644
--- a/tools/mt/apertium/filters/Makefile.am
+++ b/tools/mt/apertium/filters/Makefile.am
@@ -47,3 +47,4 @@ endif # WANT_APERTIUM
include $(top_srcdir)/../giella-core/am-shared/tools-mt-apertium-filters-dir-include.am
# vim: set ft=automake:
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/mt/apertium/tagsets/Makefile.am b/tools/mt/apertium/tagsets/Makefile.am
index c38964e..09a3f96 100644
--- a/tools/mt/apertium/tagsets/Makefile.am
+++ b/tools/mt/apertium/tagsets/Makefile.am
@@ -18,3 +18,4 @@ clean-local:
# General build rules included from here:#
include $(top_srcdir)/../giella-core/am-shared/tools-mt-apertium-tagsets-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/mt/apertium/test/Makefile.am b/tools/mt/apertium/test/Makefile.am
index 6990d94..12ae3e6 100644
--- a/tools/mt/apertium/test/Makefile.am
+++ b/tools/mt/apertium/test/Makefile.am
@@ -23,3 +23,4 @@ XFAIL_TESTS=run-mt-gt-desc-anayaml-testcases.sh
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/mt/cgbased/Makefile.am b/tools/mt/cgbased/Makefile.am
index 98afb33..387903a 100644
--- a/tools/mt/cgbased/Makefile.am
+++ b/tools/mt/cgbased/Makefile.am
@@ -25,3 +25,4 @@ clean-local:
# General build rules included from here:#
include $(top_srcdir)/../giella-core/am-shared/tools-mt-cgbased-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/mt/filters/Makefile.am b/tools/mt/filters/Makefile.am
index 8e00629..cc6d751 100644
--- a/tools/mt/filters/Makefile.am
+++ b/tools/mt/filters/Makefile.am
@@ -39,3 +39,4 @@ endif # WANT_APERTIUM
include $(top_srcdir)/../giella-core/am-shared/tools-mt-filters-dir-include.am
# vim: set ft=automake:
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/shellscripts/Makefile.am b/tools/shellscripts/Makefile.am
index 5729f19..a091963 100644
--- a/tools/shellscripts/Makefile.am
+++ b/tools/shellscripts/Makefile.am
@@ -9,3 +9,4 @@
# processing.
bin_SCRIPTS=utau-gt.sh \
# Let this line end the definition
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/Makefile.am b/tools/spellcheckers/Makefile.am
index 9c3c726..2330698 100644
--- a/tools/spellcheckers/Makefile.am
+++ b/tools/spellcheckers/Makefile.am
@@ -12,3 +12,4 @@ include $(srcdir)/Makefile.mod-desktop-hfst.am
include $(srcdir)/Makefile.mod-mobile.am
include $(srcdir)/Makefile.mod-mobile-hfst.am
include $(top_srcdir)/../giella-core/am-shared/tools-spellcheckers-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/filters/Makefile.am b/tools/spellcheckers/filters/Makefile.am
index cc25b7e..6965b9e 100644
--- a/tools/spellcheckers/filters/Makefile.am
+++ b/tools/spellcheckers/filters/Makefile.am
@@ -36,3 +36,4 @@ include $(srcdir)/Makefile.mod-desktop-filters.am
include $(srcdir)/Makefile.mod-fstbased-filters.am
include $(srcdir)/Makefile.mod-mobile-filters.am
include $(top_srcdir)/../giella-core/am-shared/tools-spellcheckers-filters-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/test/Makefile.am b/tools/spellcheckers/test/Makefile.am
index dcc1df9..ecc4075 100644
--- a/tools/spellcheckers/test/Makefile.am
+++ b/tools/spellcheckers/test/Makefile.am
@@ -38,3 +38,4 @@ EXTRA_DIST=$(OTHER_TEST_RUNNERS) \
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/test/fstbased/Makefile.am b/tools/spellcheckers/test/fstbased/Makefile.am
index 7f8e665..a4416f6 100644
--- a/tools/spellcheckers/test/fstbased/Makefile.am
+++ b/tools/spellcheckers/test/fstbased/Makefile.am
@@ -18,3 +18,4 @@ endif # WANT_SPELLERS
# List tests that are presently (expected) failures here (in addition to above),
# ie things that should be fixed *later*, but is not critical at the moment:
XFAIL_TESTS=run-fstspeller-gt-norm-yaml-testcases.sh
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/test/fstbased/desktop/Makefile.am b/tools/spellcheckers/test/fstbased/desktop/Makefile.am
index 127df38..4bf70a2 100644
--- a/tools/spellcheckers/test/fstbased/desktop/Makefile.am
+++ b/tools/spellcheckers/test/fstbased/desktop/Makefile.am
@@ -18,3 +18,4 @@ endif # WANT_SPELLERS
# List tests that are presently (expected) failures here (in addition to above),
# ie things that should be fixed *later*, but is not critical at the moment:
XFAIL_TESTS=run-fstspeller-gt-norm-yaml-testcases.sh
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am b/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am
index 00833a4..26b8f83 100644
--- a/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am
+++ b/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am
@@ -43,3 +43,4 @@ EXTRA_DIST=$(OTHER_TEST_RUNNERS_IN) \
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/test/fstbased/mobile/Makefile.am b/tools/spellcheckers/test/fstbased/mobile/Makefile.am
index 4143bab..cecf2ed 100644
--- a/tools/spellcheckers/test/fstbased/mobile/Makefile.am
+++ b/tools/spellcheckers/test/fstbased/mobile/Makefile.am
@@ -18,3 +18,4 @@ endif # WANT_SPELLERS
# List tests that are presently (expected) failures here (in addition to above),
# ie things that should be fixed *later*, but is not critical at the moment:
XFAIL_TESTS=run-fstspeller-gt-norm-yaml-testcases.sh
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/spellcheckers/weights/Makefile.am b/tools/spellcheckers/weights/Makefile.am
index 50c5826..085588d 100644
--- a/tools/spellcheckers/weights/Makefile.am
+++ b/tools/spellcheckers/weights/Makefile.am
@@ -10,3 +10,4 @@ GIELLA_RAW_MOBILE_SPELLER_CORPUS=$(GIELLA_RAW_DESKTOP_SPELLER_CORPUS)
GIELLA_CLEAN_MOBILE_SPELLER_CORPUS=$(GIELLA_CLEAN_DESKTOP_SPELLER_CORPUS)
include $(top_srcdir)/../giella-core/am-shared/tools-spellcheckers-fstbased-desktop-weighting-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/tokenisers/Makefile.am b/tools/tokenisers/Makefile.am
index 0b4a593..1cad12e 100644
--- a/tools/tokenisers/Makefile.am
+++ b/tools/tokenisers/Makefile.am
@@ -39,3 +39,4 @@ clean-local:
-rm -f *.hfst *.xfst *.pmhfst
include $(top_srcdir)/../giella-core/am-shared/tools-tokenisers-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/tokenisers/filters/Makefile.am b/tools/tokenisers/filters/Makefile.am
index 31d4d55..2527b94 100644
--- a/tools/tokenisers/filters/Makefile.am
+++ b/tools/tokenisers/filters/Makefile.am
@@ -31,3 +31,4 @@ clean-local:
-rm -f *fst *.txt *.regex $(GT_LOCAL_COPY_FILTER_SRCS)
include $(top_srcdir)/../giella-core/am-shared/tools-tokenisers-filters-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/tokenisers/tests/Makefile.am b/tools/tokenisers/tests/Makefile.am
index e44eaf3..7bcb832 100644
--- a/tools/tokenisers/tests/Makefile.am
+++ b/tools/tokenisers/tests/Makefile.am
@@ -17,3 +17,4 @@ endif # WANT_TOKENISERS
#### Do NOT edit below here: ####
include $(top_srcdir)/../giella-core/am-shared/tools-tokenisers-tests-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/tts/Makefile.am b/tools/tts/Makefile.am
index b487be9..1dca8da 100644
--- a/tools/tts/Makefile.am
+++ b/tools/tts/Makefile.am
@@ -33,3 +33,4 @@ LOCAL_ANL_ZIP_FILES=
#### Do NOT edit below here: ####
include $(top_srcdir)/../giella-core/am-shared/tools-tts-dir-include.am
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am
diff --git a/tools/tts/test/Makefile.am b/tools/tts/test/Makefile.am
index a205890..a6095b3 100644
--- a/tools/tts/test/Makefile.am
+++ b/tools/tts/test/Makefile.am
@@ -19,3 +19,4 @@ XFAIL_TESTS=
####### Other targets: ###########
clean-local:
-rm -f *.txt
+include $(top_srcdir)/../giella-core/am-shared/devtest-include.am