10 files changed, 12 insertions, 13 deletions

diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index 9db4f62d..2b9d73e4 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -3,7 +3,7 @@ from django.conf.urls import patterns, url, include
 from django.contrib.auth.models import User
 from django.http import HttpResponse
 from django.test import TestCase
-from django.utils import unittest
+from django.utils import six, unittest
 from django.utils.http import urlencode
 from rest_framework import HTTP_HEADER_ENCODING
 from rest_framework import exceptions
@@ -20,7 +20,6 @@ from rest_framework.authentication import (
     OAuth2Authentication
 )
 from rest_framework.authtoken.models import Token
-from rest_framework.compat import six
 from rest_framework.compat import oauth2_provider, oauth2_provider_scope
 from rest_framework.compat import oauth, oauth_provider
 from rest_framework.test import APIRequestFactory, APIClient
diff --git a/tests/test_files.py b/tests/test_files.py
index af110df9..de4f71d1 100644
--- a/tests/test_files.py
+++ b/tests/test_files.py
@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 from django.test import TestCase
+from django.utils import six
 from rest_framework import serializers
 from rest_framework.compat import BytesIO
-from rest_framework.compat import six
 import datetime
 
 
diff --git a/tests/test_generics.py b/tests/test_generics.py
index 36832aff..e9f5bebd 100644
--- a/tests/test_generics.py
+++ b/tests/test_generics.py
@@ -2,11 +2,11 @@ from __future__ import unicode_literals
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.test import TestCase
+from django.utils import six
 from rest_framework import generics, renderers, serializers, status
 from rest_framework.test import APIRequestFactory
 from tests.models import BasicModel, Comment, SlugBasedModel
 from tests.models import ForeignKeySource, ForeignKeyTarget
-from rest_framework.compat import six
 
 factory = APIRequestFactory()
 
diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py
index 5a680f99..2edc6b4b 100644
--- a/tests/test_htmlrenderer.py
+++ b/tests/test_htmlrenderer.py
@@ -4,12 +4,12 @@ from django.conf.urls import patterns, url
 from django.http import Http404
 from django.test import TestCase
 from django.template import TemplateDoesNotExist, Template
-import django.template.loader
+from django.utils import six
 from rest_framework import status
 from rest_framework.decorators import api_view, renderer_classes
 from rest_framework.renderers import TemplateHTMLRenderer
 from rest_framework.response import Response
-from rest_framework.compat import six
+import django.template.loader
 
 
 @api_view(('GET',))
diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py
index c051b076..e3f836ed 100644
--- a/tests/test_relations_pk.py
+++ b/tests/test_relations_pk.py
@@ -1,12 +1,12 @@
 from __future__ import unicode_literals
 from django.db import models
 from django.test import TestCase
+from django.utils import six
 from rest_framework import serializers
 from tests.models import (
     BlogPost, ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource,
     NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource,
 )
-from rest_framework.compat import six
 
 
 # ManyToMany
diff --git a/tests/test_renderers.py b/tests/test_renderers.py
index 0403cde2..91244e26 100644
--- a/tests/test_renderers.py
+++ b/tests/test_renderers.py
@@ -6,10 +6,10 @@ from django.conf.urls import patterns, url, include
 from django.core.cache import cache
 from django.db import models
 from django.test import TestCase
-from django.utils import unittest
+from django.utils import six, unittest
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import status, permissions
-from rest_framework.compat import yaml, etree, six, StringIO
+from rest_framework.compat import yaml, etree, StringIO
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \
diff --git a/tests/test_request.py b/tests/test_request.py
index 8b048b5c..8ddaf0a7 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -8,6 +8,7 @@ from django.contrib.auth import authenticate, login, logout
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.core.handlers.wsgi import WSGIRequest
 from django.test import TestCase
+from django.utils import six
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.parsers import (
@@ -21,7 +22,6 @@ from rest_framework.response import Response
 from rest_framework.settings import api_settings
 from rest_framework.test import APIRequestFactory, APIClient
 from rest_framework.views import APIView
-from rest_framework.compat import six
 from io import BytesIO
 import json
 
diff --git a/tests/test_response.py b/tests/test_response.py
index c28f186e..2eff83d3 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 from django.conf.urls import patterns, url, include
 from django.test import TestCase
+from django.utils import six
 from tests.models import BasicModel, BasicModelSerializer
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -14,7 +15,6 @@ from rest_framework.renderers import (
 )
 from rest_framework import viewsets
 from rest_framework.settings import api_settings
-from rest_framework.compat import six
 
 
 class MockPickleRenderer(BaseRenderer):
diff --git a/tests/test_serializers.py b/tests/test_serializers.py
index 09de9f4c..31c41730 100644
--- a/tests/test_serializers.py
+++ b/tests/test_serializers.py
@@ -1,5 +1,5 @@
 from django.test import TestCase
-from rest_framework.compat import six
+from django.utils import six
 from rest_framework.serializers import _resolve_model
 from tests.models import BasicModel
 
diff --git a/tests/utils.py b/tests/utils.py
index a8f2eb0b..28be81bd 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,5 +1,5 @@
 from contextlib import contextmanager
-from rest_framework.compat import six
+from django.utils import six
 from rest_framework.settings import api_settings