diff --git a/src/modules/files/socktest.pike b/src/modules/files/socktest.pike
index 623689a9110bb62bc6bf42c86f6ea688d36f6779..425c667041a3eca55a35422108a449cae9d82f90 100755
--- a/src/modules/files/socktest.pike
+++ b/src/modules/files/socktest.pike
@@ -1,6 +1,6 @@
 #!/usr/local/bin/pike
 
-/* $Id: socktest.pike,v 1.9 1998/04/06 04:34:05 hubbe Exp $ */
+/* $Id: socktest.pike,v 1.10 1998/04/14 18:56:23 hubbe Exp $ */
 
 import Stdio;
 import String;
@@ -311,14 +311,14 @@ int main()
 {
   if(!port1::bind(0, accept_callback))
   {
-    werror("Bind failed.\n");
+    werror("Bind failed. (%d)\n",port1::errno());
     exit(1);
   }
   sscanf(port1::query_address(),"%*s %d",portno1);
 
   if(!port2::bind(0))
   {
-    werror("Bind failed.\n");
+    werror("Bind failed. (%d)\n",port2::errno());
     exit(1);
   }
 
diff --git a/src/modules/files/testsuite.in b/src/modules/files/testsuite.in
index 54f8bff264a6c7eca0d9dfde3f99f263e02d4159..b3aa004b0c09196e237828b576487ec896e701cf 100644
--- a/src/modules/files/testsuite.in
+++ b/src/modules/files/testsuite.in
@@ -19,16 +19,16 @@ test_true(rm("conftest"))
 test_eq(file_stat("conftest"),0)
 
 // - file->write
-test_any(int e; object o=clone(Stdio.File); if(!o->open("conftest","wct")) return -3; e=o->write("sune"); if(!o->close()) return -2; return e,4)
+test_any(int e; object o=clone(Stdio.File); if(!o->open("conftest","wct")) return "open"+o->errno(); e=o->write("sune"); if(!o->close()) return "close"+o->errno(); return e,4)
 
 // - file->read
-test_any(string s; object o=clone(Stdio.File); if(!o->open("conftest","r")) return -1; s=o->read(4); if(!o->close()) return -1; return s,"sune")
+test_any(string s; object o=clone(Stdio.File); if(!o->open("conftest","r")) return "open"+o->errno(); s=o->read(4); if(!o->close()) return "close"+o->errno(); return s,"sune")
 
-test_any(string s; object o=clone(Stdio.File); if(!o->open("conftest","r")) return -1; s=o->read(999999); if(!o->close()) return -1; return s,"sune")
+test_any(string s; object o=clone(Stdio.File); if(!o->open("conftest","r")) return "open"+o->errno(); s=o->read(999999); if(!o->close()) return "close"+o->errno(); return s,"sune")
 
-test_any(int e; object o=clone(Stdio.File); if(!o->open("conftest","wct")) return -1; e=o->write(sprintf("%'+-*'100000s","")); if(!o->close()) return -1; return e,100000)
+test_any(int e; object o=clone(Stdio.File); if(!o->open("conftest","wct")) return "open"+o->errno(); e=o->write(sprintf("%'+-*'100000s","")); if(!o->close()) return "close"+o->errno(); return e,100000)
 
-test_any(string s; object o=clone(Stdio.File); if(!o->open("conftest","r")) return -1; s=o->read(9999999); if(!o->close()) return -1; return s,sprintf("%'+-*'100000s",""))
+test_any(string s; object o=clone(Stdio.File); if(!o->open("conftest","r")) return "open"+o->errno(); s=o->read(9999999); if(!o->close()) return "close"+o->errno(); return s,sprintf("%'+-*'100000s",""))
 
 // - file->seek
 // - file->tell