diff --git a/tests/.gitignore b/tests/.gitignore
index 99411f2..5bb8b59 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -40,6 +40,7 @@
 fanotify_mark
 fchmod
 fchmodat
+fchown
 fchownat
 fcntl
 fcntl64
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 823fc0a..2e576c3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -92,6 +92,7 @@
 	fanotify_mark \
 	fchmod \
 	fchmodat \
+	fchown \
 	fchownat \
 	fcntl \
 	fcntl64 \
@@ -303,6 +304,7 @@
 	fanotify_mark.test \
 	fchmod.test \
 	fchmodat.test \
+	fchown.test \
 	fchownat.test \
 	fcntl.test \
 	fcntl64.test \
diff --git a/tests/fchown.c b/tests/fchown.c
new file mode 100644
index 0000000..53a522e
--- /dev/null
+++ b/tests/fchown.c
@@ -0,0 +1,20 @@
+#include "tests.h"
+#include <sys/syscall.h>
+
+#ifdef __NR_fchown
+
+# define SYSCALL_NR __NR_fchown
+# define SYSCALL_NAME "fchown"
+# define ACCESS_BY_DESCRIPTOR
+
+# if defined __NR_fchown32 && __NR_fchown != __NR_fchown32
+#  define UGID_TYPE_IS_SHORT
+# endif
+
+# include "xchownx.c"
+
+#else
+
+SKIP_MAIN_UNDEFINED("__NR_fchown")
+
+#endif
diff --git a/tests/fchown.test b/tests/fchown.test
new file mode 100755
index 0000000..63a0f2e
--- /dev/null
+++ b/tests/fchown.test
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Check fchown syscall decoding.
+
+. "${srcdir=.}/init.sh"
+run_strace_match_diff -a16