diff --git a/src/tests/Jamfile b/src/tests/Jamfile
index f0d91e0d66..ac4d6b00c9 100644
--- a/src/tests/Jamfile
+++ b/src/tests/Jamfile
@@ -1,3 +1,4 @@
 SubDir OBOS_TOP src tests ;
 
+SubInclude OBOS_TOP src tests add-ons ;
 SubInclude OBOS_TOP src tests kits ;
diff --git a/src/tests/add-ons/Jamfile b/src/tests/add-ons/Jamfile
new file mode 100644
index 0000000000..eab8f4f5b8
--- /dev/null
+++ b/src/tests/add-ons/Jamfile
@@ -0,0 +1,4 @@
+SubDir OBOS_TOP src tests add-ons ;
+
+SubInclude OBOS_TOP src tests add-ons kernel ;
+SubInclude OBOS_TOP src tests add-ons print ;
diff --git a/src/tests/add-ons/kernel/Jamfile b/src/tests/add-ons/kernel/Jamfile
new file mode 100644
index 0000000000..92e1dea10a
--- /dev/null
+++ b/src/tests/add-ons/kernel/Jamfile
@@ -0,0 +1,3 @@
+SubDir OBOS_TOP src tests add-ons kernel ;
+
+SubInclude OBOS_TOP src tests add-ons kernel file_systems ;
diff --git a/src/tests/add-ons/kernel/file_systems/Jamfile b/src/tests/add-ons/kernel/file_systems/Jamfile
new file mode 100644
index 0000000000..c339facac6
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/Jamfile
@@ -0,0 +1,3 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems ;
+
+SubInclude OBOS_TOP src tests add-ons kernel file_systems befs ;
diff --git a/src/tests/add-ons/kernel/file_systems/befs/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/Jamfile
new file mode 100644
index 0000000000..5b6f5d8f15
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/befs/Jamfile
@@ -0,0 +1,7 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems befs ;
+
+SubInclude OBOS_TOP src tests add-ons kernel file_systems befs array ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems befs btree ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems befs queries ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems befs randomread ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems befs rename ;
diff --git a/src/tests/add-ons/kernel/file_systems/befs/array/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/array/Jamfile
new file mode 100644
index 0000000000..7724597874
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/befs/array/Jamfile
@@ -0,0 +1,24 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems befs array ;
+
+SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems befs ;
+
+{
+	local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM
+	SubDirCcFlags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
+	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
+}
+
+SimpleTest arrayTest
+	: array.cpp
+	  Utility.cpp
+	: be ;
+
+SimpleTest smallArrayTest
+	: smallArray.cpp
+	  Utility.o
+	: be ;
+
+# Tell Jam where to find these sources
+SEARCH on [ FGristFiles Utility.cpp ]
+	= [ FDirName $(OBOS_TOP) src add-ons kernel file_systems befs ] ;
+
diff --git a/src/tests/add-ons/kernel/file_systems/befs/btree/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/btree/Jamfile
new file mode 100644
index 0000000000..953ed8d56a
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/befs/btree/Jamfile
@@ -0,0 +1,22 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems befs btree ;
+
+SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems befs ;
+
+{
+	local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM
+	SubDirCcFlags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
+	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
+}
+
+SimpleTest btreeTest
+	: test.cpp
+	  Volume.cpp
+	  Inode.cpp
+	  cache.cpp
+	  BPlusTree.cpp
+	  Debug.cpp
+	: be ;
+
+# Tell Jam where to find these sources
+SEARCH on [ FGristFiles BPlusTree.cpp Debug.cpp ]
+	= [ FDirName $(OBOS_TOP) src add-ons kernel file_systems befs ] ;
diff --git a/src/tests/add-ons/kernel/file_systems/befs/queries/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/queries/Jamfile
new file mode 100644
index 0000000000..0943720ae6
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/befs/queries/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems befs queries ;
+
+SimpleTest queryTest
+	: test.cpp
+	: be ;
+
diff --git a/src/tests/add-ons/kernel/file_systems/befs/randomread/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/randomread/Jamfile
new file mode 100644
index 0000000000..d18d1e2f47
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/befs/randomread/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems befs randomread ;
+
+SimpleTest randomread
+	: randomread.cpp
+	: be ;
+
diff --git a/src/tests/add-ons/kernel/file_systems/befs/rename/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/rename/Jamfile
new file mode 100644
index 0000000000..ca309a666d
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/befs/rename/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems befs rename ;
+
+SimpleTest rename
+	: rename.c
+	: ;
+
diff --git a/src/tests/add-ons/print/Jamfile b/src/tests/add-ons/print/Jamfile
new file mode 100644
index 0000000000..dce1af5b99
--- /dev/null
+++ b/src/tests/add-ons/print/Jamfile
@@ -0,0 +1,3 @@
+SubDir OBOS_TOP src tests add-ons print ;
+
+SubInclude OBOS_TOP src tests add-ons print pdf ;
diff --git a/src/tests/add-ons/print/pdf/Jamfile b/src/tests/add-ons/print/pdf/Jamfile
new file mode 100644
index 0000000000..219aafe10f
--- /dev/null
+++ b/src/tests/add-ons/print/pdf/Jamfile
@@ -0,0 +1,4 @@
+SubDir OBOS_TOP src tests add-ons print pdf ;
+
+SubInclude OBOS_TOP src tests add-ons print pdf bezierbounds ;
+SubInclude OBOS_TOP src tests add-ons print pdf linepathbuilder ;
diff --git a/src/tests/add-ons/print/pdf/bezierbounds/Jamfile b/src/tests/add-ons/print/pdf/bezierbounds/Jamfile
new file mode 100644
index 0000000000..afbbee84ff
--- /dev/null
+++ b/src/tests/add-ons/print/pdf/bezierbounds/Jamfile
@@ -0,0 +1,28 @@
+SubDir OBOS_TOP src tests add-ons print pdf bezierbounds ;
+
+SubDirHdrs $(OBOS_TOP) src add-ons print drivers pdf source ;
+
+AddResources BezierBounds : <$(SOURCE_GRIST)>Application.rsrc ;
+
+local sources =
+	Application.cpp
+	View.cpp
+	BezierBounds.cpp
+	SubPath.cpp
+;
+
+SimpleTest BezierBounds
+	: $(sources)
+	: be root
+;
+
+# Tell Jam where to find these sources:
+SEARCH on [ FGristFiles SubPath.cpp ]
+	= [ FDirName $(OBOS_TOP) src add-ons print drivers pdf source ] ;
+
+# Ugly hack: Prepend the dirs containing Be's Application.h/View.h to the list
+# of include search dirs. Otherwise they won't be found.
+# It is certainly a good idea to rename the local files.
+PrependObjectHdrs $(sources)
+	: /boot/develop/headers/be/app /boot/develop/headers/be/interface ;
+
diff --git a/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile b/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile
new file mode 100644
index 0000000000..076b40d63d
--- /dev/null
+++ b/src/tests/add-ons/print/pdf/linepathbuilder/Jamfile
@@ -0,0 +1,28 @@
+SubDir OBOS_TOP src tests add-ons print pdf linepathbuilder ;
+
+SubDirHdrs $(OBOS_TOP) src add-ons print drivers pdf source ;
+
+AddResources LinePathBuilder : <$(SOURCE_GRIST)>Application.rsrc ;
+
+local sources =
+	Application.cpp
+	View.cpp
+	SubPath.cpp
+	LinePathBuilder.cpp
+;
+
+SimpleTest LinePathBuilder
+	: $(sources)
+	: be root
+;
+
+# Tell Jam where to find these sources:
+SEARCH on [ FGristFiles LinePathBuilder.cpp SubPath.cpp ]
+	= [ FDirName $(OBOS_TOP) src add-ons print drivers pdf source ] ;
+
+# Ugly hack: Prepend the dirs containing Be's Application.h/View.h to the list
+# of include search dirs. Otherwise they won't be found.
+# It is certainly a good idea to rename the local files.
+PrependObjectHdrs $(sources)
+	: /boot/develop/headers/be/app /boot/develop/headers/be/interface ;
+