Merge branch 'master' into pre-nnbd--merge
diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md
index d9a1fe6..fcc12da 100644
--- a/pkgs/test/CHANGELOG.md
+++ b/pkgs/test/CHANGELOG.md
@@ -66,6 +66,10 @@
`package:test_api/test_api.dart` (and hence through
`package:test_core/test_core.dart` and `package:test/test.dart`).
+## 1.15.6 (Backport)
+
+* Support `package:analyzer` version `0.41.x`.
+
## 1.15.5 (Backport)
* Fix `spawnHybridUri` to respect language versioning of the spawned uri.
diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md
index 0b3a8b3..07730aa 100644
--- a/pkgs/test_core/CHANGELOG.md
+++ b/pkgs/test_core/CHANGELOG.md
@@ -57,6 +57,10 @@
* Migrate to null safety.
+## 0.3.11+3 (Backport)
+
+* Support `package:analyzer` version `0.41.x`.
+
## 0.3.11+2 (Backport)
* Fix `spawnHybridUri` to respect language versioning of the spawned uri.
