diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index e342d93332b596..f8603ae6023ede 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -3,7 +3,7 @@ name: build-windows
 on: [push, pull_request]
 
 env:
-  PYTHON_VERSION: 3.8
+  PYTHON_VERSION: 3.9
   FLAKY_TESTS: dontcare
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
       - name: Install deps
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index f0ee528a0f4e0f..c3f46bf518eec2 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -3,7 +3,7 @@ name: linters
 on: [push, pull_request]
 
 env:
-  PYTHON_VERSION: 3.8
+  PYTHON_VERSION: 3.9
   NODE_VERSION: 10.x
 
 jobs:
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
       - name: Environment Information
@@ -62,7 +62,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
       - name: Environment Information
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
deleted file mode 100644
index 9b428b1f507d94..00000000000000
--- a/.github/workflows/test-linux.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: test-linux
-
-on: [push, pull_request]
-
-env:
-  PYTHON_VERSION: 3.8
-  FLAKY_TESTS: dontcare
-
-jobs:
-  test-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v1
-        with:
-          PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
-      - name: Environment Information
-        run: npx envinfo
-      - name: Build
-        run: make build-ci -j2 V=1
-      - name: Test
-        run: make run-ci -j2 V=1
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 55fda9317a91fb..c579e185263afd 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -3,7 +3,7 @@ name: test-macOS
 on: [push, pull_request]
 
 env:
-  PYTHON_VERSION: 3.8
+  PYTHON_VERSION: 3.9
   FLAKY_TESTS: dontcare
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
       - name: Environment Information
diff --git a/configure b/configure
index 71c2fc87ca4cfc..07581d9c5a4ff1 100755
--- a/configure
+++ b/configure
@@ -5,11 +5,12 @@
 # as is the fact that the ] goes on a new line.
 _=[ 'exec' '/bin/sh' '-c' '''
 test ${FORCE_PYTHON2} && exec python2 "$0" "$@"  # workaround for gclient
-which python3.8 >/dev/null && exec python3.8 "$0" "$@"
-which python3.7 >/dev/null && exec python3.7 "$0" "$@"
-which python3.6 >/dev/null && exec python3.6 "$0" "$@"
-which python3.5 >/dev/null && exec python3.5 "$0" "$@"
-which python2.7 >/dev/null && exec python2.7 "$0" "$@"
+command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
+command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
+command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
+command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
+command -v python3.5 >/dev/null && exec python3.5 "$0" "$@"
+command -v python2.7 >/dev/null && exec python2.7 "$0" "$@"
 exec python "$0" "$@"
 ''' "$0" "$@"
 ]
@@ -19,7 +20,7 @@ import sys
 from distutils.spawn import find_executable
 
 print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
+acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
 if sys.version_info[:2] in acceptable_pythons:
   import configure
 else: