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 7a5659f977..7c1dc5f6ff 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
@@ -24,9 +24,13 @@ UsePrivateHeaders [ FDirName kernel ] ;			# For kernel_cpp.cpp
 	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti $(malloc_debug_flags) -include [ FDirName $(SUBDIR) Debug.h ] ;
 }
 
+local fsShellSources = 
+	fsh.c rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
+	stub.c tracker.cpp sysdep.c hexdump.c argv.c
+;
+
 SimpleTest bfs_shell :
-	fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c tracker.cpp
-	sysdep.c hexdump.c argv.c
+	$(fsShellSources)
 
 	Volume.cpp BPlusTree.cpp Inode.cpp Index.cpp Query.cpp Journal.cpp
 	BlockAllocator.cpp kernel_interface_r5.cpp Utility.cpp BufferPool.cpp
@@ -46,6 +50,5 @@ SEARCH on [ FGristFiles
 	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
 
 SEARCH on [ FGristFiles
-		fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c tracker.cpp
-		sysdep.c hexdump.c argv.c
+		$(fsShellSources)
 	] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;
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 3acaf91962..97439e40b0 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
@@ -3,7 +3,7 @@
  *
  * Format:
  *
- * static void
+ * static int
  * function(int argc, char **argv)
  * {
  * }
@@ -17,7 +17,7 @@
 #include "bfs_control.h"
 
 
-static void
+static int
 do_chkbfs(int argc, char **argv)
 {
 	struct check_control result;
@@ -27,7 +27,7 @@ do_chkbfs(int argc, char **argv)
 	int fd = sys_open(1, -1, "/myfs/.", O_RDONLY, S_IFREG, 0);
 	if (fd < 0) {
 	    printf("chkbfs: error opening '.'\n");
-	    return;
+	    return fd;
 	}
 
 	memset(&result, 0, sizeof(result));
@@ -91,5 +91,7 @@ do_chkbfs(int argc, char **argv)
 		printf("errors have been fixed\n");
 
 	sys_close(1, fd);
+
+	return 0;
 }
 
diff --git a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
index 75e556965f..9bf2dcc732 100644
--- a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
@@ -8,10 +8,14 @@ SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ;
 	SubDirCcFlags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
 }
 
+local fsShellSources = 
+	fsh.c rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
+	stub.c tracker.cpp sysdep.c hexdump.c argv.c
+;
+
 SimpleTest iso9660_shell
 	:
-	fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
-	sysdep.c hexdump.c argv.c tracker.cpp
+	$(fsShellSources)
 
 	iso.c kernel_interface.c
 	:
@@ -23,6 +27,5 @@ SEARCH on [ FGristFiles
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems iso9660 ] ;
 
 SEARCH on [ FGristFiles
-		fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
-		sysdep.c hexdump.c argv.c tracker.cpp
+		$(fsShellSources)
 	] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;
diff --git a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
index 67a3e64e7b..80f4b77342 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
@@ -12,10 +12,14 @@ UsePrivateHeaders [ FDirName kernel ] ;
 	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
 }
 
+local fsShellSources = 
+	fsh.c rootfs.c initfs.c kernel.c cache.c external_commands.cpp sl.c
+	stub.c tracker.cpp sysdep.c hexdump.c argv.c
+;
+
 SimpleTest udf_shell
 	:
-	fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
-	sysdep.c hexdump.c argv.c tracker.cpp
+	$(fsShellSources)
 
 	udf.cpp
 	DirectoryIterator.cpp DString.cpp Icb.cpp
@@ -35,6 +39,5 @@ SEARCH on [ FGristFiles
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
 
 SEARCH on [ FGristFiles
-		fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
-		sysdep.c hexdump.c argv.c tracker.cpp
+		$(fsShellSources)
 	] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;