diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index a44315f516a..30324317f3f 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -34,7 +34,6 @@ endif
 
 REQUIRES	= necko \
 		  string \
-		  unicharutil \
 		  $(NULL)
 
 CPPSRCS		= \
@@ -74,7 +73,6 @@ CPPSRCS		+= \
 endif
 
 LIBS		+= \
-		$(MOZ_UNICHARUTIL_LIBS) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
diff --git a/mozilla/xpcom/tests/TestAtoms.cpp b/mozilla/xpcom/tests/TestAtoms.cpp
index d0a4c59fde8..b4074b4bbbe 100644
--- a/mozilla/xpcom/tests/TestAtoms.cpp
+++ b/mozilla/xpcom/tests/TestAtoms.cpp
@@ -37,7 +37,6 @@
 #include "nsIAtom.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#include "nsUnicharUtils.h"
 #include "prprf.h"
 #include "prtime.h"
 #include <stdio.h>
@@ -64,8 +63,8 @@ int main(int argc, char** argv)
     if (nsnull == s) {
       break;
     }
-    nsAutoString sb;
-    sb.AssignWithConversion(buf);
+    nsCAutoString sb;
+    sb.Assign(buf);
     strings[count++] = ToNewUnicode(sb);
     ToUpperCase(sb);
     strings[count++] = ToNewUnicode(sb);
diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win
index 492d3d5cc02..d2f824a71a1 100644
--- a/mozilla/xpcom/tests/makefile.win
+++ b/mozilla/xpcom/tests/makefile.win
@@ -23,7 +23,6 @@ DEPTH=..\..
 REQUIRES	= xpcom \
 		  string \
 		  necko \
-		  unicharutil \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
@@ -88,7 +87,6 @@ LINCS=                     \
         $(NULL)
 
 LLIBS=                         \
-        $(DIST)\lib\unicharutil_s.lib  \
         $(DIST)\lib\xpcom.lib  \
         $(LIBNSPR)