diff --git a/test/visual/default.html b/test/visual/default.html
index 3d6e0cc..18b9051 100644
--- a/test/visual/default.html
+++ b/test/visual/default.html
@@ -62,6 +62,21 @@
     </vaadin-checkbox-group>
   </div>
 
+  <div id="wrapping-group-tests" style="width: 300px;">
+    <vaadin-checkbox-group label="Choose a number">
+      <vaadin-checkbox value="1">Checkbox 1</vaadin-checkbox>
+      <vaadin-checkbox value="2">Checkbox 2</vaadin-checkbox>
+      <vaadin-checkbox value="3">Checkbox 3</vaadin-checkbox>
+      <vaadin-checkbox value="4">Checkbox 4</vaadin-checkbox>
+      <vaadin-checkbox value="5">Checkbox 5</vaadin-checkbox>
+      <vaadin-checkbox value="6">Checkbox 6</vaadin-checkbox>
+      <vaadin-checkbox value="7">Checkbox 7</vaadin-checkbox>
+      <vaadin-checkbox value="8">Checkbox 8</vaadin-checkbox>
+      <vaadin-checkbox value="9">Checkbox 9</vaadin-checkbox>
+      <vaadin-checkbox value="10">Checkbox 10</vaadin-checkbox>
+    </vaadin-checkbox-group>
+  </div>
+
   <script>
     window.addEventListener('WebComponentsReady', () => {
       const checkboxGroup = document.getElementById('validation-checkbox-group');
diff --git a/test/visual/screens/vaadin-checkbox/wrapping-group-tests-lumo/default/chrome.png b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-lumo/default/chrome.png
new file mode 100644
index 0000000..f8b61c2
Binary files /dev/null and b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-lumo/default/chrome.png differ
diff --git a/test/visual/screens/vaadin-checkbox/wrapping-group-tests-lumo/default/firefox.png b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-lumo/default/firefox.png
new file mode 100644
index 0000000..6dfd84d
Binary files /dev/null and b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-lumo/default/firefox.png differ
diff --git a/test/visual/screens/vaadin-checkbox/wrapping-group-tests-material/default/chrome.png b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-material/default/chrome.png
new file mode 100644
index 0000000..dfdc254
Binary files /dev/null and b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-material/default/chrome.png differ
diff --git a/test/visual/screens/vaadin-checkbox/wrapping-group-tests-material/default/firefox.png b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-material/default/firefox.png
new file mode 100644
index 0000000..e2a54f1
Binary files /dev/null and b/test/visual/screens/vaadin-checkbox/wrapping-group-tests-material/default/firefox.png differ
diff --git a/test/visual/test.js b/test/visual/test.js
index c33e67e..2659483 100644
--- a/test/visual/test.js
+++ b/test/visual/test.js
@@ -59,6 +59,13 @@ gemini.suite('vaadin-checkbox', function(rootSuite) {
         .setCaptureElements('#focus-tests')
         .capture('focus');
     });
+
+    gemini.suite(`wrapping-group-tests-${theme}`, function(suite) {
+      suite
+        .setUrl(`default.html?theme=${theme}`)
+        .setCaptureElements('#wrapping-group-tests')
+        .capture('default');
+    });
   });
 
 });