diff --git a/mozilla/netwerk/test/TestDBMAccess.cpp b/mozilla/netwerk/test/TestDBMAccess.cpp
index d3adad380e9..3a8223da644 100644
--- a/mozilla/netwerk/test/TestDBMAccess.cpp
+++ b/mozilla/netwerk/test/TestDBMAccess.cpp
@@ -169,12 +169,12 @@ writeFile(int cycles)
     PRIntervalTime time = PR_IntervalNow();
     while (cycles--) {
         // create "cache" directories
-        mkdir("/tmp/foo", 0755);
+        PR_MkDir("/tmp/foo", 0755);
         
         for (x=0; x<32; x++) {
             nsCAutoString filename; filename.Assign("/tmp/foo/");
             filename.AppendInt(x);
-            mkdir(filename, 0755);
+            PR_MkDir(filename, 0755);
         }
         
         // create "cache" files
diff --git a/mozilla/netwerk/test/TestSocketIO.cpp b/mozilla/netwerk/test/TestSocketIO.cpp
index 4264ee2094b..c3d39e784c7 100644
--- a/mozilla/netwerk/test/TestSocketIO.cpp
+++ b/mozilla/netwerk/test/TestSocketIO.cpp
@@ -241,7 +241,11 @@ main(int argc, char* argv[])
 {
   nsresult rv;
 
+#ifdef XP_OS2_VACPP
+    signal(SIGSEGV, (_SigFunc)sighandler);
+#else
     signal(SIGSEGV, sighandler);
+#endif
 
 #if defined(PR_LOGGING)
     gTestSocketIOLog = PR_NewLogModule("TestSocketIO");