diff --git a/.travis.yml b/.travis.yml
index 52590d91f8a8b53b620fcf9005e0db52f1cf7853..e7c4389ed5c5dfab7e49cd6c210303371ddc5d0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,20 @@
-sudo: false
-
-language: python
-
-python:
-  - 3.6
-  - 3.5
-  - 3.4
-  - 2.7
-
-install:
-  - echo No requirements
-
-script:
-  - make test
+sudo: false
+
+language: python
+
+python:
+  - 3.6
+  - 3.5
+  - 3.4
+  - 2.7
+
+install:
+  - pip install --disable-pip-version-check --upgrade pip
+  - pip install -r requirements.txt
+
+before_script:
+  - python ./setup.py develop
+
+script:
+  - py.test
+  - make -C test test
diff --git a/Makefile b/Makefile
index 8989c084af9f864fa52e476e50ada087ce8fc702..3e4f672564c53e6ed9229fdf1a96e52328c64e89 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ all :
 install : all
 	python ./setup.py install --root=${DESTDIR}
 
-
 clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
 
 
@@ -32,6 +31,7 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr htmlcov/
 
 test :
+	python setup.py test
 	$(MAKE) -C test test
 
 upload : test
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..57d645e06f9a985110e21b5f43497ad03dcc5036
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+pytest==3.0.7
+pytest-runner==2.11.1
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..b7e478982ccf9ab1963c74e1084dfccb6e42c583
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[aliases]
+test=pytest
diff --git a/setup.py b/setup.py
index 851800b3e3cbb0ec0b32fe40330ec942e6a50bf6..a5a60243d889bc54e5b4c925de9bef5bee9d8d61 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import sys
 from setuptools import setup, find_packages
 
-import sys
 sys.path.insert(0, 'src')
 from paho.mqtt import __version__
 
@@ -11,7 +11,8 @@ with open('README.rst') as readme_file:
     readme = readme_file.read()
 
 requirements = []
-test_requirements = []
+test_requirements = ['pytest']
+setup_requirements = ['pytest-runner']
 
 setup(
     name='paho-mqtt',
@@ -47,5 +48,6 @@ setup(
         'Topic :: Internet',
     ],
     test_suite='tests',
-    tests_require=test_requirements
+    tests_require=test_requirements,
+    setup_requires=setup_requirements
 )