diff --git a/src/tests/add-ons/kernel/file_systems/bfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
index f408046330..47bfac38d3 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
@@ -2,3 +2,4 @@ SubDir OBOS_TOP src tests add-ons kernel file_systems bfs ;
 
 #SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs blockAllocator ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs bufferPool ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs bfs_shell ;
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
new file mode 100644
index 0000000000..87c7a20a44
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
@@ -0,0 +1,33 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems bfs bfs_shell ;
+
+SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ;
+SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
+
+{
+	local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM
+	SubDirCcFlags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
+	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
+}
+
+SimpleTest bfs_shell
+	:
+	fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
+	sysdep.c hexdump.c argv.c
+
+	Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
+	BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp
+	Debug.cpp cpp.cpp
+	:
+	;
+
+# Tell Jam where to find these sources
+SEARCH on [ FGristFiles
+		Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
+		BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp
+		Debug.cpp cpp.cpp
+	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems bfs ] ;
+
+SEARCH on [ FGristFiles
+		fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
+		sysdep.c hexdump.c argv.c
+	] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;