diff --git a/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js b/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js
index 5853fa49ec..3631d9bd57 100644
--- a/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js
+++ b/tests/cypress/e2e/Entries/EntriesPageDataValidations.cy.js
@@ -73,7 +73,7 @@ describe( 'Entries submitted from a form', () => {
 		cy.get( '.frm_form_nav > :nth-child(1) > a' ).should( 'contain', 'Build' ).click();
 		cy.get( "a[aria-label='Close']", { timeout: 5000 } ).click( { force: true } );
 		cy.log( 'Verify that entries are not allowed from the forms list' );
-		cy.get( 'td[data-colname="Entries"] svg[data-original-title="Saving entries is disabled for this form"]' ).should( 'exist' );
+		cy.get( 'td[data-colname="Entries"] svg[title="Saving entries is disabled for this form"]' ).should( 'exist' );
 	} );
 
 	it( 'should be stored and validated in the entry list', () => {
diff --git a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js
index 30bb1a63d9..5bfb99f95b 100644
--- a/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js
+++ b/tests/cypress/e2e/Forms/fieldsInFormBuilder.cy.js
@@ -21,10 +21,22 @@ describe( 'Fields in the form builder', () => {
 
 		const removeField = field => {
 			field.within( () => {
-				cy.get( '.frm-field-action-icons > .dropdown > .frm_bstooltip > .frmsvg > use' ).click( { force: true } );
-				cy.get( '.frm-dropdown-menu > :nth-child(1) > .frm_delete_field' ).should( 'contain', 'Delete' ).click( { force: true } );
+				cy.get( '.frm-field-action-icons .dropdown' )
+					.trigger( 'mouseover' );
+
+				cy.get( '.frm-field-action-icons .dropdown .frm-hover-icon .frmsvg' )
+					.click( { force: true } );
+
+				cy.get( '.frm-dropdown-menu .frm_delete_field' )
+					.should( 'contain', 'Delete' )
+					.click( { force: true } );
 			} );
-			cy.get( '.postbox a[id="frm-confirmed-click"]' ).contains( 'Confirm' ).should( 'be.visible' ).click( { force: true } );
+
+			cy.get( '.postbox a[id="frm-confirmed-click"]' )
+				.contains( 'Confirm' )
+				.should( 'be.visible' )
+				.click( { force: true } );
+
 			cy.get( `li[data-type="${ field }"]` ).should( 'not.exist' );
 		};
 
@@ -241,7 +253,7 @@ describe( 'Fields in the form builder', () => {
 
 	afterEach( () => {
 		cy.log( 'Teardown - Save the form and delete it' );
-		cy.get( "a[aria-label='Close']", { timeout: 5000 } ).click( { force: true } );
+		cy.get( "a[aria-label='Close']", { timeout: 10000 } ).click( { force: true } );
 		cy.deleteForm();
 	} );
 } );