diff --git a/src/tests/add-ons/kernel/file_systems/Jamfile b/src/tests/add-ons/kernel/file_systems/Jamfile
index 4aad467c4b..43851a950f 100644
--- a/src/tests/add-ons/kernel/file_systems/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/Jamfile
@@ -3,4 +3,4 @@ SubDir HAIKU_TOP src tests add-ons kernel file_systems ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems bfs ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems fs_shell ;
 #SubInclude HAIKU_TOP src tests add-ons kernel file_systems iso9660 ;
-#SubInclude HAIKU_TOP src tests add-ons kernel file_systems udf ;
+SubInclude HAIKU_TOP src tests add-ons kernel file_systems udf ;
diff --git a/src/tests/add-ons/kernel/file_systems/udf/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/Jamfile
index d26916f374..f3c9cc4083 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/Jamfile
@@ -1,3 +1,4 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems udf ;
 
+SubInclude HAIKU_TOP src tests add-ons kernel file_systems udf r5 ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems udf udf_shell ;
diff --git a/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile
index be8ffa3469..b33c717241 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/r5/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons kernel file_systems udf ;
+SubDir HAIKU_TOP src tests add-ons kernel file_systems udf r5 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 SubDirC++Flags -fno-rtti ;
@@ -27,7 +27,7 @@ oldOPTIM = $(OPTIM) ;
 UsePrivateHeaders kernel ;			# For kernel_cpp.cpp
 UsePrivateHeaders [ FDirName kernel util ] ;	# For all the UDF source files
 
-KernelAddon udf : kernel file_systems :
+KernelAddon <r5>udf : kernel file_systems :
 	kernel_cpp.cpp
 	udf.cpp
 
@@ -66,4 +66,4 @@ InstallUDF install : udf ;
 # restore original optimization level
 OPTIM = $(oldOPTIM) ;
 
-SubInclude HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ;
+SubInclude HAIKU_TOP src tests add-ons kernel file_systems udf r5 drive_setup_addon ;
diff --git a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile
index ece2906377..5f849d91f7 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/r5/drive_setup_addon/Jamfile
@@ -1,4 +1,6 @@
-SubDir HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ;
+SubDir HAIKU_TOP src tests add-ons kernel file_systems udf r5 drive_setup_addon ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
 
 # save original optimization level
 oldOPTIM = $(OPTIM) ;
@@ -26,12 +28,12 @@ oldOPTIM = $(OPTIM) ;
 }
 
 UsePrivateHeaders [ FDirName kernel util ] ;
-SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems udf ] ;
+SubDirHdrs [ FDirName $(SUBDIR) .. ] ;
 
 # Note that the add-on is named "i-udf-ds" to put it alphabetically
 # before the standard iso9660 add-on, thus giving it first dibs at
 # iso9660/UDF hybrid discs.
-Addon i-udf-ds : [ FDirName drive_setup fs ] :
+Addon <r5>i-udf-ds : [ FDirName drive_setup fs ] :
 	udf-ds.cpp
 	Recognition.cpp
 	UdfDebug.cpp
@@ -45,7 +47,7 @@ Addon i-udf-ds : [ FDirName drive_setup fs ] :
 
 SEARCH on [ FGristFiles
 		Recognition.cpp UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp
-	] = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems udf ] ;
+	] = [ FDirName $(SUBDIR) .. ] ;
 
 rule InstallUDFDS
 {