diff --git a/cypress/e2e/collection-edit.cy.ts b/cypress/e2e/collection-edit.cy.ts
index e1ba1c5eed8..11ef9a3ed45 100644
--- a/cypress/e2e/collection-edit.cy.ts
+++ b/cypress/e2e/collection-edit.cy.ts
@@ -12,8 +12,8 @@ beforeEach(() => {
 
 describe('Edit Collection > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
-    // <ds-edit-collection> tag must be loaded
-    cy.get('ds-edit-collection').should('be.visible');
+    // <ds-collection-form> tag must be loaded
+    cy.get('ds-collection-form').should('be.visible');
 
     // Analyze <ds-edit-collection> for accessibility issues
     testA11y('ds-edit-collection');
diff --git a/cypress/e2e/community-edit.cy.ts b/cypress/e2e/community-edit.cy.ts
index 77e260feec0..edf4da2dac3 100644
--- a/cypress/e2e/community-edit.cy.ts
+++ b/cypress/e2e/community-edit.cy.ts
@@ -12,8 +12,8 @@ beforeEach(() => {
 
 describe('Edit Community > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
-    // <ds-edit-community> tag must be loaded
-    cy.get('ds-edit-community').should('be.visible');
+    // <ds-community-form> tag must be loaded
+    cy.get('ds-community-form').should('be.visible');
 
     // Analyze <ds-edit-community> for accessibility issues
     testA11y('ds-edit-community');
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index a8ca674c263..7797ba13c91 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -11,9 +11,10 @@ <h1>{{ type + '.edit.head' | translate }}</h1>
         </div>
       </div>
       <div class="pt-2">
-        <ul class="nav nav-tabs justify-content-start mb-2">
-          <li *ngFor="let page of pages" class="nav-item">
-            <a class="nav-link"
+        <ul class="nav nav-tabs justify-content-start mb-2" role="tablist">
+          <li *ngFor="let page of pages" class="nav-item" role="presentation">
+            <a class="nav-link" role="tab"
+               [attr.aria-selected]="page === currentPage"
                [ngClass]="{'active' : page === currentPage}"
                [routerLink]="['./' + page]"
                [attr.data-test]="page">