diff --git a/tools/test-runner b/tools/test-runner
index 7e89d71c..a0e3e5f7 100755
--- a/tools/test-runner
+++ b/tools/test-runner
@@ -1254,9 +1254,9 @@ def pre_test(ctx, test, copied):
 	ctx.start_ofono()
 
 	if ctx.args.log:
-		ctx.start_process(['iwmon'])
+		ctx.start_process(['iwmon', '--nowiphy'])
 	elif ctx.args.monitor:
-		ctx.start_process(['iwmon'], outfile=ctx.args.monitor)
+		ctx.start_process(['iwmon', '--nowiphy'], outfile=ctx.args.monitor)
 
 	if ctx.hw_config.has_option('SETUP', 'start_iwd'):
 		start = ctx.hw_config.getboolean('SETUP', 'start_iwd')
@@ -1734,7 +1734,7 @@ class Main:
 				rootflags=trans=virtio,msize=1048576,version=9p2000.u \
 				acpi=off pci=noacpi %s ro \
 				mac80211_hwsim.radios=0 %s' % (kern_log, options),
-			'-cpu', 'host', '-smp', str(smp)
+			'-smp', str(smp)
 		]
 
 		# Add two ethernet devices for testing EAD