diff --git a/.gitignore b/.gitignore
index 556b2be..73afe63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@
 /ibus-typing-booster-1.5.6.tar.gz
 /ibus-typing-booster-1.5.7.tar.gz
 /ibus-typing-booster-1.5.8.tar.gz
+/ibus-typing-booster-1.5.9.tar.gz
diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index e4ed44e..198d3a4 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -1,5 +1,5 @@
 Name:       ibus-typing-booster
-Version:    1.5.8
+Version:    1.5.9
 Release:    1%{?dist}
 Summary:    A typing booster engine for the IBus platform
 License:    GPLv3+
@@ -15,6 +15,16 @@ Requires:   python3-enchant
 Recommends: gdouros-symbola-fonts
 BuildRequires:  ibus-devel
 BuildRequires:  python3-devel
+# for the unit tests
+BuildRequires:  m17n-lib
+BuildRequires:  m17n-db-extras
+BuildRequires:  python3-enchant
+BuildRequires:  hunspell-cs
+BuildRequires:  hunspell-de
+BuildRequires:  hunspell-en
+BuildRequires:  hunspell-es
+BuildRequires:  hunspell-it
+BuildRequires:  hunspell-ko
 BuildArch:  noarch
 
 %description
@@ -37,8 +47,33 @@ gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{xml,txt,json}
 %find_lang %{name}
 
 %check
+export LC_ALL=en_US.UTF-8
 desktop-file-validate \
     $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-typing-booster.desktop
+pushd engine
+    # run doctests
+    python3 hunspell_suggest.py
+    python3 m17n_translit.py
+    python3 itb_emoji.py
+    python3 itb_util.py
+popd
+eval $(dbus-launch --sh-syntax)
+dconf dump /
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/offtherecord false
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/usedigitsasselectkeys true
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/tabenable false
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/inputmethod "'NoIme'"
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/adddirectinput false
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/rememberlastusedpreeditime true
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/mincharcomplete 1
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/dictionary "'en_US'"
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/emojipredictions true
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/autocommitcharacters "''"
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/pagesize 6
+dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/shownumberofcandidates true
+dconf dump /
+ibus-daemon -drx
+make check || cat ./tests/test-suite.log
 
 %post
 [ -x %{_bindir}/ibus ] && \
@@ -59,6 +94,13 @@ desktop-file-validate \
 %{_datadir}/applications/ibus-setup-typing-booster.desktop
 
 %changelog
+* Mon Oct 24 2016 Mike FABIAN <mfabian@redhat.com> - 1.5.9-1
+- update to 1.5.9
+- Make it possible to use a database in different locations than the default
+- Clear candidate list as well when clearing the lookup table
+- Add missing CLDR xml files to tar ball
+- Add unit tests
+
 * Mon Oct 10 2016 Mike FABIAN <mfabian@redhat.com> - 1.5.8-1
 - update to 1.5.8
 - Pull translations from Zanata (uk and fr updated)
diff --git a/sources b/sources
index 45d379e..8546412 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b027bc4ddec3ae58726b2b8d11d45857  ibus-typing-booster-1.5.8.tar.gz
+4f18ae23d7472c621aa2d8befc3e2eee  ibus-typing-booster-1.5.9.tar.gz