diff --git a/tests/.gitignore b/tests/.gitignore
index 849d6ef..9ef0c03 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -28,6 +28,7 @@
 epoll_create
 epoll_create1
 epoll_ctl
+epoll_wait
 eventfd
 execve
 execve-v
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2a761d8..7cd3991 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -79,6 +79,7 @@
 	epoll_create \
 	epoll_create1 \
 	epoll_ctl \
+	epoll_wait \
 	eventfd \
 	execve \
 	execve-v \
@@ -280,6 +281,7 @@
 	epoll_create.test \
 	epoll_create1.test \
 	epoll_ctl.test \
+	epoll_wait.test \
 	eventfd.test \
 	execve.test \
 	execve-v.test \
diff --git a/tests/epoll_wait.c b/tests/epoll_wait.c
new file mode 100644
index 0000000..98b431f
--- /dev/null
+++ b/tests/epoll_wait.c
@@ -0,0 +1,28 @@
+#include "tests.h"
+#include <sys/syscall.h>
+
+#if defined __NR_epoll_wait && defined HAVE_SYS_EPOLL_H
+
+# include <errno.h>
+# include <stdio.h>
+# include <sys/epoll.h>
+# include <unistd.h>
+
+int
+main(void)
+{
+	struct epoll_event *const ev = tail_alloc(sizeof(*ev));
+
+	int rc = syscall(__NR_epoll_wait, -1, ev, 1, -2);
+	printf("epoll_wait(-1, %p, 1, -2) = %d %s (%m)\n",
+	       ev, rc, errno == ENOSYS ? "ENOSYS" : "EBADF");
+
+	puts("+++ exited with 0 +++");
+	return 0;
+}
+
+#else
+
+SKIP_MAIN_UNDEFINED("__NR_epoll_wait && HAVE_SYS_EPOLL_H")
+
+#endif
diff --git a/tests/epoll_wait.test b/tests/epoll_wait.test
new file mode 100755
index 0000000..83ae161
--- /dev/null
+++ b/tests/epoll_wait.test
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Check epoll_wait syscall decoding.
+
+. "${srcdir=.}/init.sh"
+run_strace_match_diff -a26