diff --git a/CHANGELOG.md b/CHANGELOG.md
index a75775d43..993a8d729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.0.4 ([commits](https://github.com/scholarslab/Neatline/compare/2.0.4...2.0.4)) ~ August 14, 2013
+
+#### Bug Fixes
+
+  - Fixes a class capitalization typo that was causing failure notices to be erroneously displayed afted deleting records under some versions of PHP.
+
 ## v2.0.3 ([commits](https://github.com/scholarslab/Neatline/compare/2.0.2...2.0.3)) ~ August 9, 2013
 
 #### Bug Fixes
diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 3c3da3a2b..12505439b 100644
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -30,3 +30,12 @@
 
 // Mock filter callbacks.
 require_once 'mocks/filters.php';
+
+
+// TODO: Other than downgrading PHPUnit, how to fix this?
+//
+// Manually load `Zend_Test_PHPUnit_Constraint_DomQuery`, which triggers
+// a false-negative error in the suite when first loaded by Zend's PHPUnit
+// subclasses, which don't work with PHPUnit 3.6+.
+
+@require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';