diff --git a/app/helpers/investigations_helper.rb b/app/helpers/investigations_helper.rb
index ffa66162d7..2959565e48 100644
--- a/app/helpers/investigations_helper.rb
+++ b/app/helpers/investigations_helper.rb
@@ -568,6 +568,17 @@ def non_search_cases_page_names
     %w[team_cases your_cases assigned_cases].freeze
   end
 
+  def calculate_row_index(investigation_counter, row_number)
+    # Each investigation has 3 rows (title, meta, status)
+    # So for investigation 0, rows are 1,2,3
+    # For investigation 1, rows are 4,5,6 etc.
+    (investigation_counter * 3) + row_number
+  end
+
+  def investigation_owner(investigation)
+    sanitize(investigation.owner_display_name_for(viewer: current_user))
+  end
+
 private
 
   def search_result_values(_search_terms, number_of_results)
diff --git a/app/views/investigations/_full_table_body.html.erb b/app/views/investigations/_full_table_body.html.erb
index 8dd937db0f..969a144e16 100644
--- a/app/views/investigations/_full_table_body.html.erb
+++ b/app/views/investigations/_full_table_body.html.erb
@@ -1,54 +1,58 @@
 <tbody class="govuk-table__body" data-cy-case-id="<%= investigation.pretty_id %>">
-  <tr class="govuk-table__row">
-    <th class="govuk-visually-hidden">
-      Notification title
-    </th>
-    <th id="<%= dom_id investigation, :item %>" colspan="5" scope="colgroup" class="govuk-table__header">
-      <%= link_to sanitize(investigation.title), investigation_path(investigation), class: "govuk-link govuk-link--no-visited-state" %>
+  <tr class="govuk-table__row" id="<%= dom_id investigation, :title %>" aria-rowindex="<%= calculate_row_index(investigation_counter, 1) %>">
+    <th scope="row" class="govuk-table__header" colspan="5" headers="case">
+      <span id="desc-<%= investigation.id %>" class="govuk-visually-hidden">
+        Notification number: <%= investigation.pretty_id %>.
+        <%= non_search_cases_page_names.include?(@page_name) ? "Created: #{investigation.created_at.to_formatted_s(:govuk)}" : "Owner: #{investigation_owner(investigation)}" %>.
+        <%= @page_name == "assigned_cases" ? "Assigner: #{sanitize(investigation.owner_team&.name)}" : "Hazard type: #{sanitize(investigation.hazard_type.presence || "Not provided")}" %>.
+        Product count: <%= pluralize investigation.products.count, "product" %>.
+        <%= sorted_by == SortByHelper::SORT_BY_CREATED_AT ? "Created: #{time_ago_in_words(investigation.created_at)} ago" : "Updated: #{date_or_recent_time_ago investigation.updated_at}" %>.
+      </span>
+      <%= link_to sanitize(investigation.title), investigation_path(investigation), class: "govuk-link govuk-link--no-visited-state", "aria-describedby": "desc-#{investigation.id}" %>
     </th>
   </tr>
-  <tr class="govuk-table__row">
-    <th headers="<%= dom_id investigation, :item %>" id="<%= dom_id investigation, :meta %>" class="govuk-visually-hidden">
+  <tr class="govuk-table__row" id="<%= dom_id investigation, :meta %>" aria-rowindex="<%= calculate_row_index(investigation_counter, 2) %>">
+    <th headers="case" id="<%= dom_id investigation, :meta_header %>" class="govuk-visually-hidden">
       Metadata
     </th>
-    <td headers="case <%= dom_id investigation, :item %> <%= dom_id investigation, :meta %>" class="govuk-table__cell">
+    <td headers="case <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
       <%= investigation.pretty_id %>
     </td>
 
     <% if non_search_cases_page_names.include? @page_name %>
-      <td headers="casecreated <%= dom_id investigation, :item %> <%= dom_id investigation, :meta %>" class="govuk-table__cell">
+      <td headers="casecreated <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
         <%= investigation.created_at.to_formatted_s(:govuk) %>
       </td>
     <% else %>
-      <td headers="caseowner <%= dom_id investigation, :item %> <%= dom_id investigation, :meta %>" class="govuk-table__cell">
-        <%= sanitize(investigation.owner_display_name_for(viewer: current_user)) %>
+      <td headers="caseowner <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
+        <%= investigation_owner(investigation) %>
       </td>
     <% end %>
 
     <% if @page_name == "assigned_cases" %>
-      <td headers="assigner" class="govuk-table__cell">
+      <td headers="assigner <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
         <%= sanitize(investigation.owner_team&.name) %>
       </td>
     <% else %>
-      <td headers="haztype" class="govuk-table__cell">
+      <td headers="haztype <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
         <%= sanitize(investigation.hazard_type.presence || "Not provided") %>
       </td>
     <% end %>
 
-    <td headers="product_count" class="govuk-table__cell">
+    <td headers="prodcount <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
       <%= pluralize investigation.products.count, "product" %>
     </td>
 
     <% if sorted_by == SortByHelper::SORT_BY_CREATED_AT %>
-      <td headers="created <%= dom_id investigation, :item %> <%= dom_id investigation, :meta %>" class="govuk-table__cell">
+      <td headers="created <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
         <%= "#{time_ago_in_words(investigation.created_at)} ago" %>
       </td>
     <% else %>
-      <td headers="updated <%= dom_id investigation, :item %> <%= dom_id investigation, :meta %>" class="govuk-table__cell">
+      <td headers="updated <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
         <%= date_or_recent_time_ago investigation.updated_at %>
       </td>
     <% end %>
   </tr>
 
-  <%= render "investigations/status_table_row", investigation: investigation %>
+  <%= render "investigations/status_table_row", investigation: investigation, investigation_counter: investigation_counter %>
 </tbody>
diff --git a/app/views/investigations/_restricted_table_body.html.erb b/app/views/investigations/_restricted_table_body.html.erb
index fffe66c693..0ac89abef2 100644
--- a/app/views/investigations/_restricted_table_body.html.erb
+++ b/app/views/investigations/_restricted_table_body.html.erb
@@ -1,22 +1,25 @@
 <tbody class="govuk-table__body">
-  <tr class="govuk-table__row">
-    <th class="govuk-visually-hidden">
-      Notification title
-    </th>
-    <th id="<%= dom_id investigation, :item %>" colspan="4" scope="colgroup" class="govuk-table__header">
+  <tr class="govuk-table__row" id="<%= dom_id investigation, :title %>" aria-rowindex="<%= calculate_row_index(investigation_counter, 1) %>">
+    <th scope="row" class="govuk-table__header" colspan="4" headers="case">
+      <span id="desc-<%= investigation.id %>" class="govuk-visually-hidden">
+        Notification number: <%= investigation.pretty_id %>.
+        <%= non_search_cases_page_names.include?(page_name) ? "Created: #{investigation.created_at.to_formatted_s(:govuk)}" : "Owner: #{investigation_owner(investigation)}" %>.
+        <%= page_name == "assigned_cases" ? "Assigner: #{sanitize(investigation.owner_team&.name)}" : "Hazard type: #{sanitize(investigation.hazard_type.presence || "Not provided")}" %>.
+        Product count: <%= pluralize investigation.products.count, "product" %>.
+      </span>
       <%= "#{sanitize(investigation.case_type&.capitalize)} restricted" %>
     </th>
   </tr>
-  <tr class="govuk-table__row">
-    <th headers="<%= dom_id investigation, :item %>" id="<%= dom_id investigation, :meta %>" class="govuk-visually-hidden">
+  <tr class="govuk-table__row" id="<%= dom_id investigation, :meta %>" aria-rowindex="<%= calculate_row_index(investigation_counter, 2) %>">
+    <th headers="case" id="<%= dom_id investigation, :meta_header %>" class="govuk-visually-hidden">
       Metadata
     </th>
-    <td headers="case <%= dom_id investigation, :item %> <%= dom_id investigation, :meta %>" class="govuk-table__cell">
+    <td headers="case <%= dom_id investigation, :meta_header %>" class="govuk-table__cell">
       <%= investigation.pretty_id %>
     </td>
-    <td headers="caseowner <%= dom_id investigation, :item %> <%= dom_id investigation, :meta %>" class="govuk-table__cell" colspan="2">
+    <td headers="caseowner <%= dom_id investigation, :meta_header %>" class="govuk-table__cell" colspan="2">
       &nbsp;
     </td>
   </tr>
-  <%= render "investigations/status_table_row", investigation: investigation %>
+  <%= render "investigations/status_table_row", investigation: investigation, investigation_counter: investigation_counter %>
 </tbody>
diff --git a/app/views/investigations/_status_table_row.html.erb b/app/views/investigations/_status_table_row.html.erb
index 2f0411b76c..556c943290 100644
--- a/app/views/investigations/_status_table_row.html.erb
+++ b/app/views/investigations/_status_table_row.html.erb
@@ -21,7 +21,7 @@
   <% end %>
 <% end %>
 
-<tr class="govuk-table__row">
+<tr class="govuk-table__row" aria-rowindex="<%= calculate_row_index(investigation_counter, 3) %>">
   <th headers="<%= dom_id investigation, :item %>" id="<%= dom_id investigation, :status %>" class="govuk-visually-hidden">
     Type
   </th>
diff --git a/app/views/investigations/_table_body.html.erb b/app/views/investigations/_table_body.html.erb
index f5f8505174..cc8b5cd7df 100644
--- a/app/views/investigations/_table_body.html.erb
+++ b/app/views/investigations/_table_body.html.erb
@@ -1,5 +1,5 @@
 <% if policy(investigation).view_non_protected_details? %>
-  <%= render "investigations/full_table_body", investigation: investigation.decorate, sorted_by: sorted_by, page_name: page_name %>
+  <%= render "investigations/full_table_body", investigation: investigation.decorate, sorted_by: sorted_by, page_name: page_name, investigation_counter: investigation_counter %>
 <% else %>
-  <%= render "investigations/restricted_table_body", investigation: investigation.decorate, page_name: page_name %>
+  <%= render "investigations/restricted_table_body", investigation: investigation.decorate, page_name: page_name, investigation_counter: investigation_counter %>
 <% end %>
diff --git a/app/views/notifications/create/search_for_or_add_a_business.html.erb b/app/views/notifications/create/search_for_or_add_a_business.html.erb
index a2b941cc05..8dbea7edee 100644
--- a/app/views/notifications/create/search_for_or_add_a_business.html.erb
+++ b/app/views/notifications/create/search_for_or_add_a_business.html.erb
@@ -65,14 +65,14 @@
       <% if @records.any? %>
         <p class="govuk-body"><% if @records_count == 1 %>There is currently 1 business.<% else %>There are currently <%= @records_count %> businesses.<% end %></p>
         <%=
-          govuk_table do |table|
+          govuk_table(html_attributes: { role: "table" }) do |table|
             table.with_head do |head|
               head.with_row do |row|
-                row.with_cell(text: "Trading name")
-                row.with_cell(text: "Registered or Legal name")
-                row.with_cell(text: "Companies House number")
-                row.with_cell(text: "Address")
-                row.with_cell(text: "<span class=\"govuk-visually-hidden\">Select business</span>".html_safe)
+                row.with_cell(text: "Trading name", header: true, html_attributes: { scope: "col" })
+                row.with_cell(text: "Registered or Legal name", header: true, html_attributes: { scope: "col" })
+                row.with_cell(text: "Companies House number", header: true, html_attributes: { scope: "col" })
+                row.with_cell(text: "Address", header: true, html_attributes: { scope: "col" })
+                row.with_cell(text: "<span class=\"govuk-visually-hidden\">Select business</span>".html_safe, header: true, html_attributes: { scope: "col" })
               end
             end
 
@@ -86,8 +86,18 @@
                               end.join("<hr class=\"govuk-section-break govuk-section-break--m govuk-section-break--visible\">")
                             end
 
-                select_button = form_with url: "#{wizard_path}?business_id=#{record.id}", method: :put, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f|
-                  f.govuk_submit "Select", name: "draft", value: true, secondary: true
+                select_button = if @existing_business_ids.include?(record.id)
+                  ""
+                else
+                  "<span id=\"desc-#{record.id}\" class=\"govuk-visually-hidden\">
+                    Trading name: #{sanitize(record.trading_name)}.
+                    Registered or Legal name: #{sanitize(record.legal_name)}.
+                    Companies House number: #{sanitize(record.company_number)}.
+                    Address: #{sanitize(addresses)}.
+                  </span>".html_safe +
+                  form_with(url: "#{wizard_path}?business_id=#{record.id}", method: :put, builder: GOVUKDesignSystemFormBuilder::FormBuilder) do |f|
+                    f.govuk_submit "Select", name: "draft", value: true, secondary: true, "aria-describedby": "desc-#{record.id}"
+                  end
                 end
 
                 body.with_row do |row|
@@ -95,11 +105,7 @@
                   row.with_cell(text: sanitize(record.legal_name))
                   row.with_cell(text: sanitize(record.company_number))
                   row.with_cell(text: sanitize(addresses).html_safe)
-                  if @existing_business_ids.include?(record.id)
-                    row.with_cell(text: "")
-                  else
-                    row.with_cell(text: select_button)
-                  end
+                  row.with_cell(text: select_button.html_safe)
                 end
               end
             end
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 30ab78aefb..db2d6b0126 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -30,25 +30,25 @@
               <thead class="govuk-table__head">
                 <tr class="govuk-table__row">
                   <th class="govuk-visually-hidden">&nbsp;</th>
-                  <th id="case" scope="col" class="govuk-table__header">Notification number</th>
+                  <th id="case" scope="col" class="govuk-table__header" aria-label="Notification number">Notification number</th>
                   <% if non_search_cases_page_names.include? @page_name %>
-                    <th id="casecreated" scope="col" class="govuk-table__header">Notification created</th>
+                    <th id="casecreated" scope="col" class="govuk-table__header" aria-label="Notification created">Notification created</th>
                   <% else %>
-                    <th id="caseowner" scope="col" class="govuk-table__header">Notification owner</th>
+                    <th id="caseowner" scope="col" class="govuk-table__header" aria-label="Notification owner">Notification owner</th>
                   <% end %>
 
                   <% if @page_name == "assigned_cases" %>
-                    <th id="assigner" scope="col" class="govuk-table__header">Assigner</th>
+                    <th id="assigner" scope="col" class="govuk-table__header" aria-label="Assigner">Assigner</th>
                   <% else %>
-                    <th id="haztype" scope="col" class="govuk-table__header">Hazard type</th>
+                    <th id="haztype" scope="col" class="govuk-table__header" aria-label="Hazard type">Hazard type</th>
                   <% end %>
 
-                  <th scope="col" class="govuk-table__header">Product count</th>
+                  <th id="prodcount" scope="col" class="govuk-table__header" aria-label="Product count">Product count</th>
 
                   <% if query_params[:sort_by] == SortByHelper::SORT_BY_CREATED_AT && non_search_cases_page_names.exclude?(@page_name) %>
-                    <th id="created" scope="col" class="govuk-table__header">Created</th>
+                    <th id="created" scope="col" class="govuk-table__header" aria-label="Created">Created</th>
                   <% else %>
-                    <th id="updated" scope="col" class="govuk-table__header">Updated</th>
+                    <th id="updated" scope="col" class="govuk-table__header" aria-label="Updated">Updated</th>
                   <% end %>
                 </tr>
               </thead>
@@ -63,21 +63,23 @@
                 <tfoot class="govuk-table__head">
                   <tr class="govuk-table__row">
                     <th class="govuk-visually-hidden">&nbsp;</th>
-                    <th scope="col" class="govuk-table__header">Notification number</th>
-                    <th scope="col" class="govuk-table__header">Notification <%= non_search_cases_page_names.include?(@page_name) ? "created" : "owner" %></th>
+                    <th scope="col" class="govuk-table__header" aria-label="Notification number">Notification number</th>
+                    <th scope="col" class="govuk-table__header" aria-label="<%= non_search_cases_page_names.include?(@page_name) ? "Notification created" : "Notification owner" %>">
+                      Notification <%= non_search_cases_page_names.include?(@page_name) ? "created" : "owner" %>
+                    </th>
 
                     <% if @page_name == "assigned_cases" %>
-                      <th scope="col" class="govuk-table__header">Assigner</th>
+                      <th scope="col" class="govuk-table__header" aria-label="Assigner">Assigner</th>
                     <% else %>
-                      <th scope="col" class="govuk-table__header">Hazard type</th>
+                      <th scope="col" class="govuk-table__header" aria-label="Hazard type">Hazard type</th>
                     <% end %>
 
-                    <th scope="col" class="govuk-table__header">Product count</th>
+                    <th scope="col" class="govuk-table__header" aria-label="Product count">Product count</th>
 
                     <% if query_params[:sort_by] == SortByHelper::SORT_BY_CREATED_AT && non_search_cases_page_names.exclude?(@page_name) %>
-                      <th scope="col" class="govuk-table__header">Created</th>
+                      <th scope="col" class="govuk-table__header" aria-label="Created">Created</th>
                     <% else %>
-                      <th scope="col" class="govuk-table__header">Updated</th>
+                      <th scope="col" class="govuk-table__header" aria-label="Updated">Updated</th>
                     <% end %>
                   </tr>
                 </tfoot>
diff --git a/app/views/notifications/your_notifications.html.erb b/app/views/notifications/your_notifications.html.erb
index cd4c150377..a195a8f951 100644
--- a/app/views/notifications/your_notifications.html.erb
+++ b/app/views/notifications/your_notifications.html.erb
@@ -12,7 +12,7 @@
 
       <% if @draft_notifications.any? %>
         <%=
-          govuk_table do |table|
+          govuk_table(html_attributes: { role: "table" }) do |table|
           if Flipper.enabled?(:submit_notification_reminder)
             table.with_caption(size: "m") do
                   safe_join([
@@ -32,22 +32,44 @@
 
             table.with_head do |head|
               head.with_row do |row|
-                row.with_cell(text: "Product name(s)")
-                row.with_cell(text: "Notification title")
-                row.with_cell(text: "Last updated")
-                row.with_cell(text: "Status")
-                row.with_cell(text: "<span class=\"govuk-visually-hidden\">Make changes/delete notification</span>".html_safe)
+                row.with_cell(text: "Product name(s)", html_attributes: { scope: "col" })
+                row.with_cell(text: "Notification title", html_attributes: { scope: "col" })
+                row.with_cell(text: "Last updated", html_attributes: { scope: "col" })
+                row.with_cell(text: "Status", html_attributes: { scope: "col" })
+                row.with_cell(text: "<span class=\"govuk-visually-hidden\">Actions</span>".html_safe, html_attributes: { scope: "col" })
               end
             end
 
-            @draft_notifications.each do |notification|
+            @draft_notifications.each_with_index do |notification, index|
               table.with_body do |body|
                 body.with_row do |row|
-                  row.with_cell(header: true, text: sanitize(notification.investigation_products.decorate.map(&:product).map(&:name_with_brand).presence&.join("<br>") || "Not provided", tags: %w(br)).html_safe)
-                  row.with_cell(text: sanitize(notification.user_title.presence || "Not provided"))
-                  row.with_cell(text: notification.updated_at.to_formatted_s(:govuk))
-                  row.with_cell(text: govuk_tag(text: "Draft", colour: "grey").html_safe)
-                  row.with_cell(text: sanitize("<a href=\"#{notification_create_index_path(notification)}\" class=\"govuk-link\">Make changes</a><hr class=\"govuk-section-break govuk-section-break--m govuk-section-break--visible\"><a href=\"#{delete_notification_path(notification)}\" class=\"govuk-link\">Delete</a>", tags: %w(a hr), attributes: %w(href class)).html_safe)
+                  product_value = notification.investigation_products.decorate.map(&:product).map(&:name_with_brand).presence&.join(", ") || "Not provided"
+                  title_value = notification.user_title.presence || "Not provided"
+                  updated_value = notification.updated_at.to_formatted_s(:govuk)
+                  status_value = "Draft"
+
+                  row.with_cell(
+                    header: true,
+                    text: sanitize(notification.investigation_products.decorate.map(&:product).map(&:name_with_brand).presence&.join("<br>") || "Not provided", tags: %w(br)).html_safe
+                  )
+                  row.with_cell(text: sanitize(title_value))
+                  row.with_cell(text: updated_value)
+                  row.with_cell(text: govuk_tag(text: status_value, colour: "grey").html_safe)
+                  row.with_cell(
+                    text: sanitize(
+                      "<span id=\"desc-#{notification.id}\" class=\"govuk-visually-hidden\">
+                        Product name(s): #{product_value}.
+                        Notification title: #{title_value}.
+                        Last updated: #{updated_value}.
+                        Status: #{status_value}.
+                      </span>
+                      <a href=\"#{notification_create_index_path(notification)}\" class=\"govuk-link\" aria-describedby=\"desc-#{notification.id}\">Make changes</a>
+                      <hr class=\"govuk-section-break govuk-section-break--m govuk-section-break--visible\">
+                      <a href=\"#{delete_notification_path(notification)}\" class=\"govuk-link\" aria-describedby=\"desc-#{notification.id}\">Delete</a>",
+                      tags: %w(a hr span),
+                      attributes: %w(href class id aria-describedby)
+                    ).html_safe
+                  )
                 end
               end
             end
@@ -58,27 +80,47 @@
 
       <% if @submitted_notifications.any? %>
         <%=
-          govuk_table do |table|
+          govuk_table(html_attributes: { role: "table" }) do |table|
             table.with_caption(size: "m", text: "Submitted notifications")
 
             table.with_head do |head|
               head.with_row do |row|
-                row.with_cell(text: "Product name(s)")
-                row.with_cell(text: "Notification title")
-                row.with_cell(text: "Last updated")
-                row.with_cell(text: "Status")
-                row.with_cell(text: "<span class=\"govuk-visually-hidden\">Update notification</span>".html_safe)
+                row.with_cell(text: "Product name(s)", html_attributes: { scope: "col" })
+                row.with_cell(text: "Notification title", html_attributes: { scope: "col" })
+                row.with_cell(text: "Last updated", html_attributes: { scope: "col" })
+                row.with_cell(text: "Status", html_attributes: { scope: "col" })
+                row.with_cell(text: "<span class=\"govuk-visually-hidden\">Actions</span>".html_safe, html_attributes: { scope: "col" })
               end
             end
 
-            @submitted_notifications.each do |notification|
+            @submitted_notifications.each_with_index do |notification, index|
               table.with_body do |body|
                 body.with_row do |row|
-                  row.with_cell(header: true, text: sanitize(notification.investigation_products.decorate.map(&:product).map(&:name_with_brand).join("<br>"), tags: %w(br)).html_safe)
-                  row.with_cell(text: sanitize(notification.user_title))
-                  row.with_cell(text: notification.updated_at.to_formatted_s(:govuk))
-                  row.with_cell(text: "#{govuk_tag(text: 'Submitted', colour: 'green').html_safe}<br><br>#{notification.submitted_at? ?notification.submitted_at.to_formatted_s(:govuk) : "Date not provided"}".html_safe)
-                  row.with_cell(text: sanitize("<a href=\"#{notification_path(notification)}\" class=\"govuk-link\">Update notification</a>", tags: %w(a), attributes: %w(href class)).html_safe)
+                  product_value = notification.investigation_products.decorate.map(&:product).map(&:name_with_brand).join(", ")
+                  title_value = notification.user_title
+                  updated_value = notification.updated_at.to_formatted_s(:govuk)
+                  status_value = "Submitted #{notification.submitted_at? ? notification.submitted_at.to_formatted_s(:govuk) : "Date not provided"}"
+
+                  row.with_cell(
+                    header: true,
+                    text: sanitize(notification.investigation_products.decorate.map(&:product).map(&:name_with_brand).join("<br>"), tags: %w(br)).html_safe
+                  )
+                  row.with_cell(text: sanitize(title_value))
+                  row.with_cell(text: updated_value)
+                  row.with_cell(text: "#{govuk_tag(text: 'Submitted', colour: 'green').html_safe}<br><br>#{notification.submitted_at? ? notification.submitted_at.to_formatted_s(:govuk) : "Date not provided"}".html_safe)
+                  row.with_cell(
+                    text: sanitize(
+                      "<span id=\"desc-submitted-#{notification.id}\" class=\"govuk-visually-hidden\">
+                        Product name(s): #{product_value}.
+                        Notification title: #{title_value}.
+                        Last updated: #{updated_value}.
+                        Status: #{status_value}.
+                      </span>
+                      <a href=\"#{notification_path(notification)}\" class=\"govuk-link\" aria-describedby=\"desc-submitted-#{notification.id}\">Update notification</a>",
+                      tags: %w(a span),
+                      attributes: %w(href class id aria-describedby)
+                    ).html_safe
+                  )
                 end
               end
             end
diff --git a/spec/features/table_accessibility_spec.rb b/spec/features/table_accessibility_spec.rb
new file mode 100644
index 0000000000..4aaae7bba0
--- /dev/null
+++ b/spec/features/table_accessibility_spec.rb
@@ -0,0 +1,43 @@
+require "rails_helper"
+
+RSpec.describe "Table accessibility" do
+  let(:user) { create(:user, :activated, has_viewed_introduction: true) }
+  let(:investigation) { create(:notification, creator: user) }
+  let(:mail_message) { instance_double(ActionMailer::MessageDelivery, deliver_later: true) }
+
+  before do
+    allow(NotifyMailer).to receive(:notification_created).and_return(mail_message)
+    investigation # Create the investigation
+    sign_in(user)
+  end
+
+  describe "notifications tables" do
+    it "has proper accessibility attributes" do
+      visit "/notifications/your-notifications"
+
+      # Check table class
+      expect(page).to have_css("table.govuk-table")
+
+      # Check header cells have scope
+      within "table" do
+        expect(page).to have_css("th[scope='col']")
+      end
+
+      # Check hidden descriptions
+      expect(page).to have_css("caption.govuk-visually-hidden", text: "Notifications data: 5 columns with each notification described across rows within each table body.", visible: :all)
+
+      # Check links have aria-describedby
+      expect(page).to have_css("a[aria-describedby]")
+    end
+
+    it "has proper row indices" do
+      visit "/notifications/team-notifications"
+
+      within "tbody" do
+        expect(page).to have_css("tr[aria-rowindex='1']")
+        expect(page).to have_css("tr[aria-rowindex='2']")
+        expect(page).to have_css("tr[aria-rowindex='3']")
+      end
+    end
+  end
+end
diff --git a/spec/helpers/investigations_helper_spec.rb b/spec/helpers/investigations_helper_spec.rb
new file mode 100644
index 0000000000..806a3f4fc8
--- /dev/null
+++ b/spec/helpers/investigations_helper_spec.rb
@@ -0,0 +1,31 @@
+require "rails_helper"
+
+RSpec.describe InvestigationsHelper do
+  describe "#calculate_row_index" do
+    context "with different investigation counters and row numbers" do
+      it "calculates row index for first row" do
+        expect(helper.calculate_row_index(1, 1)).to eq(4)
+      end
+
+      it "calculates row index for second row" do
+        expect(helper.calculate_row_index(1, 2)).to eq(5)
+      end
+
+      it "calculates row index for third row" do
+        expect(helper.calculate_row_index(1, 3)).to eq(6)
+      end
+
+      it "calculates row index for first row of second investigation" do
+        expect(helper.calculate_row_index(2, 1)).to eq(7)
+      end
+
+      it "calculates row index for second row of second investigation" do
+        expect(helper.calculate_row_index(2, 2)).to eq(8)
+      end
+
+      it "calculates row index for third row of second investigation" do
+        expect(helper.calculate_row_index(2, 3)).to eq(9)
+      end
+    end
+  end
+end