diff --git a/src/tests/kernel/boot/loader/Jamfile b/src/tests/kernel/boot/loader/Jamfile
index c33c9253b8..84996db1f2 100644
--- a/src/tests/kernel/boot/loader/Jamfile
+++ b/src/tests/kernel/boot/loader/Jamfile
@@ -50,6 +50,7 @@ ObjectsDefines
 
 		BOOT_SUPPORT_FILE_SYSTEM_BFS
 		BOOT_SUPPORT_FILE_SYSTEM_AMIGA_FFS
+		BOOT_SUPPORT_FILE_SYSTEM_TARFS
 		;
 
 	defines = [ FDefines $(defines) ] ;
@@ -96,7 +97,7 @@ SimpleTest BootLoaderTest :
 	strlcpy.c
 	driver_settings.c
 
-	: boottest_bfs.a boottest_amiga_ffs.a
+	: boottest_bfs.a boottest_amiga_ffs.a boottest_tarfs.a libz.a
 	;
 
 # Tell Jam where to find the utility sources
diff --git a/src/tests/kernel/boot/loader/file_systems/Jamfile b/src/tests/kernel/boot/loader/file_systems/Jamfile
index d1fa6342c2..f8b34d3981 100644
--- a/src/tests/kernel/boot/loader/file_systems/Jamfile
+++ b/src/tests/kernel/boot/loader/file_systems/Jamfile
@@ -1,4 +1,5 @@
 SubDir OBOS_TOP src tests kernel boot loader file_systems ;
 
-SubInclude OBOS_TOP src tests kernel boot loader file_systems bfs ;
 SubInclude OBOS_TOP src tests kernel boot loader file_systems amiga_ffs ;
+SubInclude OBOS_TOP src tests kernel boot loader file_systems bfs ;
+SubInclude OBOS_TOP src tests kernel boot loader file_systems tarfs ;
diff --git a/src/tests/kernel/boot/loader/file_systems/tarfs/Jamfile b/src/tests/kernel/boot/loader/file_systems/tarfs/Jamfile
new file mode 100644
index 0000000000..7596618ca9
--- /dev/null
+++ b/src/tests/kernel/boot/loader/file_systems/tarfs/Jamfile
@@ -0,0 +1,28 @@
+SubDir OBOS_TOP src tests kernel boot loader file_systems tarfs ;
+
+UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
+UsePrivateHeaders kernel shared storage ;
+SubDirHdrs $(OBOS_TOP) src tests kernel boot loader ;
+SubDirHdrs $(OBOS_TOP) headers libs zlib ;
+
+ObjectsDefines 
+	tarfs.cpp
+	:
+	read_pos=boot_read_pos fstat=boot_fstat open=boot_open close=boot_close _BOOT_MODE
+	;
+
+#SubDirCcFlags -DGUNZIP=1 ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src libs zlib ] ;
+
+KernelStaticLibrary boottest_tarfs :
+	tarfs.cpp
+	inflate.c
+	: #-fcheck-memory-usage -D_NO_INLINE_ASM
+	;
+
+# Tell Jam where to find the sources
+
+SEARCH on [ FGristFiles
+		tarfs.cpp
+	] = [ FDirName $(OBOS_TOP) src system boot loader file_systems tarfs ] ;