diff --git a/test/build.mk b/test/build.mk
index 407d7cb540..27a5447060 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -18,12 +18,8 @@ test-list-$(BOARD_pit)+=kb_scan stress
 test-list-$(BOARD_snow)+=kb_scan stress
 test-list-$(BOARD_spring)+=kb_scan stress
 
-# Disable x86 boards until they compiles
-# TODO(victoryang): Fix them
-test-list-$(BOARD_link)=
-test-list-$(BOARD_slippy)=
-test-list-$(BOARD_falco)=
-test-list-$(BOARD_peppy)=
+# Bolt and Samus have board-specific chipset code, and the tests don't
+# compile with those. Disable them for now.
 test-list-$(BOARD_bolt)=
 test-list-$(BOARD_samus)=