diff --git a/src/tests/kernel/boot/loader/Jamfile b/src/tests/kernel/boot/loader/Jamfile
index b52575390a..05f1203cb8 100644
--- a/src/tests/kernel/boot/loader/Jamfile
+++ b/src/tests/kernel/boot/loader/Jamfile
@@ -4,7 +4,10 @@ UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
 SubDirHdrs $(OBOS_TOP) headers private kernel arch $(OBOS_ARCH) ;
-SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
+
+# we need to redefine certain calls in the boot loader so that
+# they will really be used instead of their POSIX counterparts
+# in libroot.so
 
 ObjectsDefines 
 	# boot loader
@@ -18,13 +21,6 @@ ObjectsDefines
 	apple.cpp
 	intel.cpp
 	PartitionMap.cpp
-
-	# file systems
-	bfs.cpp
-	Directory.cpp
-	File.cpp
-	Stream.cpp
-	BPlusTree.cpp
 	:
 	read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close
 	;
@@ -37,6 +33,7 @@ ObjectsDefines
 		BOOT_SUPPORT_PARTITION_INTEL
 
 		BOOT_SUPPORT_FILE_SYSTEM_BFS
+		BOOT_SUPPORT_FILE_SYSTEM_AMIGA_FFS
 		;
 
 	defines = [ FDefines $(defines) ] ;
@@ -45,7 +42,7 @@ ObjectsDefines
 	#	SubDirC++Flags -include /usr/include/stdio.h ;
 	} else {
 	#	SubDirC++Flags -include /boot/develop/headers/posix/stdio.h ;
-		SubDirC++Flags $(defines) -DHAVE_READ_POS=1 ;
+		SubDirC++Flags $(defines) -DHAVE_READ_POS=1 ; # -fcheck-memory-usage -D_NO_INLINE_ASM ;
 	}
 }
 
@@ -69,18 +66,11 @@ SimpleTest BootLoaderTest :
 	intel.cpp
 	PartitionMap.cpp
 
-	# file systems
-	bfs.cpp
-	Directory.cpp
-	File.cpp
-	Stream.cpp
-	BPlusTree.cpp
-
 	# utility functions - Dano has a strlcpy() function in libroot.so, while R5 has not
 	list.c
 	strlcpy.c
-	:
-	: -fno-builtin
+
+	: boottest_bfs.a boottest_amiga_ffs.a
 	;
 
 # Tell Jam where to find the utility sources
@@ -96,6 +86,8 @@ SEARCH on [ FGristFiles
 		heap.cpp RootFileSystem.cpp
 	] = [ FDirName $(OBOS_TOP) src kernel boot loader ] ;
 
+# partitioning system modules
+
 SEARCH on [ FGristFiles amiga_rdb.cpp ]
 	= [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ] ;
 
@@ -105,6 +97,5 @@ SEARCH on [ FGristFiles apple.cpp ]
 SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp ]
 	= [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems intel ] ;
 
-SEARCH on [ FGristFiles
-		bfs.cpp Directory.cpp File.cpp Stream.cpp BPlusTree.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel boot loader file_systems bfs ] ;
+
+SubInclude OBOS_TOP src tests kernel boot loader file_systems ;