diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e6db289f4b..46d47323d69 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-29  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/i386/mpx/memcpy-1.c: Include mpx-check.h.
+	(main): Renamed to ...
+	(mpx_test): ... this.  Add argc and argv arguments.
+
 2016-12-29  Martin Liska  <mliska@suse.cz>
 
 	PR c/78933
diff --git a/gcc/testsuite/gcc.target/i386/mpx/memcpy-1.c b/gcc/testsuite/gcc.target/i386/mpx/memcpy-1.c
index 169134829aa..6ecbdc1a322 100644
--- a/gcc/testsuite/gcc.target/i386/mpx/memcpy-1.c
+++ b/gcc/testsuite/gcc.target/i386/mpx/memcpy-1.c
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "mpx-check.h"
 
 char s[10];
 char d[10];
@@ -16,7 +17,7 @@ __attribute__((noinline))
 char* foo(char* dst, char* src, size_t size) {
   return memcpy(dst, src, size);
 }
-int main() {
+int mpx_test(int argc, const char **argv) {
   char* r = foo(d, s, 11);
   printf("r = %p\n", r);
   return 0;