diff --git a/features/core-download.feature b/features/core-download.feature
index 52912266..7c53c1ec 100644
--- a/features/core-download.feature
+++ b/features/core-download.feature
@@ -386,6 +386,10 @@ Feature: Download WordPress
       """
     And the return code should be 1
 
+  @skip-windows
+  Scenario: Fail if path can't be created (root-level-directory)
+    Given an empty directory
+
     When I try `wp core download --path=/root-level-directory`
     Then STDERR should contain:
       """
diff --git a/features/core.feature b/features/core.feature
index db3228f0..4918f74c 100644
--- a/features/core.feature
+++ b/features/core.feature
@@ -209,7 +209,12 @@ Feature: Manage WordPress installation
       """
     And the return code should be 0
 
-    When I run `wp eval 'echo $GLOBALS["current_site"]->domain;'`
+    Given a current-site-domain.php file:
+      """
+      <?php
+      echo $GLOBALS['current_site']->domain;
+      """
+    When I run `wp eval-file current-site-domain.php`
     Then STDOUT should be:
       """
       foobar.org
@@ -296,6 +301,7 @@ Feature: Manage WordPress installation
       http://localhost:8001
       """
 
+  @skip-windows
   Scenario: Test output in a multisite install with custom base path
     Given a WP install