diff --git a/test/functional/chat_controller_test.rb b/test/functional/chat_controller_test.rb
index 4b9a028..05f7d13 100644
--- a/test/functional/chat_controller_test.rb
+++ b/test/functional/chat_controller_test.rb
@@ -91,7 +91,7 @@ class ChatControllerTest < ActionController::TestCase
     get :index
 
     assert_response 404
-    assert_template 'not_found.rhtml'
+    assert_template 'not_found'
   end
 
   should 'not update presence status from non-ajax requests' do
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 80ee9e3..ed2fc66 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1166,7 +1166,7 @@ class CmsControllerTest < ActionController::TestCase
 
     get :new, :profile => c.identifier
     assert_response :forbidden
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'allow user with permission create an article in community' do
@@ -1188,7 +1188,7 @@ class CmsControllerTest < ActionController::TestCase
 
     get :edit, :profile => c.identifier, :id => a.id
     assert_response :forbidden
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'not allow user edit article if he is owner but has no publish permission' do
@@ -1199,7 +1199,7 @@ class CmsControllerTest < ActionController::TestCase
 
     get :edit, :profile => c.identifier, :id => a.id
     assert_response :forbidden
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'allow user edit article if he is owner and has publish permission' do
@@ -1670,7 +1670,7 @@ class CmsControllerTest < ActionController::TestCase
 
     get :upload_files, :profile => c.identifier, :parent_id => a.id
     assert_response :forbidden
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'filter profile folders to select' do
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index 6bb44e2..8aa518f 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -169,7 +169,7 @@ class ContentViewerControllerTest < ActionController::TestCase
 
     get :view_page, :profile => community.identifier, :page => [ folder.path ]
 
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'show private content to profile moderators' do
@@ -250,7 +250,7 @@ class ContentViewerControllerTest < ActionController::TestCase
 
     get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
 
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'not give access to private articles if logged in but not member' do
@@ -260,7 +260,7 @@ class ContentViewerControllerTest < ActionController::TestCase
 
     get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
 
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'not give access to private articles if logged in and only member' do
@@ -272,7 +272,7 @@ class ContentViewerControllerTest < ActionController::TestCase
 
     get :view_page, :profile => 'test_profile', :page => [ 'my-intranet' ]
 
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'give access to private articles if logged in and moderator' do
diff --git a/test/functional/manage_products_controller_test.rb b/test/functional/manage_products_controller_test.rb
index 835c888..7a551f3 100644
--- a/test/functional/manage_products_controller_test.rb
+++ b/test/functional/manage_products_controller_test.rb
@@ -31,7 +31,7 @@ class ManageProductsControllerTest < ActionController::TestCase
     login_as :user_test
     get 'index', :profile => @enterprise.identifier
     assert :success
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should "get index" do
@@ -198,7 +198,7 @@ class ManageProductsControllerTest < ActionController::TestCase
     @enterprise.save!
     get :index, :profile => @enterprise.identifier
 
-    assert_template 'not_found.rhtml'
+    assert_template 'not_found'
   end
 
   should 'show top level product categories for the user to choose' do
diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb
index 1317ae6..fb347b7 100644
--- a/test/functional/profile_members_controller_test.rb
+++ b/test/functional/profile_members_controller_test.rb
@@ -29,7 +29,7 @@ class ProfileMembersControllerTest < ActionController::TestCase
     get 'index', :profile => 'test_enterprise'
 
     assert_response 403
-    assert_template 'access_denied.rhtml'
+    assert_template 'access_denied'
   end
 
   should 'access index' do
diff --git a/test/integration/exception_notification_test.rb b/test/integration/exception_notification_test.rb
index aa95ad2..680dc30 100644
--- a/test/integration/exception_notification_test.rb
+++ b/test/integration/exception_notification_test.rb
@@ -29,7 +29,7 @@ begin
 
     should 'render not found when try to access invalid url' do
       get '/profile/ze/tag/notexists'
-      assert_template 'not_found.rhtml'
+      assert_template 'not_found'
     end
   end
 rescue LoadError
--
libgit2 0.21.2