diff --git a/data/buildlogs.py b/data/buildlogs.py
index b33f25559..d2904fbc8 100644
--- a/data/buildlogs.py
+++ b/data/buildlogs.py
@@ -17,7 +17,7 @@ class RedisBuildLogs(object):
   PHASE = 'phase'
 
   def __init__(self, redis_host):
-    self._redis = redis.StrictRedis(host=redis_host, socket_timeout=5)
+    self._redis = redis.StrictRedis(host=redis_host, socket_connect_timeout=5)
 
   @staticmethod
   def _logs_key(build_id):
diff --git a/data/userevent.py b/data/userevent.py
index d137eac04..b732a6e12 100644
--- a/data/userevent.py
+++ b/data/userevent.py
@@ -44,7 +44,7 @@ class UserEvent(object):
   as backed by Redis.
   """
   def __init__(self, redis_host, username):
-    self._redis = redis.StrictRedis(host=redis_host, socket_timeout=5)
+    self._redis = redis.StrictRedis(host=redis_host, socket_connect_timeout=5)
     self._username = username
 
   @staticmethod
@@ -77,7 +77,7 @@ class UserEventListener(object):
   def __init__(self, redis_host, username, events=set([])):
     channels = [self._user_event_key(username, e) for e in events]
 
-    self._redis = redis.StrictRedis(host=redis_host, socket_timeout=5)
+    self._redis = redis.StrictRedis(host=redis_host, socket_connect_timeout=5)
     self._pubsub = self._redis.pubsub()
     self._pubsub.subscribe(channels)