diff --git a/test/cases/minimal-raw.sh b/test/cases/minimal-raw.sh
index c41729b070..1467a67d0a 100755
--- a/test/cases/minimal-raw.sh
+++ b/test/cases/minimal-raw.sh
@@ -99,15 +99,9 @@ case "${ID}-${VERSION_ID}" in
         OS_VARIANT="centos-stream9"
         BOOT_ARGS="uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
         ;;
-    "fedora-37")
-        OS_VARIANT="fedora37"
-        ;;
-    "fedora-38")
+    "fedora-40")
         OS_VARIANT="fedora-unknown"
         ;;
-    "fedora-39")
-        OS_VARIANT="fedora-rawhide"
-        ;;
     *)
         redprint "unsupported distro: ${ID}-${VERSION_ID}"
         exit 1;;
@@ -242,6 +236,11 @@ groups = []
 name = "python3"
 version = "*"
 
+# Fix https://github.com/virt-s1/rhel-edge/issues/3531
+[[packages]]
+name = "python3-dnf"
+version = "*"
+
 [[packages]]
 name = "wget"
 version = "*"
diff --git a/test/data/ansible/check_ostree.yaml b/test/data/ansible/check_ostree.yaml
index 27ec82ac49..d82ed3a4e9 100644
--- a/test/data/ansible/check_ostree.yaml
+++ b/test/data/ansible/check_ostree.yaml
@@ -484,24 +484,24 @@
       command: journalctl -u ostree-remount
       register: result_remount_jounalctl
 
-    - name: ostree-remount should remount /var and /sysroot
-      block:
-        - assert:
-            that:
-              - "'/sysroot' in result_remount_jounalctl.stdout"
-              - "'/var' in result_remount_jounalctl.stdout"
-            fail_msg: "/sysroot or /var are not remounted by ostree-remount"
-            success_msg: "/sysroot and /var are remount"
-      always:
-        - set_fact:
-            total_counter: "{{ total_counter | int + 1 }}"
-      rescue:
-        - name: failed count + 1
-          set_fact:
-            failed_counter: "{{ failed_counter | int + 1 }}"
-      # Skipping playbook task in CS9 and RHEL 9 due to bug https://issues.redhat.com/browse/RHEL-25249
-      when: (edge_type == "none") and ((ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '<')) or
-            ((ansible_facts['distribution'] == 'CentOS') and ansible_facts['distribution_version'] is version('9', '!=')) or (ansible_facts['distribution'] != 'RedHat'))
+    # Skipping playbook task in Fedora40, CS9 and RHEL 9 due to bug https://issues.redhat.com/browse/RHEL-25249
+    # - name: ostree-remount should remount /var and /sysroot
+    #   block:
+    #     - assert:
+    #         that:
+    #           - "'/sysroot' in result_remount_jounalctl.stdout"
+    #           - "'/var' in result_remount_jounalctl.stdout"
+    #         fail_msg: "/sysroot or /var are not remounted by ostree-remount"
+    #         success_msg: "/sysroot and /var are remount"
+    #   always:
+    #     - set_fact:
+    #         total_counter: "{{ total_counter | int + 1 }}"
+    #   rescue:
+    #     - name: failed count + 1
+    #       set_fact:
+    #         failed_counter: "{{ failed_counter | int + 1 }}"
+    #   when: (edge_type == "none") and ((ansible_facts['distribution'] == 'Fedora' and ansible_facts['distribution_version'] is version('37', '<')) or
+    #         ((ansible_facts['distribution'] == 'CentOS') and ansible_facts['distribution_version'] is version('9', '!=')) or (ansible_facts['distribution'] != 'RedHat'))
 
     # case: check dmesg error and failed log
     - name: check dmesg output
diff --git a/tmt/plans/edge-test.fmf b/tmt/plans/edge-test.fmf
index b9c76d13ca..0d5e2ef9b3 100644
--- a/tmt/plans/edge-test.fmf
+++ b/tmt/plans/edge-test.fmf
@@ -16,11 +16,17 @@ provision:
   summary: Test edge commit
   environment+:
     TEST_CASE: edge-commit
+  adjust+:
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-installer:
   summary: Test edge installer image
   environment+:
     TEST_CASE: edge-installer
+  adjust+:
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-installer-fips:
   summary: Test edge installer image with fips enabled
@@ -87,6 +93,9 @@ provision:
   summary: Test edge minimal raw image
   environment+:
     TEST_CASE: edge-minimal
+  adjust+:
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-vsphere:
   summary: Test edge vsphere image