diff --git a/valgrind-3.8.0-avx2-prereq.patch b/valgrind-3.8.0-avx2-prereq.patch
new file mode 100644
index 0000000..615f61c
--- /dev/null
+++ b/valgrind-3.8.0-avx2-prereq.patch
@@ -0,0 +1,24 @@
+diff -u valgrind.avx.orig/none/tests/amd64/avx2-1.vgtest valgrind/none/tests/amd64/avx2-1.vgtest
+--- valgrind.avx.orig/none/tests/amd64/avx2-1.vgtest	2012-09-19 16:40:20.675627549 +0200
++++ valgrind/none/tests/amd64/avx2-1.vgtest	2012-09-19 20:53:16.939765249 +0200
+@@ -1,3 +1,3 @@
+ prog: avx2-1
+-prereq: ../../../tests/x86_amd64_features amd64-avx
++prereq: test -x avx2-1 && ../../../tests/x86_amd64_features amd64-avx
+ vgopts: -q
+diff -u valgrind.avx.orig/none/tests/amd64/bmi.vgtest valgrind/none/tests/amd64/bmi.vgtest
+--- valgrind.avx.orig/none/tests/amd64/bmi.vgtest	2012-09-19 16:40:20.368622951 +0200
++++ valgrind/none/tests/amd64/bmi.vgtest	2012-09-19 20:54:31.168839454 +0200
+@@ -1,3 +1,3 @@
+ prog: bmi
+-prereq: ../../../tests/x86_amd64_features amd64-avx
++prereq: test -x bmi && ../../../tests/x86_amd64_features amd64-avx
+ vgopts: -q
+diff -u valgrind.avx.orig/none/tests/amd64/fma.vgtest valgrind/none/tests/amd64/fma.vgtest
+--- valgrind.avx.orig/none/tests/amd64/fma.vgtest	2012-09-19 16:40:20.755628747 +0200
++++ valgrind/none/tests/amd64/fma.vgtest	2012-09-19 20:54:58.851240219 +0200
+@@ -1,3 +1,3 @@
+ prog: fma
+-prereq: ../../../tests/x86_amd64_features amd64-avx
++prereq: test -x fma && ../../../tests/x86_amd64_features amd64-avx
+ vgopts: -q
diff --git a/valgrind.spec b/valgrind.spec
index 854731d..448e877 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -51,8 +51,9 @@ Patch17: valgrind-3.8.0-bmi-conf-check.patch
 # Partial backport of upstream revision 12884 without it AVX2 VPBROADCASTB
 # insn is broken under memcheck.
 Patch18: valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch
+Patch19: valgrind-3.8.0-avx2-prereq.patch
 
-Patch19: valgrind-3.8.0-cfi_dw_ops.patch
+Patch20: valgrind-3.8.0-cfi_dw_ops.patch
 
 Obsoletes: valgrind-callgrind
 %ifarch x86_64 ppc64
@@ -154,9 +155,10 @@ touch ./none/tests/amd64/fma.stderr.exp
 touch ./none/tests/amd64/bmi.stderr.exp
 %patch17 -p1
 %patch18 -p1
-
 %patch19 -p1
 
+%patch20 -p1
+
 %build
 CC=gcc
 %ifarch x86_64 ppc64
@@ -272,6 +274,7 @@ echo ===============END TESTING===============
   without it AVX2 VPBROADCASTB insn is broken under memcheck.
 - Add valgrind-3.8.0-cfi_dw_ops.patch (KDE#307038)
   DWARF2 CFI reader: unhandled DW_OP_ opcode 0x8 (DW_OP_const1u and friends)
+- Add valgrind-3.8.0-avx2-prereq.patch.
 
 * Wed Sep 12 2012 Mark Wielaard <mjw@redhat.com> 3.8.0-8
 - Add configure fixup valgrind-3.8.0-bmi-conf-check.patch