diff --git a/src/kernel/apps/Jamfile b/src/kernel/apps/Jamfile
index 98be3d2bc6..aaf64c0e83 100644
--- a/src/kernel/apps/Jamfile
+++ b/src/kernel/apps/Jamfile
@@ -20,10 +20,6 @@ UsePrivateHeaders kernel ;
 UsePrivateHeaders [ FDirName kernel arch $(OBOS_ARCH) ] ;
 UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
 
-StdBinCommands
-	cache_control.cpp
-	: libroot.so ;
-
 if $(OBOS_ARCH) = x86 {
 	SubInclude OBOS_TOP src kernel apps cpuinfo ;
 }
diff --git a/src/tests/kernel/core/cache/Jamfile b/src/tests/kernel/core/cache/Jamfile
index ce623c21e0..ca31c6858d 100644
--- a/src/tests/kernel/core/cache/Jamfile
+++ b/src/tests/kernel/core/cache/Jamfile
@@ -4,12 +4,17 @@ SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core cache ] ;
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core ] ;
 
 UsePrivateHeaders kernel ;
+UsePrivateHeaders [ FDirName kernel arch $(OBOS_ARCH) ] ;
+UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
 UseHeaders [ FDirName $(OBOS_TOP) src kernel core cache ] ;
 
+StdBinCommands
+	cache_control.cpp
+	: libroot.so ;
+
 SimpleTest BlockMapTest :
 	BlockMapTest.cpp
 	BlockMap.cpp
 	khash.c
-	: libkernelland_emu.so
-	;
+	: libkernelland_emu.so ;
 
diff --git a/src/kernel/apps/cache_control.cpp b/src/tests/kernel/core/cache/cache_control.cpp
similarity index 100%
rename from src/kernel/apps/cache_control.cpp
rename to src/tests/kernel/core/cache/cache_control.cpp