diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 203d746b5fc..cd810c3d6cb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2015-04-21  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* gcc.target/i386/avx512bw-vpermi2w-2.c: Fix includes to use actual
+	headers.
+	* gcc.target/i386/avx512bw-vpermt2w-2.c: Likewise.
+	* gcc.target/i386/avx512bw-vpmaddubsw-2.c: Likewise.
+	* gcc.target/i386/avx512bw-vpmaddwd-2.c: Likewise.
+	* gcc.target/i386/avx512dq-vfpclasspd-2.c: Likewise.
+	* gcc.target/i386/avx512dq-vfpclassps-2.c: Likewise.
+	* gcc.target/i386/avx512vbmi-vpermi2b-2.c: Likewise.
+	* gcc.target/i386/avx512vbmi-vpermt2b-2.c: Likewise.
+
 2015-04-21 Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/56743
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c
index 0fd83da3109..b1aa81dc9a7 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpermi2w-2.c
@@ -6,8 +6,9 @@
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
-#include "math.h"
-#include "values.h"
+#include <math.h>
+#include <limits.h>
+#include <float.h>
 #include "avx512f-mask-type.h"
 
 #define NUM 32
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c
index 50446be97b2..9a15e9ef71c 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpermt2w-2.c
@@ -6,8 +6,9 @@
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 16)
-#include "math.h"
-#include "values.h"
+#include <math.h>
+#include <limits.h>
+#include <float.h>
 #include "avx512f-mask-type.h"
 
 #define NUM 32
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c
index d66be4f5965..354e15937dd 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddubsw-2.c
@@ -6,7 +6,8 @@
 #include "avx512f-helper.h"
 
 #include <math.h>
-#include <values.h>
+#include <limits.h>
+#include <float.h>
 #define SIZE (AVX512F_LEN / 16)
 #include "avx512f-mask-type.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c
index 3d08543362a..5077427fa8a 100644
--- a/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512bw-vpmaddwd-2.c
@@ -6,7 +6,8 @@
 #include "avx512f-helper.h"
 
 #include <math.h>
-#include <values.h>
+#include <limits.h>
+#include <float.h>
 #define SIZE (AVX512F_LEN / 32)
 #include "avx512f-mask-type.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c
index d6dfad7c971..6f7c65bfc26 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclasspd-2.c
@@ -6,7 +6,8 @@
 #include "avx512f-helper.h"
 
 #include <math.h>
-#include <values.h>
+#include <limits.h>
+#include <float.h>
 #define SIZE (AVX512F_LEN / 64)
 #include "avx512f-mask-type.h"
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c
index 9401f04137a..40b66c435c2 100644
--- a/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512dq-vfpclassps-2.c
@@ -6,7 +6,8 @@
 #include "avx512f-helper.h"
 
 #include <math.h>
-#include <values.h>
+#include <limits.h>
+#include <float.h>
 #include "avx512f-mask-type.h"
 #define SIZE (AVX512F_LEN / 32)
 
diff --git a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c
index 31afc521e18..b41131cb1d0 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermi2b-2.c
@@ -7,8 +7,9 @@
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
-#include "math.h"
-#include "values.h"
+#include <math.h>
+#include <limits.h>
+#include <float.h>
 #include "avx512f-mask-type.h"
 
 #define NUM 32
diff --git a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c
index cc034268d80..69c00733604 100644
--- a/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c
+++ b/gcc/testsuite/gcc.target/i386/avx512vbmi-vpermt2b-2.c
@@ -7,8 +7,9 @@
 #include "avx512f-helper.h"
 
 #define SIZE (AVX512F_LEN / 8)
-#include "math.h"
-#include "values.h"
+#include <math.h>
+#include <limits.h>
+#include <float.h>
 #include "avx512f-mask-type.h"
 
 #define NUM 32