diff --git a/setup.py b/setup.py
index af7c754..f95b81a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,35 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
+import sys
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
 
-setup(name='VCR.py',
-      version='1.0',
-      description='VCR.py',
-      author='Kevin McCarthy',
-      author_email='mc@kevinmccarthy.org',
-      packages=['vcr'],
-      )
+class PyTest(TestCommand):
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+    def run_tests(self):
+        #import here, cause outside the eggs aren't loaded
+        import pytest
+        errno = pytest.main(self.test_args)
+        sys.exit(errno)
+
+setup(name='vcrpy',
+    version='0.0.2',
+    description="A Python port of Ruby's VCR to make mocking HTTP easier",
+    author='Kevin McCarthy',
+    author_email='me@kevinmccarthy.org',
+    url='https://github.com/kevin1024/vcrpy',
+    packages=['vcr'],
+    install_requires=['PyYAML'],
+    license='MIT',
+    tests_require=['pytest'],
+    cmdclass={'test': PyTest},
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Programming Language :: Python',
+    ],
+)