diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 000000000..3d5e5889f
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+omit = freqtrade/tests/*
diff --git a/.travis.yml b/.travis.yml
index aa1e01d31..461324f45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ install:
 - pip install coveralls
 - pip install -r requirements.txt
 script:
-- coverage run --source=freqtrade setup.py test
+- pytest --cov=freqtrade --cov-config=.coveragerc freqtrade/tests/
 after_success:
 - coveralls
 notifications:
diff --git a/requirements.txt b/requirements.txt
index b070fe0ed..b7bf943ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,6 +13,7 @@ numpy==1.13.3
 TA-Lib==0.4.10
 pytest==3.2.2
 pytest-mock==1.6.3
+pytest-cov==2.5.1
 
 # Required for plotting data
 #matplotlib==2.0.2
diff --git a/setup.cfg b/setup.cfg
index c5d8a376a..ea59030de 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,4 +2,4 @@
 test=pytest
 
 [tool:pytest]
-addopts = --pyargs freqtrade
+addopts = --cov=freqtrade --cov-config=.coveragerc freqtrade/tests/
diff --git a/setup.py b/setup.py
index 2cd551cb2..e89fd2eee 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(name='freqtrade',
       packages=['freqtrade'],
       scripts=['bin/freqtrade'],
       setup_requires=['pytest-runner'],
-      tests_require=['pytest', 'pytest-mock'],
+      tests_require=['pytest', 'pytest-mock', 'pytest-cov'],
       install_requires=[
           'python-bittrex==0.1.3',
           'SQLAlchemy==1.1.13',