diff --git a/doc/en/logging.rst b/doc/en/logging.rst
index c32205f13ad..e6f91cdf781 100644
--- a/doc/en/logging.rst
+++ b/doc/en/logging.rst
@@ -161,7 +161,7 @@ the records for the ``setup`` and ``call`` stages during teardown like so:
         yield window
         for when in ("setup", "call"):
             messages = [
-                x.message for x in caplog.get_records(when) if x.level == logging.WARNING
+                x.message for x in caplog.get_records(when) if x.levelno == logging.WARNING
             ]
             if messages:
                 pytest.fail(
diff --git a/scripts/report-coverage.sh b/scripts/report-coverage.sh
index 755783d2adf..500d217f053 100755
--- a/scripts/report-coverage.sh
+++ b/scripts/report-coverage.sh
@@ -13,4 +13,5 @@ fi
 python -m coverage combine
 python -m coverage xml
 python -m coverage report -m
-bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml
+curl -S -L --retry 3 -s https://codecov.io/bash -o codecov-upload.sh
+bash codecov-upload.sh -Z -X fix -f coverage.xml
diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py
index dd7bc875387..5350974d786 100644
--- a/testing/test_parseopt.py
+++ b/testing/test_parseopt.py
@@ -298,7 +298,11 @@ def test_argcomplete(testdir, monkeypatch):
         # redirect output from argcomplete to stdin and stderr is not trivial
         # http://stackoverflow.com/q/12589419/1307905
         # so we use bash
-        fp.write('COMP_WORDBREAKS="$COMP_WORDBREAKS" python -m pytest 8>&1 9>&2')
+        fp.write(
+            'COMP_WORDBREAKS="$COMP_WORDBREAKS" {} -m pytest 8>&1 9>&2'.format(
+                sys.executable
+            )
+        )
     # alternative would be exteneded Testdir.{run(),_run(),popen()} to be able
     # to handle a keyword argument env that replaces os.environ in popen or
     # extends the copy, advantage: could not forget to restore