diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile
index 050728c576..f0592e9e90 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/Jamfile
@@ -49,5 +49,3 @@ Addon <userland>ramfs
 	: libuserlandfs_haiku_kernel.so
 ;
 
-SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs ramfs
-	beos_interface ;
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile
deleted file mode 100644
index 70390dd255..0000000000
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/ramfs/beos_interface/Jamfile
+++ /dev/null
@@ -1,63 +0,0 @@
-SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs ramfs
-	beos_interface ;
-
-local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel
-	file_systems userlandfs ] ;
-local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
-local ramFSTop = [ FDirName $(HAIKU_TOP) src tests add-ons kernel
-	file_systems userlandfs r5 src test ramfs ] ;
-
-UsePrivateHeaders kernel shared ;
-
-DEFINES += USER=1 ;
-
-# avoid inclusion of <drivers/Select.h>
-DEFINES += _DRIVERS_SELECT_H ;
-
-SubDirC++Flags -include
-	[ FDirName $(userlandFSIncludes) shared Compatibility.h ] ;
-
-SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
-SubDirSysHdrs [ FDirName $(userlandFSIncludes) legacy ] ;
-SubDirHdrs [ FDirName $(userlandFSIncludes) legacy ] ;
-SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
-
-SEARCH_SOURCE += $(ramFSTop) ;
-SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
-
-Addon <userland-beos>ramfs
-	: Debug.cpp
-	  String.cpp
-
-	  AllocationInfo.cpp
-	  AreaUtils.cpp
-	  Attribute.cpp
-	  AttributeIndex.cpp
-	  AttributeIndexImpl.cpp
-	  AttributeIterator.cpp
-	  BlockAllocator.cpp
-	  BlockAllocatorArea.cpp
-	  BlockAllocatorAreaBucket.cpp
-	  BlockReferenceManager.cpp
-	  DataContainer.cpp
-	  Directory.cpp
-	  Entry.cpp
-	  EntryIterator.cpp
-	  EntryListener.cpp
-	  File.cpp
-	  Index.cpp
-	  IndexDirectory.cpp
-	  kernel_interface.cpp
-	  LastModifiedIndex.cpp
-	  NameIndex.cpp
-	  Node.cpp
-	  NodeListener.cpp
-	  NodeTable.cpp
-	  Query.cpp
-	  SizeIndex.cpp
-	  SymLink.cpp
-	  Volume.cpp
-	: libuserlandfs_beos_kernel.so
-	  be	# for BLocker only
-	  [ TargetLibsupc++ ]
-;
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile
index 2652cc71d8..f456976754 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile
@@ -34,5 +34,3 @@ Addon <userland>reiserfs
 	  be	# for BLocker only
 	  [ TargetLibsupc++ ]
 ;
-
-HaikuSubInclude beos_interface ;
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile
deleted file mode 100644
index fd1e0db362..0000000000
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile
+++ /dev/null
@@ -1,37 +0,0 @@
-SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs reiserfs
-	beos_interface ;
-
-local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
-local reiserFSTop = [ FDirName $(HAIKU_TOP) src tests add-ons kernel
-	file_systems userlandfs r5 src test reiserfs ] ;
-
-DEFINES += USER=1 ;
-
-SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
-SubDirSysHdrs [ FDirName $(userlandFSIncludes) legacy ] ;
-
-# avoid inclusion of <drivers/Select.h>
-DEFINES += _DRIVERS_SELECT_H ;
-
-SEARCH_SOURCE += $(reiserFSTop) ;
-
-Addon <userland-beos>reiserfs
-	: 
-	Block.cpp
-	BlockCache.cpp
-	hashes.cpp
-	Item.cpp
-	Iterators.cpp
-	kernel_interface.cpp
-	Locker.cpp
-	Tree.cpp
-	VNode.cpp
-	Volume.cpp 
-
-	Debug.cpp
-	Settings.cpp
-	String.cpp
-	SuperBlock.cpp
-
-	: libuserlandfs_beos_kernel.so [ TargetLibsupc++ ]
-;