diff --git a/test/bson/binary_test.rb b/test/bson/binary_test.rb
index 30ffa78..666e7c3 100644
--- a/test/bson/binary_test.rb
+++ b/test/bson/binary_test.rb
@@ -2,14 +2,12 @@
 require './test/bson/test_helper'
 
 class BinaryTest < Test::Unit::TestCase
-  context "Inspecting" do
-    setup do
-      @data = ("THIS IS BINARY " * 50).unpack("c*")
-    end
+  def setup
+    @data = ("THIS IS BINARY " * 50).unpack("c*")
+  end
 
-    should "not display actual data" do
-      binary = BSON::Binary.new(@data)
-      assert_equal "<BSON::Binary:#{binary.object_id}>", binary.inspect
-    end
+  def test_do_not_display_binary_data
+    binary = BSON::Binary.new(@data)
+    assert_equal "<BSON::Binary:#{binary.object_id}>", binary.inspect
   end
 end
diff --git a/test/bson/bson_test.rb b/test/bson/bson_test.rb
index b9e0e26..ff00f83 100644
--- a/test/bson/bson_test.rb
+++ b/test/bson/bson_test.rb
@@ -9,6 +9,7 @@ end
 require 'bigdecimal'
 
 begin
+  require 'date'
   require 'tzinfo'
   require 'active_support/core_ext'
   Time.zone = "Pacific Time (US & Canada)"
diff --git a/test/bson/test_helper.rb b/test/bson/test_helper.rb
index 668f77e..5cda020 100644
--- a/test/bson/test_helper.rb
+++ b/test/bson/test_helper.rb
@@ -10,23 +10,6 @@ def silently
   result
 end
 
-begin
-  require 'rubygems' if RUBY_VERSION < "1.9.0" && !ENV['C_EXT']
-  silently { require 'shoulda' }
-  silently { require 'mocha' }
-rescue LoadError
-  puts <<MSG
-
-This test suite requires shoulda and mocha.
-You can install them as follows:
-  gem install shoulda
-  gem install mocha
-
-MSG
-
-  exit
-end
-
 require 'bson_ext/cbson' if !(RUBY_PLATFORM =~ /java/) && ENV['C_EXT']
 
 class Test::Unit::TestCase