diff --git a/.travis.yml b/.travis.yml
index ae84ddb3056..d6be780d2d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,4 +15,6 @@ script:
   - make test-all
   - gulp test
 after_success:
-  - coveralls
+  - coverage xml
+  - bash <(curl -s https://codecov.io/bash) -cF python -f coverage.xml
+  - bash <(curl -s https://codecov.io/bash) -cF javascript -f build/coverage-js/coverage.xml
diff --git a/Makefile b/Makefile
index 6176f39ae06..d83d6050481 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,6 @@ clean: ## remove generated byte code, coverage reports, and build artifacts
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
-	coverage erase
 	rm -fr build/
 	rm -fr dist/
 	rm -fr *.egg-info
@@ -37,14 +36,13 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	pip-compile --upgrade -o requirements/doc.txt requirements/base.in requirements/doc.in
 	pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
 	pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
-	pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
 	# Let tox control the Django version for tests
 	sed '/django==/d' requirements/test.txt > requirements/test.tmp
 	mv requirements/test.tmp requirements/test.txt
 
 requirements: ## install development environment requirements
 	pip install -qr requirements/dev.txt --exists-action w
-	pip-sync requirements/base.txt requirements/dev.txt requirements/private.* requirements/test.txt
+	pip-sync requirements/*.txt requirements/private.*
 
 install: upgrade requirements
 	./manage.py syncdb --noinput --settings=test_settings
diff --git a/README.rst b/README.rst
index 98c6c7d762a..87314107fa2 100644
--- a/README.rst
+++ b/README.rst
@@ -9,8 +9,8 @@ django-component-views
     :target: https://travis-ci.org/edx/edx-proctoring
     :alt: Travis
 
-.. image:: http://codecov.io/github/edx/edx-proctoring/coverage.svg?branch=master
-    :target: http://codecov.io/github/edx/edx-proctoring?branch=master
+.. image:: https://codecov.io/gh/edx/edx-proctoring/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/edx/edx-proctoring
     :alt: Codecov
 
 .. image:: https://img.shields.io/pypi/pyversions/edx-proctoring.svg
@@ -130,4 +130,4 @@ Have a question about this repository, or about Open edX in general?  Please
 refer to this `list of resources`_ if you need any assistance.
 
 .. _list of resources: https://open.edx.org/getting-help
-.. _Including Proctored Exams In Your Course: http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/course_features/credit_courses/proctored_exams.html
\ No newline at end of file
+.. _Including Proctored Exams In Your Course: http://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/course_features/credit_courses/proctored_exams.html
diff --git a/requirements/travis.in b/requirements/travis.in
deleted file mode 100644
index 87c343496a2..00000000000
--- a/requirements/travis.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# Requirements for running tests in Travis
-
-codecov                   # Code coverage reporting
-tox                       # Virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
diff --git a/tox.ini b/tox.ini
index 5e4c2624b49..e7830469895 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,17 +17,15 @@ ignore = D101,D200,D203,D212
 match-dir = (?!migrations)
 
 [testenv]
-addopts = --cov edx_proctoring --cov-report term-missing --cov-report xml
-norecursedirs = .* docs requirements
 setenv =
     DJANGO_SETTINGS_MODULE = test_settings
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
-    -r{toxinidir}/requirements/test.txt
+    -rrequirements/test.txt
 commands =
-    ./manage.py test {posargs}
+    coverage run ./manage.py test {posargs}
 
 [testenv:docs]
 setenv =