diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp
index 674e1e88b34..dbbad7759d0 100644
--- a/mozilla/netwerk/test/TestCallbacks.cpp
+++ b/mozilla/netwerk/test/TestCallbacks.cpp
@@ -268,24 +268,9 @@ int main(int argc, char *argv[]) {
 
     // Enter the message pump to allow the URL load to proceed.
     while ( gKeepRunning ) {
-#ifdef WIN32
-        MSG msg;
-
-        if (GetMessage(&msg, NULL, 0, 0)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        } else {
-            gKeepRunning = 0;
-    }
-#else
-#ifdef XP_MAC
-    /* Mac stuff is missing here! */
-#else
-    PLEvent *gEvent;
-    rv = gEventQ->GetEvent(&gEvent);
-    rv = gEventQ->HandleEvent(gEvent);
-#endif /* XP_UNIX */
-#endif /* !WIN32 */
+        PLEvent *gEvent;
+        gEventQ->WaitForEvent(&gEvent);
+        gEventQ->HandleEvent(gEvent);
     }
 
     NS_ShutdownXPCOM(nsnull);
diff --git a/mozilla/netwerk/test/TestOverlappedIO.cpp b/mozilla/netwerk/test/TestOverlappedIO.cpp
index 8cef39bc2e4..12c7ef8df13 100644
--- a/mozilla/netwerk/test/TestOverlappedIO.cpp
+++ b/mozilla/netwerk/test/TestOverlappedIO.cpp
@@ -344,27 +344,9 @@ main(int argc, char* argv[])
 
     // Enter the message pump
     while ( gKeepRunning ) {
-#ifdef WIN32
-        MSG msg;
-        if (GetMessage(&msg, NULL, 0, 0)) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-        else
-            gKeepRunning = FALSE;
-#elif XP_MAC
-        /* Mac stuff is missing here! */
-#elif XP_OS2
-        QMSG qmsg;
-        if (WinGetMsg(0, &qmsg, 0, 0, 0))
-            WinDispatchMsg(0, &qmsg);
-        else
-            gKeepRunning = FALSE;
-#else
         PLEvent *gEvent;
-        rv = gEventQ->WaitForEvent(&gEvent);
-        rv = gEventQ->HandleEvent(gEvent);
-#endif
+        gEventQ->WaitForEvent(&gEvent);
+        gEventQ->HandleEvent(gEvent);
     }
 
     PRTime endTime; 
diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp
index 0484b05a591..1e148542afe 100644
--- a/mozilla/netwerk/test/TestProtocols.cpp
+++ b/mozilla/netwerk/test/TestProtocols.cpp
@@ -645,24 +645,9 @@ main(int argc, char* argv[])
         }
       // Enter the message pump to allow the URL load to proceed.
         while ( gKeepRunning ) {
-#ifdef WIN32
-            MSG msg;
-
-            if (GetMessage(&msg, NULL, 0, 0)) {
-                TranslateMessage(&msg);
-                DispatchMessage(&msg);
-            } else {
-                gKeepRunning = 0;
-            }
-#else
-#ifdef XP_MAC
-            /* Mac stuff is missing here! */
-#else
             PLEvent *gEvent;
-            rv = gEventQ->WaitForEvent(&gEvent);
-            rv = gEventQ->HandleEvent(gEvent);
-#endif /* XP_UNIX */
-#endif /* !WIN32 */
+            gEventQ->WaitForEvent(&gEvent);
+            gEventQ->HandleEvent(gEvent);
         }
     } // this scopes the nsCOMPtrs
     // no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp
index 62a3fc8a483..9d6bbcd28ad 100644
--- a/mozilla/netwerk/test/TestSocketIO.cpp
+++ b/mozilla/netwerk/test/TestSocketIO.cpp
@@ -343,27 +343,9 @@ main(int argc, char* argv[])
 
         // Enter the message pump to allow the URL load to proceed.
         while ( gKeepRunning ) {
-#ifdef WIN32
-            MSG msg;
-            if (GetMessage(&msg, NULL, 0, 0)) {
-                TranslateMessage(&msg);
-                DispatchMessage(&msg);
-            }
-            else
-                gKeepRunning = FALSE;
-#elif XP_MAC
-            /* Mac stuff is missing here! */
-#elif XP_OS2
-            QMSG qmsg;
-            if (WinGetMsg(0, &qmsg, 0, 0, 0))
-                WinDispatchMsg(0, &qmsg);
-            else
-                gKeepRunning = FALSE;
-#else
             PLEvent *gEvent;
-            rv = gEventQ->WaitForEvent(&gEvent);
-            rv = gEventQ->HandleEvent(gEvent);
-#endif
+            gEventQ->WaitForEvent(&gEvent);
+            gEventQ->HandleEvent(gEvent);
         }
     }
     else {
diff --git a/mozilla/netwerk/test/TestSocketInput.cpp b/mozilla/netwerk/test/TestSocketInput.cpp
index ba07ab71536..b3cdb7fcdae 100644
--- a/mozilla/netwerk/test/TestSocketInput.cpp
+++ b/mozilla/netwerk/test/TestSocketInput.cpp
@@ -183,31 +183,9 @@ main(int argc, char* argv[])
 
     // Enter the message pump to allow the URL load to proceed.
     while ( gKeepRunning ) {
-#ifdef WIN32
-      MSG msg;
-
-      if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-      }
-#else
-#ifdef XP_MAC
-      /* Mac stuff is missing here! */
-#else
-#ifdef XP_OS2
-      QMSG qmsg;
-
-      if (WinGetMsg(0, &qmsg, 0, 0, 0))
-        WinDispatchMsg(0, &qmsg);
-      else
-        gKeepRunning = FALSE;
-#else
       PLEvent *gEvent;
-      rv = eventQ->GetEvent(&gEvent);
-      rv = eventQ->HandleEvent(gEvent);
-#endif
-#endif
-#endif
+      eventQ->WaitForEvent(&gEvent);
+      eventQ->HandleEvent(gEvent);
     }
 
   } // this scopes the nsCOMPtrs
diff --git a/mozilla/netwerk/test/TestUpload.cpp b/mozilla/netwerk/test/TestUpload.cpp
index f66b1f5d982..50ae63d6a67 100644
--- a/mozilla/netwerk/test/TestUpload.cpp
+++ b/mozilla/netwerk/test/TestUpload.cpp
@@ -190,31 +190,16 @@ main(int argc, char* argv[])
         listener = new InputTestConsumer;
         if (!listener) {
             NS_ERROR("Failed to create a new stream listener!");
-            return -1;;
+            return -1;
         }
         NS_ADDREF(listener);
 
         channel->AsyncOpen(listener, nsnull);
 
         while ( gKeepRunning ) {
-#ifdef WIN32
-            MSG msg;
-
-            if (GetMessage(&msg, NULL, 0, 0)) {
-                TranslateMessage(&msg);
-                DispatchMessage(&msg);
-            } else {
-                gKeepRunning = 0;
-            }
-#else
-#ifdef XP_MAC
-            /* Mac stuff is missing here! */
-#else
             PLEvent *gEvent;
-            rv = gEventQ->WaitForEvent(&gEvent);
-            rv = gEventQ->HandleEvent(gEvent);
-#endif /* XP_UNIX */
-#endif /* !WIN32 */
+            gEventQ->WaitForEvent(&gEvent);
+            gEventQ->HandleEvent(gEvent);
         }
     } // this scopes the nsCOMPtrs
     // no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM