diff --git a/.github/workflows/build-and-test-ci.yml b/.github/workflows/build-and-test-ci.yml
index 09dd662f66..71b5400ba2 100644
--- a/.github/workflows/build-and-test-ci.yml
+++ b/.github/workflows/build-and-test-ci.yml
@@ -308,7 +308,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     container:
-      image: ghcr.io/edgcpp/ci-runner@sha256:da140ca90c420977f187279d7939fe0c7cb3c4b656e5ab2dc0f6b9ac2a43a255
+      image: ghcr.io/edgcpp/ci-runner@sha256:565d7b6581912008ca91c5dbc940280c6e28a02c8cb6487d88ee5f0d7e8c51d7
     defaults:
       run:
         shell: edg-container-exec "bash -eo pipefail {0}"
diff --git a/.github/workflows/ci-toolchain.yml b/.github/workflows/ci-toolchain.yml
index 1aec80fa48..87cfdb7cd8 100644
--- a/.github/workflows/ci-toolchain.yml
+++ b/.github/workflows/ci-toolchain.yml
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     container:
-      image: &ci-runner-image ghcr.io/edgcpp/ci-runner@sha256:da140ca90c420977f187279d7939fe0c7cb3c4b656e5ab2dc0f6b9ac2a43a255
+      image: &ci-runner-image ghcr.io/edgcpp/ci-runner@sha256:565d7b6581912008ca91c5dbc940280c6e28a02c8cb6487d88ee5f0d7e8c51d7
     defaults: &container-defaults
       run:
         shell: edg-container-exec "bash -eo pipefail {0}"
diff --git a/.github/workflows/promote-test-cache.yml b/.github/workflows/promote-test-cache.yml
index 1d24f6ab89..85f0784ee4 100644
--- a/.github/workflows/promote-test-cache.yml
+++ b/.github/workflows/promote-test-cache.yml
@@ -72,7 +72,7 @@ jobs:
     # The test legs' image, so that actions/cache picks the same compression
     # (part of an entry's version) and the test legs can restore the entry.
     container:
-      image: ghcr.io/edgcpp/ci-runner@sha256:da140ca90c420977f187279d7939fe0c7cb3c4b656e5ab2dc0f6b9ac2a43a255
+      image: ghcr.io/edgcpp/ci-runner@sha256:565d7b6581912008ca91c5dbc940280c6e28a02c8cb6487d88ee5f0d7e8c51d7
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/strict-build-check.yml b/.github/workflows/strict-build-check.yml
index 258e9aa8b6..ebdb1f94ff 100644
--- a/.github/workflows/strict-build-check.yml
+++ b/.github/workflows/strict-build-check.yml
@@ -158,7 +158,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     container:
-      image: ghcr.io/edgcpp/ci-runner@sha256:da140ca90c420977f187279d7939fe0c7cb3c4b656e5ab2dc0f6b9ac2a43a255
+      image: ghcr.io/edgcpp/ci-runner@sha256:565d7b6581912008ca91c5dbc940280c6e28a02c8cb6487d88ee5f0d7e8c51d7
     defaults:
       run:
         shell: edg-container-exec "bash -eo pipefail {0}"
@@ -185,7 +185,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     container:
-      image: ghcr.io/edgcpp/ci-runner@sha256:da140ca90c420977f187279d7939fe0c7cb3c4b656e5ab2dc0f6b9ac2a43a255
+      image: ghcr.io/edgcpp/ci-runner@sha256:565d7b6581912008ca91c5dbc940280c6e28a02c8cb6487d88ee5f0d7e8c51d7
     defaults:
       run:
         shell: edg-container-exec "bash -eo pipefail {0}"
@@ -212,7 +212,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     container:
-      image: ghcr.io/edgcpp/ci-runner@sha256:da140ca90c420977f187279d7939fe0c7cb3c4b656e5ab2dc0f6b9ac2a43a255
+      image: ghcr.io/edgcpp/ci-runner@sha256:565d7b6581912008ca91c5dbc940280c6e28a02c8cb6487d88ee5f0d7e8c51d7
     defaults:
       run:
         shell: edg-container-exec "bash -eo pipefail {0}"
@@ -239,7 +239,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 120
     container:
-      image: ghcr.io/edgcpp/ci-runner@sha256:da140ca90c420977f187279d7939fe0c7cb3c4b656e5ab2dc0f6b9ac2a43a255
+      image: ghcr.io/edgcpp/ci-runner@sha256:565d7b6581912008ca91c5dbc940280c6e28a02c8cb6487d88ee5f0d7e8c51d7
     defaults:
       run:
         shell: edg-container-exec "bash -eo pipefail {0}"
diff --git a/dev_tools/pylibs/edgtest/filter/__init__.py b/dev_tools/pylibs/edgtest/filter/__init__.py
index cfcb640ce7..07c8d07722 100644
--- a/dev_tools/pylibs/edgtest/filter/__init__.py
+++ b/dev_tools/pylibs/edgtest/filter/__init__.py
@@ -190,6 +190,18 @@ def __init__(self, *, normalize_il: bool, stack_addr_cleanup: bool = False,
             'time_of_compilation:     IL BUILD TIME'
           ),
         )
+      # The predefined __DATE__ and __TIME__ macros appear as macro text in
+      # IL displays of configurations that keep predefined macros.
+      self.replacements.extend([
+        (
+          r'#define __DATE__ \\"[A-Z][a-z]{2} [ \d]\d \d{4}\\"',
+          r'#define __DATE__ \"Mmm DD YYYY\"'
+        ),
+        (
+          r'#define __TIME__ \\"\d\d:\d\d:\d\d\\"',
+          r'#define __TIME__ \"HH:MM:SS\"'
+        )
+      ])
 
     replacement_groups = [f"({r})" for r, _ in self.replacements]
     self.normalization_regex = re.compile(f"{'|'.join(replacement_groups)}")
diff --git a/tests/tests/edg/cmeerw/gnats-26329-dump.sft.cpp b/tests/tests/edg/cmeerw/gnats-26329-dump.sft.cpp
index fff013e31f..c74a2f0f05 100644
--- a/tests/tests/edg/cmeerw/gnats-26329-dump.sft.cpp
+++ b/tests/tests/edg/cmeerw/gnats-26329-dump.sft.cpp
@@ -1,4 +1,4 @@
 //type:fp
 //options_all:-d-dump_builtins --set_flag preload_builtin_functions
 //options:--c++ --clang_version 180100:--c++ --clang_version 180100 --target linux_aarch64:--c++ --clang_version 180100 --target linux_armv7:--c++ --clang_version 80000:--c++ --clang_version 80000 --target linux_aarch64:--c++ --clang_version 80000 --target linux_armv7:--c++ --gn 40900:--c++ --gn 40900 --target linux_aarch64:--c++ --gn 40900 --target linux_armv7:--c++ --gn 130200:--c++ --gn 130200 --target linux_aarch64:--c++ --gn 130200 --target linux_armv7
-//filter:sort
+//filter:edg-normalize-test-output | sort
diff --git a/tests/tests/edg/cmeerw/gnats-27483-dump.sft.cpp b/tests/tests/edg/cmeerw/gnats-27483-dump.sft.cpp
index 3caea1bbce..f9379d7bb7 100644
--- a/tests/tests/edg/cmeerw/gnats-27483-dump.sft.cpp
+++ b/tests/tests/edg/cmeerw/gnats-27483-dump.sft.cpp
@@ -1,4 +1,4 @@
 //type:fp
 //options_all:-d-dump_builtins --set_flag preload_builtin_functions --c++
 //options:--clang_version 190100 --target linux_x86_64:--clang_version 190100 --target linux_i686:--clang_version 190100 --target linux_aarch64:--clang_version 190100 --target linux_armv7
-//filter:sort
+//filter:edg-normalize-test-output | sort
diff --git a/tests/tests/edg/cmeerw/gnats-27904.sft.cpp b/tests/tests/edg/cmeerw/gnats-27904.sft.cpp
index 4bb3e7c4e5..4f0cf31c62 100644
--- a/tests/tests/edg/cmeerw/gnats-27904.sft.cpp
+++ b/tests/tests/edg/cmeerw/gnats-27904.sft.cpp
@@ -1,4 +1,4 @@
 //type:fp
 //options:--target linux_i686:--target linux_x86_64:--target linux_armv7:--target linux_aarch64
 //options_all:--c++20 --clang_version 200100 -d-dump_builtins --set_flag preload_builtin_functions
-//filter:sort
+//filter:edg-normalize-test-output | sort
diff --git a/tests/tests/edg/cmeerw/gnats-27950-dump.sft.cpp b/tests/tests/edg/cmeerw/gnats-27950-dump.sft.cpp
index cbce18c1f6..5ed2afc8b8 100644
--- a/tests/tests/edg/cmeerw/gnats-27950-dump.sft.cpp
+++ b/tests/tests/edg/cmeerw/gnats-27950-dump.sft.cpp
@@ -1,4 +1,4 @@
 //type:fp
 //options:--target linux_i686:--target linux_x86_64:--target linux_armv7:--target linux_aarch64
 //options_all:--c11 --clang_version 200100 -d-dump_builtins --set_flag preload_builtin_functions
-//filter:sort
+//filter:edg-normalize-test-output | sort
diff --git a/tests/tests/edg/cmeerw/gnats-28358.sft.cpp b/tests/tests/edg/cmeerw/gnats-28358.sft.cpp
index 88eb8a7c11..622189d383 100644
--- a/tests/tests/edg/cmeerw/gnats-28358.sft.cpp
+++ b/tests/tests/edg/cmeerw/gnats-28358.sft.cpp
@@ -1,4 +1,4 @@
 //type:fp
 //options:--target linux_i686:--target linux_x86_64:--target linux_armv7:--target linux_aarch64
 //options_all:--c++20 --clang_version 210100 -d-dump_builtins --set_flag preload_builtin_functions
-//filter:sort
+//filter:edg-normalize-test-output | sort
diff --git a/tests/tests/edg/cmeerw/gnats-28648.sft.cpp b/tests/tests/edg/cmeerw/gnats-28648.sft.cpp
index 8215a8b013..4f4ae2c625 100644
--- a/tests/tests/edg/cmeerw/gnats-28648.sft.cpp
+++ b/tests/tests/edg/cmeerw/gnats-28648.sft.cpp
@@ -1,4 +1,4 @@
 //type:fp
 //options:--target linux_i686:--target linux_x86_64:--target linux_armv7:--target linux_aarch64:--target linux_riscv32:--target linux_riscv64
 //options_all:--c++20 --clang_version 220100 -d-dump_builtins --set_flag preload_builtin_functions
-//filter:sort
+//filter:edg-normalize-test-output | sort
diff --git a/tests/tests/edg/cmeerw/gnats-28966.sft.cpp b/tests/tests/edg/cmeerw/gnats-28966.sft.cpp
index 541c70b2f8..6583486a18 100644
--- a/tests/tests/edg/cmeerw/gnats-28966.sft.cpp
+++ b/tests/tests/edg/cmeerw/gnats-28966.sft.cpp
@@ -1,4 +1,4 @@
 //type:fp
 //options:--target linux_i686:--target linux_x86_64:--target linux_armv7:--target linux_aarch64:--target linux_riscv32:--target linux_riscv64
 //options_all:--c++20 --clang_version 230100 -d-dump_builtins --set_flag preload_builtin_functions
-//filter:sort
+//filter:edg-normalize-test-output | sort