1 files changed, 4 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
index a5f7b83c32..ec785c953f 100644
--- a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
@@ -105,9 +105,11 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
         test(gridLayout);
         populateLayout(gridLayout);
 
-        final Window window = new Window("TEST: Window");
+        VerticalLayout layout = new VerticalLayout();
+        layout.setMargin(true);
+        final Window window = new Window("TEST: Window", layout);
         test(window);
-        populateLayout((Layout) window.getContent());
+        populateLayout(layout);
 
     }