diff --git a/nbdkit.spec b/nbdkit.spec
index 164555a..34f9e0f 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -19,8 +19,7 @@
 # On all other architectures, a simpler test suite must pass.  This
 # omits any tests that run full qemu, since running qemu under TCG is
 # often broken on non-x86_64 arches.
-# x86_64 is currently broken in F31 by https://bugzilla.redhat.com/1692047
-%global complete_test_arches NONE
+%global complete_test_arches x86_64
 
 # If we should verify tarball signature with GPGv2.
 %global verify_tarball_signature 1
@@ -569,8 +568,7 @@ autoreconf -i
 
 %ifnarch %{complete_test_arches}
 # Simplify the test suite so it doesn't require qemu.
-sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am
-sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
+sed -i -e '/^LIBGUESTFS_TESTS/d' tests/Makefile.am
 autoreconf -i
 %endif