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
index 76265c9619..8ec8b28969 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/Jamfile
@@ -14,7 +14,9 @@ UsePrivateHeaders [ FDirName kernel ] ;			# For kernel_cpp.cpp
 		malloc_debug_flags = -fcheck-memory-usage ;
 	}
 
-	local defines = [ FDefines USER DEBUG USED_IN_FS_SHELL
+	local defines = [ FDefines USER
+		#DEBUG
+		USED_IN_FS_SHELL NO_FILE_UNCACHED_IO
 		UNSAFE_GET_VNODE
 		#BFS_BIG_ENDIAN_ONLY
 		$(malloc_debug_defines) ] ;
@@ -27,7 +29,7 @@ SimpleTest bfs_shell :
 	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
+	BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
 	Debug.cpp kernel_cpp.cpp
 	:
 	;
@@ -35,7 +37,7 @@ SimpleTest bfs_shell :
 # 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
+		BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
 		Debug.cpp cpp.cpp
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems bfs ] ;
 
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c
index 6586695ada..3acaf91962 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bfs_shell/additional_commands.c
@@ -11,6 +11,9 @@
  */
 
 
+#define _FS_INTERFACE_H
+	// don't include that file
+
 #include "bfs_control.h"
 
 
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
index 01d8845219..30adb5499b 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
@@ -31,7 +31,7 @@ SimpleTest mkbfs :
 	rootfs.c
 
 	Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
-	BlockAllocator.cpp kernel_interface.cpp Utility.cpp BufferPool.cpp
+	BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
 	Debug.cpp
 	:
 	;
@@ -43,7 +43,7 @@ SimpleTest allocationGroups :
 # 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
+		BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
 		Debug.cpp
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems bfs ] ;