diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py
index 84a260f..a84a572 100644
--- a/eventlet/hubs/poll.py
+++ b/eventlet/hubs/poll.py
@@ -28,7 +28,7 @@ import time
 
 from eventlet.hubs import hub
 
-EXC_MASK = select.POLLERR | select.POLLHUP | select.POLLNVAL
+EXC_MASK = select.POLLERR | select.POLLHUP
 READ_MASK = select.POLLIN
 WRITE_MASK = select.POLLOUT
 
diff --git a/tests/greenio_test.py b/tests/greenio_test.py
index 466322b..f9ddbe2 100644
--- a/tests/greenio_test.py
+++ b/tests/greenio_test.py
@@ -144,17 +144,13 @@ class TestGreenIo(LimitedTestCase):
         large_evt.wait()
         client.close()
      
-        
-    @skipped
     def test_sendall(self):
         # test adapted from Brian Brunswick's email
-        # It spawns off a coroutine that tries to write varying amounts of data
-        # to a socket that the main coroutine is reading from; then it sends a
-        # small amount of data over the same socket.  We verify that both quantities
-        # of data are received correctly, and do so for a varying number of bytes sent.
+        # it may legitimately take a while, but will eventually complete
+        self.timer.cancel()
         second_bytes = 10
         def test_sendall_impl(many_bytes):
-            bufsize = max(many_bytes/45, 2)
+            bufsize = max(many_bytes/15, 2)
             def sender(listener):
                 (sock, addr) = listener.accept()
                 sock = bufsized(sock, size=bufsize)