diff --git a/plugins/site_tour/lib/site_tour_plugin/tour_block.rb b/plugins/site_tour/lib/site_tour_plugin/tour_block.rb
index 65db701..6b7158d 100644
--- a/plugins/site_tour/lib/site_tour_plugin/tour_block.rb
+++ b/plugins/site_tour/lib/site_tour_plugin/tour_block.rb
@@ -19,11 +19,4 @@ class SiteTourPlugin::TourBlock < Block
     _('Configure a step-by-step tour.')
   end
 
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/tour', :locals => {:block => block}
-    end
-  end
-
 end
diff --git a/plugins/site_tour/test/unit/tour_block_test.rb b/plugins/site_tour/test/unit/tour_block_test.rb
index af9f009..075a002 100644
--- a/plugins/site_tour/test/unit/tour_block_test.rb
+++ b/plugins/site_tour/test/unit/tour_block_test.rb
@@ -3,6 +3,7 @@ require 'test_helper'
 class TrackListBlockTest < ActionView::TestCase
 
   ActionView::Base.send :include, ApplicationHelper
+  include BoxesHelper
 
   def setup
     @block = fast_create(SiteTourPlugin::TourBlock)
@@ -18,24 +19,24 @@ class TrackListBlockTest < ActionView::TestCase
 
   should 'render script tag in visualization mode' do
     controller.expects(:boxes_editor?).returns(false)
-    assert_tag_in_string instance_eval(&block.content), :tag => 'script'
+    assert_tag_in_string render_block_content(block), :tag => 'script'
   end
 
   should 'do not render script tag when editing' do
     controller.expects(:boxes_editor?).returns(true)
     controller.expects(:uses_design_blocks?).returns(true)
-    assert_no_tag_in_string instance_eval(&block.content), :tag => 'script'
+    assert_no_tag_in_string render_block_content(block), :tag => 'script'
   end
 
   should 'display help button' do
     controller.expects(:boxes_editor?).returns(false)
-    assert_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+    assert_tag_in_string render_block_content(block), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
   end
 
   should 'do not display help button when display_button is false' do
     block.display_button = false
     controller.expects(:boxes_editor?).returns(false)
-    assert_no_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+    assert_no_tag_in_string render_block_content(block), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
   end
 
 end
--
libgit2 0.21.2