diff --git a/0026-XFS-resize-test-fix.patch b/0026-XFS-resize-test-fix.patch
index 9b82d36..0599c03 100644
--- a/0026-XFS-resize-test-fix.patch
+++ b/0026-XFS-resize-test-fix.patch
@@ -1,4 +1,4 @@
-From 5bd9eee844859f5cd5d9f4f1c8915dab931de12b Mon Sep 17 00:00:00 2001
+From c2e247fe953568a65c73f5408a6da7af12c4d6a1 Mon Sep 17 00:00:00 2001
 From: Vojtech Trefny <vtrefny@redhat.com>
 Date: Tue, 18 Jun 2024 14:47:39 +0200
 Subject: [PATCH 1/2] tests: Try waiting after partition creation for XFS
@@ -7,9 +7,24 @@ Subject: [PATCH 1/2] tests: Try waiting after partition creation for XFS
 The test randomly fails to find the newly created partition so
 lets try waiting a bit with udev settle.
 ---
+ tests/skip.yml                              | 6 ------
  tests/storage_tests/formats_test/fs_test.py | 2 ++
- 1 file changed, 2 insertions(+)
+ 2 files changed, 2 insertions(+), 6 deletions(-)
 
+diff --git a/tests/skip.yml b/tests/skip.yml
+index c0ca0eaf..8d353b1b 100644
+--- a/tests/skip.yml
++++ b/tests/skip.yml
+@@ -23,9 +23,3 @@
+ # - all "skips" can specified as a list, for example 'version: [10, 11]'
+ 
+ ---
+-
+-- test: storage_tests.formats_test.fs_test.XFSTestCase.test_resize
+-  skip_on:
+-    - distro: ["centos", "enterprise_linux"]
+-      version: "9"
+-      reason: "Creating partitions on loop devices is broken on CentOS/RHEL 9 latest kernel"
 diff --git a/tests/storage_tests/formats_test/fs_test.py b/tests/storage_tests/formats_test/fs_test.py
 index 1d42dc21..59c0f998 100644
 --- a/tests/storage_tests/formats_test/fs_test.py
@@ -34,7 +49,7 @@ index 1d42dc21..59c0f998 100644
 2.45.2
 
 
-From 230cbb1d194333a00554b8afe09768f15972cf2f Mon Sep 17 00:00:00 2001
+From 511d64c69618de0e7bb567353e5e0c92b61da10e Mon Sep 17 00:00:00 2001
 From: Vojtech Trefny <vtrefny@redhat.com>
 Date: Thu, 7 Mar 2024 09:45:28 +0100
 Subject: [PATCH 2/2] Fix util.detect_virt on Amazon
diff --git a/python-blivet.spec b/python-blivet.spec
index d7fd182..ded98be 100644
--- a/python-blivet.spec
+++ b/python-blivet.spec
@@ -23,7 +23,7 @@ Version: 3.6.0
 
 #%%global prerelease .b2
 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2
-Release: 16%{?prerelease}%{?dist}
+Release: 17%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPLv2+
 %global realname blivet
@@ -219,6 +219,10 @@ configuration.
 %endif
 
 %changelog
+* Mon Jul 22 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-17
+- Fix 'Try waiting after partition creation for XFS resize test'
+  Resolves: RHEL-8009
+
 * Thu Jun 27 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-16
 - tests: Try waiting after partition creation for XFS resize test
   Resolves: RHEL-8009