diff --git a/.coveragerc b/.coveragerc
index 4bd5b63fa..96ad6b09b 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,6 @@
 [run]
 omit =
     scripts/*
-    freqtrade/tests/*
     freqtrade/vendor/*
     freqtrade/__main__.py
+    tests/*
diff --git a/.travis.yml b/.travis.yml
index c75049276..405228ab8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,19 +22,19 @@ jobs:
   include:
     - stage: tests
       script:
-      - pytest --random-order --cov=freqtrade --cov-config=.coveragerc freqtrade/tests/
+      - pytest --random-order --cov=freqtrade --cov-config=.coveragerc
       # Allow failure for coveralls
       - coveralls || true
       name: pytest
     - script:
       - cp config.json.example config.json
-      - freqtrade --datadir freqtrade/tests/testdata backtesting
+      - freqtrade --datadir tests/testdata backtesting
       name: backtest
     - script:
       - cp config.json.example config.json
-      - freqtrade --datadir freqtrade/tests/testdata hyperopt -e 5
+      - freqtrade --datadir tests/testdata hyperopt -e 5
       name: hyperopt
-    - script: flake8 freqtrade scripts
+    - script: flake8
       name: flake8
     - script:
       # Test Documentation boxes -
diff --git a/MANIFEST.in b/MANIFEST.in
index 63508c05d..7529152a0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ include LICENSE
 include README.md
 include config.json.example
 recursive-include freqtrade *.py
-include freqtrade/tests/testdata/*.json
diff --git a/setup.cfg b/setup.cfg
index 473f50639..34f25482b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,9 +2,14 @@
 #ignore =
 max-line-length = 100
 max-complexity = 12
+exclude =
+    .git,
+    __pycache__,
+    .eggs,
+    user_data,
 
 [mypy]
 ignore_missing_imports = True
 
-[mypy-freqtrade.tests.*]
+[mypy-tests.*]
 ignore_errors = True