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 c4a06cadf9..0aca5b3529 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/Jamfile
@@ -1,38 +1,39 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs reiserfs ;
 
+local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems
+	userlandfs ] ;
 local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
-local reiserFSTop = [ FDirName $(HAIKU_TOP) src tests add-ons kernel
-	file_systems userlandfs r5 src test reiserfs ] ;
+local reiserFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems
+	reiserfs ] ;
 
 DEFINES += USER=1 ;
 
-SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
-SubDirSysHdrs [ FDirName $(userlandFSIncludes) legacy ] ;
-
-# avoid inclusion of <drivers/Select.h>
-DEFINES += _DRIVERS_SELECT_H ;
+SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
 
 SEARCH_SOURCE += $(reiserFSTop) ;
+SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
 
 Addon <userland>reiserfs
 	: # relpath - obsolete
 	: 
+	Debug.cpp
+	Locker.cpp
+	String.cpp
+
 	Block.cpp
 	BlockCache.cpp
 	hashes.cpp
 	Item.cpp
 	Iterators.cpp
 	kernel_interface.cpp
-	Locker.cpp
+	Settings.cpp
+	SuperBlock.cpp
 	Tree.cpp
 	VNode.cpp
 	Volume.cpp 
 
-	Debug.cpp
-	Settings.cpp
-	String.cpp
-	SuperBlock.cpp
-
 	: false		# is executable
-	: libuserlandfs_beos_kernel.so
+	: libuserlandfs_haiku_kernel.so
 ;
+
+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
new file mode 100644
index 0000000000..8d4ec15cdc
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/reiserfs/beos_interface/Jamfile
@@ -0,0 +1,39 @@
+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
+	: # relpath - obsolete
+	: 
+	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
+
+	: false		# is executable
+	: libuserlandfs_beos_kernel.so
+;