diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index d4b8169..dc302f4 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -26,13 +26,20 @@ class CalendarsControllerTest < ActionController::TestCase
            :members,
            :enabled_modules
 
-  def test_calendar
+  def test_show
     get :show, :project_id => 1
     assert_response :success
     assert_template 'calendar'
     assert_not_nil assigns(:calendar)
   end
 
+  def test_show_should_run_custom_queries
+    @query = IssueQuery.create!(:name => 'Calendar', :is_public => true)
+
+    get :show, :query_id => @query.id
+    assert_response :success
+  end
+
   def test_cross_project_calendar
     get :show
     assert_response :success
@@ -40,16 +47,6 @@ class CalendarsControllerTest < ActionController::TestCase
     assert_not_nil assigns(:calendar)
   end
 
-  context "GET :show" do
-    should "run custom queries" do
-      @query = IssueQuery.create!(:name => 'Calendar', :is_public => true)
-
-      get :show, :query_id => @query.id
-      assert_response :success
-    end
-
-  end
-
   def test_week_number_calculation
     Setting.start_of_week = 7