diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index b166cd1748e..92a1d5ca0b3 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -49,6 +49,9 @@ LIBS = \
 	-lraptorhtml \
 	-lpref \
 	-lsecfree \
+	-lraptorgfx \
+	-lgfx$(MOZ_TOOLKIT) \
+	-lgfxps \
 	-limg \
 	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	$(PNG_LIBS) \
diff --git a/layout/html/tests/Makefile.in b/layout/html/tests/Makefile.in
index 7a9e5b98c21..8ebaedd9c5f 100644
--- a/layout/html/tests/Makefile.in
+++ b/layout/html/tests/Makefile.in
@@ -60,8 +60,9 @@ LIBS = \
 	-l$(MOZ_LIB_JS_PREFIX)js \
 	-ljsdom \
 	-lraptorgfx \
+	-lgfx$(MOZ_TOOLKIT) \
+	-lgfxps \
 	-lxpcom \
-	-lreg \
 	-lxp \
 	-lraptorhtmlpars \
 	-lexpat \
diff --git a/network/module/tests/Makefile.in b/network/module/tests/Makefile.in
index 61d9856e44c..21617185d41 100644
--- a/network/module/tests/Makefile.in
+++ b/network/module/tests/Makefile.in
@@ -33,29 +33,32 @@ LOCAL_INCLUDES := -I$(srcdir)/../src
 REQUIRES = raptor netlib xpcom reg pref
 
 LIBS = \
+	-lraptorgfx	\
+	-lgfx$(MOZ_TOOLKIT) \
+	-lgfxps \
+	-lnetlib \
 	-labouturl \
 	-lfileurl \
-	-lftpurl \
-	-lgophurl \
 	-lremoturl \
-	-lhttpurl \
-	-lsockstuburl \
-	-lnetcache \
-	-lmimetype \
+	-lgophurl \
 	-lnetcnvts \
-	-lnetwork \
-	-lnetlib \
-	-lreg	\
-	-lxpcom	\
+	-lsockstuburl \
+	-lftpurl \
+	-lmimetype \
 	-lpwcac \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm	\
-	-lxp	\
-	-lpref	\
-	-l$(MOZ_LIB_JS_PREFIX)js	\
-	-lsecfree \
-	$(NSPR_LIBS) \
+	-lhttpurl \
+	-lnetwork \
+	-lnetcache \
 	$(TK_LIBS) \
+	-lpref \
+	-lsecfree \
+	-l$(MOZ_LIB_JS_PREFIX)js \
+	-limg \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
+	-lxp \
+	-lxpcom \
 	$(ZLIB_LIBS) \
+	$(NSPR_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/config.mk
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index ef18bf27db4..a0c7838acbc 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -23,7 +23,34 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= dynamic
 
-CPPSRCS		= RegFactory.cpp TestFactory.cpp TestCOMPtr.cpp TestID.cpp TestXPIDLString.cpp
+TESTS_NOT_COMPILING	=	\
+	TestArray.cpp		\
+	TestServMgr.cpp		\
+	$(NULL)
+
+CPPSRCS		=		\
+	RegFactory.cpp		\
+	TestFactory.cpp		\
+	TestCOMPtr.cpp		\
+	TestID.cpp		\
+	TestXPIDLString.cpp	\
+	TestAtoms.cpp		\
+	TestCRT.cpp		\
+	CvtURL.cpp		\
+	FilesTest.cpp		\
+	PropertiesTest.cpp	\
+	TestAutoLock.cpp	\
+	TestObserverService.cpp	\
+	SizeTest01.cpp		\
+	SizeTest02.cpp		\
+	SizeTest03.cpp		\
+	SizeTest04.cpp		\
+	SizeTest05.cpp		\
+	SizeTest06.cpp		\
+	TestBuffers.cpp		\
+	TestPipes.cpp		\
+	TestThreads.cpp		\
+	$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
@@ -50,33 +77,30 @@ NETLIB_LIBS =	      \
 	$(NULL)
 
 LIBS		= \
-	-lpref \
-	-l$(MOZ_LIB_JS_PREFIX)js \
-	-lsecfree \
-	-lxp \
-	-labouturl    \
-	-lfileurl     \
-	-lftpurl      \
-	-lgophurl     \
-	-lhttpurl     \
-	-lremoturl    \
+	-lraptorgfx	\
+	-lgfx$(MOZ_TOOLKIT) \
+	-lgfxps \
+	-lnetlib \
+	-labouturl \
+	-lfileurl \
+	-lremoturl \
+	-lgophurl \
+	-lnetcnvts \
 	-lsockstuburl \
-	-lmimetype    \
-	-lnetcache    \
-	-lnetcnvts    \
-	-lnetlib      \
-	-lnetwork     \
-	-lxp	      \
-	-lxpcom       \
-	-lreg       \
-	-ljsurl	      \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
-	-lpwcac	      \
+	-lftpurl \
+	-lmimetype \
+	-lpwcac \
+	-lhttpurl \
+	-lnetwork \
+	-lnetcache \
 	$(TK_LIBS) \
-	-limg	     \
-	$(JPEG_LIBS) \
-	$(PNG_LIBS)  \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
+	-lpref \
+	-lsecfree \
+	-l$(MOZ_LIB_JS_PREFIX)js \
+	-limg \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
+	-lxp \
+	-lxpcom \
 	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)