diff --git a/qemu.mk b/qemu.mk
index ef8b781..f1019ab 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -141,18 +141,14 @@
 # Run targets
 ################################################################################
 define run-help
-	@echo "Run QEMU"
-	@echo QEMU is now waiting to start the execution
-	@echo Start execution with either a \'c\' followed by \<enter\> in the QEMU console or
-	@echo attach a debugger and continue from there.
 	@echo
-	@echo To run xtest paste the following on the serial 0 prompt
-	@echo tee-supplicant\&
-	@echo sleep 0.1
-	@echo xtest
+	@echo \* QEMU is now waiting to start the execution
+	@echo \* Start execution with either a \'c\' followed by \<enter\> in the QEMU console or
+	@echo \* attach a debugger and continue from there.
+	@echo \*
+	@echo \* To run OP-TEE tests, use the xtest command in the \'Normal World\' terminal
+	@echo \* Enter \'xtest -h\' for help.
 	@echo
-	@echo To run a single test case replace the xtest command with for instance
-	@echo xtest 1004
 endef
 
 define launch-terminal
diff --git a/qemu_v8.mk b/qemu_v8.mk
index 0dded16..754e7b2 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -190,18 +190,14 @@
 # Run targets
 ################################################################################
 define run-help
-	@echo "Run QEMU"
-	@echo QEMU is now waiting to start the execution
-	@echo Start execution with either a \'c\' followed by \<enter\> in the QEMU console or
-	@echo attach a debugger and continue from there.
 	@echo
-	@echo To run xtest paste the following on the serial 0 prompt
-	@echo tee-supplicant\&
-	@echo sleep 0.1
-	@echo xtest
+	@echo \* QEMU is now waiting to start the execution
+	@echo \* Start execution with either a \'c\' followed by \<enter\> in the QEMU console or
+	@echo \* attach a debugger and continue from there.
+	@echo \*
+	@echo \* To run OP-TEE tests, use the xtest command in the \'Normal World\' terminal
+	@echo \* Enter \'xtest -h\' for help.
 	@echo
-	@echo To run a single test case replace the xtest command with for instance
-	@echo xtest 1004
 endef
 
 define launch-terminal
@@ -229,7 +225,7 @@
 		-nographic \
 		-serial tcp:localhost:54320 -serial tcp:localhost:54321 \
 		-machine virt,secure=on -cpu cortex-a57 -m 1057 -bios $(ARM_TF_PATH)/build/qemu/release/bl1.bin \
-		-semihosting -d unimp \
+		-s -S -semihosting-config enable,target=native -d unimp \
 		-initrd $(GEN_ROOTFS_PATH)/filesystem.cpio.gz \
 		-kernel $(LINUX_PATH)/arch/arm64/boot/Image \
 		-append 'console=ttyAMA0,38400 keep_bootcon root=/dev/vda2' \