diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 468012142ef..3c46ba6f8ae 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -237,7 +237,9 @@ SUBDIR+=vacation
 
 .if ${MACHINE_ARCH} == "i386"
 # Things that don't compile on alpha or are aout specific:
+# move bluetooth when tested on other architectures
 SUBDIR+=doscmd \
+	bluetooth \
 	ncplist \
 	ncplogin \
 	sasc \
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index b394af90b55..65acba6bbc3 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -170,10 +170,12 @@ SUBDIR+=elf2exe \
 	pnpinfo
 .endif
 
+# Move bluetooth when tested on other architectures
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=acpi \
 	apm \
 	apmd \
+	bluetooth \
 	btxld \
 	kgmon \
 	kgzip \