diff --git a/tests/.gitignore b/tests/.gitignore
index 9195b5b..8a1e65a 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -124,6 +124,7 @@
 netlink_inet_diag
 netlink_unix_diag
 newfstatat
+nsyscalls
 old_mmap
 oldselect
 open
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a418b03..8542aa0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -176,6 +176,7 @@
 	netlink_inet_diag \
 	netlink_unix_diag \
 	newfstatat \
+	nsyscalls \
 	old_mmap \
 	oldselect \
 	open \
@@ -440,6 +441,7 @@
 	net-yy-unix.test \
 	net.test \
 	newfstatat.test \
+	nsyscalls.test \
 	old_mmap.test \
 	oldselect.test \
 	open.test \
diff --git a/tests/nsyscalls.c b/tests/nsyscalls.c
new file mode 100644
index 0000000..81a90aa
--- /dev/null
+++ b/tests/nsyscalls.c
@@ -0,0 +1,80 @@
+/*
+ * Check decoding of out-of-range syscalls.
+ *
+ * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+#include "syscall.h"
+
+#define TD 0
+#define TF 0
+#define TI 0
+#define TN 0
+#define TP 0
+#define TS 0
+#define TM 0
+#define NF 0
+#define MA 0
+#define SI 0
+#define SE 0
+#define SEN(arg) 0,0
+
+static const struct_sysent syscallent[] = {
+#include "syscallent.h"
+};
+
+#include <sys/syscall.h>
+
+#if defined __X32_SYSCALL_BIT && defined __NR_read \
+ && (__X32_SYSCALL_BIT & __NR_read) != 0
+# define SYSCALL_BIT __X32_SYSCALL_BIT
+#else
+# define SYSCALL_BIT 0
+#endif
+
+static const unsigned long nr = ARRAY_SIZE(syscallent) | SYSCALL_BIT;
+
+int
+main(void)
+{
+	static const unsigned long a[] = {
+		(unsigned long) 0xface0fedbadc0ded,
+		(unsigned long) 0xface1fedbadc1ded,
+		(unsigned long) 0xface2fedbadc2ded,
+		(unsigned long) 0xface3fedbadc3ded,
+		(unsigned long) 0xface4fedbadc4ded,
+		(unsigned long) 0xface5fedbadc5ded
+	};
+
+	long rc = syscall(nr, a[0], a[1], a[2], a[3], a[4], a[5]);
+	printf("syscall_%lu(%#lx, %#lx, %#lx, %#lx, %#lx, %#lx)"
+	       " = %ld (errno %d)\n", nr & (~SYSCALL_BIT),
+	       a[0], a[1], a[2], a[3], a[4], a[5], rc, errno);
+
+	puts("+++ exited with 0 +++");
+	return 0;
+}
diff --git a/tests/nsyscalls.test b/tests/nsyscalls.test
new file mode 100755
index 0000000..46f9b0a
--- /dev/null
+++ b/tests/nsyscalls.test
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Check decoding of out-of-range syscalls.
+
+. "${srcdir=.}/init.sh"
+run_strace_match_diff -e trace=none