diff --git a/build/makelib/wordpress.mk b/build/makelib/wordpress.mk
index 2df20cb3..971276e9 100644
--- a/build/makelib/wordpress.mk
+++ b/build/makelib/wordpress.mk
@@ -44,7 +44,7 @@ WP_TESTS_ARCHIVE := $(CACHE_DIR)/wordpress-develop-$(WP_VERSION).tar.gz
 
 $(WP_TESTS_ARCHIVE):
 	@$(INFO) fetching $(notdir $@) from $(WP_TESTS_DOWNLOAD_URL)
-	@curl -sLo "$@" "$(WP_TESTS_DOWNLOAD_URL)" || $(FAIL)
+	@curl -v -sLo "$@" "$(WP_TESTS_DOWNLOAD_URL)" || $(FAIL)
 	@$(OK) fetching $(notdir $@) from $(WP_TESTS_DOWNLOAD_URL)
 
 $(WP_TESTS_DIR)/src/wp-includes/version.php: $(WP_TESTS_ARCHIVE)
@@ -59,6 +59,13 @@ $(WP_TESTS_DIR)/src/wp-includes/version.php: $(WP_TESTS_ARCHIVE)
 $(WP_TESTS_DIR)/wp-tests-config.php: $(WP_TESTS_CONFIG) $(WP_TESTS_DIR)/src/wp-includes/version.php
 	@cp $(WP_TESTS_CONFIG) $@
 
+$(WP_TESTS_DIR)/includes: $(WP_TESTS_DIR)
+	@cp -r $(WP_TESTS_DIR)/tests/phpunit/includes $@
+
+$(WP_TESTS_DIR)/data: $(WP_TESTS_DIR)
+	@cp -r $(WP_TESTS_DIR)/tests/phpunit/data $@
+
+
 # add WP_TESTS_DIR env var for running tests
 .do.php.test: PHPUNIT:=WP_TESTS_DIR=$(WP_TESTS_DIR) $(PHPUNIT)