diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 8b7cb72012..1265e4db4a 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -10,41 +10,46 @@ jobs:
       matrix:
         compiler: [gcc, clang]
         python-ruby-version:
-          - {python: 3.9, ruby: 2.7}
-          - {python: 3.9, ruby: 2.7, other: test-flags-override}
-          - {python: 3.9, ruby: 2.7, other: test-debug}
-          - {python: 3.9, ruby: 2.7, other: linker-bfd}
-          - {python: 3.9, ruby: 2.7, other: linker-gold}
+          - {python: '3.10', ruby: '3.1'}
+          - {python: '3.10', ruby: '3.1', other: test-flags-override}
+          - {python: '3.10', ruby: '3.1', other: test-debug}
+          - {python: '3.10', ruby: '3.1', other: linker-bfd}
+          - {python: '3.10', ruby: '3.1', other: linker-gold}
           # Test several Python versions with the latest Ruby version
-          - {python: 3.8, ruby: 2.7}
-          - {python: 3.7, ruby: 2.7}
-          - {python: 3.6, ruby: 2.7}
-          - {python: 3.5, ruby: 2.7}
-          - {python: pypy3, ruby: 2.7}
+          - {python: '3.9', ruby: '3.1'}
+          - {python: '3.8', ruby: '3.1'}
+          - {python: '3.7', ruby: '3.1'}
+          - {python: '3.6', ruby: '3.1'}
+          - {python: '3.5', ruby: '3.1'}
+          - {python: 'pypy3.10', ruby: '3.1'}
+          - {python: 'pypy3.5', ruby: '3.1'}
           # Test several Ruby versions with the latest Python version
-          - {python: 3.9, ruby: 2.6}
-          - {python: 3.9, ruby: 2.5}
+          - {python: '3.10', ruby: '3.0'}
+          - {python: '3.10', ruby: '2.7'}
+          - {python: '3.10', ruby: '2.6'}
+          - {python: '3.10', ruby: '2.5'}
         exclude:
           - compiler: clang
-            python-ruby-version: {python: 3.9, ruby: 2.7, other: linker-bfd}
+            python-ruby-version: {python: '3.10', ruby: '3.1', other: linker-bfd}
           - compiler: clang
-            python-ruby-version: {python: 3.9, ruby: 2.7, other: linker-gold}
+            python-ruby-version: {python: '3.10', ruby: '3.1', other: linker-gold}
         include:
           - compiler: gcc
-            python-ruby-version: {python: 3.9, ruby: 2.7, other: sanitizers}
+            python-ruby-version: {python: '3.10', ruby: '3.1', other: sanitizers}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-ruby-version.python }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-ruby-version.python }}
 
     - name: Set up Ruby ${{ matrix.python-ruby-version.ruby }}
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.python-ruby-version.ruby }}
+        bundler-cache: true
 
     - name: Install dependencies
       run: |
@@ -110,7 +115,7 @@ jobs:
         PYTHON_SYS_PREFIX="$(python -c 'import sys;print(sys.prefix)')"
         echo "PKG_CONFIG_PATH=${PYTHON_SYS_PREFIX}/lib/pkgconfig" >> $GITHUB_ENV
 
-        if [ "${{ matrix.python-ruby-version.python }}" = "pypy3" ] ; then
+        if [ "${{ matrix.python-ruby-version.python }}" = "pypy*" ] ; then
             # PyPy does not provide a config file for pkg-config
             # libpypy-c.so is provided in bin/libpypy-c.so for PyPy and bin/libpypy3-c.so for PyPy3
             echo "PYINC=-I${PYTHON_SYS_PREFIX}/include" >> $GITHUB_ENV
diff --git a/.github/workflows/vm_testsuite.yml b/.github/workflows/vm_testsuite.yml
index 601276ddcf..92155da20b 100644
--- a/.github/workflows/vm_testsuite.yml
+++ b/.github/workflows/vm_testsuite.yml
@@ -6,11 +6,10 @@ jobs:
   vm_testsuite:
 
     # Use VirtualBox+vagrant on macOS, as described in https://github.com/actions/virtual-environments/issues/433
-    # Use an old version of macOS until https://github.com/actions/virtual-environments/pull/4010 is merged.
-    runs-on: macos-10.15
+    runs-on: macos-12
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Create Vagrant VM
       run: |