diff --git a/.github/workflows/cmake-tier1.yml b/.github/workflows/cmake-tier1.yml
index 09976ba..2aaa1b9 100644
--- a/.github/workflows/cmake-tier1.yml
+++ b/.github/workflows/cmake-tier1.yml
@@ -55,7 +55,7 @@ jobs:
     - name: Test
       working-directory: ${{github.workspace}}/build
       shell: bash
-      run: ctest -C $BUILD_TYPE
+      run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
 
     - name: Pack (cmake install and make binary package)
       shell: bash
@@ -114,7 +114,7 @@ jobs:
       - name: Test
         working-directory: ${{github.workspace}}/build
         shell: msys2 {0}
-        run: ctest -C $BUILD_TYPE
+        run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
 
       - name: Download Package Requirements
         shell: msys2 {0}
diff --git a/.github/workflows/cmake-tier2-flaky.yml b/.github/workflows/cmake-tier2-flaky.yml
index 0dddeb8..250e646 100644
--- a/.github/workflows/cmake-tier2-flaky.yml
+++ b/.github/workflows/cmake-tier2-flaky.yml
@@ -23,12 +23,11 @@ jobs:
 
     - name: Build and test in FreeBSD
       id: test
-      uses: vmactions/freebsd-vm@v0.1.2
+      uses: vmactions/freebsd-vm@v1
       with:
         envs: 'BUILD_TYPE'
         usesh: true
         sync: rsync
-        mem: 2048
         prepare: >
           pkg install -y cmake pkgconf gtkmm30 gettext pcre libiconv
 
@@ -43,4 +42,4 @@ jobs:
 
           cmake --build . --config $BUILD_TYPE
 
-          ctest -C $BUILD_TYPE
+          ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
diff --git a/.github/workflows/cmake-tier2.yml b/.github/workflows/cmake-tier2.yml
index bffe00d..278ea3a 100644
--- a/.github/workflows/cmake-tier2.yml
+++ b/.github/workflows/cmake-tier2.yml
@@ -71,5 +71,5 @@ jobs:
     - name: Test
       working-directory: ${{github.workspace}}/build
       shell: bash
-      run: ctest -C $BUILD_TYPE
+      run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure
 
diff --git a/docs/software_requirements.md b/docs/software_requirements.md
index 4e2f4af..4612bc3 100644
--- a/docs/software_requirements.md
+++ b/docs/software_requirements.md
@@ -25,6 +25,7 @@ permalink: /software-requirements
 * [pcre1](https://www.pcre.org) library.
 * [GTK+ 3](https://www.gtk.org) library, version 3.4 or higher.
 * [Gtkmm](https://www.gtkmm.org) library, version 3.4 or higher.
+* C++20 Compiler (GCC 13 or later, Clang/libc++ 17 or later, Apple Clang 15 or later)
 
 ## Runtime Requirements
 **Note:** The Windows packages already include all the required software.