diff --git a/libguestfs.spec b/libguestfs.spec
index 03b49ed..dd10497 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.21.7
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -770,6 +770,18 @@ export SKIP_TEST_BTRFS_SUBVOLUME_DEFAULT_PL=1
 # Disable set_label tests (RHBZ#906777).
 export SKIP_TEST_SET_LABEL=1
 
+# Disable all btrfs tests (RHBZ#863978).
+export SKIP_TEST_BTRFS_FSCK=1
+export SKIP_TEST_BTRFS_SET_SEEDING=1
+export SKIP_TEST_BTRFS_FILESYSTEM_SYNC=1
+export SKIP_TEST_BTRFS_SUBVOLUME_DELETE=1
+export SKIP_TEST_BTRFS_SUBVOLUME_SNAPSHOT=1
+export SKIP_TEST_MKFS_BTRFS=1
+export SKIP_TEST_BTRFS_DEVICES_SH=1
+export SKIP_TEST_BTRFS_SUBVOLUME_DEFAULT_PL=1
+export SKIP_TEST_CHARSET_FIDELITY=1
+export SKIP_TEST_VIRT_MAKE_FS_BTRFS=1
+
 %if %{runtests}
 make check -k
 %endif
@@ -1029,8 +1041,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
-* Tue Feb  5 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.7-3
+* Tue Feb  5 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.7-4
 - Skip set_label tests because of RHBZ#906777.
+- Disable btrfs tests again because RHBZ#863978 is not fixed.
 
 * Mon Feb  4 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.21.7-2
 - New development version 1.21.7.