diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml
index 6306bb4b2b6..f1386c171ac 100644
--- a/.github/workflows/clang15_test.yml
+++ b/.github/workflows/clang15_test.yml
@@ -21,6 +21,10 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include: # Use "CLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -52,7 +56,8 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
+      CPPFLAGS: ${{ (matrix.CLASSIC_AUTOSPELL_LIST != '' &&  matrix.CLASSIC_AUTOSPELL_LIST) || '' }}
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} CPPFLAGS="${{ env.CPPFLAGS }}"
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
     steps:
       - uses: actions/checkout@v1