diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1370bc61..2ad87c1a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,15 +3,18 @@ version: 2.0
 my-steps: &steps
   - checkout
   - run: sudo pip install -r requirements.txt
-  - run: sudo pip install flake8 pytest
+  - run: sudo pip install flake8 pytest coveralls
   - run: python --version ; pip --version ; pwd ; ls -l
   # stop the build if there are Python syntax errors or undefined names
   - run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
   # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
   - run: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
   #- run: pytest # test_s2gs test_replays
-  - run: python -m unittest discover test_s2gs
-  - run: python -m unittest discover test_replays
+  - run: coverage run --source sc2reader -m unittest discover test_s2gs
+  - run: 
+      halt_build_on_fail: true
+      command: coverage run --source sc2reader --append -m unittest discover test_replays
+  - run: coveralls
 
 jobs:
   Python2:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1fc93c94..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: python
-python:
- - 2.6
- - 2.7
- - 3.4
- - 3.6
- - pypy
-install:
- - python setup.py develop
- - pip install coveralls hacking
- - mkdir local_cache
-before_script:
-    # stop the build if there are Python syntax errors or undefined names
-    - time flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
-    # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
-    - time flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-script:
- - SC2READER_CACHE_DIR=local_cache coverage run --source=sc2reader test_replays/test_all.py
- - SC2READER_CACHE_DIR=local_cache coverage run --source=sc2reader --append test_s2gs/test_all.py
-after_success:
- - coveralls
-branches:
-  only:
-    - master
-notifications:
-  irc: "chat.freenode.net#sc2reader"