diff --git a/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs b/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs
index 2734833954..857f772f3a 100644
--- a/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs
+++ b/packages/govuk-frontend/src/govuk/components/accordion/accordion.mjs
@@ -141,7 +141,7 @@ export class Accordion extends GOVUKFrontendComponent {
     if (!$sections.length) {
       throw new ElementError({
         componentName: 'Accordion',
-        identifier: `Sections (\`.${this.sectionClass}\`)`
+        identifier: `Sections (\`<div class="${this.sectionClass}">\`)`
       })
     }
 
@@ -208,7 +208,7 @@ export class Accordion extends GOVUKFrontendComponent {
       if (!$header) {
         throw new ElementError({
           componentName: 'Accordion',
-          identifier: `Section headers (\`.${this.sectionHeaderClass}\`)`
+          identifier: `Section headers (\`<div class="${this.sectionHeaderClass}">\`)`
         })
       }
 
@@ -247,7 +247,7 @@ export class Accordion extends GOVUKFrontendComponent {
     if (!$span) {
       throw new ElementError({
         componentName: 'Accordion',
-        identifier: `Section button (\`.${this.sectionButtonClass}\`)`
+        identifier: `Section button (\`<span class="${this.sectionButtonClass}">\`)`
       })
     }
 
@@ -414,14 +414,14 @@ export class Accordion extends GOVUKFrontendComponent {
     if (!$button) {
       throw new ElementError({
         componentName: 'Accordion',
-        identifier: `Section button (\`.${this.sectionButtonClass}\`)`
+        identifier: `Section button (\`<span class="${this.sectionButtonClass}">\`)`
       })
     }
 
     if (!$content) {
       throw new ElementError({
         componentName: 'Accordion',
-        identifier: `Section content (\`.${this.sectionContentClass}\`)`
+        identifier: `Section content (\`<div class="${this.sectionContentClass}">\`)`
       })
     }
 
diff --git a/packages/govuk-frontend/src/govuk/components/accordion/accordion.puppeteer.test.js b/packages/govuk-frontend/src/govuk/components/accordion/accordion.puppeteer.test.js
index aff7500207..192fb34b9b 100644
--- a/packages/govuk-frontend/src/govuk/components/accordion/accordion.puppeteer.test.js
+++ b/packages/govuk-frontend/src/govuk/components/accordion/accordion.puppeteer.test.js
@@ -783,7 +783,7 @@ describe('/components/accordion', () => {
             cause: {
               name: 'ElementError',
               message:
-                'Accordion: Sections (`.govuk-accordion__section`) not found'
+                'Accordion: Sections (`<div class="govuk-accordion__section">`) not found'
             }
           })
         })
@@ -804,7 +804,7 @@ describe('/components/accordion', () => {
             cause: {
               name: 'ElementError',
               message:
-                'Accordion: Section headers (`.govuk-accordion__section-header`) not found'
+                'Accordion: Section headers (`<div class="govuk-accordion__section-header">`) not found'
             }
           })
         })
@@ -842,7 +842,7 @@ describe('/components/accordion', () => {
             cause: {
               name: 'ElementError',
               message:
-                'Accordion: Section button (`.govuk-accordion__section-button`) not found'
+                'Accordion: Section button (`<span class="govuk-accordion__section-button">`) not found'
             }
           })
         })
@@ -861,7 +861,7 @@ describe('/components/accordion', () => {
             cause: {
               name: 'ElementError',
               message:
-                'Accordion: Section content (`.govuk-accordion__section-content`) not found'
+                'Accordion: Section content (`<div class="govuk-accordion__section-content">`) not found'
             }
           })
         })