diff --git a/duedil/search/pro/__init__.py b/duedil/search/pro/__init__.py
index 0a08d37..a195c92 100644
--- a/duedil/search/pro/__init__.py
+++ b/duedil/search/pro/__init__.py
@@ -3,8 +3,12 @@
 from .. import SearchResouceList
 
 from collections import Sequence
-from urllib import urlencode
-import urlparse
+try:
+    from urllib import urlencode
+    import urlparse
+except ImportError:
+    from urllib.parse import urlencode
+    from urllib import parse as urlparse
 
 class ProSearchResourceList(SearchResouceList):
 
diff --git a/setup.py b/setup.py
index 2756a90..fb7409c 100644
--- a/setup.py
+++ b/setup.py
@@ -15,8 +15,9 @@ class PyTest(test_command):
 
     def finalize_options(self):
         test_command.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
+        if sys.version_info.major < 3:
+            self.test_args = []
+            self.test_suite = True
 
     def run_tests(self):
         # import here, cause outside the eggs aren't loaded
@@ -25,7 +26,7 @@ def run_tests(self):
         sys.exit(errno)
 
 
-version = '0.6.0'
+version = '0.6.1'
 
 setup(name='duedil',
       version=version,