diff --git a/src/api.c b/src/api.c
index bb3bba7e..8c1263a7 100644
--- a/src/api.c
+++ b/src/api.c
@@ -4702,8 +4702,7 @@ void api_flush_log_buffer(struct vcpu_locked *vcpu_locked)
 	ffa_id_t vcpu_id = vcpu_index(vcpu);
 
 	buffer->chars[buffer->len] = '\0';
-	dlog("%s%#x@%#x: %s\n", ffa_is_vm_id(vm_id) ? "VM" : "SP", vm_id,
-	     vcpu_id, buffer->chars);
+	dlog("[%x %u] %s\n", vm_id, vcpu_id, buffer->chars);
 	buffer->len = 0;
 }
 
diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index b63e8022..7d3f80cb 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -41,7 +41,7 @@
 HFTEST_CTRL_GET_COMMAND_LINE = "[hftest_ctrl:get_command_line]"
 HFTEST_CTRL_FINISHED = "[hftest_ctrl:finished]"
 
-HFTEST_CTRL_JSON_REGEX = re.compile("^(VM|SP)0x[0-9a-fA-F]+@0x[0-9a-fA-F]+: ")
+HFTEST_CTRL_JSON_REGEX = re.compile("^\\[[0-9a-fA-F]+ [0-9a-fA-F]+\\] ")
 
 HF_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
     os.path.abspath(__file__))))