diff --git a/features/scaffold-theme-tests.feature b/features/scaffold-theme-tests.feature
index 91e44def..80cc91a8 100644
--- a/features/scaffold-theme-tests.feature
+++ b/features/scaffold-theme-tests.feature
@@ -78,8 +78,13 @@ Feature: Scaffold theme unit tests
       """
       <?php echo __FILE__ . " loaded.\n";
       """
+    And I run `MYSQL_PWD=password1 mysql -u wp_cli_test -e "DROP DATABASE IF EXISTS wp_cli_test_scaffold"`
+    And I try `rm -fr /tmp/behat-wordpress-tests-lib`
+    And I try `rm -fr /tmp/behat-wordpress`
+	And I try `WP_TESTS_DIR=/tmp/behat-wordpress-tests-lib WP_CORE_DIR=/tmp/behat-wordpress {THEME_DIR}/p2child/bin/install-wp-tests.sh wp_cli_test_scaffold wp_cli_test password1 localhost latest`
+    Then the return code should be 0
 
-    When I run `cd {THEME_DIR}/p2child; phpunit`
+    When I run `cd {THEME_DIR}/p2child; WP_TESTS_DIR=/tmp/behat-wordpress-tests-lib phpunit`
     Then STDOUT should contain:
       """
       p2child/functions.php loaded.
@@ -93,7 +98,7 @@ Feature: Scaffold theme unit tests
       OK (1 test, 1 assertion)
       """
 
-    When I run `cd {THEME_DIR}/p2child; WP_MULTISITE=1 phpunit`
+    When I run `cd {THEME_DIR}/p2child; WP_MULTISITE=1 WP_TESTS_DIR=/tmp/behat-wordpress-tests-lib phpunit`
     Then STDOUT should contain:
       """
       p2child/functions.php loaded.