diff -Nru ostree-2021.5/debian/changelog ostree-2021.5/debian/changelog
--- ostree-2021.5/debian/changelog	2021-10-10 16:51:27.000000000 +0000
+++ ostree-2021.5/debian/changelog	2021-10-14 15:18:46.000000000 +0000
@@ -1,3 +1,10 @@
+ostree (2021.5-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 2020.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Dec 2020 11:54:45 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Oct 2021 15:18:46 +0000
+
 ostree (2021.5-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru ostree-2021.5/debian/.gitignore ostree-2021.5/debian/.gitignore
--- ostree-2021.5/debian/.gitignore	2021-10-10 16:51:27.000000000 +0000
+++ ostree-2021.5/debian/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-/*.debhelper
-/*.substvars
-/gir1.2-ostree-1.0/
-/libostree-1-1/
-/libostree-dev/
-/libostree-doc/
-/ostree-grub2/
-/ostree/
diff -Nru ostree-2021.5/debian/rules ostree-2021.5/debian/rules
--- ostree-2021.5/debian/rules	2021-10-10 16:51:27.000000000 +0000
+++ ostree-2021.5/debian/rules	2021-10-14 15:18:46.000000000 +0000
@@ -43,7 +43,7 @@
 	dh_auto_configure -- $(configure_options)
 
 override_dh_auto_test-arch:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	chmod +x tests/test-pull-bareuseronly.sh
 	debian/test.sh
 endif