diff --git a/Makefile b/Makefile
index e2cce08e..1a0e23b7 100644
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ unit-test-robot:
 .PHONY: unit-test-registry
 unit-test-registry:
 	echo "mode: count" > coverage.out
-	$(GO) test -v -timeout=2m -covermode=count -coverprofile=profile.out ./registry/... > tmp.out; \
+	$(GO) test -v -p 1 -timeout=5m -covermode=count -coverprofile=profile.out ./registry/... > tmp.out; \
 	cat tmp.out; \
 	if grep -q "^--- FAIL" tmp.out; then \
 		rm tmp.out; \
diff --git a/registry/manager/e2e_helpers_test.go b/registry/manager/e2e_helpers_test.go
index a09c61b4..6e4fb792 100644
--- a/registry/manager/e2e_helpers_test.go
+++ b/registry/manager/e2e_helpers_test.go
@@ -189,7 +189,7 @@ func buildV2AgentApp(t *testing.T) string {
   "mentionable": false
 }`)
 	mustWriteFile(t, filepath.Join(assistDir, "prompts.yml"),
-		"system: |\n  You are the v2 registry test assistant with enhanced capabilities.\n")
+		"- role: system\n  content: |\n    You are the v2 registry test assistant with enhanced capabilities.\n")
 	mustWriteFile(t, filepath.Join(assistDir, "tools.ts"),
 		`export function newV2Tool(): number { return 42; }`)
 
@@ -321,7 +321,7 @@ func buildV2AnalyticsApp(t *testing.T) string {
   "mentionable": false
 }`)
 	mustWriteFile(t, filepath.Join(assistDir, "prompts.yml"),
-		"system: |\n  You are the v2 analytics assistant with charting capabilities.\n")
+		"- role: system\n  content: |\n    You are the v2 analytics assistant with charting capabilities.\n")
 	mustWriteFile(t, filepath.Join(assistDir, "chart_helper.ts"),
 		`export function renderChart(): string { return "chart-v2"; }`)