diff --git a/bijoe/hobo_agent/management/commands/hobo_deploy.py b/bijoe/hobo_agent/management/commands/hobo_deploy.py
index 285605d..6deb9ab 100644
--- a/bijoe/hobo_agent/management/commands/hobo_deploy.py
+++ b/bijoe/hobo_agent/management/commands/hobo_deploy.py
@@ -16,7 +16,8 @@
 
 import os
 import urlparse
-import ConfigParser
+
+from django.utils.six.moves import configparser as ConfigParser
 
 from tenant_schemas.utils import tenant_context
 from hobo.agent.common.management.commands import hobo_deploy
diff --git a/tests/test_hobo_deploy.py b/tests/test_hobo_deploy.py
index c661541..b38c5b4 100644
--- a/tests/test_hobo_deploy.py
+++ b/tests/test_hobo_deploy.py
@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from contextlib import contextmanager
-import ConfigParser
-
 from psycopg2.extensions import parse_dsn
 
+from django.utils.six.moves import configparser as ConfigParser
+
 from bijoe.hobo_agent.management.commands import hobo_deploy