diff --git a/mozilla/modules/unicharutil/tests/Makefile.in b/mozilla/modules/unicharutil/tests/Makefile.in
index 0c531a41ee5..4d18ffb23dc 100644
--- a/mozilla/modules/unicharutil/tests/Makefile.in
+++ b/mozilla/modules/unicharutil/tests/Makefile.in
@@ -25,7 +25,7 @@ CPPSRCS		= UnicharSelfTest.cpp
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -DUSE_NSREG
+#DEFINES		+= -DUSE_NSREG
 INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
 
 EX_LIBS		= $(DIST)/lib/libxpcom.$(LIB_SUFFIX) \
diff --git a/mozilla/modules/unicharutil/tests/UnicharSelfTest.cpp b/mozilla/modules/unicharutil/tests/UnicharSelfTest.cpp
index dd57fd3dea6..62e269ae5c7 100644
--- a/mozilla/modules/unicharutil/tests/UnicharSelfTest.cpp
+++ b/mozilla/modules/unicharutil/tests/UnicharSelfTest.cpp
@@ -24,7 +24,11 @@
 NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
 NS_DEFINE_IID(kCaseConversionIID, NS_ICASECONVERSION_IID);
 
+#ifdef XP_UNIX
+#define UNICHARUTIL_DLL_NAME "libunicharutil.so"
+#else
 #define UNICHARUTIL_DLL_NAME "UNICHARUTIL_DLL"
+#endif
 
 #define TESTLEN 29
 #define T2LEN TESTLEN