diff --git a/app/assets/javascripts/previewPane.js b/app/assets/javascripts/previewPane.js
index 2dac47421..9c6bd50e3 100644
--- a/app/assets/javascripts/previewPane.js
+++ b/app/assets/javascripts/previewPane.js
@@ -4,7 +4,7 @@
 
   $ = global.jQuery;
 
-  let branding_style = $('.multiple-choice input[name="branding_style"]:checked');
+  let branding_style = $('.govuk-radios__item input[name="branding_style"]:checked');
 
   if (!branding_style.length) { return; }
 
diff --git a/tests/javascripts/previewPane.test.js b/tests/javascripts/previewPane.test.js
index f6cccc34c..2f550f8b8 100644
--- a/tests/javascripts/previewPane.test.js
+++ b/tests/javascripts/previewPane.test.js
@@ -65,7 +65,7 @@ describe('Preview pane', () => {
         <div class="govuk-grid-row">
           <div class="govuk-grid-column-full">
             <div data-module="autofocus">
-              <div class="live-search js-header" data-module="live-search" data-targets=".multiple-choice">
+              <div class="live-search js-header" data-module="live-search" data-targets=".govuk-radios__item">
                 <div class="form-group">
                   <label class="form-label" for="search">
                       Search branding styles by name
diff --git a/tests/javascripts/support/helpers/html.js b/tests/javascripts/support/helpers/html.js
index dacc0f930..0f7c086fe 100644
--- a/tests/javascripts/support/helpers/html.js
+++ b/tests/javascripts/support/helpers/html.js
@@ -7,9 +7,9 @@ function getRadios (fields, name) {
     const count = idx + 1;
 
     return `
-      <div class="multiple-choice">
-        <input id="${name}-1" name="${name}" type="radio" value="${field.value}" ${field.checked ? 'checked' : ''}>
-        <label class="block-label" for="${name}-1">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="${name}-1" name="${name}" type="radio" value="${field.value}" ${field.checked ? 'checked' : ''}>
+        <label class="govuk-label govuk-radios__label" for="${name}-1">
           ${field.label}
         </label>
       </div>`;
@@ -19,16 +19,17 @@ function getRadios (fields, name) {
 function getRadioGroup (data) {
   let radioGroup = document.createElement('div');
 
+  radioGroup.classList.add('govuk-form-group');
   data.cssClasses.forEach(cssClass => radioGroup.classList.add(cssClass));
   radioGroup.innerHTML = `
-    <div class="form-group ">
-      <fieldset id="${data.name}">
-        <legend class="form-label">
-          ${data.label}
-        </legend>
+    <fieldset class="govuk-fieldset" id="${data.name}">
+      <legend class="govuk-fieldset__legend">
+        ${data.label}
+      </legend>
+      <div class="govuk-radios">
         ${getRadios(data.fields, data.name)}
-      </fieldset>
-    </div>`;
+      </div>
+    </fieldset>`;
 
     return radioGroup;
 };