diff --git a/spec/shared/features/documentable.rb b/spec/shared/features/documentable.rb
index f480bc2cb..3b3520267 100644
--- a/spec/shared/features/documentable.rb
+++ b/spec/shared/features/documentable.rb
@@ -15,30 +15,24 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path,
     end
   end
 
-  context "Show documents tab" do
+  context "Show documents" do
 
     scenario "Download action should be able to anyone" do
       visit send(documentable_path, arguments)
 
-      within "#tab-documents" do
-        expect(page).to have_link("Download file")
-      end
+      expect(page).to have_link("Download file")
     end
 
     scenario "Download file link should have blank target attribute" do
       visit send(documentable_path, arguments)
 
-      within "#tab-documents" do
-        expect(page).to have_selector("a[target=_blank]", text: "Download file")
-      end
+      expect(page).to have_selector("a[target=_blank]", text: "Download file")
     end
 
     scenario "Download file links should have rel attribute setted to no follow" do
       visit send(documentable_path, arguments)
 
-      within "#tab-documents" do
-        expect(page).to have_selector("a[rel=nofollow]", text: "Download file")
-      end
+      expect(page).to have_selector("a[rel=nofollow]", text: "Download file")
     end
 
     describe "Destroy action" do
@@ -46,36 +40,28 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path,
       scenario "Should not be able when no user logged in" do
         visit send(documentable_path, arguments)
 
-        within "#tab-documents" do
-          expect(page).not_to have_link("Destroy")
-        end
+        expect(page).not_to have_link("Destroy document")
       end
 
       scenario "Should be able when documentable author is logged in" do
         login_as documentable.author
         visit send(documentable_path, arguments)
 
-        within "#tab-documents" do
-          expect(page).to have_link("Destroy")
-        end
+        expect(page).to have_link("Destroy document")
       end
 
       scenario "Administrators cannot destroy documentables they have not authored" do
         login_as(administrator)
         visit send(documentable_path, arguments)
 
-        within "#tab-documents" do
-          expect(page).not_to have_link("Destroy")
-        end
+        expect(page).not_to have_link("Destroy document")
       end
 
       scenario "Users cannot destroy documentables they have not authored" do
         login_as(create(:user))
         visit send(documentable_path, arguments)
 
-        within "#tab-documents" do
-          expect(page).not_to have_link("Destroy")
-        end
+        expect(page).not_to have_link("Destroy document")
       end
 
     end
@@ -88,10 +74,9 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path,
       login_as documentable.author
 
       visit send(documentable_path, arguments)
-      within "#tab-documents" do
-        within "#document_#{document.id}" do
-          click_on "Destroy"
-        end
+
+      within "#document_#{document.id}" do
+        click_on "Destroy document"
       end
 
       expect(page).to have_content "Document was deleted successfully."
@@ -101,23 +86,21 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path,
       login_as documentable.author
 
       visit send(documentable_path, arguments)
-      within "#tab-documents" do
-        within "#document_#{document.id}" do
-          click_on "Destroy"
-        end
+
+      within "#document_#{document.id}" do
+        click_on "Destroy document"
       end
 
-      expect(page).to have_link "Documents (0)"
+      expect(page).to have_content "Documents (0)"
     end
 
     scenario "Should redirect to documentable path after successful deletion" do
       login_as documentable.author
 
       visit send(documentable_path, arguments)
-      within "#tab-documents" do
-        within "#document_#{document.id}" do
-          click_on "Destroy"
-        end
+
+      within "#document_#{document.id}" do
+        click_on "Destroy document"
       end
 
       within "##{dom_id(documentable)}" do
diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb
index 02dd1e54d..2e5db8228 100644
--- a/spec/shared/features/nested_documentable.rb
+++ b/spec/shared/features/nested_documentable.rb
@@ -195,8 +195,6 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na
       documentable_redirected_to_resource_show_or_navigate_to
 
       expect(page).to have_content "Documents"
-
-      find("#tab-documents-label").click
       expect(page).to have_content "empty.pdf"
 
       # Review