diff -Nru gnupg2-2.2.12/debian/changelog gnupg2-2.2.12/debian/changelog
--- gnupg2-2.2.12/debian/changelog	2019-08-22 19:11:59.000000000 +0000
+++ gnupg2-2.2.12/debian/changelog	2019-09-09 22:31:46.000000000 +0000
@@ -1,3 +1,10 @@
+gnupg2 (2.2.12-1+rpi1+deb10u1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.2.12-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Dec 2018 15:10:42 +0000]
+  * Disable testsuite.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Sep 2019 22:31:46 +0000
+
 gnupg2 (2.2.12-1+deb10u1) buster; urgency=medium
 
   * drop unneeded patch for printing revocation certificates
diff -Nru gnupg2-2.2.12/debian/rules gnupg2-2.2.12/debian/rules
--- gnupg2-2.2.12/debian/rules	2019-08-21 18:53:30.000000000 +0000
+++ gnupg2-2.2.12/debian/rules	2019-09-09 22:31:46.000000000 +0000
@@ -77,7 +77,7 @@
 
 
 override_dh_auto_test:
-	dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)
+	#dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)
 
 override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.