diff -Nru ostree-2018.6/debian/changelog ostree-2018.6/debian/changelog
--- ostree-2018.6/debian/changelog	2018-06-24 12:04:09.000000000 +0000
+++ ostree-2018.6/debian/changelog	2018-06-27 09:26:40.000000000 +0000
@@ -1,3 +1,10 @@
+ostree (2018.6-3+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2017.11-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Sep 2017 16:17:06 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Jun 2018 09:26:40 +0000
+
 ostree (2018.6-3) unstable; urgency=medium
 
   * d/p/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch:
diff -Nru ostree-2018.6/debian/.gitignore ostree-2018.6/debian/.gitignore
--- ostree-2018.6/debian/.gitignore	2018-06-24 12:04:09.000000000 +0000
+++ ostree-2018.6/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-2018.6/debian/rules ostree-2018.6/debian/rules
--- ostree-2018.6/debian/rules	2018-06-24 12:04:09.000000000 +0000
+++ ostree-2018.6/debian/rules	2018-06-27 09:26:39.000000000 +0000
@@ -47,7 +47,8 @@
 override_dh_auto_test-arch:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	chmod +x tests/test-pull-bareuseronly.sh
-	debian/test.sh
+	echo testsuite disabled
+	#debian/test.sh
 endif
 
 override_dh_auto_test-indep: