diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 8caec486a2..03782636e5 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -176,10 +176,10 @@ pre_initialize_variables () {
     : ${ARMC6_BIN_DIR:=/usr/bin}
     : ${ARM_NONE_EABI_GCC_PREFIX:=arm-none-eabi-}
     : ${ARM_LINUX_GNUEABI_GCC_PREFIX:=arm-linux-gnueabi-}
-    : ${CLANG_LATEST:="clang-16"}
-    : ${CLANG_EARLIEST:="clang-3.5"}
-    : ${GCC_LATEST:="gcc-12"}
-    : ${GCC_EARLIEST:="gcc-4.7"}
+    : ${CLANG_LATEST:="clang-latest"}
+    : ${CLANG_EARLIEST:="clang-earliest"}
+    : ${GCC_LATEST:="gcc-latest"}
+    : ${GCC_EARLIEST:="gcc-earliest"}
     # if MAKEFLAGS is not set add the -j option to speed up invocations of make
     if [ -z "${MAKEFLAGS+set}" ]; then
         export MAKEFLAGS="-j$(all_sh_nproc)"
diff --git a/tests/scripts/generate_test_code.py b/tests/scripts/generate_test_code.py
index c42f9a84ba..76806de95f 100755
--- a/tests/scripts/generate_test_code.py
+++ b/tests/scripts/generate_test_code.py
@@ -668,7 +668,7 @@ def parse_function_code(funcs_f, dependencies, suite_dependencies):
     name = 'test_' + name
 
     # If a test function has no arguments then add 'void' argument to
-    # avoid "-Wstrict-prototypes" warnings from clang-16
+    # avoid "-Wstrict-prototypes" warnings from clang
     if len(args) == 0:
         code = code.replace('()', '(void)', 1)