diff --git a/diffutils.changes b/diffutils.changes
index c05285c..c4977cf 100644
--- a/diffutils.changes
+++ b/diffutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 20 17:45:41 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Skip stack overflow tests under qemu emulation (bsc#1190046)
+
 -------------------------------------------------------------------
 Sat Aug  7 08:57:49 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/diffutils.spec b/diffutils.spec
index 82206e1..d29371c 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -45,6 +45,12 @@ make source code patches, for instance.
 %make_build
 
 %check
+%if 0%{?qemu_user_space_build}
+# Stack overflow tests are difficult to emulate, skip them
+echo exit 77 > gnulib-tests/test-c-stack.sh
+echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow1.c
+echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow2.c
+%endif
 %make_build check
 
 %install