diff --git a/eventlet/green/threading.py b/eventlet/green/threading.py
index bc13c8a..4db23af 100644
--- a/eventlet/green/threading.py
+++ b/eventlet/green/threading.py
@@ -36,33 +36,23 @@ class _GreenThread(object):
     def join(self, timeout=None):
         return self._g.wait()
 
-    @property
-    def name(self):
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        self._name = str(name)
-
     def getName(self):
-        return self.name
+        return self._name
     get_name = getName
 
     def setName(self, name):
-        self.name = name
+        self._name = str(name)
     set_name = setName
 
-    @property
-    def ident(self):
-        return id(self._g)
+    name = property(getName, setName)
+
+    ident = property(lambda self: id(self._g))
 
     def isAlive(self):
         return True
     is_alive = isAlive
 
-    @property
-    def daemon(self):
-        return True
+    daemon = property(lambda self: True)
 
     def isDaemon(self):
         return self.daemon
@@ -111,7 +101,7 @@ def current_thread():
             # Not a GreenThread type, so there's no way to hook into
             # the green thread exiting. Fall back to the standard
             # function then.
-            t = _fixup_thread(__orig_threading.current_thread())
+            t = _fixup_thread(__orig_threading.currentThread())
         else:
             t = active[id(g)] = _GreenThread(g)
 
diff --git a/eventlet/green/zmq.py b/eventlet/green/zmq.py
index 5f379e7..5fcd7e4 100644
--- a/eventlet/green/zmq.py
+++ b/eventlet/green/zmq.py
@@ -1,5 +1,8 @@
 """The :mod:`zmq` module wraps the :class:`Socket` and :class:`Context` found in :mod:`pyzmq <zmq>` to be non blocking
 """
+
+from __future__ import with_statement
+
 __zmq__ = __import__('zmq')
 from eventlet import hubs
 from eventlet.patcher import slurp_properties
diff --git a/tests/hub_test.py b/tests/hub_test.py
index aa5aceb..70789e6 100644
--- a/tests/hub_test.py
+++ b/tests/hub_test.py
@@ -1,3 +1,5 @@
+from __future__ import with_statement
+
 from tests import LimitedTestCase, main, skip_with_pyevent, skip_if_no_itimer
 import time
 import eventlet
diff --git a/tests/zmq_test.py b/tests/zmq_test.py
index 107a339..b19d1a5 100644
--- a/tests/zmq_test.py
+++ b/tests/zmq_test.py
@@ -1,3 +1,5 @@
+from __future__ import with_statement
+
 from eventlet import event, spawn, sleep, patcher, semaphore
 from eventlet.hubs import get_hub, _threadlocal, use_hub
 from nose.tools import *
diff --git a/tox.ini b/tox.ini
index 2e510fe..1b3f7b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27
+envlist = py25,py26,py27
 
 [testenv]
 deps = nose
@@ -9,6 +9,14 @@ commands =
              eventlet/pool.py eventlet/pools.py eventlet/proc.py \
              eventlet/queue.py eventlet/timeout.py
 
+[testenv:py25selects]
+basepython = python2.5
+setenv = EVENTLET_HUB = selects
+
+[testenv:py25poll]
+basepython = python2.5
+setenv = EVENTLET_HUB = poll
+
 [testenv:py26selects]
 basepython = python2.6
 setenv = EVENTLET_HUB = selects