diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9c4cc66f..9beb4fd6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -214,7 +214,6 @@ DECODER_TESTS = \
 	prctl-securebits.test \
 	prctl-tid_address.test \
 	prctl-tsc.test \
-	pread64-pwrite64.test \
 	qual_fault-exit_group.test \
 	readv.test \
 	regex.test \
diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index da105b46..3e885a24 100644
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -200,6 +200,7 @@ pkey_free	-a13
 pkey_mprotect	-a37
 ppoll	-s2
 ppoll-v	-v -s2 -e trace=ppoll
+pread64-pwrite64	-a21 -eread=0 -ewrite=1 -e trace=pread64,pwrite64 -P pread64-pwrite64-tmpfile -P /dev/zero -P /dev/null
 preadv	-a21
 preadv-pwritev	-a19 -eread=0 -ewrite=1 -e trace=preadv,pwritev
 preadv2-pwritev2	-a22 -eread=0 -ewrite=1 -e trace=preadv2,pwritev2
diff --git a/tests/pread64-pwrite64.c b/tests/pread64-pwrite64.c
index 4a0932a9..11b02772 100644
--- a/tests/pread64-pwrite64.c
+++ b/tests/pread64-pwrite64.c
@@ -123,7 +123,9 @@ main(void)
 {
 	tprintf("%s", "");
 
-	static char tmp[] = "pread64-pwrite64-tmpfile";
+	skip_if_unavailable("/proc/self/fd/");
+
+	static const char tmp[] = "pread64-pwrite64-tmpfile";
 	if (open(tmp, O_CREAT|O_RDONLY|O_TRUNC, 0600) != 0)
 		perror_msg_and_fail("creat: %s", tmp);
 	if (open(tmp, O_WRONLY) != 1)
diff --git a/tests/pread64-pwrite64.test b/tests/pread64-pwrite64.test
deleted file mode 100755
index 44dafedf..00000000
--- a/tests/pread64-pwrite64.test
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Check decoding and dumping of pread64 and pwrite64 syscalls.
-
-. "${srcdir=.}/init.sh"
-
-# strace -P is implemented using /proc/self/fd
-[ -d /proc/self/fd/ ] ||
-	framework_skip_ '/proc/self/fd/ is not available'
-
-tmpfile=pread64-pwrite64-tmpfile
-
-run_strace_match_diff \
-	-a21 -eread=0 -ewrite=1 -e trace=pread64,pwrite64 \
-	-P $tmpfile -P /dev/zero -P /dev/null