diff --git a/packages/form-layout/test/form-layout.common.js b/packages/form-layout/test/form-layout.common.js
index 280ab3056a..ca4f375f14 100644
--- a/packages/form-layout/test/form-layout.common.js
+++ b/packages/form-layout/test/form-layout.common.js
@@ -171,80 +171,6 @@ describe('form layout', () => {
     });
   });
 
-  describe('container overflow', () => {
-    let container, layout;
-
-    beforeEach(() => {
-      container = fixtureSync(`
-      <div style="width: 300px; overflow: auto;">
-          <vaadin-form-layout responsive-steps='[{"columns": 3}]'>
-            <div at-start>1 start</div>
-            <div>2 mid</div>
-            <div at-end>3 end</div>
-            <br>
-            <div style="display: none;">invisible</div>
-            <div at-start colspan="2">4 start</div>
-            <div style="display: none;">invisible</div>
-            <br>
-            <div at-start>5 start</div>
-            <div colspan="2" at-end>6 end</div>
-            <div colspan="2" at-start>7 start</div>
-            <div at-end>8 end</div>
-            <div colspan="3" at-start at-end>9 start to end</div>
-          </vaadin-form-layout>
-        </div>
-      `);
-      layout = container.firstElementChild;
-    });
-
-    it('should not overflow containers horizontally', () => {
-      expect(container.scrollWidth).to.equal(container.clientWidth);
-    });
-
-    it('should maintain the colspan value before the line break', () => {
-      const secondItemRect = layout.children[1].getBoundingClientRect();
-      const fourthItemRect = layout.children[5].getBoundingClientRect();
-      expect(secondItemRect.right).to.be.closeTo(fourthItemRect.right, 0.5);
-    });
-
-    describe('no spacing on edges', () => {
-      it('should not have spacing on the left edge', () => {
-        const containerRect = container.getBoundingClientRect();
-        Array.from(layout.querySelectorAll('[at-start]')).forEach((child) => {
-          expect(child.getBoundingClientRect().left).to.be.closeTo(containerRect.left, 0.5);
-        });
-      });
-
-      it('should not have spacing on the right edge', () => {
-        const containerRect = container.getBoundingClientRect();
-        Array.from(layout.querySelectorAll('[at-end]')).forEach((child) => {
-          expect(child.getBoundingClientRect().right).to.be.closeTo(containerRect.right, 0.5);
-        });
-      });
-    });
-
-    describe('no spacing on edges (rtl)', () => {
-      beforeEach(async () => {
-        container.dir = 'rtl';
-        await aTimeout(100);
-      });
-
-      it('should not have spacing on the right edge', () => {
-        const containerRect = container.getBoundingClientRect();
-        Array.from(layout.querySelectorAll('[at-start]')).forEach((child) => {
-          expect(child.getBoundingClientRect().right).to.be.closeTo(containerRect.right, 0.5);
-        });
-      });
-
-      it('should not have spacing on the left edge', () => {
-        const containerRect = container.getBoundingClientRect();
-        Array.from(layout.querySelectorAll('[at-end]')).forEach((child) => {
-          expect(child.getBoundingClientRect().left).to.be.closeTo(containerRect.left, 0.5);
-        });
-      });
-    });
-  });
-
   describe('responsiveSteps property', () => {
     let layout;
 
diff --git a/packages/form-layout/test/visual/lumo/form-layout.test.js b/packages/form-layout/test/visual/lumo/form-layout.test.js
index 17cdd1223b..802931b951 100644
--- a/packages/form-layout/test/visual/lumo/form-layout.test.js
+++ b/packages/form-layout/test/visual/lumo/form-layout.test.js
@@ -246,4 +246,56 @@ describe('form-layout', () => {
       await visualDiff(element, 'required-indicator-labels-on-top');
     });
   });
+
+  ['ltr', 'rtl'].forEach((dir) => {
+    describe(dir, () => {
+      before(() => {
+        document.documentElement.setAttribute('dir', dir);
+      });
+
+      after(() => {
+        document.documentElement.removeAttribute('dir');
+      });
+
+      describe('container overflow', () => {
+        beforeEach(() => {
+          element = fixtureSync(`
+            <div style="display: inline-block; padding: 10px">
+              <style>
+                vaadin-form-layout > div:nth-child(even) {
+                  background: var(--lumo-contrast-10pct);
+                }
+
+                vaadin-form-layout > div:nth-child(odd) {
+                  background: var(--lumo-contrast-50pct);
+                }
+              </style>
+
+              <div style="width: 300px; overflow: auto; border: 1px solid;">
+                <vaadin-form-layout responsive-steps='[{"columns": 3}]'>
+                  <div>1/3</div>
+                  <div>1/3</div>
+                  <div>1/3</div>
+                  <br>
+                  <div style="display: none;">hidden</div>
+                  <div colspan="2">2/3</div>
+                  <div style="display: none;">hidden</div>
+                  <br>
+                  <div>1/3</div>
+                  <div colspan="2">2/3</div>
+                  <div colspan="2">2/3</div>
+                  <div>1/3</div>
+                  <div colspan="3">3/3</div>
+                </vaadin-form-layout>
+              </div>
+            </div>
+          `);
+        });
+
+        it('basic', async () => {
+          await visualDiff(element, `${dir}-container-overflow`);
+        });
+      });
+    });
+  });
 });
diff --git a/packages/form-layout/test/visual/lumo/screenshots/form-layout/baseline/ltr-container-overflow.png b/packages/form-layout/test/visual/lumo/screenshots/form-layout/baseline/ltr-container-overflow.png
new file mode 100644
index 0000000000..b2fd80d585
Binary files /dev/null and b/packages/form-layout/test/visual/lumo/screenshots/form-layout/baseline/ltr-container-overflow.png differ
diff --git a/packages/form-layout/test/visual/lumo/screenshots/form-layout/baseline/rtl-container-overflow.png b/packages/form-layout/test/visual/lumo/screenshots/form-layout/baseline/rtl-container-overflow.png
new file mode 100644
index 0000000000..5c81106f0b
Binary files /dev/null and b/packages/form-layout/test/visual/lumo/screenshots/form-layout/baseline/rtl-container-overflow.png differ