diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..fa02c6d
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,5 @@
+---
+
+standard-inventory-qcow2:
+  qemu:
+    m: 5G
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..fcc4a5c
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,97 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-source   # Fetch source tarball and unpack it into the test environment
+    tags:
+      - always
+
+  - role: standard-test-basic
+    tags:
+      - classic
+
+    required_packages:           # Install test dependencies
+      - dbus-daemon
+      - python3-blivet
+      - python3-bytesize
+      - python3-systemd
+      - targetcli
+      - smartmontools
+      - genisoimage
+      - xfsprogs
+      - dosfstools
+      - e2fsprogs
+      - cryptsetup
+      - python3-six
+      - kmod-kvdo
+      - vdo
+      - sqlite
+      - libstoragemgmt
+      - python3-libstoragemgmt
+      - udisks2-iscsi
+      - udisks2-lsm
+      - udisks2-lvm2
+
+    tests:
+      - start-lsmd:
+          dir: .
+          run: "systemctl start libstoragemgmt.service"
+      - udisksctl-help:
+          dir: .
+          run: "/usr/bin/udisksctl help"
+      - udisksctl-dump:
+          dir: .
+          run: "/usr/bin/udisksctl dump"
+
+      # Unit tests disabled - needs to be compiled and would not test the system binaries
+      #    - unittests:
+      #        dir: ./source/src/tests/
+      #        run: "./udisks-test"
+
+      - increase-timeouts:
+          dir: ./source/src/tests/
+          run: "find -name '*.py' -or -name integration-test | while read i; do sed -e 's/time\\.sleep(/time.sleep(5*/' -i $i; done"
+
+
+      - dbus-tests-mark-start:
+          dir: .
+          run: "echo \"--------------------------------- dbus tests start\" > /dev/kmsg; targetcli clearconfig confirm=True"
+      - dbus-tests-disable-vdo:
+          dir: ./source/src/tests/dbus-tests/
+          run: "sed -i test_10_basic.py -e 's/find_executable(\"vdo\")/find_executable(\"vdo-disabled\")/'"
+      - dbus-tests:
+          dir: ./source/
+          run: "python3 src/tests/dbus-tests/run_tests.py --system"
+      - dbus-tests-mark-finish:
+          dir: .
+          run: "echo \"--------------------------------- dbus tests finished\" > /dev/kmsg; echo \"# free\"; free; echo -e \"\\n\\n# df -h\\n\"; df -h; echo -e \"\\n\\n# blkid\\n\"; blkid; echo -e \"\\n\\n# lsblk\\n\"; lsblk; echo -e \"\\n\\n# udevadm info --query=all --export-db\\n\"; udevadm info --query=all --export-db"
+
+
+      - integration-tests-mark-start:
+          dir: .
+          run: "echo \"--------------------------------- integration tests start\" > /dev/kmsg; targetcli clearconfig confirm=True"
+      - integration-tests:
+          dir: ./source/src/tests/
+          run: "python3 ./integration-test --log-file=integration-tests.log 2>&1"
+      - integration-tests-mark-finish:
+          dir: .
+          run: "echo \">--------------------------------- integration tests finished\" > /dev/kmsg; echo \"# free\"; free; echo -e \"\\n\\n# df -h\\n\"; df -h; echo -e \"\\n\\n# blkid\\n\"; blkid; echo -e \"\\n\\n# lsblk\\n\"; lsblk; echo -e \"\\n\\n# udevadm info --query=all --export-db\\n\"; udevadm info --query=all --export-db"
+
+
+      - dump-rpm:
+          dir: .
+          run: "rpm -qa | sort"
+      - dump-integration-tests-log:
+          dir: ./source/src/tests/
+          run: "cat integration-tests.log"
+      - dump-flight_record:
+          dir: ./source/
+          run: "cat flight_record.log"
+      - dump-journal-dbus_tests:
+          dir: ./source/
+          run: "cat journaldump.log"
+      - dump-journal-system:
+          dir: .
+          run: "journalctl --all --no-pager"
+      - dump-dmesg:
+          dir: .
+          run: "dmesg"
diff --git a/udisks2.spec b/udisks2.spec
index 9d53f8a..ec63d0c 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -56,7 +56,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     https://github.com/storaged-project/udisks
@@ -526,6 +526,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 06 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-15
+- Reimport gating tests
+
 * Fri Jun 02 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-14
 - iscsi: CHAP auth algorithm selection fixes (#2188991)
 - tests: Use stronger passphrases for LUKS tests