diff --git a/mailpoet/tests/acceptance/Subscriptions/WooCheckoutBlocksCest.php b/mailpoet/tests/acceptance/Subscriptions/WooCheckoutBlocksCest.php
index bac9f3fe84..33bb511449 100644
--- a/mailpoet/tests/acceptance/Subscriptions/WooCheckoutBlocksCest.php
+++ b/mailpoet/tests/acceptance/Subscriptions/WooCheckoutBlocksCest.php
@@ -281,10 +281,10 @@ class WooCheckoutBlocksCest {
 
   private function placeOrder(\AcceptanceTester $i): void {
     // Add a note to order just to avoid flakiness due to race conditions
-    $i->click('Add a note to your order');
+    $i->click(Locator::contains('label', 'Add a note to your order'));
     $i->fillField('.wc-block-components-textarea', 'This is a note');
     $i->waitForText('Place Order');
-    $i->waitForElementClickable(Locator::contains('button', 'Place Order'));
+    $i->waitForElementClickable('.wc-block-components-checkout-place-order-button');
     $i->click(Locator::contains('button', 'Place Order'));
     $i->waitForText('Your order has been received');
   }