diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 3005b01903c..26c67f7c711 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -36,6 +36,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20200923: memfd_test moved to /usr/tests/sys/posixshm
+OLD_FILES+=usr/tests/sys/kern/memfd_test
+
 # 20200910: remove vm_map_create(9) to sync with the code
 OLD_FILES+=usr/share/man/man9/vm_map_create.9.gz
 
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index ed33bc52ecd..ebd7e053dd2 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -11,7 +11,6 @@ TESTSDIR=	${TESTSBASE}/sys/kern
 ATF_TESTS_C+=	kern_copyin
 ATF_TESTS_C+=	kern_descrip_test
 ATF_TESTS_C+=	kill_zombie
-ATF_TESTS_C+=	memfd_test
 ATF_TESTS_C+=	ptrace_test
 TEST_METADATA.ptrace_test+=		timeout="15"
 ATF_TESTS_C+=	reaper
diff --git a/tests/sys/posixshm/Makefile b/tests/sys/posixshm/Makefile
index 6e9e345d5b1..cd76e5a7db1 100644
--- a/tests/sys/posixshm/Makefile
+++ b/tests/sys/posixshm/Makefile
@@ -4,6 +4,7 @@ PACKAGE=	tests
 
 TESTSDIR=	${TESTSBASE}/sys/posixshm
 
+ATF_TESTS_C+=	memfd_test
 ATF_TESTS_C+=	posixshm_test
 
 .include <bsd.test.mk>
diff --git a/tests/sys/kern/memfd_test.c b/tests/sys/posixshm/memfd_test.c
similarity index 100%
rename from tests/sys/kern/memfd_test.c
rename to tests/sys/posixshm/memfd_test.c