diff --git a/tests/Makefile.am b/tests/Makefile.am
index cc71998e..75ade3e4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -543,7 +543,6 @@ DECODER_TESTS = \
 	sched.test \
 	scm_rights-fd.test \
 	seccomp-strict.test \
-	shmxt.test \
 	sigaction.test \
 	sigaltstack.test \
 	statfs.test \
diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index d855212e..9f91fddd 100644
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -269,6 +269,7 @@ setreuid32	-a17
 setrlimit	-a27
 setuid	-a10
 setuid32	-a12
+shmxt	-a11 -e trace=/\\(osf_\\)\\?shmat,shmdt
 shutdown	-a24
 siginfo	-e trace=none
 signal_receive	-a16 -e trace=kill
diff --git a/tests/shmxt.test b/tests/shmxt.test
deleted file mode 100755
index 3757cfa4..00000000
--- a/tests/shmxt.test
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Check shmat and shmdt syscalls decoding.
-
-. "${srcdir=.}/init.sh"
-
-case "$STRACE_ARCH" in
-	alpha) shmat=osf_shmat ;;
-	*) shmat=shmat ;;
-esac
-
-run_strace_match_diff -e trace=$shmat,shmdt -a11