diff --git a/helpdesk/forms.py b/helpdesk/forms.py
index f3b28351..f8a89d92 100644
--- a/helpdesk/forms.py
+++ b/helpdesk/forms.py
@@ -8,10 +8,7 @@ forms.py - Definitions of newforms-based forms for creating and maintaining
 """
 from django.core.exceptions import ObjectDoesNotExist
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from django.utils.six import StringIO
 
 from django import forms
 from django.forms import extras
diff --git a/helpdesk/models.py b/helpdesk/models.py
index c3effa5c..9e02da2b 100644
--- a/helpdesk/models.py
+++ b/helpdesk/models.py
@@ -1388,7 +1388,7 @@ class CustomField(models.Model):
     )
 
     def _choices_as_array(self):
-        from StringIO import StringIO
+        from django.utils.six import StringIO
         valuebuffer = StringIO(self.list_values)
         choices = [[item.strip(), item.strip()] for item in valuebuffer.readlines()]
         valuebuffer.close()