diff --git a/nixos/tests/firewalld.nix b/nixos/tests/firewalld.nix
index a191fe806354..5c1c34e35ece 100644
--- a/nixos/tests/firewalld.nix
+++ b/nixos/tests/firewalld.nix
@@ -29,6 +29,8 @@
 
     walled.wait_for_unit("firewalld")
     walled.wait_for_unit("httpd")
+    # https://github.com/firewalld/firewalld/issues/1571
+    walled.wait_until_succeeds("firewall-cmd --state")
 
     open.wait_for_unit("network.target")