diff --git a/clients/drcachesim/tests/offline-burst_threadL0filter.templatex b/clients/drcachesim/tests/offline-burst_threadL0filter.templatex
index 6f90aaf475d..4ad2faf34e6 100644
--- a/clients/drcachesim/tests/offline-burst_threadL0filter.templatex
+++ b/clients/drcachesim/tests/offline-burst_threadL0filter.templatex
@@ -32,3 +32,4 @@ Total counts:
            0 total physical address unavailable markers
     *[0-9]* total other markers
     *[0-9]* total encodings
+.*
diff --git a/clients/drcachesim/tests/offline-interval-count-output.templatex b/clients/drcachesim/tests/offline-interval-count-output.templatex
index ee7deabd1c5..ae7dad76862 100644
--- a/clients/drcachesim/tests/offline-interval-count-output.templatex
+++ b/clients/drcachesim/tests/offline-interval-count-output.templatex
@@ -1,3 +1,4 @@
+Hello, world!
 Basic counts tool results:
 Total counts:
      .* total \(fetched\) instructions
@@ -57,3 +58,4 @@ Interval #1 ending at timestamp.*
            0 interval delta physical address unavailable markers
      .* interval delta other markers
      .* interval delta encodings.*
+.*
diff --git a/clients/drcachesim/tests/offline-rseq.templatex b/clients/drcachesim/tests/offline-rseq.templatex
index 4076ae23d54..780e8f8d5d8 100644
--- a/clients/drcachesim/tests/offline-rseq.templatex
+++ b/clients/drcachesim/tests/offline-rseq.templatex
@@ -1,3 +1,4 @@
+Hit delay threshold: enabling tracing.
 All done
 Cache simulation results:
 Core #0 \(1 thread\(s\)\)
diff --git a/clients/drcachesim/tests/raw2trace-simple.templatex b/clients/drcachesim/tests/raw2trace-simple.templatex
index 1f1987d6e0b..716b80b55df 100644
--- a/clients/drcachesim/tests/raw2trace-simple.templatex
+++ b/clients/drcachesim/tests/raw2trace-simple.templatex
@@ -1,12 +1,16 @@
+.*
 \[drmemtrace\]: Reading module file from memory
 open|close
+.*
 \[drmemtrace\]: Successfully read [0-9]+ modules
+.*
 \[drmemtrace\]: Successfully converted [0-9]+ thread files
 Processed
 About to load modules
 Loaded modules successfully
 Successfully found app entry
 Custom user_free was called
+.*
 Read timestamp from thread header
 Read timestamp without thread header
 Verified boundary conditions
diff --git a/suite/tests/runmulti.cmake b/suite/tests/runmulti.cmake
index 105c2d8f5a2..9808a5babb7 100644
--- a/suite/tests/runmulti.cmake
+++ b/suite/tests/runmulti.cmake
@@ -1,5 +1,5 @@
 # **********************************************************
-# Copyright (c) 2015-2022 Google, Inc.    All rights reserved.
+# Copyright (c) 2015-2023 Google, Inc.    All rights reserved.
 # **********************************************************
 
 # Redistribution and use in source and binary forms, with or without
@@ -53,6 +53,9 @@ macro(process_cmdline line skip_empty err_and_out)
   string(REGEX REPLACE "@@" " " ${line} "${${line}}")
   string(REGEX REPLACE "@" ";" ${line} "${${line}}")
   string(REGEX REPLACE "!" "\\\;" ${line} "${${line}}")
+  # Clear to avoid repeating prior command if this one isn't run.
+  set(cmd_err "")
+  set(cmd_out "")
 
   if (${line} MATCHES "^foreach;")
     set(each ${${line}})
@@ -115,6 +118,7 @@ endmacro()
 process_cmdline(precmd ON ignore)
 
 process_cmdline(cmd OFF tomatch)
+message("output: |${tomatch}|")
 
 if (NOT "${postcmd}" STREQUAL "")
   process_cmdline(postcmd OFF tomatch)
@@ -128,6 +132,6 @@ endif()
 # get expected output (must already be processed w/ regex => literal, etc.)
 file(READ "${cmp}" str)
 
-if (NOT "${tomatch}" MATCHES "${str}")
+if (NOT "${tomatch}" MATCHES "^${str}$")
   message(FATAL_ERROR "output |${tomatch}| failed to match expected output |${str}|")
 endif ()