diff --git a/src/tests/add-ons/kernel/file_systems/Jamfile b/src/tests/add-ons/kernel/file_systems/Jamfile
index 63fa0cebdb..1619a300ee 100644
--- a/src/tests/add-ons/kernel/file_systems/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/Jamfile
@@ -1,6 +1,5 @@
 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 ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems udf ;
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
index 2c6b5fce48..9a695f7bb5 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/Jamfile
@@ -1,5 +1,6 @@
 SubDir OBOS_TOP src tests add-ons kernel file_systems bfs ;
 
+SubInclude OBOS_TOP src tests add-ons kernel file_systems bfs array ;
 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 ;
diff --git a/src/tests/add-ons/kernel/file_systems/befs/array/Jamfile b/src/tests/add-ons/kernel/file_systems/bfs/array/Jamfile
similarity index 80%
rename from src/tests/add-ons/kernel/file_systems/befs/array/Jamfile
rename to src/tests/add-ons/kernel/file_systems/bfs/array/Jamfile
index d1462ab967..bfb3e5b0bb 100644
--- a/src/tests/add-ons/kernel/file_systems/befs/array/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/array/Jamfile
@@ -1,7 +1,7 @@
-SubDir OBOS_TOP src tests add-ons kernel file_systems befs array ;
+SubDir OBOS_TOP src tests add-ons kernel file_systems bfs array ;
 
 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/befs/array/array.cpp b/src/tests/add-ons/kernel/file_systems/bfs/array/array.cpp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/befs/array/array.cpp
rename to src/tests/add-ons/kernel/file_systems/bfs/array/array.cpp
diff --git a/src/tests/add-ons/kernel/file_systems/befs/array/smallArray.cpp b/src/tests/add-ons/kernel/file_systems/bfs/array/smallArray.cpp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/befs/array/smallArray.cpp
rename to src/tests/add-ons/kernel/file_systems/bfs/array/smallArray.cpp