diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile
index 0931e8eef0..0e73731636 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs ;
 
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs bfs ;
+SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs cdda ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs ntfs ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs r5 ;
 SubInclude HAIKU_TOP src tests add-ons kernel file_systems userlandfs ramfs ;
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/cdda/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/cdda/Jamfile
new file mode 100644
index 0000000000..0052627578
--- /dev/null
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/cdda/Jamfile
@@ -0,0 +1,31 @@
+SubDir HAIKU_TOP src tests add-ons kernel file_systems userlandfs cdda ;
+
+local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems
+	userlandfs ] ;
+local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
+local cddaTop = [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems
+	cdda ] ;
+
+DEFINES += USER=1 ;
+
+SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
+
+SEARCH_SOURCE += $(cddaTop) ;
+SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
+
+UsePrivateHeaders drivers kernel shared storage ;
+
+Addon <userland>cdda
+	:
+	Debug.cpp
+	String.cpp
+
+	cdda.cpp
+	cddb.cpp
+	kernel_interface.cpp
+
+	: libuserlandfs_haiku_kernel.so
+	  be	# for BLocker only
+	  [ TargetLibsupc++ ]
+;
+