diff -Nru at-spi2-atk-2.34.2/debian/changelog at-spi2-atk-2.34.2/debian/changelog
--- at-spi2-atk-2.34.2/debian/changelog	2020-05-06 10:22:36.000000000 +0000
+++ at-spi2-atk-2.34.2/debian/changelog	2020-05-09 13:49:18.000000000 +0000
@@ -1,3 +1,13 @@
+at-spi2-atk (2.34.2-0ubuntu2) groovy; urgency=medium
+
+  * Bring back use_system_atk_adaptor.patch, which is still used by the tests.
+    Don't put it in debian/patches, otherwise when you use gbp pq it'll be
+    dropped as unused. Put it in debian/test-patches/ instead, and then you
+    can use `QUILT_PATCHES=debian/test-patches/ quilt push -a` to change it if
+    you need to.
+
+ -- Iain Lane <iain.lane@canonical.com>  Sat, 09 May 2020 14:49:18 +0100
+
 at-spi2-atk (2.34.2-0ubuntu1) groovy; urgency=medium
 
   [ Samuel Thibault ]
diff -Nru at-spi2-atk-2.34.2/debian/test-patches/series at-spi2-atk-2.34.2/debian/test-patches/series
--- at-spi2-atk-2.34.2/debian/test-patches/series	1970-01-01 00:00:00.000000000 +0000
+++ at-spi2-atk-2.34.2/debian/test-patches/series	2020-05-09 13:49:18.000000000 +0000
@@ -0,0 +1 @@
+use_system_atk_adaptor.patch
diff -Nru at-spi2-atk-2.34.2/debian/test-patches/use_system_atk_adaptor.patch at-spi2-atk-2.34.2/debian/test-patches/use_system_atk_adaptor.patch
--- at-spi2-atk-2.34.2/debian/test-patches/use_system_atk_adaptor.patch	1970-01-01 00:00:00.000000000 +0000
+++ at-spi2-atk-2.34.2/debian/test-patches/use_system_atk_adaptor.patch	2020-05-09 13:49:18.000000000 +0000
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index 65be8ec..dd6bb77 100644
+--- a/meson.build
++++ b/meson.build
+@@ -60,5 +60,6 @@ install_data('at-spi2-atk.desktop',
+              install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules'))
+ 
+ subdir('droute')
+-subdir('atk-adaptor')
++#subdir('atk-adaptor')
++libatk_bridge_dep = dependency('atk-bridge-2.0')
+ subdir('tests')
diff -Nru at-spi2-atk-2.34.2/debian/tests/tests at-spi2-atk-2.34.2/debian/tests/tests
--- at-spi2-atk-2.34.2/debian/tests/tests	2020-05-06 10:22:36.000000000 +0000
+++ at-spi2-atk-2.34.2/debian/tests/tests	2020-05-09 13:49:18.000000000 +0000
@@ -5,7 +5,7 @@
 WORKDIR=$AUTOPKGTEST_TMP
 SRCDIR=$PWD
 
-patch -p1 < debian/patches/use_system_atk_adaptor.patch 2>&1 || true
+patch -p1 < debian/test-patches/use_system_atk_adaptor.patch 2>&1 || true
 
 cd $WORKDIR
 if [ -n "$DEB_HOST_GNU_TYPE" ]; then
@@ -25,4 +25,4 @@
 xvfb-run -s -noreset -a dbus-run-session --dbus-daemon $SRCDIR/debian/tests/dbus-daemon -- ninja test -v
 
 cd $SRCDIR
-patch -p1 -R < debian/patches/use_system_atk_adaptor.patch
+patch -p1 -R < debian/test-patches/use_system_atk_adaptor.patch