diff --git a/lib/shoulda/active_record/assertions.rb b/lib/shoulda/active_record/assertions.rb
index dbe6a5c9..2e4ba5af 100644
--- a/lib/shoulda/active_record/assertions.rb
+++ b/lib/shoulda/active_record/assertions.rb
@@ -1,4 +1,3 @@
-### TODO: replace with matches
 module Shoulda # :nodoc:
   module ActiveRecord # :nodoc:
     module Assertions
diff --git a/test/matchers/action_mailer/have_sent_email_test.rb b/test/matchers/action_mailer/have_sent_email_test.rb
index cbfa3f66..1f608787 100644
--- a/test/matchers/action_mailer/have_sent_email_test.rb
+++ b/test/matchers/action_mailer/have_sent_email_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require 'test_helper'
 
 class HaveSentEmailTest < ActiveSupport::TestCase # :nodoc:
   context "an email" do