diff --git a/disable-tests-with-ptrace.patch b/disable-tests-with-ptrace.patch
new file mode 100644
index 0000000..52bf48e
--- /dev/null
+++ b/disable-tests-with-ptrace.patch
@@ -0,0 +1,31 @@
+qemu-linux-user does not support ptrace, disable tests that depend on it
+
+Index: elfutils-0.166/tests/Makefile.am
+===================================================================
+--- elfutils-0.166.orig/tests/Makefile.am
++++ elfutils-0.166/tests/Makefile.am
+@@ -121,7 +121,7 @@ TESTS = run-arextract.sh run-arsymtest.s
+ 	run-stack-demangled-test.sh run-readelf-zx.sh run-readelf-zp.sh \
+ 	run-readelf-dwz-multi.sh run-allfcts-multi.sh run-deleted.sh \
+ 	run-linkmap-cut.sh run-aggregate-size.sh vdsosyms run-readelf-A.sh \
+-	run-getsrc-die.sh run-strptr.sh newdata elfstrtab dwfl-proc-attach \
++	run-getsrc-die.sh run-strptr.sh newdata elfstrtab \
+ 	elfshphehdr run-lfs-symbols.sh run-dwelfgnucompressed.sh \
+ 	run-elfgetchdr.sh \
+ 	run-elfgetzdata.sh run-elfputzdata.sh run-zstrptr.sh \
+Index: elfutils-0.166/tests/backtrace-subr.sh
+===================================================================
+--- elfutils-0.166.orig/tests/backtrace-subr.sh
++++ elfutils-0.166/tests/backtrace-subr.sh
+@@ -93,6 +93,11 @@ check_native_unsupported()
+       fi
+     ;;
+   esac
++
++  if egrep 'qemu: Unsupported syscall' $err; then
++    echo >&2 $testname: qemu-linux-user does not support ptrace
++    exit 77
++  fi
+ }
+ 
+ check_core()
diff --git a/elfutils.changes b/elfutils.changes
index 67cced6..7423b17 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 11 09:16:14 UTC 2016 - schwab@suse.de
+
+- disable-tests-with-ptrace.patch: disable tests that use ptrace when
+  running under qemu-linux-user
+
 -------------------------------------------------------------------
 Mon Jun 27 12:26:22 UTC 2016 - fcrozat@suse.com
 
diff --git a/elfutils.spec b/elfutils.spec
index 02fd08b..63242c2 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -32,6 +32,7 @@ Source2:        baselibs.conf
 Source3:        %{name}.changes
 Patch1:         elfutils-0.137-dwarf-header-check-fix.diff
 Patch2:         elfutils-0.166-elfcmp-comp-gcc6.patch
+Patch3:         disable-tests-with-ptrace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -141,6 +142,10 @@ to develop applications that require these.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%if 0%{?qemu_user_space_build}
+# qemu does not support ptrace
+%patch3 -p1
+%endif
 
 %build
 # Change DATE/TIME macros to use last change time of elfutils.changes