diff --git a/test/visual/default.html b/test/visual/default.html
index 48ec5c59..7d0badab 100644
--- a/test/visual/default.html
+++ b/test/visual/default.html
@@ -9,7 +9,7 @@
     document.write(`<link rel="import" href="../../theme/${theme}/vaadin-date-picker.html">`);
 
     window.addEventListener('WebComponentsReady', function() {
-      setTimeout(function() {
+      customElements.whenDefined('vaadin-date-picker').then(() => {
         window.ShadyDOM && window.ShadyDOM.flush(); // Force DOM composition
         window.webComponentsAreReady = true; // Checked in gemini before capture callback
       });