Merge "Use six.moves.urllib.parse instead of urlparse"
diff --git a/test-requirements.txt b/test-requirements.txt
index 34a7a6b..875a821 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@
discover
fixtures>=0.3.14
python-subunit
+six>=1.4.1
testrepository>=0.0.17
testtools>=0.9.32
sphinxcontrib-programoutput
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 9576440..4a4d6de 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -34,11 +34,11 @@
import time
import urllib
import urllib2
-import urlparse
import git
import gear
import fixtures
+import six.moves.urllib.parse as urlparse
import statsd
import testtools