diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index b6fd3b509..934b01785 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -98,7 +98,7 @@ class ActivitiesControllerTest < ActionController::TestCase
   def test_index_atom_feed
     get :index, :format => 'atom', :with_subprojects => 0
     assert_response :success
-    assert_template 'common/feed.atom'
+    assert_template 'common/feed'
 
     assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
         :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?with_subprojects=0'}
@@ -122,7 +122,7 @@ class ActivitiesControllerTest < ActionController::TestCase
       :show_wiki_edits => 1
 
     assert_response :success
-    assert_template 'common/feed.atom'
+    assert_template 'common/feed'
 
     assert_tag :tag => 'link', :parent =>  {:tag => 'feed', :parent => nil },
         :attributes => {:rel => 'self', :href => 'http://test.host/activity.atom?show_changesets=1&amp;show_documents=1&amp;show_files=1&amp;show_issues=1&amp;show_messages=1&amp;show_news=1&amp;show_time_entries=1&amp;show_wiki_edits=1&amp;with_subprojects=0'}
@@ -137,7 +137,7 @@ class ActivitiesControllerTest < ActionController::TestCase
   def test_index_atom_feed_with_one_item_type
     get :index, :format => 'atom', :show_issues => '1'
     assert_response :success
-    assert_template 'common/feed.atom'
+    assert_template 'common/feed'
     assert_tag :tag => 'title', :content => /Issues/
   end
 end
diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb
index 73ec98dae..c848b3e1a 100644
--- a/test/functional/boards_controller_test.rb
+++ b/test/functional/boards_controller_test.rb
@@ -68,7 +68,7 @@ class BoardsControllerTest < ActionController::TestCase
   def test_show_atom
     get :show, :project_id => 1, :id => 1, :format => 'atom'
     assert_response :success
-    assert_template 'common/feed.atom'
+    assert_template 'common/feed'
     assert_not_nil assigns(:board)
     assert_not_nil assigns(:project)
     assert_not_nil assigns(:messages)
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 9b7fca3c0..8f2d56767 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -55,7 +55,7 @@ class ProjectsControllerTest < ActionController::TestCase
   def test_index_atom
     get :index, :format => 'atom'
     assert_response :success
-    assert_template 'common/feed.atom'
+    assert_template 'common/feed'
     assert_select 'feed>title', :text => 'Redmine: Latest projects'
     assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_condition(User.current))
   end