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/gating.yaml b/gating.yaml
deleted file mode 100644
index 6985029..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/isns-utils.spec b/isns-utils.spec
index 1d6c909..2f52f4a 100644
--- a/isns-utils.spec
+++ b/isns-utils.spec
@@ -15,6 +15,7 @@ BuildRequires: make
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 The iSNS package contains the daemon and tools to setup a iSNS server,
diff --git a/plans/smoke.fmf b/plans/smoke.fmf
new file mode 100644
index 0000000..08500e3
--- /dev/null
+++ b/plans/smoke.fmf
@@ -0,0 +1,6 @@
+discover:
+  how: fmf
+  dist-git-source: true
+  dist-git-install-builddeps: true
+execute:
+  how: tmt
diff --git a/test_as_installed.patch b/test_as_installed.patch
index 7f08d8a..0619060 100644
--- a/test_as_installed.patch
+++ b/test_as_installed.patch
@@ -1,15 +1,15 @@
-From 420ae1af11fad3151b5bfa676e7218168e4e6f3f Mon Sep 17 00:00:00 2001
+From 224f1d45934346f1836c75d9ce257029960543b9 Mon Sep 17 00:00:00 2001
 From: Chris Leech <cleech@redhat.com>
 Date: Wed, 26 May 2021 10:00:17 -0700
 Subject: [PATCH 1/1] run tests with binaries from arbitrary paths
 
 ---
  tests/Makefile   | 4 ++++
- tests/harness.py | 4 ++++
- 2 files changed, 8 insertions(+)
+ tests/harness.py | 6 +++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/tests/Makefile b/tests/Makefile
-index 372572d..2c61183 100644
+index 372572d..93bcac7 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
 @@ -48,3 +48,7 @@ quick: tests-no-security
@@ -19,9 +19,9 @@ index 372572d..2c61183 100644
 +
 +tests-as-installed:
 +	@echo running tests from installed executables -- takes about 2 minutes
-+	./test-isns.py -s --path="/usr/sbin"
++	./test-isns.py --path="/usr/sbin"
 diff --git a/tests/harness.py b/tests/harness.py
-index 39fc5e6..b710f5a 100644
+index 39fc5e6..83091ea 100644
 --- a/tests/harness.py
 +++ b/tests/harness.py
 @@ -137,6 +137,9 @@ def new_initArgParsers(self):
@@ -42,6 +42,15 @@ index 39fc5e6..b710f5a 100644
      dprint("found: verbosity=%d, security=%s" % \
             (Global.verbosity, Global.security))
  
+@@ -415,7 +419,7 @@ def isns_external_test(client_config, args):
+     """
+     logfile = get_logfile_from_config(client_config.path)
+ 
+-    cmd = ['%s/%s' % (Global._isns_bin_dir, args[0]),
++    cmd = ['%s/%s' % ("..", args[0]),
+            '-c', client_config.path] + args[1:]
+     exit_val = run_cmd(cmd, logfile)
+     return (logfile, exit_val)
 -- 
-2.31.1
+2.55.0
 
diff --git a/tests/smoke.fmf b/tests/smoke.fmf
new file mode 100644
index 0000000..909e2b3
--- /dev/null
+++ b/tests/smoke.fmf
@@ -0,0 +1,11 @@
+summary: Run upstream tests
+component: [isns-utils]
+require: [make, python3]
+test: >
+    rpmbuild -bc
+    --define "_sourcedir $TMT_SOURCE_DIR"
+    --define "_builddir $TMT_SOURCE_DIR/BUILD"
+    $TMT_SOURCE_DIR/*.spec &&
+    cd $TMT_SOURCE_DIR/BUILD/open-isns-*/tests &&
+    make tests-as-installed
+
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 8ca7ed2..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-source
-    tags:
-    - always
-
-  - role: standard-test-basic
-    tags:
-    - classic
-    required_packages:
-    - make
-    - python3
-    - isns-utils
-    - openssl
-    tests:
-    - smoke:
-        dir: ./source/tests/
-        run: make tests-as-installed
-