diff --git a/src/tests/add-ons/kernel/file_systems/befs/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/Jamfile
deleted file mode 100644
index 88ecbb10b1..0000000000
--- a/src/tests/add-ons/kernel/file_systems/befs/Jamfile
+++ /dev/null
@@ -1,6 +0,0 @@
-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 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/queries/Jamfile b/src/tests/add-ons/kernel/file_systems/befs/queries/Jamfile
deleted file mode 100644
index 0943720ae6..0000000000
--- a/src/tests/add-ons/kernel/file_systems/befs/queries/Jamfile
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index d18d1e2f47..0000000000
--- a/src/tests/add-ons/kernel/file_systems/befs/randomread/Jamfile
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index ca309a666d..0000000000
--- a/src/tests/add-ons/kernel/file_systems/befs/rename/Jamfile
+++ /dev/null
@@ -1,6 +0,0 @@
-SubDir OBOS_TOP src tests add-ons kernel file_systems befs rename ;
-
-SimpleTest rename
-	: rename.c
-	: ;
-
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
index 9a695f7bb5..86ef456506 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
@@ -5,4 +5,7 @@ SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs bufferPool ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs bfs_shell ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs btree ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs mkbfs ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs queries ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs randomread ;
+SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs rename ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs structureSizes ;
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile
index 0b5d4f9901..4e8f89b1e7 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile
@@ -2,7 +2,7 @@ SubDir OBOS_TOP src tests add-ons kernel file_systems bfs btree ;
 
 SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
 
-UsePrivateHeaders [ FDirName kernel util ] ;			# For kernel_cpp.cpp
+UsePrivateHeaders [ FDirName kernel ] ;			# For kernel_cpp.cpp
 
 rule FPreIncludes { return -include\ $(1:D=$(SUBDIR)) ; }
 
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile
index 75021dba40..59c845bbf6 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/bufferPool/Jamfile
@@ -1,7 +1,7 @@
 SubDir OBOS_TOP src tests add-ons kernel file_systems bfs bufferPool ;
 
 SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
-UsePrivateHeaders [ FDirName kernel util ] ;			# For kernel_cpp.cpp
+UsePrivateHeaders [ FDirName kernel ] ;			# For kernel_cpp.cpp
 
 {
 	local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
index f02623172e..01d8845219 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/mkbfs/Jamfile
@@ -2,7 +2,7 @@ SubDir OBOS_TOP src tests add-ons kernel file_systems bfs mkbfs ;
 
 SubDirHdrs $(OBOS_TOP) src tests add-ons kernel file_systems fs_shell ;
 SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
-UsePrivateHeaders [ FDirName kernel util ] ;
+UsePrivateHeaders [ FDirName kernel ] ;
 
 {
 	# set CHECK_MALLOC to something when doing tests against memory corruption
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile
new file mode 100644
index 0000000000..90126e61a1
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/bfs/queries/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems bfs queries ;
+
+SimpleTest queryTest
+	: test.cpp
+	: be ;
+
diff --git a/src/tests/add-ons/kernel/file_systems/befs/queries/test.cpp b/src/tests/add-ons/kernel/file_systems/bfs/queries/test.cpp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/befs/queries/test.cpp
rename to src/tests/add-ons/kernel/file_systems/bfs/queries/test.cpp
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/randomread/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/randomread/Jamfile
new file mode 100644
index 0000000000..8bc56d21e3
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/bfs/randomread/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems bfs randomread ;
+
+SimpleTest randomread
+	: randomread.cpp
+	: be ;
+
diff --git a/src/tests/add-ons/kernel/file_systems/befs/randomread/randomread.cpp b/src/tests/add-ons/kernel/file_systems/bfs/randomread/randomread.cpp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/befs/randomread/randomread.cpp
rename to src/tests/add-ons/kernel/file_systems/bfs/randomread/randomread.cpp
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/rename/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/rename/Jamfile
new file mode 100644
index 0000000000..5e28ce5d7e
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/bfs/rename/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src tests add-ons kernel file_systems bfs rename ;
+
+SimpleTest rename
+	: rename.c
+	: ;
+
diff --git a/src/tests/add-ons/kernel/file_systems/befs/rename/rename.c b/src/tests/add-ons/kernel/file_systems/bfs/rename/rename.c
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/befs/rename/rename.c
rename to src/tests/add-ons/kernel/file_systems/bfs/rename/rename.c