diff --git a/src/applications/coronavirus-screener/components/FormQuestion.jsx b/src/applications/coronavirus-screener/components/FormQuestion.jsx
index ffe52c09698b..f3eb72c64d3e 100644
--- a/src/applications/coronavirus-screener/components/FormQuestion.jsx
+++ b/src/applications/coronavirus-screener/components/FormQuestion.jsx
@@ -47,10 +47,13 @@ export default function FormQuestion({
   ));
 
   return (
-    <div className="feature" id={`question-${question.id}`}>
+    <va-summary-box
+      class="vads-u-margin-bottom--3"
+      id={`question-${question.id}`}
+    >
       <Element name={scrollElementName} />
-      <h2>{question.text[selectedLanguage]}</h2>
+      <h2 slot="headline">{question.text[selectedLanguage]}</h2>
       {options}
-    </div>
+    </va-summary-box>
   );
 }
diff --git a/src/applications/coronavirus-screener/tests/00.coronavirus-screener.cypress.spec.js b/src/applications/coronavirus-screener/tests/00.coronavirus-screener.cypress.spec.js
index 57cbce83c103..3990ac574ca2 100644
--- a/src/applications/coronavirus-screener/tests/00.coronavirus-screener.cypress.spec.js
+++ b/src/applications/coronavirus-screener/tests/00.coronavirus-screener.cypress.spec.js
@@ -12,8 +12,12 @@ Cypress.Commands.add('testQuestionScenario', ({ scenario, routeOption }) => {
   cy.reload();
   cy.get('body', { timeout: normal }).should('be.visible');
   scenario.questions.forEach(question => {
-    cy.get(`div[id=${question.id}]`, { timeout: slow }).should('be.visible');
-    cy.get(`div[id=${question.id}] > button[value=${question.value}]`).click();
+    cy.get(`va-summary-box[id=${question.id}]`, { timeout: slow }).should(
+      'be.visible',
+    );
+    cy.get(
+      `va-summary-box[id=${question.id}] > button[value=${question.value}]`,
+    ).click();
   });
   cy.get(`div[class*=${scenario.result.class}]`, { timeout: slow }).should(
     'be.visible',
@@ -25,7 +29,7 @@ describe('Coronavirus Screener', () => {
   it('Gets the correct result for each scenario', () => {
     cy.visit('/covid19screen');
     cy.get('body').should('be.visible');
-    cy.get('div[id=question-isStaff]').should('be.visible');
+    cy.get('va-summary-box[id=question-isStaff]').should('be.visible');
     cy.get('div[class*=covid-screener-results-incomplete]').should(
       'be.visible',
     );
diff --git a/src/applications/coronavirus-screener/tests/01.custom-questions.cypress.disabled.spec.js b/src/applications/coronavirus-screener/tests/01.custom-questions.cypress.disabled.spec.js
index 19f494f122c2..d6cb316204ab 100644
--- a/src/applications/coronavirus-screener/tests/01.custom-questions.cypress.disabled.spec.js
+++ b/src/applications/coronavirus-screener/tests/01.custom-questions.cypress.disabled.spec.js
@@ -86,7 +86,7 @@ describe('Coronavirus Screener Alternate', () => {
     // custom travel question /459
     cy.visit('/covid19screen/459');
     cy.get('body', { timeout: normal }).should('be.visible');
-    cy.get('div[id=question-isStaff]').should('be.visible');
+    cy.get('va-summary-box[id=question-isStaff]').should('be.visible');
     cy.get('div[class*=covid-screener-results-incomplete]').should(
       'be.visible',
     );
@@ -105,7 +105,7 @@ describe('Coronavirus Screener Alternate', () => {
 
     cy.visit('/covid19screen/459GH');
     cy.get('body', { timeout: normal }).should('be.visible');
-    cy.get('div[id=question-isStaff]').should('be.visible');
+    cy.get('va-summary-box[id=question-isStaff]').should('be.visible');
     cy.get('div[class*=covid-screener-results-incomplete]').should(
       'be.visible',
     );
@@ -119,7 +119,7 @@ describe('Coronavirus Screener Alternate', () => {
     // custom travel question case insensitive /459gh
     cy.visit('/covid19screen/459gh');
     cy.get('body', { timeout: normal }).should('be.visible');
-    cy.get('div[id=question-isStaff]').should('be.visible');
+    cy.get('va-summary-box[id=question-isStaff]').should('be.visible');
     cy.get('div[class*=covid-screener-results-incomplete]').should(
       'be.visible',
     );