diff --git a/scripts/github-actions/linux-build_and_test.sh b/scripts/github-actions/linux-build_and_test.sh
index fc7ad631f5..9037f47912 100755
--- a/scripts/github-actions/linux-build_and_test.sh
+++ b/scripts/github-actions/linux-build_and_test.sh
@@ -45,7 +45,7 @@ if [[ "$DO_BUILD" == "yes" ]] ; then
     fi
 
     echo "~~~~~~ RUNNING TESTS ~~~~~~~~"
-    make CTEST_OUTPUT_ON_FAILURE=1 test ARGS="-T Test --output-on-failure -j${NUM_BUILD_PROCS}"
+    or_die make CTEST_OUTPUT_ON_FAILURE=1 test ARGS="-T Test --output-on-failure -j${NUM_BUILD_PROCS}"
 
     if [[ "${DO_BENCHMARKS}" == "yes" ]] ; then
         echo "~~~~~~ RUNNING BENCHMARKS ~~~~~~~~"
diff --git a/src/axom/slic/core/Logger.cpp b/src/axom/slic/core/Logger.cpp
index 8714d842a5..ddccc2f454 100644
--- a/src/axom/slic/core/Logger.cpp
+++ b/src/axom/slic/core/Logger.cpp
@@ -16,29 +16,33 @@ namespace axom
 {
 namespace slic
 {
+//------------------------------------------------------------------------------
+// Slic's singleton state, scope-limited to this file.
+//
+// Defined the singleton state at namespace scope so its destructors are registered
+// late and runs early during teardown.
+//------------------------------------------------------------------------------
+
 using Loggermap = std::map<std::string, Logger*>;
 
 //------------------------------------------------------------------------------
-// This is a singleton, scope-limited to this file.
+static Loggermap s_loggers;
 Loggermap& getLoggers()
 {
-  static Loggermap s_loggers;
   return s_loggers;
 }
 
 //------------------------------------------------------------------------------
-// This is a singleton, scope-limited to this file.
+static Logger* s_Logger = nullptr;
 Logger*& getLogger()
 {
-  static Logger* s_Logger = nullptr;
   return s_Logger;
 }
 
 //------------------------------------------------------------------------------
-// This is a singleton, scope-limited to this file.
+static LogStreamStatusMonitor s_logStreamStatusMonitor;
 LogStreamStatusMonitor& getLogStreamStatusMonitor()
 {
-  static LogStreamStatusMonitor s_logStreamStatusMonitor;
   return s_logStreamStatusMonitor;
 }