diff -Nru nss-wrapper-1.1.11/debian/changelog nss-wrapper-1.1.11/debian/changelog
--- nss-wrapper-1.1.11/debian/changelog	2020-04-02 18:45:05.000000000 +0000
+++ nss-wrapper-1.1.11/debian/changelog	2020-06-10 21:04:28.000000000 +0000
@@ -1,3 +1,9 @@
+nss-wrapper (1.1.11-1ubuntu1) groovy; urgency=medium
+
+  * Make autopkgtests cross-test-friendly.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 10 Jun 2020 14:04:28 -0700
+
 nss-wrapper (1.1.11-1) unstable; urgency=medium
 
   [ Simon McVittie ]
diff -Nru nss-wrapper-1.1.11/debian/control nss-wrapper-1.1.11/debian/control
--- nss-wrapper-1.1.11/debian/control	2020-04-02 18:44:47.000000000 +0000
+++ nss-wrapper-1.1.11/debian/control	2020-06-10 21:04:28.000000000 +0000
@@ -1,7 +1,8 @@
 Source: nss-wrapper
 Section: devel
 Priority: optional
-Maintainer: Debian SSSD Team <pkg-sssd-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian SSSD Team <pkg-sssd-devel@lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton@debian.org>
 Build-Depends:
  debhelper-compat (= 12),
diff -Nru nss-wrapper-1.1.11/debian/tests/control nss-wrapper-1.1.11/debian/tests/control
--- nss-wrapper-1.1.11/debian/tests/control	2020-04-02 17:23:15.000000000 +0000
+++ nss-wrapper-1.1.11/debian/tests/control	2020-06-10 21:03:08.000000000 +0000
@@ -1,10 +1,11 @@
 Tests: tests
 Depends: libnss-wrapper,
- gcc, libc-dev,
- cmake (>= 2.8.8-3~), make,
+ build-essential,
+ libc6-dev,
+ cmake (>= 2.8.8-3~),
  libcmocka-dev,
  netbase
 Restrictions: allow-stderr
 
 Tests: adequate
-Depends: libnss-wrapper, adequate
+Depends: libnss-wrapper, adequate:native
diff -Nru nss-wrapper-1.1.11/debian/tests/tests nss-wrapper-1.1.11/debian/tests/tests
--- nss-wrapper-1.1.11/debian/tests/tests	2020-04-02 17:23:15.000000000 +0000
+++ nss-wrapper-1.1.11/debian/tests/tests	2020-06-10 20:54:51.000000000 +0000
@@ -5,7 +5,19 @@
 rm -rf obj debian
 mkdir obj
 cd obj
-cmake .. -DUNIT_TESTING=1
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    cat <<EOF > "$ADTTMP/toolchain.cmake"
+set(CMAKE_C_COMPILER $DEB_HOST_GNU_TYPE-gcc)
+set(CMAKE_CXX_COMPILER $DEB_HOST_GNU_TYPE-g++)
+set(PKG_CONFIG_EXECUTABLE $DEB_HOST_GNU_TYPE-pkg-config)
+EOF
+    CCFILE=-DCMAKE_TOOLCHAIN_FILE="$ADTTMP/toolchain.cmake"
+else
+    CCFILE=
+fi
+
+cmake .. "$CCFILE" -DUNIT_TESTING=1
 make -C tests/
 cd tests
 sed -e 's#\(LD_PRELOAD=\)[^;]*/\(libnss_wrapper.so\)#\1\2#' -i CTestTestfile.cmake