diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25834314a..c3af74077 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
         experimental: [false]
         python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
         include:
-          - python-version: 3.10.0-alpha.7  # Newest: https://github.com/actions/python-versions/blob/main/versions-manifest.json
+          - python-version: 3.10.0-beta.4  # Newest: https://github.com/actions/python-versions/blob/main/versions-manifest.json
             os: ubuntu-latest
             experimental: true
       fail-fast: false
@@ -32,6 +32,10 @@ jobs:
     - name: Test with pytest via tox
       run: |
         tox -e gh
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        fail_ci_if_error: true
 
   format:
     runs-on: ubuntu-latest
diff --git a/tox.ini b/tox.ini
index 164dfdd8e..4709f9d82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,10 +2,10 @@
 
 [testenv]
 deps =
-    pytest~=5.3
-    pytest-timeout~=1.3
-    pytest-cov~=2.8
-    coverage==4.5.*
+    pytest==6.2.*,>=6.2.4
+    pytest-timeout==1.4.*
+    pytest-cov==2.12.*
+    coverage==5.5
     codecov==2.1.10
     hypothesis~=4.56
     pyserial~=3.0
@@ -20,12 +20,8 @@ recreate = True
 passenv =
     CI
     GITHUB_*
-    CODECOV_*
     PY_COLORS
 
-commands_post =
-    codecov -X gcov
-
 [testenv:travis]
 passenv =
     CI
@@ -39,7 +35,7 @@ commands_post =
 
 [pytest]
 testpaths = test
-addopts = -v --timeout=300 --cov=can --cov-append --cov-report=term
+addopts = -v --timeout=300 --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term
 
 
 [coverage:run]