diff --git a/repos/os/run/trace_logger.run b/repos/os/run/trace_logger.run
index 708cd798d..6c23447c0 100644
--- a/repos/os/run/trace_logger.run
+++ b/repos/os/run/trace_logger.run
@@ -82,7 +82,7 @@ append config {
 
 			<policy label="init -> test-trace_logger"
 			        thread="ep"
-			        buffer="1M"
+			        buffer="4K"
 			        policy="rpc_name"/>
 		</config>
 	</start>
@@ -167,6 +167,15 @@ lappend_if [have_spec gpio] boot_modules [gpio_drv]
 
 build_boot_image $boot_modules
 
-append qemu_args " -smp 4,cores=4 "
+append qemu_args " -nographic "
 
-run_genode_until forever
+if {[have_spec x86]} { append qemu_args " -smp 4,cores=4 " }
+
+set done_string ""
+for {set i 50} {$i <= 100} {incr i 1} {
+	append done_string ".*trace_logger\] $i .*\n"
+	append done_string ".*trace_logger\] trigger_once.*\n"
+	append done_string ".*trace_logger\] trigger_once.*\n"
+}
+
+run_genode_until $done_string 60
diff --git a/repos/os/src/test/trace_logger/main.cc b/repos/os/src/test/trace_logger/main.cc
index af1c5e574..f72fc5ba4 100644
--- a/repos/os/src/test/trace_logger/main.cc
+++ b/repos/os/src/test/trace_logger/main.cc
@@ -22,8 +22,8 @@ using namespace Genode;
 void Component::construct(Genode::Env &env)
 {
 	Timer::Connection timer(env);
-	for (unsigned i = 0; i < 20; i++) {
-		timer.msleep(500);
+	for (unsigned i = 0; ; i++) {
+		timer.msleep(100);
 		Thread::trace(String<32>(i, " ", Trace::timestamp()).string());
 	}
 	env.parent().exit(0);
diff --git a/tool/autopilot.list b/tool/autopilot.list
index 0909e9943..2fd6a9b03 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -119,3 +119,4 @@ verify
 fetchurl
 depot_query
 depot_download
+trace_logger