diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index a6c80680e..ef085d0bd 100644
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -44,7 +44,6 @@ check_PROGRAMS = \
 	insn-bsfl \
 	insn-pmovmskb \
 	sh-mem-vec128 \
-	shr_edx \
 	sse_memory \
 	xor-undef-amd64
 if BUILD_AVX_TESTS
@@ -55,7 +54,9 @@ if HAVE_ASM_CONSTRAINT_P
 endif
 # clang 3.5.0 barfs about -mfancy-math-387
 if !COMPILER_IS_CLANG
- check_PROGRAMS += more_x87_fp
+ check_PROGRAMS += \
+ 	more_x87_fp \
+ 	shr_edx
 endif
 
 AM_CFLAGS    += @FLAG_M64@
diff --git a/memcheck/tests/amd64/shr_edx.vgtest b/memcheck/tests/amd64/shr_edx.vgtest
index 3d783ef44..e02f7e844 100644
--- a/memcheck/tests/amd64/shr_edx.vgtest
+++ b/memcheck/tests/amd64/shr_edx.vgtest
@@ -1,2 +1,3 @@
+prereq: test -e shr_edx
 prog: shr_edx
 vgopts: -q