diff --git a/src/servers/registrar/Jamfile b/src/servers/registrar/Jamfile
index 250bcada8c..638fe4371e 100644
--- a/src/servers/registrar/Jamfile
+++ b/src/servers/registrar/Jamfile
@@ -13,20 +13,7 @@ Server obos_registrar :
 	TRoster.cpp
 ;
 LinkSharedOSLibs obos_registrar :
-	<$(SOURCE_GRIST)>libstorage.so
 	<boot!home!config!lib>libopenbeos.so
 	stdc++.r4
 	be root
 ;
-
-# To run the registrar, these libraries must be around.
-{
-	local libdir = [ on obos_registrar FDirName $(LOCATE[1]) lib ] ;
-	MakeLocate <$(SOURCE_GRIST)>libstorage.so : $(libdir) ;
-	MakeLocate <$(SOURCE_GRIST)>libbeadapter.so : $(libdir) ;
-	RelSymLink <$(SOURCE_GRIST)>libstorage.so : libstorage.so ;
-	RelSymLink <$(SOURCE_GRIST)>libbeadapter.so : libbeadapter.so ;
-	Includes <$(SOURCE_GRIST)>libstorage.so
-		: <$(SOURCE_GRIST)>libbeadapter.so ;
-}
-
diff --git a/src/tests/kits/storage/Jamfile b/src/tests/kits/storage/Jamfile
index 7dd79a11f2..292ac96d13 100644
--- a/src/tests/kits/storage/Jamfile
+++ b/src/tests/kits/storage/Jamfile
@@ -20,23 +20,12 @@ CommonTestLib libstoragetest.so
 		ResourceStringsTest.cpp
 		StatableTest.cpp
 		SymLinkTest.cpp
-	: <$(SOURCE_GRIST)>libstorage.so be stdc++.r4
+	: <boot!home!config!lib>libopenbeos.so be stdc++.r4
 	: be stdc++.r4
 	:
 	: storage
 ;
 
-# To run the tests the libraries must be around.
-{
-	local libdir = [ on UnitTesterHelper FDirName $(LOCATE[1]) lib ] ;
-	MakeLocate <$(SOURCE_GRIST)>libstorage.so : $(libdir) ;
-	MakeLocate <$(SOURCE_GRIST)>libbeadapter.so : $(libdir) ;
-	RelSymLink <$(SOURCE_GRIST)>libstorage.so : libstorage.so ;
-	RelSymLink <$(SOURCE_GRIST)>libbeadapter.so : libbeadapter.so ;
-	Includes <$(SOURCE_GRIST)>libstorage.so
-		: <$(SOURCE_GRIST)>libbeadapter.so ;
-}
-
 # To run the tests some test files must be around.
 {
 	local resdir = <storage!kit!test!files>resources ;
@@ -44,4 +33,3 @@ CommonTestLib libstoragetest.so
 	RelSymLink $(resdir) : [ FDirName $(SUBDIR) resources ] ;
 	DEPENDS libstoragetest.so : $(resdir) ;
 }
-