diff --git a/Makefile b/Makefile
index 222f850..e919443 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,11 @@ NOSE := bin/nosetests
 # Tests rule!
 # ###########
 .PHONY: test
-test: venv develop $(NOSE)
+test: venv $(NOSE)
 	$(NOSE) --with-id -s tests
 
 $(NOSE):
-	$(PIP) install nose pep8 coverage
+	$(PY) setup.py test
 
 # #######
 # INSTALL
@@ -30,8 +30,9 @@ bin/python:
 clean_venv:
 	rm -rf bin include lib local man
 
-develop: lib/python*/site-packages/bookie-api.egg-link
-lib/python*/site-packages/bookie-api.egg-link:
+.PHONY: develop
+develop: lib/python*/site-packages/readability_lxml.egg-link
+lib/python*/site-packages/readability_lxml.egg-link:
 	$(PY) setup.py develop
 
 
@@ -40,6 +41,9 @@ lib/python*/site-packages/bookie-api.egg-link:
 # ###########
 .PHONY: clean_all
 clean_all: clean_venv
+	if [ -d dist ]; then \
+		rm -r dist; \
+    fi
 
 
 # ###########
diff --git a/setup.py b/setup.py
index 02251fc..fd68a81 100755
--- a/setup.py
+++ b/setup.py
@@ -1,22 +1,33 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
 
+version = "0.2.5"
+install_requires = [
+    "chardet",
+    "lxml",
+]
+tests_require = [
+    'coverage',
+    'nose',
+    'pep8',
+]
+
 setup(
     name="readability-lxml",
-    version="0.2.5",
+    version=version,
     author="Yuri Baburov",
     author_email="burchik@gmail.com",
     description="fast python port of arc90's readability tool",
-    test_suite = "tests.test_article_only",
+    keywords='readable read parse html document readability',
     long_description=open("README").read(),
     license="Apache License 2.0",
     url="http://github.com/buriy/python-readability",
     package_dir={'': 'readability'},
     packages=find_packages('readability', exclude=["*.tests", "*.tests.*"]),
-    install_requires=[
-        "chardet",
-        "lxml"
-        ],
+    install_requires=install_requires,
+    extras_require={'test': tests_require},
+    test_suite = "nose.collector",
+    # test_suite="tests.test_article_only",
     classifiers=[
         "Environment :: Web Environment",
         "Intended Audience :: Developers",