diff --git a/.gitignore b/.gitignore
index 12bef32..a6b1479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
 .build/
 dist
 /MANIFEST.test_data
+/plasoscaffolder.egg-info
 /src/plasoscaffolder.egg-info
 
 # Auto-generated Sphinx documentation files
diff --git a/.travis.yml b/.travis.yml
index b2da5a7..1985493 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,30 @@
 language: python
 matrix:
   include:
-  - os: linux
+  - env: TARGET="linux-python27"
+    os: linux
     dist: trusty
     sudo: required
-    python: 3.6
-  exclude:
-  - os: osx
-    language: generic
-    env: PYTHONPATH=/Library/Python/3.6/site-packages/
+    group: edge
+    python: 2.7
+  - env: TARGET="linux-python36"
+    os: linux
     dist: trusty
     sudo: required
+    group: edge
     python: 3.6
+  - env: [TARGET="macos-python27", PYTHONPATH="/Library/Python/2.7/site-packages/"]
+    os: osx
+    osx_image: xcode9.2
+    language: generic
+  allow_failures:
+  - env: TARGET="linux-python27"
+  - env: [TARGET="macos-python27", PYTHONPATH="/Library/Python/2.7/site-packages/"]
 cache: pip
-install: 
-  - pip install -r src/requirements.txt
-  - pip install coveralls
-script: 
-  - python src/run_tests.py
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then coverage run --source=src/plasoscaffolder src/run_tests_for_coverage.py test ; fi
+install:
+- pip install -r requirements.txt
+- pip install coverage
+script:
+- if test ${TARGET} = "linux-python36"; then coverage run --source=plasoscaffolder ./src/run_tests_for_coverage.py test; else ./src/run_tests.py; fi
 after_success:
-  if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then coveralls ; fi
+- if test ${TARGET} = "linux-python36"; then curl -o codecov.sh -s https://codecov.io/bash && /bin/bash ./codecov.sh; fi
diff --git a/README.md b/README.md
index ac49d27..a997e12 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 PlasoScaffolder is a SQLite Plugin Scaffolder for Plaso.
 
 ### Project status
-[Travis-CI](https://travis-ci.org/) | [AppVeyor](https://ci.appveyor.com) | [Coveralls](https://coveralls.io/)
+[Travis-CI](https://travis-ci.org/) | [AppVeyor](https://ci.appveyor.com) | [Codecov](https://codecov.io/)
 --- | --- | ---
-[![Build Status](https://travis-ci.org/log2timeline/PlasoScaffolder.svg?branch=master)](https://travis-ci.org/log2timeline/PlasoScaffolder) | [![Build status](https://ci.appveyor.com/api/projects/status/bdd2caw07twol353?svg=true)](https://ci.appveyor.com/project/joachimmetz/plasoscaffolder) | [![Coverage Status](https://coveralls.io/repos/github/log2timeline/PlasoScaffolder/badge.svg?branch=master)](https://coveralls.io/github/log2timeline/PlasoScaffolder?branch=master)
+[![Build Status](https://travis-ci.org/log2timeline/PlasoScaffolder.svg?branch=master)](https://travis-ci.org/log2timeline/PlasoScaffolder) | [![Build status](https://ci.appveyor.com/api/projects/status/bdd2caw07twol353?svg=true)](https://ci.appveyor.com/project/joachimmetz/plasoscaffolder) | [![codecov](https://codecov.io/gh/log2timeline/PlasoScaffolder/branch/master/graph/badge.svg)](https://codecov.io/gh/log2timeline/PlasoScaffolder)
 
 ### Documentation
 https://claudiasaxer.github.io/PlasoScaffolder <br>
diff --git a/appveyor.yml b/appveyor.yml
index 4e9d7c7..93fbdc0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
 
 
 install:
-  - "%PYTHON%\\python.exe -m pip install -r src/requirements.txt"
+  - "%PYTHON%\\python.exe -m pip install -r requirements.txt"
   
 build: off
 
@@ -17,7 +17,7 @@ test_script:
   # Note that you must use the environment variable %PYTHON% to refer to
   # the interpreter you're using - Appveyor does not do anything special
   # to put the Python evrsion you want to use on PATH.
-  - "%PYTHON%\\python.exe src/run_tests.py test"
+  - "%PYTHON%\\python.exe src\\run_tests.py test"
 
 after_test:
   # This step builds your wheels.
diff --git a/src/requirements.txt b/requirements.txt
similarity index 100%
rename from src/requirements.txt
rename to requirements.txt