diff --git a/src/net/udpsock_test.go b/src/net/udpsock_test.go
index 1f06397ffa..c5a2439d6c 100644
--- a/src/net/udpsock_test.go
+++ b/src/net/udpsock_test.go
@@ -353,21 +353,18 @@ func TestUDPZeroBytePayload(t *testing.T) {
 		if n != 0 {
 			t.Errorf("got %d; want 0", n)
 		}
-		c.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
+		c.SetReadDeadline(time.Now().Add(30 * time.Second))
 		var b [1]byte
+		var name string
 		if genericRead {
 			_, err = c.(Conn).Read(b[:])
-			// Read may timeout, it depends on the platform.
-			if err != nil {
-				if nerr, ok := err.(Error); !ok || !nerr.Timeout() {
-					t.Fatal(err)
-				}
-			}
+			name = "Read"
 		} else {
 			_, _, err = c.ReadFrom(b[:])
-			if err != nil {
-				t.Fatal(err)
-			}
+			name = "ReadFrom"
+		}
+		if err != nil {
+			t.Errorf("%s of zero byte packet failed: %v", name, err)
 		}
 	}
 }