diff --git a/test/e2e/lib/gutenberg/blocks/contact-form-block-component.js b/test/e2e/lib/gutenberg/blocks/contact-form-block-component.js
index e9c44be59fd122..abf8cc9a4431fe 100644
--- a/test/e2e/lib/gutenberg/blocks/contact-form-block-component.js
+++ b/test/e2e/lib/gutenberg/blocks/contact-form-block-component.js
@@ -25,7 +25,7 @@ export class ContactFormBlockComponent extends GutenbergBlockComponent {
 
 	async insertEmail( email ) {
 		const emailSelector = By.css(
-			'.jetpack-contact-form__popover .components-base-control:nth-child(1) .components-text-control__input'
+			'.jetpack-contact-form__popover .components-base-control:nth-of-type(1) .components-text-control__input'
 		);
 		await driverHelper.waitTillPresentAndDisplayed( this.driver, emailSelector );
 
@@ -35,7 +35,7 @@ export class ContactFormBlockComponent extends GutenbergBlockComponent {
 
 	async insertSubject( subject ) {
 		const subjectSelector = By.css(
-			'.jetpack-contact-form__popover .components-base-control:nth-child(2) .components-text-control__input'
+			'.jetpack-contact-form__popover .components-base-control:nth-of-type(2) .components-text-control__input'
 		);
 		await driverHelper.waitTillPresentAndDisplayed( this.driver, subjectSelector );
 
diff --git a/test/e2e/lib/gutenberg/gutenberg-editor-component.js b/test/e2e/lib/gutenberg/gutenberg-editor-component.js
index 11af799e69263f..680f8abea030c2 100644
--- a/test/e2e/lib/gutenberg/gutenberg-editor-component.js
+++ b/test/e2e/lib/gutenberg/gutenberg-editor-component.js
@@ -415,11 +415,11 @@ export default class GutenbergEditorComponent extends AsyncBaseContainer {
 		await driverHelper.waitTillNotPresent( this.driver, this.publishingSpinnerSelector );
 		await driverHelper.waitTillPresentAndDisplayed(
 			this.driver,
-			By.css( '.editor-post-publish-panel__header-published' )
+			By.css( '.post-publish-panel__postpublish-header' )
 		);
 		return await driverHelper.verifyTextPresent(
 			this.driver,
-			By.css( '.editor-post-publish-panel__header-published' ),
+			By.css( '.post-publish-panel__postpublish-header' ),
 			'Scheduled'
 		);
 	}