diff --git a/Gemfile b/Gemfile
index fdb7f8b..58f6070 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,6 +71,8 @@ end
 
 group :test do
   gem "shoulda", "~> 2.10.3"
+  # Shoulda does not work nice on Ruby 1.9.3 and seems to need test-unit explicitely.
+  gem "test-unit", :platforms => [:mri_19]
   gem "edavis10-object_daddy", :require => "object_daddy"
   gem "mocha"
 end
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index fec04fc..85fdab9 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,6 +6,7 @@ http://www.redmine.org/
 
 == TBD v1.4.5
 
+* Defect #10818: Running rake in test environment causes exception
 * Defect #11192: Make repository identifier accept underscores
 * Defect #11307: Can't filter for negative numeric custom fields
 * Defect #11365: Attachment description length is not validated