diff --git a/tests/.gitignore b/tests/.gitignore
index 8e2919a9..f8777833 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -34,6 +34,7 @@ pc
 pipe
 ppoll
 pselect6
+readdir
 readlink
 readlinkat
 restart_syscall
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fe5f0bf5..0ca46dd6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,6 +47,7 @@ check_PROGRAMS = \
 	pipe \
 	ppoll \
 	pselect6 \
+	readdir \
 	readlink \
 	readlinkat \
 	restart_syscall \
@@ -129,6 +130,7 @@ TESTS = \
 	ipc_sem.test \
 	mq.test \
 	pselect6.test \
+	readdir.test \
 	readlink.test \
 	readlinkat.test \
 	rt_sigqueueinfo.test \
diff --git a/tests/readdir.c b/tests/readdir.c
new file mode 100644
index 00000000..1beeda16
--- /dev/null
+++ b/tests/readdir.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2015 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <sys/syscall.h>
+
+#ifdef __NR_readdir
+
+#include <assert.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+static const char fname[] =
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n"
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n"
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n"
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n"
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n"
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n"
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\n"
+	"A\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nA\nZ";
+static const char qname[] =
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\n"
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\n"
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\n"
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\n"
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\n"
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\n"
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\n"
+	"A\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nA\\nZ";
+
+int
+main(int ac, const char **av)
+{
+	char *dname;
+	struct {
+		unsigned long   d_ino;
+		unsigned long   d_off;
+		unsigned short  d_reclen;
+		char d_name[1024];
+	} e;
+	int rc;
+
+	assert(ac == 1);
+	assert(asprintf(&dname, "%s.test.tmp.dir", av[0]) > 0);
+	assert(!mkdir(dname, 0700));
+	assert(!chdir(dname));
+	(void) close(0);
+	assert(!creat(fname, 0600));
+	assert(!close(0));
+	assert(!open(".", O_RDONLY | O_DIRECTORY));
+	while ((rc = syscall(__NR_readdir, 0, &e, 1))) {
+		if (rc < 0)
+			return 77;
+		e.d_name[e.d_reclen] = '\0';
+		printf("readdir(0, {d_ino=%lu, d_off=%lu, d_reclen=%u"
+		       ", d_name=\"%s\"}) = %d\n",
+		       e.d_ino, e.d_off, e.d_reclen,
+		       e.d_name[0] == '.' ? e.d_name : qname, rc);
+	}
+	printf("readdir(0, %p) = 0\n", &e);
+	puts("+++ exited with 0 +++");
+	assert(!unlink(fname));
+	assert(!chdir(".."));
+	assert(!rmdir(dname));
+
+	return 0;
+}
+
+#else
+
+int
+main(void)
+{
+	return 77;
+}
+
+#endif
diff --git a/tests/readdir.test b/tests/readdir.test
new file mode 100755
index 00000000..9efa18d7
--- /dev/null
+++ b/tests/readdir.test
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Check readdir syscall decoding.
+
+. "${srcdir=.}/init.sh"
+
+rm -rf -- "$LOG".dir
+run_prog > /dev/null
+
+OUT="$LOG.out"
+run_strace -a16 -ereaddir $args > "$OUT"
+
+match_diff "$OUT" "$LOG"
+rm -f "$OUT"
+
+exit 0