diff --git a/src/tests/add-ons/kernel/Jamfile b/src/tests/add-ons/kernel/Jamfile
index c697cfd499..26cdc9793d 100644
--- a/src/tests/add-ons/kernel/Jamfile
+++ b/src/tests/add-ons/kernel/Jamfile
@@ -1,7 +1,9 @@
 SubDir OBOS_TOP src tests add-ons kernel ;
 
-StaticLibrary kernelland_emu : kernelland_emu.cpp ;
-#LinkSharedOSLibs libkernelland_emu.a : be stdc++.r4 ;
+SharedLibrary kernelland_emu : kernelland_emu.cpp ;
+LinkSharedOSLibs libkernelland_emu.so : be stdc++.r4 ;
+AbsSymLink <boot!home!config!lib>libkernelland_emu.so : libkernelland_emu.so
+	: /boot/home/config/lib ;
 
 SubInclude OBOS_TOP src tests add-ons kernel disk_scanner ;
 SubInclude OBOS_TOP src tests add-ons kernel file_systems ;
diff --git a/src/tests/add-ons/kernel/disk_scanner/Jamfile b/src/tests/add-ons/kernel/disk_scanner/Jamfile
index 0859ff4629..f506649ca9 100644
--- a/src/tests/add-ons/kernel/disk_scanner/Jamfile
+++ b/src/tests/add-ons/kernel/disk_scanner/Jamfile
@@ -4,8 +4,9 @@ UsePrivateHeaders $(DOT) ;
 
 # the test app
 
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
 SimpleTest DiskScannerTest : DiskScannerTest.cpp
-	: libkernelland_emu.a be stdc++.r4 ;
+	: <boot!home!config!lib>libkernelland_emu.so be stdc++.r4 ;
 LOCATE on <installed>DiskScannerTest = [ on DiskScannerTest return $(LOCATE) ] ;
 Depends <installed>DiskScannerTest : DiskScannerTest ;
 
@@ -22,8 +23,7 @@ SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel disk_scanner ] ;
 Addon <userland>disk_scanner : userland disk_scanner :
 	disk_scanner.c
 ;
-#LinkSharedOSLibs <userland>disk_scanner : libkernelland_emu.so ;
-LinkSharedOSLibs <userland>disk_scanner : <installed>DiskScannerTest ;
+LinkSharedOSLibs <userland>disk_scanner : libkernelland_emu.so ;
 
 SubInclude OBOS_TOP src tests add-ons kernel disk_scanner fs ;
 SubInclude OBOS_TOP src tests add-ons kernel disk_scanner partition ;
diff --git a/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile b/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile
index f6c56d96a2..fe8b75a4fe 100644
--- a/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile
+++ b/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile
@@ -16,12 +16,12 @@ UsePrivateHeaders $(DOT) ;
 Addon <userland>bfs : userland disk_scanner fs :
 	bfs.c
 ;
-LinkSharedOSLibs <userland>bfs : <installed>DiskScannerTest ;
+LinkSharedOSLibs <userland>bfs : libkernelland_emu.so ;
 
 # iso9660
 
 Addon <userland>iso9660 : userland disk_scanner fs :
 	iso9660.c
 ;
-LinkSharedOSLibs <userland>iso9660 : <installed>DiskScannerTest ;
+LinkSharedOSLibs <userland>iso9660 : libkernelland_emu.so ;
 
diff --git a/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile b/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile
index f34fc41741..60e5557028 100644
--- a/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile
+++ b/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile
@@ -16,4 +16,4 @@ UsePrivateHeaders $(DOT) ;
 Addon <userland>intel : userland disk_scanner partition :
 	intel.cpp intel_parameters.cpp intel_partition_map.cpp
 ;
-LinkSharedOSLibs <userland>intel : <installed>DiskScannerTest ;
+LinkSharedOSLibs <userland>intel : libkernelland_emu.so ;
diff --git a/src/tests/add-ons/kernel/disk_scanner/session/Jamfile b/src/tests/add-ons/kernel/disk_scanner/session/Jamfile
index 489d399999..5986ca5cab 100644
--- a/src/tests/add-ons/kernel/disk_scanner/session/Jamfile
+++ b/src/tests/add-ons/kernel/disk_scanner/session/Jamfile
@@ -16,4 +16,4 @@ UsePrivateHeaders $(DOT) ;
 Addon <userland>cdrom : userland disk_scanner session :
 	cdrom.c
 ;
-LinkSharedOSLibs <userland>cdrom : <installed>DiskScannerTest ;
+LinkSharedOSLibs <userland>cdrom : libkernelland_emu.so ;