diff --git a/test/vaadin-radio-group.html b/test/vaadin-radio-group.html
index 4cb1ce1..ee34316 100644
--- a/test/vaadin-radio-group.html
+++ b/test/vaadin-radio-group.html
@@ -77,6 +77,14 @@
     </template>
   </test-fixture>
 
+  <test-fixture id="default-with-slotted-helper">
+    <template>
+      <vaadin-radio-group>
+        <div slot="helper">foo</div>
+      </vaadin-radio-group>
+    </template>
+  </test-fixture>
+
   <script>
     describe('vaadin-radio-group', () => {
 
@@ -428,6 +436,69 @@
         expect(vaadinRadioButtonGroup.hasAttribute('focused')).to.be.false;
       });
 
+      it('setting errorMessage updates has-error-message attribute', function() {
+        vaadinRadioButtonGroup.errorMessage = 'foo';
+        expect(vaadinRadioButtonGroup.hasAttribute('has-error-message')).to.be.true;
+      });
+
+      it('setting errorMessage to empty string does not update has-error-message attribute', function() {
+        vaadinRadioButtonGroup.errorMessage = '';
+        expect(vaadinRadioButtonGroup.hasAttribute('has-error-message')).to.be.false;
+      });
+
+      it('setting errorMessage to null does not update has-error-message attribute', function() {
+        vaadinRadioButtonGroup.errorMessage = null;
+        expect(vaadinRadioButtonGroup.hasAttribute('has-error-message')).to.be.false;
+      });
+
+      describe('vaadin-radio-group helper text', () => {
+        it('setting helper updates has-helper attribute', function() {
+          vaadinRadioButtonGroup.helperText = 'foo';
+          expect(vaadinRadioButtonGroup.hasAttribute('has-helper')).to.be.true;
+        });
+
+        it('setting helper to empty string does not update has-helper attribute', function() {
+          vaadinRadioButtonGroup.helperText = '';
+          expect(vaadinRadioButtonGroup.hasAttribute('has-helper')).to.be.false;
+        });
+
+        it('setting helper to null does not update has-helper attribute', function() {
+          vaadinRadioButtonGroup.helperText = null;
+          expect(vaadinRadioButtonGroup.hasAttribute('has-helper')).to.be.false;
+        });
+
+        it('setting number helper updates has-helper attribute', function() {
+          vaadinRadioButtonGroup.helperText = 0;
+          expect(vaadinRadioButtonGroup.hasAttribute('has-helper')).to.be.true;
+        });
+
+        it('text-field with slotted helper updates has-helper attribute', function() {
+          const radioButtonGroupWithSlottedHelper = fixture('default-with-slotted-helper');
+          radioButtonGroupWithSlottedHelper._observer.flush();
+          expect(radioButtonGroupWithSlottedHelper.hasAttribute('has-helper')).to.be.true;
+        });
+
+        it('setting helper with slot updates has-helper attribute', function() {
+          const helper = document.createElement('div');
+          helper.setAttribute('slot', 'helper');
+          helper.textContent = 'foo';
+          vaadinRadioButtonGroup.appendChild(helper);
+          vaadinRadioButtonGroup._observer.flush();
+
+          expect(vaadinRadioButtonGroup.hasAttribute('has-helper')).to.be.true;
+        });
+
+        it('removing slotted helper removes has-helper attribute', function() {
+          const radioButtonGroupWithSlottedHelper = fixture('default-with-slotted-helper');
+
+          const helper = radioButtonGroupWithSlottedHelper.querySelector('[slot="helper"]');
+          radioButtonGroupWithSlottedHelper.removeChild(helper);
+          radioButtonGroupWithSlottedHelper._observer.flush();
+
+          expect(radioButtonGroupWithSlottedHelper.hasAttribute('has-helper')).to.be.false;
+        });
+      });
+
       describe('RTL mode', () => {
 
         beforeEach(() => vaadinRadioButtonGroup.setAttribute('dir', 'rtl'));
diff --git a/test/visual/default-rtl.html b/test/visual/default-rtl.html
index 6748fa0..9886d41 100644
--- a/test/visual/default-rtl.html
+++ b/test/visual/default-rtl.html
@@ -31,6 +31,23 @@
 
     <br/>
 
+    <vaadin-radio-group label="Label" helper-text="Helper text">
+      <vaadin-radio-button>1</vaadin-radio-button>
+      <vaadin-radio-button>2</vaadin-radio-button>
+    </vaadin-radio-group>
+
+    <br/>
+
+    <span>On material theme, helper text is hidden when error message is shown:</span>
+
+    <vaadin-radio-group label="Label" required error-message="Error message"
+      helper-text="Helper text" invalid>
+      <vaadin-radio-button>1</vaadin-radio-button>
+      <vaadin-radio-button>2</vaadin-radio-button>
+    </vaadin-radio-group>
+
+    <br/>
+
     <vaadin-radio-group label="Vertical" theme="vertical">
       <vaadin-radio-button>1</vaadin-radio-button>
       <vaadin-radio-button>2</vaadin-radio-button>
diff --git a/test/visual/default.html b/test/visual/default.html
index caff817..ad14d1f 100644
--- a/test/visual/default.html
+++ b/test/visual/default.html
@@ -30,6 +30,31 @@
 
     <br/>
 
+    <vaadin-radio-group label="Label" helper-text="Helper text">
+      <vaadin-radio-button>1</vaadin-radio-button>
+      <vaadin-radio-button>2</vaadin-radio-button>
+    </vaadin-radio-group>
+
+    <br/>
+
+    <vaadin-radio-group id="helperAboveField"
+      theme="helper-above-field" label="Label" helper-text="Helper text">
+      <vaadin-radio-button>1</vaadin-radio-button>
+      <vaadin-radio-button>2</vaadin-radio-button>
+    </vaadin-radio-group>
+
+    <br/>
+
+    <span>On material theme, helper text is hidden when error message is shown:</span>
+
+    <vaadin-radio-group label="Label" required error-message="Error message"
+      helper-text="Helper text" invalid>
+      <vaadin-radio-button>1</vaadin-radio-button>
+      <vaadin-radio-button>2</vaadin-radio-button>
+    </vaadin-radio-group>
+
+    <br/>
+
     <vaadin-radio-group label="Vertical" theme="vertical">
       <vaadin-radio-button>1</vaadin-radio-button>
       <vaadin-radio-button>2</vaadin-radio-button>
@@ -55,6 +80,10 @@
       MockInteractions.keyDownOn(document.body, 9);
       document.getElementById('radio').dispatchEvent(new CustomEvent('focusin', {composed: true, bubbles: true}));
     }
+
+    if (theme === 'material') {
+      document.querySelector('#helperAboveField').setAttribute('hidden', '');
+    }
   </script>
 
 </body>
diff --git a/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/chrome.png b/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/chrome.png
index 728d1d4..e2a8f91 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/chrome.png and b/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/chrome.png differ
diff --git a/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/firefox.png b/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/firefox.png
index 3cd1205..32f9858 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/firefox.png and b/test/visual/screens/vaadin-radio-button/default-rtl-tests-lumo/default/firefox.png differ
diff --git a/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/chrome.png b/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/chrome.png
index dc0de3c..45a8960 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/chrome.png and b/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/chrome.png differ
diff --git a/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/firefox.png b/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/firefox.png
index f776fde..8c1c9b3 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/firefox.png and b/test/visual/screens/vaadin-radio-button/default-rtl-tests-material/default/firefox.png differ
diff --git a/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/chrome.png b/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/chrome.png
index 0d1aca8..fad2390 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/chrome.png and b/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/chrome.png differ
diff --git a/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/firefox.png b/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/firefox.png
index 2597889..d7089de 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/firefox.png and b/test/visual/screens/vaadin-radio-button/default-tests-lumo/default/firefox.png differ
diff --git a/test/visual/screens/vaadin-radio-button/default-tests-material/default/chrome.png b/test/visual/screens/vaadin-radio-button/default-tests-material/default/chrome.png
index 400edf6..6669f9f 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-tests-material/default/chrome.png and b/test/visual/screens/vaadin-radio-button/default-tests-material/default/chrome.png differ
diff --git a/test/visual/screens/vaadin-radio-button/default-tests-material/default/firefox.png b/test/visual/screens/vaadin-radio-button/default-tests-material/default/firefox.png
index 6beb24f..5df4345 100644
Binary files a/test/visual/screens/vaadin-radio-button/default-tests-material/default/firefox.png and b/test/visual/screens/vaadin-radio-button/default-tests-material/default/firefox.png differ