diff --git a/src/tests/add-ons/kernel/file_systems/Jamfile b/src/tests/add-ons/kernel/file_systems/Jamfile
index e4bc8e74cc..2385055360 100644
--- a/src/tests/add-ons/kernel/file_systems/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/Jamfile
@@ -2,3 +2,4 @@ SubDir OBOS_TOP src tests add-ons kernel file_systems ;
 
 SubInclude OBOS_TOP src tests add-ons kernel file_systems befs ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems iso9660 ;
diff --git a/src/tests/add-ons/kernel/file_systems/iso9660/Jamfile b/src/tests/add-ons/kernel/file_systems/iso9660/Jamfile
new file mode 100644
index 0000000000..df7d870b21
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/Jamfile
@@ -0,0 +1,3 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems iso9660 ;
+
+SubInclude OBOS_TOP src tests add-ons kernel file_systems iso9660 iso9660_shell ;
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
new file mode 100644
index 0000000000..df814ee3c0
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
@@ -0,0 +1,28 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems iso9660 iso9660_shell ;
+
+SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems iso9660 ;
+SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ;
+
+{
+	local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM
+	SubDirCcFlags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
+}
+
+SimpleTest iso9660_shell
+	:
+	fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
+	sysdep.c hexdump.c argv.c
+
+	iso.c kernel_interface.c
+	:
+	;
+
+# Tell Jam where to find these sources
+SEARCH on [ FGristFiles
+		iso.c kernel_interface.c
+	] = [ 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
+	] = [ FDirName $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ] ;
diff --git a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/additional_commands.c b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/additional_commands.c
new file mode 100644
index 0000000000..be1c3e0112
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/additional_commands.c
@@ -0,0 +1,12 @@
+/* This file is included in fs_shell:fsh.c
+ * Insert your implementation of additional commands in here
+ *
+ * Format:
+ *
+ * static void
+ * function(int argc, char **argv)
+ * {
+ * }
+ *
+ */
+
diff --git a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/additional_commands.h b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/additional_commands.h
new file mode 100644
index 0000000000..8d5a98b620
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/additional_commands.h
@@ -0,0 +1,9 @@
+/* This file is included in fs_shell:fsh.c
+ * Insert your definition of additional commands here
+ *
+ * Format:
+ *	{ commandName, functionName, commandDescription },
+ *
+ * And don't forget the comma after the line :-)
+ */
+