diff --git a/src/tests/add-ons/kernel/disk_scanner/Jamfile b/src/tests/add-ons/kernel/disk_scanner/Jamfile
index 77e8df309c..88105bb0d7 100644
--- a/src/tests/add-ons/kernel/disk_scanner/Jamfile
+++ b/src/tests/add-ons/kernel/disk_scanner/Jamfile
@@ -25,6 +25,6 @@ Addon <userland>disk_scanner : userland disk_scanner :
 #LinkSharedOSLibs <userland>disk_scanner : libkernelland_emu.so ;
 LinkSharedOSLibs <userland>disk_scanner : <installed>DiskScannerTest ;
 
-#SubInclude OBOS_TOP src tests add-ons kernel disk_scanner fs ;
+SubInclude OBOS_TOP src tests add-ons kernel disk_scanner fs ;
 SubInclude OBOS_TOP src tests add-ons kernel disk_scanner partition ;
 #SubInclude OBOS_TOP src tests add-ons kernel disk_scanner session ;
diff --git a/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile b/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile
new file mode 100644
index 0000000000..4873b69a5a
--- /dev/null
+++ b/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile
@@ -0,0 +1,19 @@
+SubDir OBOS_TOP src tests add-ons kernel disk_scanner fs ;
+
+SEARCH_SOURCE
+	+= [ FDirName $(OBOS_TOP) src add-ons kernel disk_scanner fs ] ;
+
+UsePrivateHeaders $(DOT) ;
+
+{
+	local defines = [ FDefines USERLAND ] ;
+	SubDirCcFlags $(defines) ;
+	SubDirC++Flags $(defines) ;
+}
+
+# bfs
+
+Addon <userland>bfs : userland disk_scanner fs :
+	bfs.c
+;
+LinkSharedOSLibs <userland>bfs : <installed>DiskScannerTest ;
diff --git a/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile b/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile
new file mode 100644
index 0000000000..706106ed6a
--- /dev/null
+++ b/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile
@@ -0,0 +1,19 @@
+SubDir OBOS_TOP src tests add-ons kernel disk_scanner partition ;
+
+SEARCH_SOURCE
+	+= [ FDirName $(OBOS_TOP) src add-ons kernel disk_scanner partition ] ;
+
+UsePrivateHeaders $(DOT) ;
+
+{
+	local defines = [ FDefines USERLAND ] ;
+	SubDirCcFlags $(defines) ;
+	SubDirC++Flags $(defines) ;
+}
+
+# intel
+
+Addon <userland>intel : userland disk_scanner partition :
+	intel.c
+;
+LinkSharedOSLibs <userland>intel : <installed>DiskScannerTest ;