diff --git a/eventlet/green/select.py b/eventlet/green/select.py
index fdc5ec5..060f355 100644
--- a/eventlet/green/select.py
+++ b/eventlet/green/select.py
@@ -11,7 +11,10 @@ def get_fileno(obj):
             raise TypeError("Expected int or long, got " + type(obj))
         return obj
     else:
-        return f()
+        rv = f()
+        if not isinstance(rv, (int, long)):
+            raise TypeError("Expected int or long, got " + type(rv))
+        return rv
 
 def select(read_list, write_list, error_list, timeout=None):
     hub = get_hub()
diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py
index a6e7dfa..2a38621 100644
--- a/eventlet/hubs/poll.py
+++ b/eventlet/hubs/poll.py
@@ -56,7 +56,7 @@ class Hub(BaseHub):
         super(Hub, self).remove_descriptor(fileno)
         try:
             self.poll.unregister(fileno)
-        except KeyError:
+        except (KeyError, ValueError):
             pass
 
     def wait(self, seconds=None):
diff --git a/tests/tpool_test.py b/tests/tpool_test.py
index ef55acd..e426bd1 100644
--- a/tests/tpool_test.py
+++ b/tests/tpool_test.py
@@ -26,8 +26,10 @@ one = 1
 two = 2
 three = 3
 
+def noop():
+    pass
+
 class TestTpool(LimitedTestCase):
-    TEST_TIMEOUT=3
     def setUp(self):
         tpool.setup()
         debug.hub_exceptions(True)
@@ -38,33 +40,6 @@ class TestTpool(LimitedTestCase):
         tpool.killall()
         debug.hub_exceptions(False)
 
-    @skip_with_pyevent
-    def test_a_buncha_stuff(self):
-        assert_ = self.assert_
-        class Dummy(object):
-            def foo(self,when,token=None):
-                assert_(token is not None)
-                time.sleep(random.random()/200.0)
-                return token
-        
-        def sender_loop(loopnum):
-            obj = tpool.Proxy(Dummy())
-            count = 100
-            for n in xrange(count):
-                api.sleep(random.random()/200.0)
-                now = time.time()
-                token = loopnum * count + n
-                rv = obj.foo(now,token=token)
-                self.assertEquals(token, rv)
-                api.sleep(random.random()/200.0)
-
-        pile = eventlet.GreenPile(10)
-        for i in xrange(10):
-            pile.spawn(sender_loop,i)
-        results = list(pile)
-        self.assertEquals(len(results), 10)
-            
-
     @skip_with_pyevent
     def test_wrap_tuple(self):
         my_tuple = (1, 2)
@@ -189,35 +164,56 @@ class TestTpool(LimitedTestCase):
     def test_killall(self):
         tpool.killall()
         tpool.setup()
+
+
+class TpoolLongTests(LimitedTestCase):
+    TEST_TIMEOUT=60
+    @skip_with_pyevent
+    def test_a_buncha_stuff(self):
+        assert_ = self.assert_
+        class Dummy(object):
+            def foo(self,when,token=None):
+                assert_(token is not None)
+                time.sleep(random.random()/200.0)
+                return token
+        
+        def sender_loop(loopnum):
+            obj = tpool.Proxy(Dummy())
+            count = 100
+            for n in xrange(count):
+                api.sleep(random.random()/200.0)
+                now = time.time()
+                token = loopnum * count + n
+                rv = obj.foo(now,token=token)
+                self.assertEquals(token, rv)
+                api.sleep(random.random()/200.0)
+
+        pile = eventlet.GreenPile(10)
+        for i in xrange(10):
+            pile.spawn(sender_loop,i)
+        results = list(pile)
+        self.assertEquals(len(results), 10)
         
     @skipped
     def test_benchmark(self):
         """ Benchmark computing the amount of overhead tpool adds to function calls."""
         iterations = 10000
-        def bench(f, *args, **kw):
-            for i in xrange(iterations):
-                f(*args, **kw)
-        def noop():
-            pass
+        import timeit
+        imports = """
+from tests.tpool_test import noop
+from eventlet.tpool import execute
+        """
+        t = timeit.Timer("noop()", imports)
+        results = t.repeat(repeat=3, number=iterations)
+        best_normal = min(results)
 
-        normal_results = []
-        tpool_results = []
-        for i in xrange(3):
-            start = time.time()
-            bench(noop)
-            end = time.time()
-            normal_results.append(end-start)
+        t = timeit.Timer("execute(noop)", imports)
+        results = t.repeat(repeat=3, number=iterations)
+        best_tpool = min(results)
 
-            start = time.time()
-            bench(tpool.execute, noop)
-            end = time.time()
-            tpool_results.append(end-start)
-
-        avg_normal = sum(normal_results)/len(normal_results)
-        avg_tpool =  sum(tpool_results)/len(tpool_results)
-        tpool_overhead = (avg_tpool-avg_normal)/iterations
+        tpool_overhead = (best_tpool-best_normal)/iterations
         print "%s iterations\nTpool overhead is %s seconds per call.  Normal: %s; Tpool: %s" % (
-            iterations, tpool_overhead, normal_results, tpool_results)
+            iterations, tpool_overhead, best_normal, best_tpool)
 
 
 if __name__ == '__main__':