diff --git a/glibc.spec b/glibc.spec
index 13d6108..1a87185 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -294,7 +294,7 @@ BuildRequires: systemtap-sdt-devel
 %if %{with valgrind}
 # Require valgrind for smoke testing the dynamic loader to make sure we
 # have not broken valgrind.
-BuildRequires: /usr/bin/valgrind
+BuildRequires: valgrind
 %endif
 
 # We use systemd rpm macros for nscd
@@ -1865,7 +1865,8 @@ pushd build-%{target}
 LD_SHOW_AUXV=1 elf/ld.so --library-path .:elf:nptl:dlfcn /bin/true
 
 %if %{with valgrind}
-elf/ld.so --library-path .:elf:nptl:dlfcn /usr/bin/valgrind \
+elf/ld.so --library-path .:elf:nptl:dlfcn \
+	/usr/bin/valgrind --error-exitcode=1 \
 	elf/ld.so --library-path .:elf:nptl:dlfcn /usr/bin/true
 %endif
 popd