diff --git a/test/test_helper.rb b/test/test_helper.rb
index 75496a920..b71c9bbb3 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -26,12 +26,10 @@ if defined?(MEMCACHE)
 end
 
 class ActiveSupport::TestCase
-  include UploadTestMethods
   include PostArchiveTestHelper
 end
 
 class ActionController::TestCase
-  include UploadTestMethods
   include PostArchiveTestHelper
 
   def assert_authentication_passes(action, http_method, role, params, session)
diff --git a/test/unit/post_test.rb b/test/unit/post_test.rb
index bfd21d421..96b0ab8a4 100644
--- a/test/unit/post_test.rb
+++ b/test/unit/post_test.rb
@@ -10,7 +10,9 @@ class PostTest < ActiveSupport::TestCase
     assert_equal(posts.map(&:id), Post.tag_match(query).pluck(:id))
   end
 
-  setup do
+  def setup
+    super
+
     Timecop.travel(2.weeks.ago) do
       @user = FactoryGirl.create(:user)
     end
@@ -20,7 +22,9 @@ class PostTest < ActiveSupport::TestCase
     mock_saved_search_service!
   end
 
-  teardown do
+  def teardown
+    super
+
     CurrentUser.user = nil
     CurrentUser.ip_addr = nil
   end
@@ -2290,8 +2294,8 @@ class PostTest < ActiveSupport::TestCase
 
     context "a post that has been updated" do
       setup do
-        @post = FactoryGirl.create(:post, :rating => "q", :tag_string => "aaa")
         PostArchive.sqs_service.stubs(:merge?).returns(false)
+        @post = FactoryGirl.create(:post, :rating => "q", :tag_string => "aaa", :source => nil)
         @post.update_attributes(:tag_string => "aaa bbb ccc ddd")
         @post.update_attributes(:tag_string => "bbb xxx yyy", :source => "xyz")
         @post.update_attributes(:tag_string => "bbb mmm yyy", :source => "abc")
diff --git a/test/unit/post_vote_test.rb b/test/unit/post_vote_test.rb
index 33e874fbf..4b35fa200 100644
--- a/test/unit/post_vote_test.rb
+++ b/test/unit/post_vote_test.rb
@@ -1,7 +1,9 @@
 require 'test_helper'
 
 class PostVoteTest < ActiveSupport::TestCase
-  setup do
+  def setup
+    super
+    
     user = FactoryGirl.create(:user)
     CurrentUser.user = user
     CurrentUser.ip_addr = "127.0.0.1"