diff --git a/libguestfs.spec b/libguestfs.spec
index 7eaaac8..f8ca8c8 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -4,7 +4,7 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Version:     1.0.26
-Release:     4%{?dist}
+Release:     5%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://et.redhat.com/~rjones/libguestfs/
@@ -268,21 +268,33 @@ make INSTALLDIRS=vendor %{?_smp_mflags}
 
 
 %check
-#make check
-./fish/guestfish -v <<EOT
-alloc test.img 100M
-run
-sfdisk /dev/sda 0 0 0 ,
-pvcreate /dev/sda1
-vgcreate VG /dev/sda1
-lvcreate LV1 VG 10M
-lvcreate LV2 VG 10M
-mkfs ext2 /dev/VG/LV1
-mount /dev/VG/LV1 /
-ll /
-lvs
-sync
-EOT
+# Uncomment one of these, depending on whether you want to
+# do a very long and thorough test ('make check') or just
+# a quick test to see if things generally work.
+
+# Currently tests are disabled on some architectures because of:
+#   BZ 494075 (ppc, ppc64).
+#   BZ 500564 (x86-64)
+
+%ifarch %{ix86}
+make check
+%endif
+
+# Quick test:
+#./fish/guestfish -v <<EOT
+#alloc test.img 100M
+#run
+#sfdisk /dev/sda 0 0 0 ,
+#pvcreate /dev/sda1
+#vgcreate VG /dev/sda1
+#lvcreate LV1 VG 10M
+#lvcreate LV2 VG 10M
+#mkfs ext2 /dev/VG/LV1
+#mount /dev/VG/LV1 /
+#ll /
+#lvs
+#sync
+#EOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -441,9 +453,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon May 18 2009 Richard Jones <rjones@redhat.com> - 1.0.26-4
+* Mon May 18 2009 Richard Jones <rjones@redhat.com> - 1.0.26-5
 - Experimentally try to reenable ppc and ppc64 builds.
-- Tests take a very long time to run, so include a simple quick check.
+- Note BZ numbers which are causing tests to fail.
 
 * Mon May 18 2009 Richard Jones <rjones@redhat.com> - 1.0.26-1
 - New upstream version 1.0.26.