diff --git a/accountsplus/admin.py b/accountsplus/admin.py
index ed0bb1f..8919843 100644
--- a/accountsplus/admin.py
+++ b/accountsplus/admin.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.core.exceptions
 import django.shortcuts
 import django.http
@@ -21,8 +19,8 @@
 from django.conf import settings
 from django.apps import apps
 
-import signals
-import models
+from . import signals
+from . import models
 
 
 sensitive_post_parameters_m = django.utils.decorators.method_decorator(
@@ -185,7 +183,7 @@ def reset_passwords(self, request, queryset):
     reset_passwords.short_description = 'Send password reset emails to selected Users'
 
     def get_timezone(self, obj):
-        return unicode(obj.timezone)
+        return str(obj.timezone)
 
     def masquerade(self, obj):
         return '<a href="{}">sign in</a>'.format(django.urls.reverse('masquerade', kwargs={'user_id': obj.id}))
@@ -314,7 +312,7 @@ def queryset(self, request, queryset):
             return queryset
 
     def lookups(self, request, model_admin):
-        return LogEntryAdmin.ACTION_NAMES.items()
+        return list(LogEntryAdmin.ACTION_NAMES.items())
 
 
 @django.contrib.admin.register(django.contrib.admin.models.LogEntry)
diff --git a/accountsplus/apps.py b/accountsplus/apps.py
index f8f6117..e073873 100644
--- a/accountsplus/apps.py
+++ b/accountsplus/apps.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 
diff --git a/accountsplus/context_processors.py b/accountsplus/context_processors.py
index 6b8b519..f14c10f 100644
--- a/accountsplus/context_processors.py
+++ b/accountsplus/context_processors.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 
 def masquerade_info(request):
     if request.user.is_authenticated():
diff --git a/accountsplus/forms.py b/accountsplus/forms.py
index 6c9fbbc..5007950 100644
--- a/accountsplus/forms.py
+++ b/accountsplus/forms.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.forms
 from django.conf import settings
 from django.apps import apps
diff --git a/accountsplus/middleware.py b/accountsplus/middleware.py
index 3caa62b..8c4ae89 100644
--- a/accountsplus/middleware.py
+++ b/accountsplus/middleware.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import django.utils.timezone
 from django.utils.deprecation import MiddlewareMixin
 
diff --git a/accountsplus/models.py b/accountsplus/models.py
index 2f6d487..1b84588 100644
--- a/accountsplus/models.py
+++ b/accountsplus/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/accountsplus/signals.py b/accountsplus/signals.py
index b7bf566..5c7db9e 100644
--- a/accountsplus/signals.py
+++ b/accountsplus/signals.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.contrib.auth.signals
 from django.dispatch import receiver, Signal
 from django.conf import settings
diff --git a/accountsplus/tests/test_admin.py b/accountsplus/tests/test_admin.py
index edc1a87..85e6bb9 100644
--- a/accountsplus/tests/test_admin.py
+++ b/accountsplus/tests/test_admin.py
@@ -1,12 +1,9 @@
-from __future__ import unicode_literals
-
-import django.test
 import django.contrib.admin
 
 import logging
 
 from .. import admin
-from test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent, )
+from .test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent, )
 
 
 logging.disable(logging.CRITICAL)
diff --git a/accountsplus/tests/test_context_processors.py b/accountsplus/tests/test_context_processors.py
index 8bd1eda..d740b22 100644
--- a/accountsplus/tests/test_context_processors.py
+++ b/accountsplus/tests/test_context_processors.py
@@ -4,7 +4,7 @@
 import django.test.client
 import django.utils.timezone
 
-from test_models import (UnitTestCompany, UnitTestUser)
+from .test_models import (UnitTestCompany, UnitTestUser)
 
 
 logging.disable(logging.CRITICAL)
diff --git a/accountsplus/tests/test_middleware.py b/accountsplus/tests/test_middleware.py
index 162743d..09fc2dd 100644
--- a/accountsplus/tests/test_middleware.py
+++ b/accountsplus/tests/test_middleware.py
@@ -7,7 +7,7 @@
 import pytz
 
 from .. import middleware
-from test_models import (UnitTestCompany, UnitTestUser, )
+from .test_models import (UnitTestCompany, UnitTestUser, )
 
 
 logging.disable(logging.CRITICAL)
diff --git a/accountsplus/tests/test_models.py b/accountsplus/tests/test_models.py
index d9382c3..af1c58e 100644
--- a/accountsplus/tests/test_models.py
+++ b/accountsplus/tests/test_models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.core.mail
 import django.db.models
diff --git a/accountsplus/tests/test_signals.py b/accountsplus/tests/test_signals.py
index e23eaf4..4820442 100644
--- a/accountsplus/tests/test_signals.py
+++ b/accountsplus/tests/test_signals.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.test.utils
 
@@ -10,7 +8,7 @@
 import accountsplus.signals
 
 from .. import signals, models
-from test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent)
+from .test_models import (UnitTestCompany, UnitTestUser, UnitTestAuditLogEvent)
 
 logging.disable(logging.CRITICAL)
 
diff --git a/accountsplus/tests/test_urls.py b/accountsplus/tests/test_urls.py
index cc649bd..693824c 100644
--- a/accountsplus/tests/test_urls.py
+++ b/accountsplus/tests/test_urls.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.shortcuts
 import django.conf.urls
diff --git a/accountsplus/tests/test_views.py b/accountsplus/tests/test_views.py
index b12d2c6..28828fa 100644
--- a/accountsplus/tests/test_views.py
+++ b/accountsplus/tests/test_views.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.test
 import django.test.utils
 import django.test.client
@@ -9,8 +7,7 @@
 
 import logging
 
-from test_models import (UnitTestCompany, UnitTestUser)
-import test_admin
+from .test_models import (UnitTestCompany, UnitTestUser)
 
 
 logging.disable(logging.CRITICAL)
diff --git a/accountsplus/urls.py b/accountsplus/urls.py
index 56edc40..88a0fbb 100644
--- a/accountsplus/urls.py
+++ b/accountsplus/urls.py
@@ -1,11 +1,9 @@
-from __future__ import unicode_literals
-
 import django.conf.urls
 from django.contrib.auth.urls import url
 import django.contrib.auth.views
 
-import views
-import forms
+from . import views
+from . import forms
 
 urlpatterns = [
     url(r'^logout/$', views.logout_then_login, name='logout'),
diff --git a/accountsplus/views.py b/accountsplus/views.py
index 015afae..fdb9154 100644
--- a/accountsplus/views.py
+++ b/accountsplus/views.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import logging
 
 from django.utils.translation import ugettext as _
@@ -19,9 +18,9 @@
 
 from axes import utils
 
-import signals
-import forms
-import settings
+from . import signals
+from . import forms
+from . import settings
 
 
 logger = logging.getLogger(__name__)
diff --git a/settings_test.py b/settings_test.py
index 23e747a..d1721e0 100644
--- a/settings_test.py
+++ b/settings_test.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import os
 
 
diff --git a/urls.py b/urls.py
index b030bcb..22f88cc 100644
--- a/urls.py
+++ b/urls.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django.conf.urls
 import django.contrib.admin