diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9c258bf2d19..3dc4b8a4627 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -23,9 +23,10 @@ on:
            "ubuntu-kinetic",
            "ubuntu-lunar",
            "ubuntu-mantic",
-           "debian-buster",
+           "debian-buster-gcc_spkg",
            "debian-bullseye",
            "debian-bookworm",
+           "debian-trixie",
            "debian-sid",
            "linuxmint-20.1",
            "linuxmint-20.2",
@@ -57,7 +58,6 @@ on:
            "opensuse-tumbleweed-python3.10",
            "conda-forge",
            "ubuntu-bionic-gcc_8-i386",
-           "debian-buster-i386",
            "debian-bullseye-i386",
            ]
       tox_packages_factors:
diff --git a/README.md b/README.md
index eba7a3a7623..aee0c3a0fbc 100644
--- a/README.md
+++ b/README.md
@@ -189,8 +189,8 @@ in the Installation Guide.
 
 3.  [Linux, WSL] Install the required minimal build prerequisites.
 
-    - Compilers: `gcc`, `gfortran`, `g++` (GCC 8.x to 12.x and recent
-      versions of Clang (LLVM) are supported).
+    - Compilers: `gcc`, `gfortran`, `g++` (GCC versions from 8.4.0 to 13.x
+      and recent versions of Clang (LLVM) are supported).
       See [build/pkgs/gcc/SPKG.rst](build/pkgs/gcc/SPKG.rst) and
       [build/pkgs/gfortran/SPKG.rst](build/pkgs/gfortran/SPKG.rst)
       for a discussion of suitable compilers.
diff --git a/build/pkgs/gcc/SPKG.rst b/build/pkgs/gcc/SPKG.rst
index 75feee2d6d8..1f90eb0bf67 100644
--- a/build/pkgs/gcc/SPKG.rst
+++ b/build/pkgs/gcc/SPKG.rst
@@ -6,7 +6,7 @@ Description
 
 This package represents the required C and C++ compilers.
 
-- GCC (GNU Compiler Collection) versions 8.x to 12.x are supported.
+- GCC (GNU Compiler Collection) versions 8.x (>= 8.4.0) to 13.x are supported.
 
 - Clang (LLVM) is also supported.
 
@@ -25,7 +25,7 @@ need to run::
 Vendor and versions of the C and C++ compilers should match.
 
 Users of older Linux distributions (in particular, ``ubuntu-xenial``
-or older, ``debian-stretch`` or older, ``linuxmint-18`` or older)
+or older, ``debian-buster`` or older, ``linuxmint-18`` or older)
 should upgrade their systems before attempting to install Sage from
 source.  Users of ``ubuntu-bionic``, ``linuxmint-19.x``, and
 ``opensuse-15.x`` can install a versioned ``gcc`` system package
diff --git a/build/pkgs/gcc/spkg-configure.m4 b/build/pkgs/gcc/spkg-configure.m4
index 34953c32302..e1b44ec1c9d 100644
--- a/build/pkgs/gcc/spkg-configure.m4
+++ b/build/pkgs/gcc/spkg-configure.m4
@@ -161,8 +161,8 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
             # Add the .0 because Debian/Ubuntu gives version numbers like
             # 4.6 instead of 4.6.4 (Trac #18885)
             AS_CASE(["$GXX_VERSION.0"],
-                [[[0-7]].*], [
-                    # Install our own GCC if the system-provided one is older than gcc 8
+                [[[0-7]].*|8.[[0-3]].*], [
+                    # Install our own GCC if the system-provided one is older than gcc 8.4
                     SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is quite old])
                 ],
                 [1[[4-9]].*], [
diff --git a/tox.ini b/tox.ini
index 6f0fac97bd2..99b2c278e24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -238,6 +238,7 @@ setenv =
     debian-bullseye:  BASE_TAG=bullseye
     debian-bullseye:                           IGNORE_MISSING_SYSTEM_PACKAGES=yes
     debian-bookworm:  BASE_TAG=bookworm
+    debian-trixie:    BASE_TAG=trixie
     debian-sid:       BASE_TAG=sid
     #
     # https://hub.docker.com/u/linuxmintd