diff --git a/kvm-unit-tests/gen_makefile.sh b/kvm-unit-tests/gen_makefile.sh
index bbd5b32..2318aad 100755
--- a/kvm-unit-tests/gen_makefile.sh
+++ b/kvm-unit-tests/gen_makefile.sh
@@ -41,17 +41,13 @@
 # Generates target name for a group of given parameters.
 # Args:
 #   1) Root target name
-#   2) is VHE (0/1)
+#   2) KVM mode (pkvm/nvhe/vhe)
 function group_target_name {
 	local group="$1"
-	local vhe="$2"
+	local mode="$2"
 
 	group="$(target_name kut "${group}")"
-	if [ "${vhe}" -eq 1 ]; then
-		group="$(target_name vhe "${group}")"
-	else
-		group="$(target_name nvhe "${group}")"
-	fi
+	group="$(target_name "${mode}" "${group}")"
 	echo "${group}"
 }
 
@@ -82,18 +78,21 @@
 # Args:
 #   1) Target name
 #   2) Test binary path
-#   3) is VHE (0/1)
+#   3) KVM mode (pkvm/nvhe/vhe)
 #   4) is GDB (0/1)
 function test_target {
 	local target="$1"
 	local binary="$2"
-	local vhe="$3"
+	local mode="$3"
 	local gdb="$4"
 
 	local extra_args=()
-	if [ "${vhe}" -eq 1 ]; then
+	if [ "${mode}" == "vhe" ]; then
 		extra_args+=(-V)
 	fi
+	if [ "${mode}" != "pkvm" ]; then
+		extra_args+=(-N)
+	fi
 	if [ "${gdb}" -eq 1 ]; then
 		extra_args+=(-G)
 	fi
@@ -134,10 +133,10 @@
 fi
 
 TARGET_LIST=()
-for VHE in 0 1; do
+for MODE in pkvm nvhe vhe; do
 	# Emit a target for this test group.
 	ROOT="${GLOBAL_TEST_TARGET}"
-	GROUP="$(group_target_name "${ROOT}" "${VHE}")"
+	GROUP="$(group_target_name "${ROOT}" "${MODE}")"
 	dependency_target "${GROUP}" "${ROOT}"
 
 	for TEST_PATH in "${TEST_DIR}"/*; do
@@ -151,8 +150,8 @@
 		GDB_TARGET="$(target_name gdb ${TARGET})"
 		TARGET_LIST+=("${TARGET}" "${GDB_TARGET}")
 
-		test_target "${TARGET}" "${TEST_PATH}" "${VHE}" 0
-		test_target "${GDB_TARGET}" "${TEST_PATH}" "${VHE}" 1
+		test_target "${TARGET}" "${TEST_PATH}" "${MODE}" 0
+		test_target "${GDB_TARGET}" "${TEST_PATH}" "${MODE}" 1
 		dependency_target "${TARGET}" "${GROUP}"
 	done
 done