diff --git a/lib/libthr/tests/Makefile b/lib/libthr/tests/Makefile
index 7e6617d3b316..f899f4735093 100644
--- a/lib/libthr/tests/Makefile
+++ b/lib/libthr/tests/Makefile
@@ -23,7 +23,7 @@ NETBSD_ATF_TESTS_C+=	sigmask_test
 NETBSD_ATF_TESTS_C+=	sigsuspend_test
 NETBSD_ATF_TESTS_C+=	siglongjmp_test
 NETBSD_ATF_TESTS_C+=	sleep_test
-.if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext
+.if ${MACHINE_CPUARCH} != "aarch64" # ARM64TODO: Missing makecontext
 NETBSD_ATF_TESTS_C+=	swapcontext_test
 .endif
 NETBSD_ATF_TESTS_C+=	timedmutex_test