diff --git a/build/jam/TestsRules b/build/jam/TestsRules
index bf72ba3fad..725aab7d50 100644
--- a/build/jam/TestsRules
+++ b/build/jam/TestsRules
@@ -9,11 +9,13 @@ rule UnitTestDependency
 
 rule UnitTestLib
 {
-	# UnitTestLib <lib> : <sources> : <libraries> ;
+	# UnitTestLib <lib> : <sources> : <libraries> : <local_libraries> : <rdefs> ;
 	#
 	local lib = $(1) ;
 	local sources = $(2) ;
 	local libraries = $(3) ;
+	local local_libraries = $(4) ;
+	local rdefs = $(5) ;
 
 	# if TEST_DEBUG is defined, we turn on debugging
 	if $(TEST_DEBUG) {
@@ -34,10 +36,19 @@ rule UnitTestLib
 	UseCppUnitObjectHeaders $(sources) ;
 
 	MakeLocate $(lib) : $(TARGET_UNIT_TEST_LIB_DIR) ;
-	SharedLibrary $(lib) : $(sources) : $(libraries) libcppunit.so ;
+	SharedLibrary $(lib) : $(sources) : $(libraries) $(local_libraries) libcppunit.so : $(rdefs) ;
 
 	UnitTestDependency $(lib) ;
 	UNIT_TEST_LIBRARIES on unittests += $(lib) ;
+	UNIT_TEST_LIBRARIES on unittests += $(local_libraries) ;
+	for dep in $(local_libraries) {
+		local dep_grist = $(dep:G=unittests) ;
+		MakeLocate $(dep_grist) : [ FDirName $(TARGET_UNIT_TEST_DIR) lib ] ;
+		File $(dep_grist) : $(dep) ;
+		MimeSet $(dep_grist) ;
+		MODE on $(dep_grist) = $(EXEMODE) ;
+		UnitTestDependency $(dep_grist) ;
+	}
 }
 
 
diff --git a/src/tests/kits/support/remoteobjectdef/Jamfile b/src/tests/kits/support/remoteobjectdef/Jamfile
index 1f485d0f4e..7d055d0a77 100644
--- a/src/tests/kits/support/remoteobjectdef/Jamfile
+++ b/src/tests/kits/support/remoteobjectdef/Jamfile
@@ -5,5 +5,6 @@ AddSubDirSupportedPlatforms libbe_test ;
 UnitTestLib libsupporttest_RemoteTestObject.so
 	: RemoteTestObject.cpp
 	: be [ TargetLibstdc++ ]
+	:
 	: RemoteTestObject.rdef
 ;
diff --git a/src/tests/system/kernel/disk_device_manager/Jamfile b/src/tests/system/kernel/disk_device_manager/Jamfile
index 4a8b9e6fdf..1ffdabae4e 100644
--- a/src/tests/system/kernel/disk_device_manager/Jamfile
+++ b/src/tests/system/kernel/disk_device_manager/Jamfile
@@ -45,7 +45,7 @@ StaticLibrary test_disk_device_manager.a :
 UnitTestLib libkerneldiskdevicemanagertest.so :
 	DiskDeviceManagerTestAddon.cpp
 	KPartitionTest.cpp
-	: be [ TargetLibsupc++ ] [ TargetLibstdc++ ] test_disk_device_manager.a libkernelland_emu.so
+	: be [ TargetLibsupc++ ] [ TargetLibstdc++ ] test_disk_device_manager.a : libkernelland_emu.so
 ;
 
 SimpleTest DiskDeviceManagerTest :