diff --git a/mozilla/content/html/style/src/nsCSSScanner.cpp b/mozilla/content/html/style/src/nsCSSScanner.cpp
index cbb497d5f98..12e61f7bfa5 100644
--- a/mozilla/content/html/style/src/nsCSSScanner.cpp
+++ b/mozilla/content/html/style/src/nsCSSScanner.cpp
@@ -234,7 +234,8 @@ void nsCSSScanner::AddToError(const nsAString& aErrorText)
     mErrorColNumber = mColNumber;
     mError = aErrorText;
   } else {
-    mError.Append(NS_LITERAL_STRING("  ") + aErrorText);
+    // XXX nsAutoString is workaround for string hang bug (bug 74709)!
+    mError.Append(NS_LITERAL_STRING("  ") + nsAutoString(aErrorText));
   }
 }
 
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index faa9fcc2b8e..457cdda635f 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -28,12 +28,14 @@ include $(DEPTH)/config/autoconf.mk
 
 REQUIRES	= xpcom \
 		  string \
+		  necko \
 		  content \
 		  $(NULL)
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 CPPSRCS		= \
+		ParseCSS.cpp \
 		TestCSSPropertyLookup.cpp \
 		$(NULL)
 
diff --git a/mozilla/layout/html/tests/ParseCSS.cpp b/mozilla/layout/html/tests/ParseCSS.cpp
index 56f810acebe..d0dd2c6bebb 100644
--- a/mozilla/layout/html/tests/ParseCSS.cpp
+++ b/mozilla/layout/html/tests/ParseCSS.cpp
@@ -63,7 +63,7 @@ FileToURI(const char *aFilename)
 {
     nsCOMPtr<nsILocalFile> lf(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
     // XXX Handle relative paths somehow.
-    lf->InitWithPath(nsDependentCString(aFilename));
+    lf->InitWithPath(aFilename);
 
     nsIFileURL *url;
     CallCreateInstance(kStandardURLCID, &url);