diff --git a/tests/basic-test.sh b/tests/basic-test.sh
index c720b12..93579ed 100755
--- a/tests/basic-test.sh
+++ b/tests/basic-test.sh
@@ -13,5 +13,8 @@ set -x
 # <https://lists.corp.redhat.com/archives/osci-list/2023-June/001238.html>.
 systemctl isolate multi-user.target
 
+# Work around RHBZ#2216496.
+export LIBGUESTFS_APPEND=nosmp
+
 virt-builder -vx fedora-30
 virt-v2v -vx -i disk fedora-30.img -o null
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 0395ff0..77e7f91 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -16,7 +16,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.3.4
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPLv2+
@@ -291,6 +291,9 @@ fi
 export LIBGUESTFS_DEBUG=1
 export LIBGUESTFS_TRACE=1
 
+# Work around RHBZ#2216496.
+export LIBGUESTFS_APPEND=nosmp
+
 # The built in tests take a very long time to run under TCG (in Koji),
 # so just perform a very simple conversion to check things are
 # working.
@@ -356,8 +359,9 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check
 
 
 %changelog
-* Fri Jun 30 2023 Laszlo Ersek <lersek@redhat.com> - 1:2.3.4-4
+* Mon Jul 03 2023 Laszlo Ersek <lersek@redhat.com> - 1:2.3.4-5
 - improve UX when running as root and we can't chown v2v tmpdir or socks
+- make the appliance kernel UP in %check, for working around RHBZ#2216496
   resolves: rhbz#2182024
 
 * Tue Jun 20 2023 Laszlo Ersek <lersek@redhat.com> - 1:2.3.4-3