diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md
index 9a3f647..794a44a 100644
--- a/pkgs/test/CHANGELOG.md
+++ b/pkgs/test/CHANGELOG.md
@@ -1,6 +1,14 @@
-## 1.5.4
+## 1.6.0
 
 * Allow `analyzer` version `0.36.x`.
+* Matcher changes:
+  * Add `isA()` to create `TypeMatcher` instances in a more fluent way.
+  * Add `isCastError`.
+  * **Potentially breaking bug fix**. Ordering matchers no longer treat objects
+    with a partial ordering (such as NaN for double values) as if they had a
+    complete ordering. For instance `greaterThan` now compares with the `>`
+    operator rather not `<` and not `=`. This could cause tests which relied on
+    this bug to start failing.
 
 ## 1.5.3
 
diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml
index ae542f5..5f1ee36 100644
--- a/pkgs/test/pubspec.yaml
+++ b/pkgs/test/pubspec.yaml
@@ -1,5 +1,5 @@
 name: test
-version: 1.5.4-dev
+version: 1.6.0
 author: Dart Team <misc@dartlang.org>
 description: A full featured library for writing and running Dart tests.
 homepage: https://github.com/dart-lang/test/blob/master/pkgs/test
@@ -33,8 +33,8 @@
   web_socket_channel: '^1.0.0'
   yaml: '^2.0.0'
   # Use an exact version until the test_api and test_core package are stable.
-  test_api: '0.2.2'
-  test_core: '0.2.1+1'
+  test_api: '0.2.3'
+  test_core: '0.2.2'
 
 dev_dependencies:
   fake_async: '>=0.1.2 <2.0.0'
diff --git a/pkgs/test_api/CHANGELOG.md b/pkgs/test_api/CHANGELOG.md
index 4cf6704..bd192d6 100644
--- a/pkgs/test_api/CHANGELOG.md
+++ b/pkgs/test_api/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.3
+
+* Update to matcher version `0.12.5`.
+
 ## 0.2.2
 
 * Require Dart SDK `>=2.1.0`.
diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml
index 951845f..434b84a 100644
--- a/pkgs/test_api/pubspec.yaml
+++ b/pkgs/test_api/pubspec.yaml
@@ -1,5 +1,5 @@
 name: test_api
-version: 0.2.2
+version: 0.2.3
 author: Dart Team <misc@dartlang.org>
 description: A library for writing Dart tests.
 homepage: https://github.com/dart-lang/test/blob/master/pkgs/test_api
@@ -22,7 +22,7 @@
 
   # Use a tight version constraint to ensure that a constraint on matcher
   # properly constrains all features it provides.
-  matcher: '>=0.12.3 <0.12.4'
+  matcher: '>=0.12.5 <0.12.6'
 
 dev_dependencies:
   fake_async: '>=0.1.2 <2.0.0'
diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md
index 1da6c04..06f9ecd 100644
--- a/pkgs/test_core/CHANGELOG.md
+++ b/pkgs/test_core/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.2.2
 
 * Allow `analyzer` version `0.36.x`.
+* Update to matcher version `0.12.5`.
 
 ## 0.2.1+1
 
diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml
index 9f3664c..30a2f48 100644
--- a/pkgs/test_core/pubspec.yaml
+++ b/pkgs/test_core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: test_core
-version: 0.2.2-dev
+version: 0.2.2
 author: Dart Team <misc@dartlang.org>
 description: A basic library for writing tests and running them on the VM.
 homepage: https://github.com/dart-lang/test/blob/master/pkgs/test_core
@@ -30,9 +30,9 @@
   yaml: '^2.0.0'
   # Use a tight version constraint to ensure that a constraint on matcher
   # properly constrains all features it provides.
-  matcher: '>=0.12.3 <0.12.4'
+  matcher: '>=0.12.5 <0.12.6'
   # Use an exact version until the test_api package is stable.
-  test_api: '0.2.2'
+  test_api: '0.2.3'
 
 dependency_overrides:
   test_api: