6 files changed, 38 insertions, 24 deletions
diff --git a/test/test_client_integration.py b/test/test_client_integration.py
index b33d17c..ba84ef6 100644
--- a/test/test_client_integration.py
+++ b/test/test_client_integration.py
@@ -4,8 +4,9 @@ import unittest2
 
 import kafka
 from kafka.common import *
-from test.fixtures import ZookeeperFixture, KafkaFixture
-from test.testutil import *
+
+from .fixtures import ZookeeperFixture, KafkaFixture
+from .testutil import *
 
 class TestKafkaClientIntegration(KafkaIntegrationTestCase):
     @classmethod
diff --git a/test/test_consumer_integration.py b/test/test_consumer_integration.py
index 44dafe4..2405faf 100644
--- a/test/test_consumer_integration.py
+++ b/test/test_consumer_integration.py
@@ -1,11 +1,14 @@
-import os
 from datetime import datetime
+import os
 
-from kafka import *  # noqa
-from kafka.common import *  # noqa
+from kafka import SimpleConsumer, MultiProcessConsumer, create_message
+from kafka.common import ProduceRequest, ConsumerFetchSizeTooSmall
 from kafka.consumer import MAX_FETCH_BUFFER_SIZE_BYTES
-from fixtures import ZookeeperFixture, KafkaFixture
-from testutil import *
+
+from test.fixtures import ZookeeperFixture, KafkaFixture
+from test.testutil import (
+    KafkaIntegrationTestCase, kafka_versions, random_string, Timer
+)
 
 class TestConsumerIntegration(KafkaIntegrationTestCase):
     @classmethod
diff --git a/test/test_failover_integration.py b/test/test_failover_integration.py
index 6c0e662..49a98a8 100644
--- a/test/test_failover_integration.py
+++ b/test/test_failover_integration.py
@@ -3,11 +3,14 @@ import os
 import time
 import unittest2
 
-from kafka import *  # noqa
-from kafka.common import *  # noqa
+from kafka import KafkaClient, SimpleConsumer
+from kafka.common import TopicAndPartition, FailedPayloadsError
 from kafka.producer import Producer
-from fixtures import ZookeeperFixture, KafkaFixture
-from testutil import *
+
+from test.fixtures import ZookeeperFixture, KafkaFixture
+from test.testutil import (
+    KafkaIntegrationTestCase, kafka_versions, random_string
+)
 
 
 class TestFailover(KafkaIntegrationTestCase):
diff --git a/test/test_producer_integration.py b/test/test_producer_integration.py
index 7d3a180..edffa5e 100644
--- a/test/test_producer_integration.py
+++ b/test/test_producer_integration.py
@@ -2,11 +2,18 @@ import os
 import time
 import uuid
 
-from kafka import *  # noqa
-from kafka.common import *  # noqa
+from kafka import (
+    SimpleProducer, KeyedProducer,
+    create_message, create_gzip_message, create_snappy_message,
+    RoundRobinPartitioner, HashedPartitioner
+)
+from kafka.common import (
+    FetchRequest, ProduceRequest, UnknownTopicOrPartitionError
+)
 from kafka.codec import has_gzip, has_snappy
-from fixtures import ZookeeperFixture, KafkaFixture
-from testutil import *
+
+from test.fixtures import ZookeeperFixture, KafkaFixture
+from test.testutil import KafkaIntegrationTestCase, kafka_versions
 
 class TestKafkaProducerIntegration(KafkaIntegrationTestCase):
     topic = 'produce_topic'
diff --git a/test/test_protocol.py b/test/test_protocol.py
index 2089f48..b1c5201 100644
--- a/test/test_protocol.py
+++ b/test/test_protocol.py
@@ -1,10 +1,8 @@
-import contextlib
-from contextlib import contextmanager
+from contextlib import contextmanager, nested
 import struct
-import unittest2
 
-import mock
-from mock import sentinel
+import unittest2
+from mock import patch, sentinel
 
 from kafka import KafkaClient
 from kafka.common import (
@@ -701,12 +699,12 @@ class TestProtocol(unittest2.TestCase):
 
     @contextmanager
     def mock_create_message_fns(self):
-        patches = contextlib.nested(
-            mock.patch.object(kafka.protocol, "create_message",
+        patches = nested(
+            patch.object(kafka.protocol, "create_message",
                               return_value=sentinel.message),
-            mock.patch.object(kafka.protocol, "create_gzip_message",
+            patch.object(kafka.protocol, "create_gzip_message",
                               return_value=sentinel.gzip_message),
-            mock.patch.object(kafka.protocol, "create_snappy_message",
+            patch.object(kafka.protocol, "create_snappy_message",
                               return_value=sentinel.snappy_message),
         )
 
diff --git a/test/test_util.py b/test/test_util.py
index 7b5f294..dbc3fe6 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import struct
+
 import unittest2
+
 import kafka.util
 import kafka.common