diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in
index da0907fe885..f9b4f63e305 100644
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@@ -107,4 +107,11 @@ LIBS		= \
 
 SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
 
+EXPORT_RESOURCE = \
+	$(srcdir)/test.properties \
+	$(NULL)
+
+install::
+	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
+
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpcom/tests/PropertiesTest.cpp b/mozilla/xpcom/tests/PropertiesTest.cpp
index b4d21a04fb9..c9ab4306272 100644
--- a/mozilla/xpcom/tests/PropertiesTest.cpp
+++ b/mozilla/xpcom/tests/PropertiesTest.cpp
@@ -32,17 +32,11 @@
 
 #ifdef XP_PC
 #define NETLIB_DLL "netlib.dll"
-#define RAPTORBASE_DLL "raptorbase.dll"
-#define XPCOM_DLL "xpcom32.dll"
 #else
 #ifdef XP_MAC
 #define NETLIB_DLL "NETLIB_DLL"
-#define RAPTORBASE_DLL "base.shlb"
-#define XPCOM_DLL "XPCOM_DLL"
 #else
 #define NETLIB_DLL "libnetlib.so"
-#define RAPTORBASE_DLL "libraptorbase.so"
-#define XPCOM_DLL "libxpcom.so"
 #endif
 #endif
 static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID);
@@ -62,30 +56,14 @@ main(int argc, char* argv[])
 {
   nsresult ret;
 
+  // XXX why do I have to do this?!
+  ret = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
+                                         "components");
+  if (NS_FAILED(ret)) return ret;
+
   ret = nsComponentManager::RegisterComponent(kNetServiceCID, NULL,
     NULL, NETLIB_DLL, PR_FALSE, PR_FALSE);
-  if (NS_FAILED(ret)) {
-    printf("cannot register net service\n");
-    return 1;
-  }
-  ret = nsComponentManager::RegisterComponent(kEventQueueCID, NULL,
-    NULL, XPCOM_DLL, PR_FALSE, PR_FALSE);
-  if (NS_FAILED(ret)) {
-    printf("cannot register event queue\n");
-    return 1;
-  }
-  ret = nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL,
-    NULL, XPCOM_DLL, PR_FALSE, PR_FALSE);
-  if (NS_FAILED(ret)) {
-    printf("cannot register event queue service\n");
-    return 1;
-  }
-  ret = nsComponentManager::RegisterComponent(kPersistentPropertiesCID, NULL,
-    NULL, RAPTORBASE_DLL, PR_FALSE, PR_FALSE);
-  if (NS_FAILED(ret)) {
-    printf("cannot register persistent properties\n");
-    return 1;
-  }
+
 #ifdef XP_MAC    // have not build this on PC and UNIX yet so make it #ifdef XP_MAC
   NS_SetupRegistry(); 
 #endif
diff --git a/mozilla/xpcom/tests/TestObserverService.cpp b/mozilla/xpcom/tests/TestObserverService.cpp
index 72802ff9f40..dac0557d878 100644
--- a/mozilla/xpcom/tests/TestObserverService.cpp
+++ b/mozilla/xpcom/tests/TestObserverService.cpp
@@ -1,3 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL. You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All Rights
+ * Reserved.
+ */
+
 #define NS_IMPL_IDS
 #include "nsISupports.h"
 #include "nsRepository.h"
@@ -7,31 +25,25 @@
 
 static NS_DEFINE_IID(kIObserverServiceIID, NS_IOBSERVERSERVICE_IID);
 static NS_DEFINE_IID(kObserverServiceCID, NS_OBSERVERSERVICE_CID);
-
-
 static NS_DEFINE_IID(kIObserverIID, NS_IOBSERVER_IID);
 static NS_DEFINE_IID(kObserverCID, NS_OBSERVER_CID);
 
-#define BASE_DLL   "raptorbase.dll"
-
 int main(int argc, char *argv[])
 {
 
-	nsIObserverService *anObserverService = NULL;
+    nsIObserverService *anObserverService = NULL;
     nsresult rv;
 
-    nsComponentManager::RegisterComponent(kObserverServiceCID,
-                                           "ObserverService", 
-                                           NS_OBSERVERSERVICE_PROGID,
-                                           BASE_DLL,PR_FALSE, PR_FALSE);
-
-	nsresult res = nsRepository::CreateInstance(kObserverServiceCID,
-												NULL,
-												kIObserverServiceIID,
-												(void **) &anObserverService);
+    rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
+                                         "components");
+    if (NS_FAILED(rv)) return rv;
 
+    nsresult res = nsComponentManager::CreateInstance(kObserverServiceCID,
+                                                NULL,
+                                                 kIObserverServiceIID,
+                                                (void **) &anObserverService);
 	
-	if (res == NS_OK) {
+    if (res == NS_OK) {
 
         nsString  aTopic("htmlparser");
 
@@ -39,48 +51,44 @@ int main(int argc, char *argv[])
         nsIObserver *aObserver = nsnull;
         nsIObserver *bObserver = nsnull;
             
-		nsresult res = nsRepository::CreateInstance(kObserverCID,
-												NULL,
-												kIObserverIID,
-												(void **) &anObserver);
-                                                
+        nsresult res = nsRepository::CreateInstance(kObserverCID,
+                                                    NULL,
+                                                    kIObserverIID,
+                                                    (void **) &anObserver);
 
         rv = NS_NewObserver(&aObserver);
-		if (NS_FAILED(rv)) return rv;
-    
-        
+
+        if (NS_FAILED(rv)) return rv;
+
         rv = anObserverService->AddObserver(&aObserver, &aTopic);
-		if (NS_FAILED(rv)) return rv;
+        if (NS_FAILED(rv)) return rv;
  
-		
         rv = NS_NewObserver(&bObserver);
-		if (NS_FAILED(rv)) return rv;
+        if (NS_FAILED(rv)) return rv;
 
         rv = anObserverService->AddObserver(&bObserver, &aTopic);
-		if (NS_FAILED(rv)) return rv;
- 
-		nsIEnumerator* e;
-		rv = anObserverService->EnumerateObserverList(&e, &aTopic);
-		if (NS_FAILED(rv)) return rv;
-		nsISupports *inst;
- 
+        if (NS_FAILED(rv)) return rv;
+
+        nsIEnumerator* e;
+        rv = anObserverService->EnumerateObserverList(&e, &aTopic);
+        if (NS_FAILED(rv)) return rv;
+        nsISupports *inst;
+
         for (e->First(); e->IsDone() != NS_OK; e->Next()) {
             rv = e->CurrentItem(&inst);
             if (NS_SUCCEEDED(rv)) {
-              rv = inst->QueryInterface(nsIObserver::GetIID(), (void**)&anObserver);
+              rv = inst->QueryInterface(nsIObserver::GetIID(),(void**)&anObserver);
             }
             rv = anObserver->Notify(nsnull);
-         }
+        }
 
         rv = anObserverService->RemoveObserver(&aObserver, &aTopic);
-		if (NS_FAILED(rv)) return rv;
+		    if (NS_FAILED(rv)) return rv;
+
 
         rv = anObserverService->RemoveObserver(&bObserver, &aTopic);
-		if (NS_FAILED(rv)) return rv;
-
-  
-        
-	}
- 	return NS_OK;
+		    if (NS_FAILED(rv)) return rv;
+       
+    }
+    return NS_OK;
 }
-