diff -Nru openjdk-lts-11.0.6+10/debian/changelog openjdk-lts-11.0.6+10/debian/changelog
--- openjdk-lts-11.0.6+10/debian/changelog	2020-01-14 17:07:05.000000000 -0800
+++ openjdk-lts-11.0.6+10/debian/changelog	2020-01-30 17:15:27.000000000 -0800
@@ -1,3 +1,9 @@
+openjdk-lts (11.0.6+10-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Make autopkgtests cross-test-friendly.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 30 Jan 2020 17:15:27 -0800
+
 openjdk-lts (11.0.6+10-1ubuntu1) focal; urgency=medium
 
   * Sync packages with 11.0.6+10-1:
diff -Nru openjdk-lts-11.0.6+10/debian/control openjdk-lts-11.0.6+10/debian/control
--- openjdk-lts-11.0.6+10/debian/control	2019-12-14 02:42:06.000000000 -0800
+++ openjdk-lts-11.0.6+10/debian/control	2020-01-22 09:01:39.000000000 -0800
@@ -111,6 +111,7 @@
 
 Package: openjdk-11-source
 Architecture: all
+Multi-Arch: foreign
 Priority: optional
 Pre-Depends: ${dpkg:Depends}
 Depends: openjdk-11-jdk (>= ${source:Version}),
diff -Nru openjdk-lts-11.0.6+10/debian/tests/control openjdk-lts-11.0.6+10/debian/tests/control
--- openjdk-lts-11.0.6+10/debian/tests/control	2019-12-14 02:42:06.000000000 -0800
+++ openjdk-lts-11.0.6+10/debian/tests/control	2020-01-21 18:25:14.000000000 -0800
@@ -1,7 +1,7 @@
 Tests: hotspot, jaxp, langtools
-Depends: @, default-jre-headless, jtreg (>= 4.2-b13-0~), testng, g++
+Depends: @, default-jre-headless, jtreg:native (>= 4.2-b13-0~), testng:native, build-essential
 Restrictions: allow-stderr, skippable, flaky
 
 Tests: jdk
-Depends: @, default-jre-headless, jtreg (>= 4.2-b13-0~), testng, g++, xfwm4, xvfb, dbus-x11
+Depends: @, default-jre-headless, jtreg:native (>= 4.2-b13-0~), testng:native, build-essential, xfwm4:native, xvfb, dbus-x11
 Restrictions: allow-stderr, skippable, flaky