diff --git a/test/integration/component-tooltip.test.js b/test/integration/component-tooltip.test.js
index c9b6c0cfd5..6ed5bc7eb8 100644
--- a/test/integration/component-tooltip.test.js
+++ b/test/integration/component-tooltip.test.js
@@ -117,13 +117,14 @@ import { mouseenter, mouseleave } from '@vaadin/tooltip/test/helpers.js';
       expect(tooltipOverlay.position).to.equal(position || 'bottom');
     });
 
-    it('should or should not show tooltip', () => {
+    it('should or should not show tooltip', async () => {
       mouseenter(tooltip.target);
       expect(tooltipOverlay.opened).to.be.true;
       mouseleave(tooltip.target);
 
       if (applyShouldNotShowCondition) {
         applyShouldNotShowCondition(element);
+        await nextRender();
 
         mouseenter(tooltip.target);
         expect(tooltipOverlay.opened).to.be.false;
diff --git a/test/integration/confirm-dialog-fields.test.js b/test/integration/confirm-dialog-fields.test.js
index dce56df88a..22f6ca4f0e 100644
--- a/test/integration/confirm-dialog-fields.test.js
+++ b/test/integration/confirm-dialog-fields.test.js
@@ -30,6 +30,9 @@ describe('confirm-dialog with fields', () => {
         dialog = document.createElement('vaadin-confirm-dialog');
         field = document.createElement(`vaadin-${component}`);
         field.label = 'Label';
+        if (component === 'date-picker') {
+          field.autoOpenDisabled = true;
+        }
         dialog.appendChild(field);
         document.body.appendChild(dialog);
         dialog.opened = true;