Index: src/wp-admin/includes/schema.php
===================================================================
--- src/wp-admin/includes/schema.php	(revision 34363)
+++ src/wp-admin/includes/schema.php	(working copy)
@@ -344,7 +344,10 @@
 function populate_options() {
 	global $wpdb, $wp_db_version, $wp_current_db_version;
 
-	$guessurl = wp_guess_url();
+	$guessurl = $homeurl = wp_guess_url();
+	if ( defined( 'WP_HOME' ) && ! empty( WP_HOME ) ) { // wp_guess_url() checked WP_SITEURL constant.
+		$homeurl = WP_HOME;
+	}
 	/**
 	 * Fires before creating WordPress options and populating their default values.
 	 *