diff --git a/cranelift/filetests/filetests/cfg/loop.clif b/cranelift/filetests/filetests/cfg/loop.clif
index 42e9cb483d..a52ae09986 100644
--- a/cranelift/filetests/filetests/cfg/loop.clif
+++ b/cranelift/filetests/filetests/cfg/loop.clif
@@ -3,18 +3,33 @@ test print-cfg
 test verifier
 
 function %nonsense(i32, i32) -> f32 {
-; check: digraph "%nonsense" {
 ; regex: I=\binst\d+\b
-; check: label="{ebb0 | <$(BRZ=$I)>brz ebb2 | <$(JUMP=$I)>jump ebb3}"]
-
+; check: digraph "%nonsense" {
+; check:     ebb0 [shape=record, label="{ebb0(v1: i32, v2: i32):
+; check: | <$(BRZ=$I)>brz v2, ebb2
+; nextln: | <$(JUMP0=$I)>jump ebb3
+; nextln: }"]
+; nextln:     ebb3 [shape=record, label="{ebb3:
+; check: | <$(JUMP3=$I)>jump ebb1(v4)
+; nextln: }"]
+; nextln:     ebb1 [shape=record, label="{ebb1(v5: i32):
+; check:  | <$(BRNZ1=$I)>brnz v13, ebb1(v12)
+; nextln: | <$(JUMP1=$I)>jump ebb4
+; nextln: }"]
+; nextln:    ebb4 [shape=record, label="{ebb4:
+; check:  | <$I>return v17
+; nextln: }"]
+; nextln:    ebb2 [shape=record, label="{ebb2:
+; check:  | <$I>return v100
+; check:}"]
 ebb0(v1: i32, v2: i32):
     v3 = f64const 0x0.0
     brz v2, ebb2            ; unordered: ebb0:$BRZ -> ebb2
-    jump ebb3               ; unordered: ebb0:$JUMP -> ebb3
+    jump ebb3               ; unordered: ebb0:$JUMP0 -> ebb3
 
 ebb3:
     v4 = iconst.i32 0
-    jump ebb1(v4)           ; unordered: ebb3:inst4 -> ebb1
+    jump ebb1(v4)           ; unordered: ebb3:$JUMP3 -> ebb1
 
 ebb1(v5: i32):
     v6 = imul_imm v5, 4
@@ -25,8 +40,8 @@ ebb1(v5: i32):
     v11 = fadd v9, v10
     v12 = iadd_imm v5, 1
     v13 = icmp ult v12, v2
-    brnz v13, ebb1(v12)     ; unordered: ebb1:inst13 -> ebb1
-    jump ebb4               ; unordered: ebb1:inst14 -> ebb4
+    brnz v13, ebb1(v12)     ; unordered: ebb1:$BRNZ1 -> ebb1
+    jump ebb4               ; unordered: ebb1:$JUMP1 -> ebb4
 
 ebb4:
     v14 = f64const 0.0
diff --git a/cranelift/filetests/filetests/cfg/unused_node.clif b/cranelift/filetests/filetests/cfg/unused_node.clif
index 80f2402c07..1a2dd9fb1d 100644
--- a/cranelift/filetests/filetests/cfg/unused_node.clif
+++ b/cranelift/filetests/filetests/cfg/unused_node.clif
@@ -3,10 +3,16 @@ test print-cfg
 
 function %not_reached(i32) -> i32 {
 ; check: digraph "%not_reached" {
-; check:     ebb0 [shape=record, label="{ebb0 | <inst0>brnz ebb2}"]
-; check:     ebb1 [shape=record, label="{ebb1 | <inst4>jump ebb0}"]
-; check:     ebb2 [shape=record, label="{ebb2}"]
-
+; check:     ebb0 [shape=record, label="{ebb0(v0: i32):
+; check:  | <inst0>brnz v0, ebb2
+; check:  | <inst1>trap user0
+; check: }"]
+; check:     ebb1 [shape=record, label="{ebb1:
+; check:  | <inst4>jump ebb0(v2)
+; check: }"]
+; check:     ebb2 [shape=record, label="{ebb2:
+; check:  | <inst5>return v0
+; check: }"]
 ebb0(v0: i32):
     brnz v0, ebb2       ; unordered: ebb0:inst0 -> ebb2
     trap user0