--- pygraphviz/agraph.py
+++ pygraphviz/agraph.py
@@ -1767,29 +1767,3 @@
                        value.decode(self.encoding))
             except KeyError: # gv.agxget returned KeyError, skip
                 continue
-    
-
-
-def _test_suite():
-    import doctest
-    suite = doctest.DocFileSuite('tests/graph.txt',
-                                 'tests/attributes.txt',
-                                 'tests/layout_draw.txt',
-                                 'tests/subgraph.txt',
-                                 package='pygraphviz')
-    doctest.testmod() # test docstrings in module
-    return suite
-
-
-if __name__ == "__main__":
-    import os
-    import sys
-    import unittest
-    if sys.version_info[:2] < (2, 4):
-        print "Python version 2.4 or later required for tests (%d.%d detected)." %  sys.version_info[:2]
-        sys.exit(-1)
-    # directory of package (relative to this)
-    nxbase=sys.path[0]+os.sep+os.pardir
-    sys.path.insert(0,nxbase) # prepend to search path
-    unittest.TextTestRunner().run(_test_suite())
-    
--- pygraphviz/__init__.py
+++ pygraphviz/__init__.py
@@ -67,6 +67,3 @@
     print "pygraphviz-"+__version__
     neato=_get_prog('neato')
     os.system(neato+' -V')
-
-# import tests: run as pygraphviz.test()
-from tests import run as test