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/hunspell-si.spec b/hunspell-si.spec
index a70391f..e2f344c 100644
--- a/hunspell-si.spec
+++ b/hunspell-si.spec
@@ -1,12 +1,13 @@
-%if 0%{?fedora} > 35
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
 %global dict_dirname hunspell 
 %else
 %global dict_dirname myspell
 %endif
+
 Name: hunspell-si
 Summary: Sinhala hunspell dictionaries
 Version: 0.2.1
-Release: 32%{?dist}
+Release: 33%{?dist}
 Source: http://www.sandaru1.com/si-LK.tar.gz
 #Following URL is down since few months informed to upstream
 URL: http://www.sandaru1.com/2009/08/29/sinhala-spell-checker-for-firefox/
@@ -34,6 +35,10 @@ cp -p dictionaries/si-LK.dic $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/si_LK.d
 %{_datadir}/%{dict_dirname}/*
 
 %changelog
+* Sat Aug 03 2024 Parag Nemade <pnemade AT redhat DOT com> - 0.2.1-33
+- Resolves:RHEL-52303 - Add conditional for RHEL for using hunspell directory
+- Add tmt CI tests
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.2.1-32
 - Bump release for June 2024 mass rebuild
 
diff --git a/plans/hunspell-si.fmf b/plans/hunspell-si.fmf
new file mode 100644
index 0000000..c1627f9
--- /dev/null
+++ b/plans/hunspell-si.fmf
@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
deleted file mode 100644
index 80d965a..0000000
--- a/tests/scripts/run_tests.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-python3 test_suggest_words.py
-python3 test_dic_availability.py
diff --git a/tests/test_dic_availability.fmf b/tests/test_dic_availability.fmf
new file mode 100644
index 0000000..dd28a72
--- /dev/null
+++ b/tests/test_dic_availability.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-si
+test: python3 test_dic_availability.py
+framework: shell
+
diff --git a/tests/scripts/test_dic_availability.py b/tests/test_dic_availability.py
similarity index 100%
rename from tests/scripts/test_dic_availability.py
rename to tests/test_dic_availability.py
diff --git a/tests/test_suggest_words.fmf b/tests/test_suggest_words.fmf
new file mode 100644
index 0000000..5b07871
--- /dev/null
+++ b/tests/test_suggest_words.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-si
+test: python3 test_suggest_words.py
+framework: shell
+
diff --git a/tests/scripts/test_suggest_words.py b/tests/test_suggest_words.py
similarity index 100%
rename from tests/scripts/test_suggest_words.py
rename to tests/test_suggest_words.py
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 5ffb74a..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      required_packages:
-      - python3-enchant
-      tags:
-        - classic
-      tests:
-        - sample:
-            dir: scripts/
-            run: ./run_tests.sh