diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index 700738ed0..a44b7cc81 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -11,11 +11,9 @@ class GanttsControllerTest < ActionController::TestCase
            :workflows,
            :versions
 
-  context "#gantt" do
-    should "work" do
+    def test_gantt_should_work
       i2 = Issue.find(2)
       i2.update_attribute(:due_date, 1.month.from_now)
-
       get :show, :project_id => 1
       assert_response :success
       assert_template 'gantts/show'
@@ -29,26 +27,24 @@ class GanttsControllerTest < ActionController::TestCase
       assert_select "div a.issue", /##{i.id}/
     end
 
-    should "work without issue due dates" do
+    def test_gantt_should_work_without_issue_due_dates
       Issue.update_all("due_date = NULL")
-
       get :show, :project_id => 1
       assert_response :success
       assert_template 'gantts/show'
       assert_not_nil assigns(:gantt)
     end
 
-    should "work without issue and version due dates" do
+    def test_gantt_should_work_without_issue_and_version_due_dates
       Issue.update_all("due_date = NULL")
       Version.update_all("effective_date = NULL")
-
       get :show, :project_id => 1
       assert_response :success
       assert_template 'gantts/show'
       assert_not_nil assigns(:gantt)
     end
 
-    should "work cross project" do
+    def test_gantt_should_work_cross_project
       get :show
       assert_response :success
       assert_template 'gantts/show'
@@ -57,11 +53,10 @@ class GanttsControllerTest < ActionController::TestCase
       assert_nil assigns(:gantt).project
     end
 
-    should "not disclose private projects" do
+    def test_gantt_should_not_disclose_private_projects
       get :show
       assert_response :success
       assert_template 'gantts/show'
-
       assert_tag 'a', :content => /eCookbook/
       # Root private project
       assert_no_tag 'a', {:content => /OnlineStore/}
@@ -69,7 +64,7 @@ class GanttsControllerTest < ActionController::TestCase
       assert_no_tag 'a', :content => /Private child of eCookbook/
     end
 
-    should "export to pdf" do
+    def test_gantt_should_export_to_pdf
       get :show, :project_id => 1, :format => 'pdf'
       assert_response :success
       assert_equal 'application/pdf', @response.content_type
@@ -77,7 +72,7 @@ class GanttsControllerTest < ActionController::TestCase
       assert_not_nil assigns(:gantt)
     end
 
-    should "export to pdf cross project" do
+    def test_gantt_should_export_to_pdf_cross_project
       get :show, :format => 'pdf'
       assert_response :success
       assert_equal 'application/pdf', @response.content_type
@@ -85,11 +80,11 @@ class GanttsControllerTest < ActionController::TestCase
       assert_not_nil assigns(:gantt)
     end
 
-    should "export to png" do
-      get :show, :project_id => 1, :format => 'png'
-      assert_response :success
-      assert_equal 'image/png', @response.content_type
-    end if Object.const_defined?(:Magick)
-
-  end
+    if Object.const_defined?(:Magick)
+      def test_gantt_should_export_to_png
+        get :show, :project_id => 1, :format => 'png'
+        assert_response :success
+        assert_equal 'image/png', @response.content_type
+      end
+    end
 end