diff --git a/test/Concurrency/async_overload_filtering.swift b/test/Concurrency/async_overload_filtering.swift
index 7f7b93b0cf9..8216126ba77 100644
--- a/test/Concurrency/async_overload_filtering.swift
+++ b/test/Concurrency/async_overload_filtering.swift
@@ -18,8 +18,9 @@ var a: String? = nil
 
 // CHECK: attempting disjunction choice $T0 bound to decl async_overload_filtering.(file).filter_async(fn2:)
 // CHECK-NEXT: overload set choice binding $T0 := {{.*}}
-// CHECK-NEXT: increasing 'sync-in-asynchronous' score by 1
-// CHECK-NEXT: solution is worse than the best solution
+// CHECK-NEXT: (considering -> ({{.*}}) -> {{.*}} applicable fn {{.*}}
+// CHECK: increasing 'sync-in-asynchronous' score by 1
+// CHECK: solution is worse than the best solution
 filter_async {
   Obj()
 }.op("" + (a ?? "a"))
diff --git a/test/Constraints/common_type.swift b/test/Constraints/common_type.swift
index e64bd57d2b9..b4b034a6953 100644
--- a/test/Constraints/common_type.swift
+++ b/test/Constraints/common_type.swift
@@ -28,9 +28,11 @@ func f(_: Double) -> Y { return Y() }
 
 func testCallCommonType() {
   // CHECK: overload set choice binding $T{{[0-9]+}} := (Int) -> X
-  // CHECK-NEXT: (common result type for $T{{[0-9]+}} is Int)
+  // CHECK: (considering -> $T{{[0-9]+}}[.g: value] == [[G:\$T[0-9]+]]
+  // CHECK: (common result type for [[G]] is Int)
   // CHECK: (overload set choice binding $T{{[0-9]+}} := (Double) -> Y)
-  // CHECK-NEXT: (common result type for $T{{[0-9]+}} is Double)
+  // CHECK: (considering -> $T{{[0-9]+}}[.g: value] == [[F:\$T[0-9]+]]
+  // CHECK: (common result type for [[F]] is Double)
   _ = f(0).g(0)
 }
 
diff --git a/test/Constraints/one_way_solve.swift b/test/Constraints/one_way_solve.swift
index 53d3ac359f1..b3c477d8b39 100644
--- a/test/Constraints/one_way_solve.swift
+++ b/test/Constraints/one_way_solve.swift
@@ -7,11 +7,11 @@ func takeDoubleAndBool(_: Double, _: Bool) { }
 
 func testTernaryOneWay(b: Bool, b2: Bool) {
   // CHECK: ---Connected components---
-  // CHECK-NEXT: 3: $T10 depends on 1
-  // CHECK-NEXT: 1: $T5 $T8 $T9 depends on 0, 2
-  // CHECK-NEXT: 2: $T7
-  // CHECK-NEXT: 0: $T4
-  // CHECK-NEXT: 4: $T11 $T13 $T14
+  // CHECK-NEXT: 3: $T{{[0-9]+}} depends on 1
+  // CHECK-NEXT: 1: $T{{[0-9]+}} $T{{[0-9]+}} $T{{[0-9]+}} depends on 0, 2
+  // CHECK-NEXT: 2: $T{{[0-9]+}}
+  // CHECK-NEXT: 0: $T{{[0-9]+}}
+  // CHECK-NEXT: 4: $T{{[0-9]+}} $T{{[0-9]+}} $T{{[0-9]+}}
   takeDoubleAndBool(
     Builtin.one_way(
       b ? Builtin.one_way(3.14159) : Builtin.one_way(2.71828)),
@@ -23,22 +23,25 @@ func int8Or16(_ x: Int16) -> Int16 { return x }
 
 func testTernaryOneWayOverload(b: Bool) {
   // CHECK: ---Connected components---
-  // CHECK: 1: $T5 $T10 $T11 depends on 0, 2
-  // CHECK: 2: $T7 $T8 $T9
-  // CHECK: 0: $T2 $T3 $T4
+  // CHECK: 1: [[A:\$T[0-9]+]] [[B:\$T[0-9]+]] [[C:\$T[0-9]+]] depends on 0, 2
+  // CHECK: 2: $T{{[0-9]+}} $T{{[0-9]+}} $T{{[0-9]+}}
+  // CHECK: 0: $T{{[0-9]+}} $T{{[0-9]+}} $T{{[0-9]+}}
 
   // CHECK: solving component #1
-  // CHECK: (attempting type variable $T11 := Int8
+  // CHECK: (attempting type variable [[C]] := Int8
 
   // CHECK: solving component #1
-  // CHECK: (attempting type variable $T11 := Int8
+  // CHECK: (attempting type variable [[C]] := Int8
 
   // CHECK: solving component #1
-  // CHECK: (attempting type variable $T11 := Int8
+  // CHECK: (attempting type variable [[C]] := Int8
 
   // CHECK: solving component #1
-  // CHECK: (attempting type variable $T11 := Int8 
-  // CHECK: (found solution: [component: non-default literal(s), value: 2] [component: use of overloaded unapplied function(s), value: 2]) 
+  // CHECK: (attempting type variable [[C]] := Int8
+  // CHECK: (considering -> $T{{[0-9]+}} conv [[C]]
+  // CHECK: (considering -> $T{{[0-9]+}} conv [[C]]
+  // CHECK: (considering -> [[C]] conv Int8
+  // CHECK: (found solution: [component: non-default literal(s), value: 2] [component: use of overloaded unapplied function(s), value: 2])
 
   // CHECK: (composed solution: [component: non-default literal(s), value: 2] [component: use of overloaded unapplied function(s), value: 2])
   // CHECK-NOT: (composed solution: [component: non-default literal(s), value: 2] [component: use of overloaded unapplied function(s), value: 2])
diff --git a/test/Constraints/overload_filtering.swift b/test/Constraints/overload_filtering.swift
index ee7749b1622..286a3b19957 100644
--- a/test/Constraints/overload_filtering.swift
+++ b/test/Constraints/overload_filtering.swift
@@ -35,6 +35,10 @@ func testSubscript(x: X, i: Int) {
 func testUnresolvedMember(i: Int) -> X {
   // CHECK: disabled disjunction term {{.*}} bound to decl overload_filtering.(file).X.init(_:)
   // CHECK-NEXT: disabled disjunction term {{.*}} bound to decl overload_filtering.(file).X.init(_:_:_:)
+  // CHECK-NEXT: (removed constraint: disjunction
+  // CHECK-NEXT: > [[A:\$T[0-9]+]] bound to decl overload_filtering
+  // CHECK-NEXT: > [disabled] [[A]] bound to decl overload_filtering
+  // CHECK-NEXT: > [disabled] [[A]] bound to decl overload_filtering
   // CHECK-NEXT: introducing single enabled disjunction term {{.*}} bound to decl overload_filtering.(file).X.init(_:_:)
   return .init(i, i)
 }
@@ -56,6 +60,10 @@ func test_member_filtering() {
   func test(s: S) {
     // CHECK: disabled disjunction term {{.*}} bound to decl overload_filtering.(file).test_member_filtering().S.bar(v:)
     // CHECK-NEXT: disabled disjunction term {{.*}} bound to decl overload_filtering.(file).test_member_filtering().S.bar(a:b:)
+    // CHECK-NEXT: (removed constraint: disjunction
+    // CHECK-NEXT: > [[B:\$T[0-9]+]] bound to decl overload_filtering
+    // CHECK-NEXT: > [disabled] [[B]] bound to decl overload_filtering
+    // CHECK-NEXT: > [disabled] [[B]] bound to decl overload_filtering
     // CHECK-NEXT: introducing single enabled disjunction term {{.*}} bound to decl overload_filtering.(file).test_member_filtering().S.bar
     s.foo(42).bar(42)
   }