diff --git a/.coveragerc b/.coveragerc
index 0e53072..6c8265c 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,14 @@
+
+# Docs:  https://coverage.readthedocs.org/en/latest/config.html
+
 [run]
 concurrency = gevent
 omit =
     steam/protobufs/*
     steam/enums/*
+
+branch = False
+
+# If True, stores relative file paths in data file (needed for Github Actions).
+# Using this parameter requires coverage>=5.0
+relative_files = True
diff --git a/.github/workflows/testing_initiative.yml b/.github/workflows/testing_initiative.yml
index f660d64..635607e 100644
--- a/.github/workflows/testing_initiative.yml
+++ b/.github/workflows/testing_initiative.yml
@@ -48,19 +48,33 @@ jobs:
         run: python -c "import sys; print(sys.version)"
       - name: Install dependencies
         run: |
-          pip install -r requirements.txt
-          pip install coveralls
+          make init
       - name: Run Tests
-        env:
-          PYTHONHASHSEED: "0"
         run: |
-          pytest --cov=steam tests
-      - name: Coveralls
+          make test
+      - name: Upload to Coveralls
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          COVERALLS_PARALLEL: true
+          COVERALLS_FLAG_NAME: "${{ matrix.os }}_${{ matrix.python-version }}"
         run: |
-          coveralls
+          coveralls --service=github
+
+  coveralls:
+    name: Finish Coveralls
+    needs: test
+    runs-on: ubuntu-latest
+    container: python:3-slim
+    steps:
+    - name: Install coveralls
+      run: |
+        pip3 install --upgrade coveralls
+    - name: Send coverage finish to coveralls.io
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        coveralls --finish
+
   build-docs:
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/Makefile b/Makefile
index 5ab7ae7..4a2618d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,14 +25,14 @@ help:
 	@echo "$$HELPBODY"
 
 init: init_docs
-	pip install -r requirements.txt
+	pip install -r dev_requirements.txt
 
 init_docs:
 	pip install sphinx==1.8.5 sphinx_rtd_theme
 
 test:
 	coverage erase
-	PYTHONHASHSEED=0 pytest --cov=steam tests
+	PYTHONHASHSEED=0 pytest --tb=short --cov-config .coveragerc --cov=steam tests
 
 webauth_gen:
 	rm -f vcr/webauth*
diff --git a/README.rst b/README.rst
index 755979d..b944b0e 100644
--- a/README.rst
+++ b/README.rst
@@ -113,8 +113,8 @@ IRC: irc.freenode.net / #steamkit (`join via webchat <https://webchat.freenode.n
     :target: https://pypi.python.org/pypi/steam
     :alt: MIT License
 
-.. |coverage| image:: https://scrutinizer-ci.com/g/ValvePython/steam/badges/coverage.png?b=master
-    :target: https://scrutinizer-ci.com/g/ValvePython/steam/?branch=master
+.. |coverage| image:: https://img.shields.io/coveralls/ValvePython/steam/master.svg?style=flat
+    :target: https://coveralls.io/r/ValvePython/steam?branch=master
     :alt: Test coverage
 
 .. |sonar_maintainability| image:: https://sonarcloud.io/api/project_badges/measure?project=ValvePython_steam&metric=sqale_rating
diff --git a/dev_requirements.txt b/dev_requirements.txt
new file mode 100644
index 0000000..dad8afb
--- /dev/null
+++ b/dev_requirements.txt
@@ -0,0 +1,12 @@
+
+-r requirements.txt
+
+vcrpy==2.0.1
+mock==1.3.0
+
+coverage>=5.0; python_version == '2.7' or python_version >= '3.5'
+pytest-cov>=2.7.0; python_version == '2.7' or python_version >= '3.5'
+
+# coveralls 2.0 has removed support for Python 2.7 and 3.4
+git+https://github.com/andy-maier/coveralls-python.git@andy/add-py27#egg=coveralls; python_version == '2.7'
+coveralls>=2.1.2; python_version >= '3.5'
diff --git a/requirements.txt b/requirements.txt
index dadda5d..af1ffd9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,10 +6,5 @@ gevent>=1.3.0
 protobuf>=3.0.0
 gevent-eventemitter>=2.1
 enum34==1.1.2; python_version < '3.4'
-coverage==4.0.3
-pytest==3.2.1
-pytest-cov==2.5.1
-mock==1.3.0
 PyYAML==5.1
-vcrpy==2.0.1
 cachetools>=3.0.0