2 files changed, 9 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 39bc1192c..bf94834c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 openssh (1:8.1p1-3) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Drop suggestion of rssh, since it's been removed (see
     https://bugs.debian.org/923691).
 
+  [ Steve Langasek ]
+  * Don't build openssh-tests on Ubuntu i386 (closes: #948466).
+
  -- Colin Watson <cjwatson@debian.org>  Mon, 16 Dec 2019 15:40:12 +0000
 
 openssh (1:8.1p1-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index d1f282d11..5e415fc7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,8 +100,12 @@ confflags_udeb += --with-cflags='$(cflags_udeb)'
 confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))'
 confflags_udeb += --with-ldflags='-Wl,--as-needed'
 
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
+  BUILD_PACKAGES += -Nopenssh-tests
+endif
+
 %:
-        dh $@ --with=autoreconf,systemd,runit
+        dh $@ --with=autoreconf,systemd,runit $(BUILD_PACKAGES)
 
 autoreconf:
         autoreconf -f -i