diff --git a/kombu/tests/test_compat.py b/kombu/tests/test_compat.py
index 22bd3ae2..9cda0216 100644
--- a/kombu/tests/test_compat.py
+++ b/kombu/tests/test_compat.py
@@ -15,7 +15,7 @@ class test_misc(TestCase):
 
     def test_iterconsume(self):
 
-        class Connection(object):
+        class MyConnection(object):
             drained = 0
 
             def drain_events(self, *args, **kwargs):
@@ -28,7 +28,7 @@ class test_misc(TestCase):
             def consume(self, *args, **kwargs):
                 self.active = True
 
-        conn = Connection()
+        conn = MyConnection()
         consumer = Consumer()
         it = compat._iterconsume(conn, consumer)
         self.assertEqual(it.next(), 1)
diff --git a/kombu/tests/test_transport_redis.py b/kombu/tests/test_transport_redis.py
index 07585bc9..ddc2b2bd 100644
--- a/kombu/tests/test_transport_redis.py
+++ b/kombu/tests/test_transport_redis.py
@@ -436,7 +436,9 @@ class test_Channel(TestCase):
         c.smembers.return_value = []
 
         # We assert, that there should be at least one entry in the table.
-        self.assertRaises(AssertionError, self.channel.get_table, 'celery')
+        with self.assertRaises(AssertionError):
+            self.channel.get_table("celery")
+
 
 class test_Redis(TestCase):
 
diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
index cb1d53bf..62db9ea2 100644
--- a/kombu/transport/redis.py
+++ b/kombu/transport/redis.py
@@ -284,8 +284,9 @@ class Channel(virtual.Channel):
         tables = [tuple(val.split(self.sep))
                     for val in self._avail_client.smembers(
                             self.keyprefix_queue % exchange)]
-        assert len(tables) > 0, 'Queue list empty or key does not exist: %s' % (
-            self.keyprefix_queue % exchange)
+        assert(len(tables) > 0,
+               'Queue list empty or key does not exist: %s' % (
+                    self.keyprefix_queue % exchange))
         return tables
 
     def _purge(self, queue):