diff --git a/Plans/general.fmf b/Plans/general.fmf
new file mode 100644
index 0000000..43bc4a7
--- /dev/null
+++ b/Plans/general.fmf
@@ -0,0 +1,35 @@
+summary: test plan for usbguard errata testing
+
+#required usage of machine with usb controller
+
+provision:
+    hostname: "~ intel*"
+
+prepare:
+  - how: shell
+    script:
+     - systemctl disable --now dnf-makecache.service || true
+     - systemctl disable --now dnf-makecache.timer || true
+     - dnf makecache
+
+discover:
+  - name: Upstream_usbguard_tests
+    how: fmf
+    url: https://github.com/RedHat-SP-Security/usbguard-tests
+    ref: notifier
+    test:
+      - /Regression
+      - /Sanity
+    exclude:
+      - /Sanity/rules-fuzz
+
+adjust:
+  - when: distro == rhel-9 or distro == centos-stream-9
+    prepare+:
+      - how: shell
+        script:
+          - dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm
+
+execute:
+    how: tmt
+
diff --git a/Sanity/notifier-ipc/main.fmf b/Sanity/notifier-ipc/main.fmf
index 8cb1b22..b759cec 100644
--- a/Sanity/notifier-ipc/main.fmf
+++ b/Sanity/notifier-ipc/main.fmf
@@ -23,4 +23,6 @@ link:
 adjust+:
 -   enabled: false
     when: distro < rhel-8.6
+-   enabled: false
+    when: distro >= rhel-10
 extra-nitrate: TC#0611602
diff --git a/Sanity/service-sanity/runtest.sh b/Sanity/service-sanity/runtest.sh
index 2c24510..55ac28e 100755
--- a/Sanity/service-sanity/runtest.sh
+++ b/Sanity/service-sanity/runtest.sh
@@ -84,11 +84,7 @@ rlJournalStart
       rlRun "systemctl daemon-reexec"
       rlRun "rlServiceStart usbguard"
       rlRun -s "journalctl --no-pager --since=\"$start_time\""
-      if rlIsFedora; then
-          rlAssertGrep "Started usbguard.service - USBGuard daemon" $rlRun_LOG
-      else
-          rlAssertGrep "Started USBGuard daemon" $rlRun_LOG
-      fi
+      rlAssertGrep "Started (usbguard.service - )?USBGuard daemon" $rlRun_LOG -Eq
       rlAssertNotGrep "IPAddressDeny" $rlRun_LOG
       rm -rf $rlRun_LOG
       rlRun "rlServiceStatus usbguard"