diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4e07aee580c2..0c5b7a08ced5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -146,10 +146,10 @@ jobs:
             ~/.cache/matplotlib
             !~/.cache/matplotlib/tex.cache
             !~/.cache/matplotlib/test_cache
-          key: 1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
+          key: 2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
           restore-keys: |
-            1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
-            1-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
+            2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
+            2-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
 
       - name: Install Python dependencies
         run: |
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
index c2ed8247d93b..4c07c7ad7e09 100644
--- a/lib/matplotlib/testing/compare.py
+++ b/lib/matplotlib/testing/compare.py
@@ -103,7 +103,7 @@ def __call__(self, orig, dest):
         if not self._proc:
             self._proc = subprocess.Popen(
                 [mpl._get_executable_info("gs").executable,
-                 "-dNOSAFER", "-dNOPAUSE", "-sDEVICE=png16m"],
+                 "-dNOSAFER", "-dNOPAUSE", "-dEPSCrop", "-sDEVICE=png16m"],
                 # As far as I can see, ghostscript never outputs to stderr.
                 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
             try: