diff --git a/jet/dashboard/models.py b/jet/dashboard/models.py
index cf43c30c..54549bdf 100644
--- a/jet/dashboard/models.py
+++ b/jet/dashboard/models.py
@@ -1,10 +1,13 @@
 from importlib import import_module
 import json
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from jet.utils import LazyDateTimeEncoder
 
+try:
+    from django.utils.encoding import python_2_unicode_compatible
+except ImportError:
+    from six import python_2_unicode_compatible
 
 @python_2_unicode_compatible
 class UserDashboardModule(models.Model):
diff --git a/jet/dashboard/templates/admin/index.html b/jet/dashboard/templates/admin/index.html
index 228ece54..bb351728 100644
--- a/jet/dashboard/templates/admin/index.html
+++ b/jet/dashboard/templates/admin/index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static jet_dashboard_tags static %}
+{% load i18n static jet_dashboard_tags static %}
 
 {% block html %}{% get_dashboard 'index' as dashboard %}{{ block.super }}{% endblock %}
 
diff --git a/jet/models.py b/jet/models.py
index 8fe97564..e0973739 100644
--- a/jet/models.py
+++ b/jet/models.py
@@ -1,8 +1,11 @@
 from django.db import models
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
+try:
+    from django.utils.encoding import python_2_unicode_compatible
+except ImportError:
+    from six import python_2_unicode_compatible
 
 @python_2_unicode_compatible
 class Bookmark(models.Model):
diff --git a/jet/templates/admin/edit_inline/compact.html b/jet/templates/admin/edit_inline/compact.html
index dd4232ee..52d5a5ac 100644
--- a/jet/templates/admin/edit_inline/compact.html
+++ b/jet/templates/admin/edit_inline/compact.html
@@ -1,4 +1,4 @@
-{% load i18n admin_urls admin_static %}
+{% load i18n admin_urls static %}
 
 <div class="inline-group compact" id="{{ inline_admin_formset.formset.prefix }}-group" data-inline-prefix="{{ inline_admin_formset.formset.prefix }}" data-inline-verbose-name="{{ inline_admin_formset.opts.verbose_name|capfirst }}" data-inline-delete-text="{% trans "Remove" %}">
     <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
diff --git a/jet/templates/rangefilter/date_filter.html b/jet/templates/rangefilter/date_filter.html
index f0e47656..47327ec0 100644
--- a/jet/templates/rangefilter/date_filter.html
+++ b/jet/templates/rangefilter/date_filter.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static %}
 <h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
 <script>
     function datefilter_apply(event, qs_name, form_name){
diff --git a/jet/tests/models.py b/jet/tests/models.py
index 6af5272a..916e70fd 100644
--- a/jet/tests/models.py
+++ b/jet/tests/models.py
@@ -1,6 +1,9 @@
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 
+try:
+    from django.utils.encoding import python_2_unicode_compatible
+except ImportError:
+    from six import python_2_unicode_compatible
 
 @python_2_unicode_compatible
 class TestModel(models.Model):