diff --git a/changes/bug22497 b/changes/bug22497
new file mode 100644
index 0000000000..8cde87ff79
--- /dev/null
+++ b/changes/bug22497
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+    - Use our test macros more consistently, to produce more useful
+      error messages when our unit tests fail.  Add coccinelle patches 
+      to allow us to re-check for test macro uses. Closes ticket 22497.