diff --git a/.gitignore b/.gitignore
index 475a3ae7..a7a84700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,8 @@
 *.zhfst
 *.zip
 *.zpipe
+*.sh.log
+*.sh.trs
 .DS_Store
 .bundle
 .~lock.*#
@@ -149,5 +151,6 @@ Makefile.in
 build
 bygg
 generated*
+test-suite.log
 .deps
 .generated
diff --git a/configure.ac b/configure.ac
index 1e0bba2d..49aefee4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,14 +34,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE(
   1.11.6 tar-pax -Wall -Werror
   foreign -Wno-portability
-  dnl Automake versions before 1.13 (when the serial-tests option was
-  dnl still the default) still defined the badly obsolete macro
-  dnl 'AM_PROG_CC_STDC'. By checking for the non-existence of this macro,
-  dnl we can now force serial testing for newer automakes (with prettier
-  dnl output) and at the same time work reasonably with older automakes.
-  dnl Code based on:
-  dnl https://lists.gnu.org/archive/html/automake/2013-01/msg00060.html
-  m4_ifndef([AM_PROG_CC_STDC], [serial-tests])
 )
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/src/fst/morphology/test/Makefile.am b/src/fst/morphology/test/Makefile.am
index c4e3ba10..bf4cd1b6 100644
--- a/src/fst/morphology/test/Makefile.am
+++ b/src/fst/morphology/test/Makefile.am
@@ -17,7 +17,9 @@ GENERATION_TESTS_IN=generate-adjective-lemmas.sh.in  \
                     generate-noun-lemmas.sh.in       \
                     generate-verb-lemmas.sh.in
 
-GENERATION_TESTS=$(basename $(GENERATION_TESTS_IN))
+GENERATION_TESTS=generate-adjective-lemmas.sh \
+				 generate-noun-lemmas.sh \
+				 generate-verb-lemmas.sh
 
 if WANT_GENERATION
 TESTS+=$(GENERATION_TESTS)
diff --git a/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am b/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am
index 8704ae69..00833a43 100644
--- a/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am
+++ b/tools/spellcheckers/test/fstbased/desktop/hfst/Makefile.am
@@ -8,12 +8,14 @@ TESTS=
 # Yaml tests are run from shell scripts - specify them here:
 YAML_TEST_RUNNERS_IN=
 #run-acceptor-yaml-testcases.sh.in
-YAML_TEST_RUNNERS=$(basename $(YAML_TEST_RUNNERS_IN))
+YAML_TEST_RUNNERS=
+#run-acceptor-yaml-testcases.sh
 # Specify other shell scripts here to make sure they are included in the distro
 # even though spellers are disabled:
 OTHER_TEST_RUNNERS_IN=test-zhfst-basic-sugg-speed.sh.in \
                       accept-all-lemmas.sh.in
-OTHER_TEST_RUNNERS=$(basename $(OTHER_TEST_RUNNERS_IN))
+OTHER_TEST_RUNNERS=test-zhfst-basic-sugg-speed.sh \
+				   accept-all-lemmas.sh
 
 # Only test spellers if we build spellers:
 if WANT_SPELLERS