diff --git a/pymysql/tests/__init__.py b/pymysql/tests/__init__.py
index af01887..20cfd08 100644
--- a/pymysql/tests/__init__.py
+++ b/pymysql/tests/__init__.py
@@ -1,4 +1,4 @@
-from test_issues import *
+from pymysql.tests.test_issues import *
 
 if __name__ == "__main__":
     import unittest
diff --git a/setup.py b/setup.py
index c08a1ed..1a45567 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,8 @@
 
-#from setuptools import setup
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 version_tuple = __import__('pymysql').VERSION