diff --git a/bijoe/hobo_agent/management/commands/hobo_deploy.py b/bijoe/hobo_agent/management/commands/hobo_deploy.py
index 6deb9ab..c4f0c10 100644
--- a/bijoe/hobo_agent/management/commands/hobo_deploy.py
+++ b/bijoe/hobo_agent/management/commands/hobo_deploy.py
@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import urlparse
 
 from django.utils.six.moves import configparser as ConfigParser
+from django.utils.six.moves.urllib import parse as urlparse
 
 from tenant_schemas.utils import tenant_context
 from hobo.agent.common.management.commands import hobo_deploy
diff --git a/bijoe/visualization/signature.py b/bijoe/visualization/signature.py
index 688fb63..659ee8f 100644
--- a/bijoe/visualization/signature.py
+++ b/bijoe/visualization/signature.py
@@ -20,9 +20,10 @@ import hmac
 import hashlib
 import urllib
 import random
-import urlparse
 import logging
 
+from django.utils.six.moves.urllib import parse as urlparse
+
 
 '''Simple signature scheme for query strings'''
 # from http://repos.entrouvert.org/portail-citoyen.git/tree/portail_citoyen/apps/data_source_plugin/signature.py