diff --git a/Makefile.am b/Makefile.am
index 06bfd130..d9becfdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -290,6 +290,14 @@ src_libespeak_ng_test_la_CFLAGS  = \
 	${PCAUDIOLIB_CFLAGS} ${AM_CFLAGS}
 src_libespeak_ng_test_la_SOURCES = $(src_libespeak_ng_la_SOURCES)
 
+if OPT_KLATT
+src_libespeak_ng_test_la_CFLAGS  += -DINCLUDE_KLATT
+endif
+
+if OPT_SPEECHPLAYER
+src_libespeak_ng_test_la_CFLAGS  += -DINCLUDE_SPEECHPLAYER
+endif
+
 check_PROGRAMS += tests/encoding.test
 
 tests_encoding_test_LDADD   = src/libespeak-ng.la
diff --git a/src/libespeak-ng/sPlayer.c b/src/libespeak-ng/sPlayer.c
index f2ab5ec9..075c7ac2 100644
--- a/src/libespeak-ng/sPlayer.c
+++ b/src/libespeak-ng/sPlayer.c
@@ -98,7 +98,9 @@ void KlattInitSP() {
 }
 
 void KlattFiniSP() {
-	speechPlayer_terminate(speechPlayerHandle);
+	if (speechPlayerHandle)
+		speechPlayer_terminate(speechPlayerHandle);
+	speechPlayerHandle = NULL;
 }
 
 void KlattResetSP() {
diff --git a/src/libespeak-ng/speech.c b/src/libespeak-ng/speech.c
index befbb35e..e51a1f43 100644
--- a/src/libespeak-ng/speech.c
+++ b/src/libespeak-ng/speech.c
@@ -945,6 +945,8 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Terminate(void)
 		p_decoder = NULL;
 	}
 
+	WavegenFini();
+
 	return ENS_OK;
 }