diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/plans/hspell.fmf b/plans/hspell.fmf
new file mode 100644
index 0000000..c1627f9
--- /dev/null
+++ b/plans/hspell.fmf
@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..b7fae52
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,11 @@
+test: ./runtests.sh
+duration: 10m
+framework: beakerlib
+require:
+  - hspell
+  - hunspell-he
+  - make
+  - gcc
+  - gzip
+  - zlib-devel 
+  - rpm-build
diff --git a/tests/runtests.sh b/tests/runtests.sh
new file mode 100755
index 0000000..c125841
--- /dev/null
+++ b/tests/runtests.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+NAME=convmv
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm ${NAME}
+        rlShowPackageVersion ${NAME}
+        rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION"
+        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
+        rlRun "pushd $tmp"
+        rlFetchSrcForInstalled "${NAME}"
+        rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
+        rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
+        rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
+        if [ -d BUILD/${NAME}-${VERSION}-build ]; then
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}"
+        else
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}"
+        fi
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "set -o pipefail"
+        rlRun "echo "Default installation does not have aspell binary so remove its execution""
+        rlRun "sed -i 's/he.rws hunspell/hunspell/g' Makefile.in"
+        rlRun "./configure"
+        rlRun "sed -i '82,84d' test/test1"
+        rlRun "make V=1 test"
+        rlRun "retval=$?"
+        rlRun "echo $retval"
+        rlRun "popd" 0
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $tmp" 0 "Remove tmp directory"
+    rlPhaseEnd
+rlJournalEnd
+
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
deleted file mode 100644
index 985f950..0000000
--- a/tests/smoke/runtest.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-cd ../source
-echo "Default installation does not have aspell binary so remove its execution"
-sed -i 's/he.rws hunspell/hunspell/g' Makefile.in
-./configure
-sed -i '82,84d' test/test1
-make V=1 test
diff --git a/tests/test_dic_availability.fmf b/tests/test_dic_availability.fmf
new file mode 100644
index 0000000..ce5ab04
--- /dev/null
+++ b/tests/test_dic_availability.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-he
+test: python3 test_dic_availability.py
+framework: shell
+
diff --git a/tests/test_dic_availability.py b/tests/test_dic_availability.py
new file mode 100644
index 0000000..36ba52e
--- /dev/null
+++ b/tests/test_dic_availability.py
@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+
+import enchant
+
+lang = "he_IL"
+try:
+    dic = enchant.request_dict(lang)
+    print("Dictionary for {0} language is available for use".format(lang))
+except enchant.errors.DictNotFoundError:
+    print("Dictionary is not installed for use")
diff --git a/tests/test_suggest_words.fmf b/tests/test_suggest_words.fmf
new file mode 100644
index 0000000..67e5e69
--- /dev/null
+++ b/tests/test_suggest_words.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-he
+test: python3 test_suggest_words.py
+framework: shell
+
diff --git a/tests/test_suggest_words.py b/tests/test_suggest_words.py
new file mode 100644
index 0000000..3ca2942
--- /dev/null
+++ b/tests/test_suggest_words.py
@@ -0,0 +1,9 @@
+#!/usr/bin/python3
+
+import enchant
+
+wdlst = [ "שלום", "תֵה", "שַׁחַר"]
+dic = enchant.Dict("he_IL")
+for wd in wdlst:
+    dic.check(wd)
+    print("input word = {0}, Suggestions => {1}".format(wd, dic.suggest(wd)))
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 12af46d..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-source
- 
-- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-basic
-    tests:
-    - smoke
-    required_packages:
-    - gcc
-    - make
-    - hspell
-    - gzip
-    - zlib-devel