diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
index cd06364caf269..a47846d362bd9 100644
--- a/src/wp-admin/includes/schema.php
+++ b/src/wp-admin/includes/schema.php
@@ -424,7 +424,7 @@ function populate_options( array $options = array() ) {
 		'rss_use_excerpt'                 => 0,
 		'mailserver_url'                  => 'mail.example.com',
 		'mailserver_login'                => 'login@example.com',
-		'mailserver_pass'                 => 'password',
+		'mailserver_pass'                 => '',
 		'mailserver_port'                 => 110,
 		'default_category'                => 1,
 		'default_comment_status'          => 'open',
diff --git a/tests/phpunit/tests/admin/includesSchema.php b/tests/phpunit/tests/admin/includesSchema.php
index 77b3e06a53ed6..9f2d19f0c16aa 100644
--- a/tests/phpunit/tests/admin/includesSchema.php
+++ b/tests/phpunit/tests/admin/includesSchema.php
@@ -123,7 +123,7 @@ public function data_populate_options() {
 					'rss_use_excerpt'  => '0',
 					'mailserver_url'   => 'mail.example.com',
 					'mailserver_login' => 'login@example.com',
-					'mailserver_pass'  => 'password',
+					'mailserver_pass'  => '',
 				),
 			),
 			array(
@@ -137,7 +137,7 @@ public function data_populate_options() {
 					'rss_use_excerpt'  => '1',
 					'mailserver_url'   => 'mail.example.com',
 					'mailserver_login' => 'login@example.com',
-					'mailserver_pass'  => 'password',
+					'mailserver_pass'  => '',
 				),
 			),
 			array(
@@ -151,7 +151,7 @@ public function data_populate_options() {
 					'rss_use_excerpt'  => '0',
 					'mailserver_url'   => 'mail.example.com',
 					'mailserver_login' => 'login@example.com',
-					'mailserver_pass'  => 'password',
+					'mailserver_pass'  => '',
 				),
 			),
 			array(