diff --git a/0031-Fix_running_tests_in_FIPS_mode.patch b/0031-Fix_running_tests_in_FIPS_mode.patch
new file mode 100644
index 0000000..528addf
--- /dev/null
+++ b/0031-Fix_running_tests_in_FIPS_mode.patch
@@ -0,0 +1,35 @@
+From b7f03738543a4bb416fb19c7138f0b9d3049af61 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Fri, 8 Nov 2024 09:19:45 +0100
+Subject: [PATCH] Fix "Modified passphrase in stratis test"
+
+Follow up for 68708e347ef7b2f98312c76aa80366091dd4aade, two more
+places where the passphrase is too short for FIPS mode.
+
+Resolves: RHEL-8029
+---
+ tests/storage_tests/devices_test/stratis_test.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/storage_tests/devices_test/stratis_test.py b/tests/storage_tests/devices_test/stratis_test.py
+index 21c4d0f50..9792e0618 100644
+--- a/tests/storage_tests/devices_test/stratis_test.py
++++ b/tests/storage_tests/devices_test/stratis_test.py
+@@ -105,7 +105,7 @@ def test_stratis_encrypted(self):
+         blivet.partitioning.do_partitioning(self.storage)
+ 
+         pool = self.storage.new_stratis_pool(name="blivetTestPool", parents=[bd],
+-                                             encrypted=True, passphrase="abcde")
++                                             encrypted=True, passphrase="fipsneeds8chars")
+         self.storage.create_device(pool)
+ 
+         self.storage.do_it()
+@@ -260,7 +260,7 @@ def test_stratis_encrypted_clevis_tpm(self):
+         blivet.partitioning.do_partitioning(self.storage)
+ 
+         pool = self.storage.new_stratis_pool(name="blivetTestPool", parents=[bd],
+-                                             encrypted=True, passphrase="abcde",
++                                             encrypted=True, passphrase="fipsneeds8chars",
+                                              clevis=StratisClevisConfig(pin="tpm2"))
+         self.storage.create_device(pool)
+ 
diff --git a/python-blivet.spec b/python-blivet.spec
index 4dfc239..7e86c4c 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: 21%{?prerelease}%{?dist}
+Release: 22%{?prerelease}%{?dist}
 Epoch: 1
 License: LGPLv2+
 %global realname blivet
@@ -60,6 +60,7 @@ Patch26: 0027-RHEL96-bugfixes-1.patch
 Patch27: 0028-Fix-checking-for-NVMe-plugin-availability.patch
 Patch28: 0029-Align-sizes-up-for-growable-LVs.patch
 Patch29: 0030-mod_pass_in_stratis_test.patch
+Patch30: 0031-Fix_running_tests_in_FIPS_mode.patch
 
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
@@ -223,6 +224,9 @@ configuration.
 %endif
 
 %changelog
+* Tue Nov 12 2024 Vojtech Trefny <vtrefny@redhat.com> - 3.6.0-22
+- Fix running tests in FIPS mode
+  Resolves: RHEL-8029
 
 * Fri Nov 1 2024 Jan Pokorny <japokorn@redhat.com> - 3.6.0-21
 - Modified passphrase in stratis test