Clean up imports
diff --git a/tests/test_json_model.py b/tests/test_json_model.py
index 88f2400..fc92654 100644
--- a/tests/test_json_model.py
+++ b/tests/test_json_model.py
@@ -21,12 +21,13 @@
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
-from apiclient.model import JsonModel
-from apiclient.errors import HttpError
import os
import unittest
import httplib2
+from apiclient.model import JsonModel
+from apiclient.errors import HttpError
+
# Python 2.5 requires different modules
try:
from urlparse import parse_qs
diff --git a/tests/test_mocks.py b/tests/test_mocks.py
index 2c66aab..f2da9d9 100644
--- a/tests/test_mocks.py
+++ b/tests/test_mocks.py
@@ -21,15 +21,15 @@
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
+import httplib2
+import os
+import unittest
+
from apiclient.errors import HttpError
from apiclient.discovery import build
from apiclient.http import RequestMockBuilder
from apiclient.http import HttpMock
-import httplib2
-import os
-import unittest
-
DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
diff --git a/tests/test_oauth2client.py b/tests/test_oauth2client.py
index 9f30eff..6832739 100644
--- a/tests/test_oauth2client.py
+++ b/tests/test_oauth2client.py
@@ -22,8 +22,10 @@
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
+import httplib2
import unittest
import urlparse
+
try:
from urlparse import parse_qs
except ImportError: