diff --git a/test/factories.rb b/test/factories.rb
index ed8ff7c..b24c0f3 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -278,7 +278,7 @@ module Noosfero::Factory
   # FeedReaderBlock
   ###############################################
   def defaults_for_feed_reader_block
-    { :address => Rails.root + '/test/fixtures/files/feed.xml' }
+    { :address => File.join(Rails.root, 'test/fixtures/files/feed.xml') }
   end
 
   ###############################################
diff --git a/test/unit/feed_handler_test.rb b/test/unit/feed_handler_test.rb
index 107af13..0cc726b 100644
--- a/test/unit/feed_handler_test.rb
+++ b/test/unit/feed_handler_test.rb
@@ -90,7 +90,7 @@ class FeedHandlerTest < ActiveSupport::TestCase
   [:external_feed, :feed_reader_block].each do |container_class|
 
     should "reset the errors count after a successfull run (#{container_class})" do
-      container = build(container_class, :update_errors => 1, :address => Rails.root + '/test/fixtures/files/feed.xml')
+      container = create(container_class, :update_errors => 1, :address => File.join(Rails.root, 'test/fixtures/files/feed.xml'))
       handler.expects(:actually_process_container).with(container)
       handler.process(container)
       assert_equal 0, container.update_errors
@@ -122,6 +122,8 @@ class FeedHandlerTest < ActiveSupport::TestCase
       5.times { handler.process(container) }
 
       # after disabled period, tries to process the container again
+      handler.stubs(:actually_process_container).with(container)
+      container.stubs(:only_once).returns(false)
       last_error = Time.now
       Time.stubs(:now).returns(last_error + FeedHandler.disabled_period + 1.second)
       handler.process(container)
--
libgit2 0.21.2