diff --git a/features/media-import.feature b/features/media-import.feature
index e50aa53a..1ecdeeed 100644
--- a/features/media-import.feature
+++ b/features/media-import.feature
@@ -81,7 +81,7 @@ Feature: Manage WordPress attachments
     When I run `wp media import {CACHE_DIR}/large-image.jpg --post_id=1 --preserve-filetime --porcelain`
     Then save STDOUT as {ATTACH_ID}
 
-    And I run `wp post get {ATTACH_ID} --field=post_date`
+    When I run `wp post get {ATTACH_ID} --field=post_date`
     Then STDOUT should be:
       """
       1980-01-03 08:05:00
@@ -254,7 +254,7 @@ Feature: Manage WordPress attachments
       https://example.com/wp-content/uploads/
       """
 
-    Then STDOUT should contain:
+    And STDOUT should contain:
       """
       /large-image.jpg
       """
diff --git a/features/media-regenerate.feature b/features/media-regenerate.feature
index 67e3750d..181cd9d8 100644
--- a/features/media-regenerate.feature
+++ b/features/media-regenerate.feature
@@ -434,7 +434,7 @@ Feature: Regenerate WordPress attachments
       """
       Success: Regenerated 2 of 2 images
       """
-    Then the wp-content/uploads/large-image-125x125.jpg file should exist
+    And the wp-content/uploads/large-image-125x125.jpg file should exist
     And the wp-content/uploads/large-image-1-125x125.jpg file should exist
     And the wp-content/uploads/large-image-200x200.jpg file should exist
     And the wp-content/uploads/large-image-1-200x200.jpg file should exist
@@ -1032,7 +1032,7 @@ Feature: Regenerate WordPress attachments
 
     When I run `wp media import {CACHE_DIR}/canola.jpg --title="My imported JPG attachment" --porcelain`
     Then save STDOUT as {JPG_ATTACHMENT_ID}
-    Then the wp-content/uploads/canola-300x225.jpg file should exist
+    And the wp-content/uploads/canola-300x225.jpg file should exist
 
     When I run `wp media regenerate --yes`
     Then STDOUT should contain: