diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 69b7d9529e..5655b6e940 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -75,60 +75,6 @@ jobs:
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: ${{ matrix.task }}
 
-  # TESTS WITH TANG
-  checks_with_tang:
-    strategy:
-      matrix:
-        include:
-          # MANDATORY CHECKS USING CURRENT DEVELOPMENT COMPILER
-          - task: >-
-              TANG_URL=tang
-              RUST_LOG=stratisd=debug
-              make -f Makefile test-clevis-loop
-            toolchain: 1.78.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-            image: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
-    runs-on: ubuntu-22.04
-    container:
-      image: ${{ matrix.image }}
-      options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
-    services:
-      tang:
-        # yamllint disable rule:line-length
-        image: ghcr.io/stratis-storage/stratisd/tang:38
-        credentials:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        options: --privileged -p 80:80
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies for Fedora
-        # cracklib-dicts: https://github.com/stratis-storage/project/issues/581
-        run: >
-          dnf install -y
-          clang
-          cryptsetup-devel
-          clevis
-          clevis-luks
-          cracklib-dicts
-          curl
-          dbus-devel
-          device-mapper-devel
-          device-mapper-persistent-data
-          libblkid-devel
-          make
-          ncurses
-          sudo
-          systemd-devel
-          systemd-udev
-          xfsprogs
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
   stratis-cli-checks:
     runs-on: ubuntu-22.04
     container:
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
index 4c9250643b..30bd28e108 100644
--- a/.github/workflows/valgrind.yml
+++ b/.github/workflows/valgrind.yml
@@ -99,59 +99,6 @@ jobs:
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: ${{ matrix.task }}
 
-  # TESTS WITH TANG
-  checks_with_tang:
-    strategy:
-      matrix:
-        include:
-          # MANDATORY CHECKS USING CURRENT DEVELOPMENT COMPILER
-          - task: >-
-              TANG_URL=tang
-              RUST_LOG=stratisd=debug
-              make -f Makefile test-clevis-loop-valgrind
-            toolchain: 1.78.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
-            image: fedora:40  # CURRENT DEVELOPMENT ENVIRONMENT
-    runs-on: ubuntu-22.04
-    container:
-      image: ${{ matrix.image }}
-      options: --privileged -v /dev:/dev -v /run/udev:/run/udev --ipc=host
-    services:
-      tang:
-        # yamllint disable rule:line-length
-        image: ghcr.io/stratis-storage/stratisd/tang:38
-        credentials:
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-        options: --privileged -p 80:80
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          cryptsetup-devel
-          clevis
-          clevis-luks
-          cracklib-dicts
-          curl
-          device-mapper-persistent-data
-          dbus-devel
-          jq
-          libblkid-devel
-          make
-          sudo
-          systemd-devel
-          systemd-udev
-          valgrind
-          xfsprogs
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: ${{ matrix.components }}
-          toolchain: ${{ matrix.toolchain }}
-      - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
-        run: ${{ matrix.task }}
-
   python-based-tests:
     strategy:
       matrix:
diff --git a/tests-fmf/loop/clevis.fmf b/tests-fmf/loop/clevis.fmf
new file mode 100644
index 0000000000..048bd7ac0f
--- /dev/null
+++ b/tests-fmf/loop/clevis.fmf
@@ -0,0 +1,19 @@
+summary: Run tests that use loopbacked device framework for Clevis
+duration: 20m
+require:
+  - cargo
+  - clang
+  - clevis-luks
+  - cryptsetup-devel
+  - dbus-devel
+  - libblkid-devel
+  - make
+  - python3-dbus
+  - python3-dbus-client-gen
+  - python3-dbus-python-client-gen
+  - python3-psutil
+  - python3-pyudev
+  - rust
+  - systemd-devel
+test: make -f Makefile test-clevis-loop
+path: /
diff --git a/tests-fmf/loop/valgrind.fmf b/tests-fmf/loop/valgrind.fmf
new file mode 100644
index 0000000000..11dd7f1aaf
--- /dev/null
+++ b/tests-fmf/loop/valgrind.fmf
@@ -0,0 +1,19 @@
+summary: Run tests that use loopbacked device framework for Clevis with valgrind
+duration: 20m
+require:
+  - cargo
+  - clang
+  - clevis-luks
+  - cryptsetup-devel
+  - libblkid-devel
+  - make
+  - python3-dbus
+  - python3-dbus-client-gen
+  - python3-dbus-python-client-gen
+  - python3-psutil
+  - python3-pyudev
+  - rust
+  - systemd-devel
+  - valgrind
+test: make -f Makefile test-clevis-loop-valgrind
+path: /