# Node ID a0361278e9b69dd7e7efc642b36e27f52f062471
# Parent  31ef410b6843521775bf0deea42a41a206496037
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -238,7 +238,6 @@
     Keyword Arguments:
       do_drain -- Perform a drain/resume of the system when switching.
     """
-    print "switching cpus"
     if not isinstance(cpuList, list):
         raise RuntimeError, "Must pass a list to this function"
     for item in cpuList:
diff --git a/tests/configs/switcheroo.py b/tests/configs/switcheroo.py
--- a/tests/configs/switcheroo.py
+++ b/tests/configs/switcheroo.py
@@ -100,6 +100,15 @@
     system = root.system
     system.mem_mode = type(current_cpu).memory_mode()
 
+    # Normally suppress output.  Should wire this up to a command-line
+    # argument someday.
+    verbose = False
+
+    # Suppress "Entering event queue" messages since we get tons of them.
+    # Worse yet, they include the timestamp, which makes them highly
+    # variable and unsuitable for comparing as test outputs.
+    m5.internal.core.cvar.want_info = verbose
+
     # instantiate configuration
     m5.instantiate()
 
@@ -113,8 +122,9 @@
         if exit_cause == "simulate() limit reached":
             next_cpu = switcher.next()
 
-            print "Switching CPUs..."
-            print "Next CPU: %s" % type(next_cpu)
+            if verbose:
+                print "Switching CPUs..."
+                print "Next CPU: %s" % type(next_cpu)
             m5.drain(system)
             if current_cpu != next_cpu:
                 m5.switchCpus(system, [ (current_cpu, next_cpu) ],