diff -Nru sudo-1.9.9/debian/changelog sudo-1.9.9/debian/changelog
--- sudo-1.9.9/debian/changelog	2022-02-08 11:01:45.000000000 +0000
+++ sudo-1.9.9/debian/changelog	2022-02-14 11:48:05.000000000 +0000
@@ -1,3 +1,9 @@
+sudo (1.9.9-1ubuntu2) jammy; urgency=medium
+
+  * d/t/control: skip 03-getroot-ldap autopkgtest on non-containers
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Mon, 14 Feb 2022 12:48:05 +0100
+
 sudo (1.9.9-1ubuntu1) jammy; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff -Nru sudo-1.9.9/debian/tests/control sudo-1.9.9/debian/tests/control
--- sudo-1.9.9/debian/tests/control	2022-02-08 11:01:45.000000000 +0000
+++ sudo-1.9.9/debian/tests/control	2022-02-14 11:46:47.000000000 +0000
@@ -8,8 +8,9 @@
 
 # We cannot add 'sudo-ldap' as a Depends: as there is a removal conflict with
 # 'sudo' in Ubuntu and we need to pass the SUDO_FORCE_REMOVE env var to avoid
-# this
-Test-Command: env SUDO_FORCE_REMOVE=yes apt-get -y install sudo-ldap && debian/tests/03-getroot-ldap
+# this. Removing sudo conflicts with autopkgtest-virt-ssh, so we skip this test
+# (except for armhf/LXD containers). Needs more investigation...
+Test-Command: systemd-detect-virt -q --container || exit 77; env SUDO_FORCE_REMOVE=yes apt-get -y install sudo-ldap && debian/tests/03-getroot-ldap
 Depends: adduser, slapd, ldap-utils
-Restrictions: needs-root
-
+Restrictions: needs-root, skippable
+Features: test-name=03-getroot-ldap