diff --git a/ChangeLog b/ChangeLog
index 67b4e12bb5..e0d9d70033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov  7 20:18:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* test/psych/test_yamldbm.rb: Test case should inherit from MiniTest,
+	  load psych/helper so that psych and friends are loaded.
+
 Mon Nov  7 20:15:44 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/dbm/extconf.rb: check dbm_pagfno() and dbm_dirfno().
diff --git a/test/psych/test_yamldbm.rb b/test/psych/test_yamldbm.rb
index 1b5d4447b4..bff13635ab 100644
--- a/test/psych/test_yamldbm.rb
+++ b/test/psych/test_yamldbm.rb
@@ -1,16 +1,17 @@
 # -*- coding: UTF-8 -*-
+
+require 'psych/helper'
+require 'tmpdir'
+
 begin
-  require 'test/unit'
-  require 'psych'
   require 'yaml/dbm'
-  require 'tmpdir'
 rescue LoadError
 end
 
 module Psych
   ::Psych::DBM = ::YAML::DBM unless defined?(::Psych::DBM)
 
-  class YAMLDBMTest < Test::Unit::TestCase
+  class YAMLDBMTest < TestCase
     def setup
       @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
       @dir = Dir.mktmpdir("rubytest-file")