diff --git a/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java b/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java
index 940bdb9..6a6e296 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/googlemaps/AddMarkersDemo.java
@@ -143,9 +143,7 @@ protected void createGoogleMapsDemo(String apiKey) {
 
     FlexLayout layout = new FlexLayout();
     layout.setFlexWrap(FlexWrap.WRAP); // hide-source
-    addMarker.addClassName("margin-button"); // hide-source
-    colorCB.addClassName("margin-button"); // hide-source
-    labelText.addClassName("margin-button"); // hide-source
+    layout.getStyle().set("gap", "var(--lumo-space-s, var(--vaadin-gap-m))"); // hide-source
     layout.add(colorCB, draggable, withRightClick, withLabel, labelText, addMarker);
     layout.setAlignItems(Alignment.BASELINE); // hide-source
     layout.getStyle().set("margin-top", "0"); // hide-source
diff --git a/src/test/java/com/flowingcode/vaadin/addons/googlemaps/DisableUIControlsDemo.java b/src/test/java/com/flowingcode/vaadin/addons/googlemaps/DisableUIControlsDemo.java
index af17d40..0299b0b 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/googlemaps/DisableUIControlsDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/googlemaps/DisableUIControlsDemo.java
@@ -43,6 +43,7 @@ protected void createGoogleMapsDemo(String apiKey) {
 
     FlexLayout layout = new FlexLayout();
     layout.setFlexWrap(FlexWrap.WRAP);
+    layout.getStyle().set("gap", "var(--lumo-space-s, var(--vaadin-gap-m))"); // hide-source
 
     Checkbox disableMapTypeControl =
         new Checkbox("Disable map type control", e -> gmaps.disableMapTypeControl(e.getValue()));