6 files changed, 12 insertions, 10 deletions
diff --git a/pygithub3/tests/requests/test_core.py b/pygithub3/tests/requests/test_core.py
index 68663c0..9e38763 100644
--- a/pygithub3/tests/requests/test_core.py
+++ b/pygithub3/tests/requests/test_core.py
@@ -7,9 +7,9 @@ from mock import Mock
 from pygithub3.requests import Factory, Body, json, Request
 from pygithub3.exceptions import (UriInvalid, DoesNotExists, ValidationError,
                                   InvalidBodySchema)
-from pygithub3.tests.utils.base import mock_json
+from pygithub3.tests.utils.base import mock_json, DummyRequest
 from pygithub3.tests.utils.requests import (
-    RequestWithArgs, RequestCleanedUri, RequestBodyInvalidSchema, DummyRequest,
+    RequestWithArgs, RequestCleanedUri, RequestBodyInvalidSchema,
     RequestCleanedBody)
 
 json.dumps = Mock(side_effect=mock_json)
diff --git a/pygithub3/tests/services/test_core.py b/pygithub3/tests/services/test_core.py
index ccddee7..007f94f 100644
--- a/pygithub3/tests/services/test_core.py
+++ b/pygithub3/tests/services/test_core.py
@@ -6,10 +6,10 @@ from mock import patch
 
 import requests
 
-from pygithub3.services.base import Service
+from pygithub3.services.base import Service, MimeTypeMixin
 from pygithub3.core.result import Result
 from pygithub3.tests.utils.base import DummyRequest, mock_response
-from .utils import _
+from pygithub3.tests.utils.services import _, DummyService
 
 
 @patch.object(requests.sessions.Session, 'request')
diff --git a/pygithub3/tests/services/test_repos.py b/pygithub3/tests/services/test_repos.py
index f8414d5..963e12a 100644
--- a/pygithub3/tests/services/test_repos.py
+++ b/pygithub3/tests/services/test_repos.py
@@ -8,8 +8,9 @@ from mock import patch, Mock
 
 from pygithub3.services.repos import Repo, Collaborator, Commits
 from pygithub3.resources.base import json
-from pygithub3.tests.utils.base import mock_response, mock_response_result
-from pygithub3.tests.utils.services import _, mock_json
+from pygithub3.tests.utils.base import (mock_response, mock_response_result,
+                                        mock_json)
+from pygithub3.tests.utils.services import _
 
 json.dumps = Mock(side_effect=mock_json)
 json.loads = Mock(side_effect=mock_json)
diff --git a/pygithub3/tests/services/test_users.py b/pygithub3/tests/services/test_users.py
index 0438f99..049197b 100644
--- a/pygithub3/tests/services/test_users.py
+++ b/pygithub3/tests/services/test_users.py
@@ -10,8 +10,9 @@ from pygithub3.core.client import Client
 from pygithub3.services.users import User, Emails, Followers, Keys
 from pygithub3.exceptions import ValidationError
 from pygithub3.resources.base import json
-from pygithub3.tests.utils.base import mock_response, mock_response_result
-from pygithub3.tests.utils.services import _, mock_json
+from pygithub3.tests.utils.base import (mock_response, mock_response_result,
+                                        mock_json)
+from pygithub3.tests.utils.services import _
 
 json.dumps = Mock(side_effect=mock_json)
 json.loads = Mock(side_effect=mock_json)
diff --git a/pygithub3/tests/utils/requests.py b/pygithub3/tests/utils/requests.py
index cc92768..8dd53da 100644
--- a/pygithub3/tests/utils/requests.py
+++ b/pygithub3/tests/utils/requests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from .base import Request, DummyResource, DummyRequest
+from .base import Request
 from pygithub3.exceptions import ValidationError
 
 
diff --git a/pygithub3/tests/utils/resources.py b/pygithub3/tests/utils/resources.py
index 46a9d53..d9e4975 100644
--- a/pygithub3/tests/utils/resources.py
+++ b/pygithub3/tests/utils/resources.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from pygithub3.resources.base import Resource
+from .base import Resource
 
 
 class Simple(Resource):