diff --git tests/phpunit/includes/bootstrap.php tests/phpunit/includes/bootstrap.php
index 5d3e159685..29d9d0b66a 100644
--- tests/phpunit/includes/bootstrap.php
+++ tests/phpunit/includes/bootstrap.php
@@ -105,6 +105,11 @@ require_once ABSPATH . '/wp-settings.php';
 // Delete any default posts & related data
 _delete_all_posts();
 
+require dirname( __FILE__ ) . '/shared-fixtures.php';
+
+// Create shared user fixtures.
+_tests_create_shared_user_fixtures();
+
 require dirname( __FILE__ ) . '/testcase.php';
 require dirname( __FILE__ ) . '/testcase-rest-api.php';
 require dirname( __FILE__ ) . '/testcase-rest-controller.php';
diff --git tests/phpunit/includes/functions.php tests/phpunit/includes/functions.php
index 9a450ece84..1ccd5ac99c 100644
--- tests/phpunit/includes/functions.php
+++ tests/phpunit/includes/functions.php
@@ -75,8 +75,9 @@ function _delete_all_data() {
 
 	$wpdb->query( "UPDATE {$wpdb->term_taxonomy} SET count = 0" );
 
-	$wpdb->query( "DELETE FROM {$wpdb->users} WHERE ID != 1" );
-	$wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id != 1" );
+
+	$wpdb->query( "DELETE FROM {$wpdb->users} WHERE ID != 1 AND ID != 2 AND ID != 3 AND ID != 4 AND ID != 5" );
+	$wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id != 1 AND user_id != 2 AND user_id != 3 AND user_id != 4 AND user_id != 5" );
 }
 
 function _delete_all_posts() {
diff --git tests/phpunit/includes/shared-fixtures.php tests/phpunit/includes/shared-fixtures.php
new file mode 100644
index 0000000000..30fd4f0301
--- /dev/null
+++ tests/phpunit/includes/shared-fixtures.php
@@ -0,0 +1,86 @@
+<?php
+
+function _tests_create_shared_user_fixtures() {
+	// Editor.
+	wp_insert_user( array(
+		'role'       => 'editor',
+		'user_email' => 'editor_user@example.org',
+		'user_login' => 'editor_user',
+		'user_pass'  => 'password',
+	) );
+
+	// Author.
+	wp_insert_user( array(
+		'role'       => 'author',
+		'user_email' => 'author_user@example.org',
+		'user_login' => 'author_user',
+		'user_pass'  => 'password',
+	) );
+
+	// Contributor.
+	wp_insert_user( array(
+		'role'       => 'contributor',
+		'user_email' => 'contributor_user@example.org',
+		'user_login' => 'contributor_user',
+		'user_pass'  => 'password',
+	) );
+
+	// Subscriber.
+	wp_insert_user( array(
+		'role'       => 'subscriber',
+		'user_email' => 'subscriber_user@example.org',
+		'user_login' => 'subscriber_user',
+		'user_pass'  => 'password',
+	) );
+}
+
+function tests_get_shared_admin_user() {
+	static $admin;
+
+	if ( ! $admin ) {
+		$admin = get_user_by( 'id', 1 );
+	}
+
+	return $admin;
+}
+
+function tests_get_shared_editor_user() {
+	static $editor;
+
+	if ( ! $editor ) {
+		$editor = get_user_by( 'id', 2 );
+	}
+
+	return $editor;
+}
+
+function tests_get_shared_author_user() {
+	static $author;
+
+	if ( ! $author ) {
+		$author = get_user_by( 'id', 3 );
+	}
+
+	return $author;
+}
+
+function tests_get_shared_contributor_user() {
+	static $contributor;
+
+	if ( ! $contributor ) {
+		$contributor = get_user_by( 'id', 4 );
+	}
+
+	return $contributor;
+}
+
+function tests_get_shared_subscriber_user() {
+	static $subscriber;
+
+	if ( ! $subscriber ) {
+		$subscriber = get_user_by( 'id', 5 );
+	}
+
+	return $subscriber;
+}
+
diff --git tests/phpunit/tests/includes/shared-fixtures.php tests/phpunit/tests/includes/shared-fixtures.php
new file mode 100644
index 0000000000..0081f89686
--- /dev/null
+++ tests/phpunit/tests/includes/shared-fixtures.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @group testsuite
+ */
+class Test_Shared_Fixtures extends WP_UnitTestCase {
+
+	public function test_get_shared_admin_user() {
+		$admin = tests_get_shared_admin_user();
+
+		$this->assertSame( 'administrator', $admin->roles[0] );
+	}
+
+	public function test_get_shared_editor_user() {
+		$editor = tests_get_shared_editor_user();
+
+		$this->assertSame( 'editor', $editor->roles[0] );
+	}
+
+	public function test_get_shared_author_user() {
+		$author = tests_get_shared_author_user();
+
+		$this->assertSame( 'author', $author->roles[0] );
+	}
+
+	public function test_get_shared_contributor_user() {
+		$contributor = tests_get_shared_contributor_user();
+
+		$this->assertSame( 'contributor', $contributor->roles[0] );
+	}
+
+	public function test_get_shared_subscriber_user() {
+		$subscriber = tests_get_shared_subscriber_user();
+
+		$this->assertSame( 'subscriber', $subscriber->roles[0] );
+	}
+}
diff --git tests/phpunit/tests/meta.php tests/phpunit/tests/meta.php
index b436630af7..ed4e9461ed 100644
--- tests/phpunit/tests/meta.php
+++ tests/phpunit/tests/meta.php
@@ -137,7 +137,7 @@ class Tests_Meta extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertEquals( 1, count( $u ) );
+		$this->assertEquals( 5, count( $u ) );
 
 		// User found is not locally defined author (it's the admin)
 		$this->assertNotEquals( $this->author->user_login, $u[0]->user_login );
@@ -163,7 +163,7 @@ class Tests_Meta extends WP_UnitTestCase {
 		);
 
 		$this->assertEquals(
-			2, count(
+			6, count(
 				get_users(
 					array(
 						'meta_query' => array(
@@ -180,7 +180,7 @@ class Tests_Meta extends WP_UnitTestCase {
 		delete_metadata( 'user', $this->author->ID, 'meta_key' );
 
 		$this->assertEquals(
-			2, count(
+			6, count(
 				get_users(
 					array(
 						'meta_query' => array(
diff --git tests/phpunit/tests/rest-api/rest-users-controller.php tests/phpunit/tests/rest-api/rest-users-controller.php
index 7b81eb1240..a4ba4b2482 100644
--- tests/phpunit/tests/rest-api/rest-users-controller.php
+++ tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -280,7 +280,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$response = $this->server->dispatch( $request );
 		$headers  = $response->get_headers();
-		$this->assertEquals( 53, $headers['X-WP-Total'] );
+		$this->assertEquals( 57, $headers['X-WP-Total'] );
 		$this->assertEquals( 6, $headers['X-WP-TotalPages'] );
 		$next_link = add_query_arg(
 			array(
@@ -299,7 +299,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 		$request->set_param( 'page', 3 );
 		$response = $this->server->dispatch( $request );
 		$headers  = $response->get_headers();
-		$this->assertEquals( 54, $headers['X-WP-Total'] );
+		$this->assertEquals( 58, $headers['X-WP-Total'] );
 		$this->assertEquals( 6, $headers['X-WP-TotalPages'] );
 		$prev_link = add_query_arg(
 			array(
@@ -318,7 +318,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 		$request->set_param( 'page', 6 );
 		$response = $this->server->dispatch( $request );
 		$headers  = $response->get_headers();
-		$this->assertEquals( 54, $headers['X-WP-Total'] );
+		$this->assertEquals( 58, $headers['X-WP-Total'] );
 		$this->assertEquals( 6, $headers['X-WP-TotalPages'] );
 		$prev_link = add_query_arg(
 			array(
@@ -332,7 +332,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 		$request->set_param( 'page', 8 );
 		$response = $this->server->dispatch( $request );
 		$headers  = $response->get_headers();
-		$this->assertEquals( 54, $headers['X-WP-Total'] );
+		$this->assertEquals( 58, $headers['X-WP-Total'] );
 		$this->assertEquals( 6, $headers['X-WP-TotalPages'] );
 		$prev_link = add_query_arg(
 			array(
@@ -530,7 +530,7 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$request->set_param( 'offset', 1 );
 		$response = $this->server->dispatch( $request );
-		$this->assertCount( 9, $response->get_data() );
+		$this->assertCount( 10, $response->get_data() );
 		// 'offset' works with 'per_page'
 		$request->set_param( 'per_page', 2 );
 		$response = $this->server->dispatch( $request );
@@ -728,30 +728,20 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 	// Note: Do not test using editor role as there is an editor role created in testing and it makes it hard to test this functionality.
 	public function test_get_items_roles() {
 		wp_set_current_user( self::$user );
-		$tango   = $this->factory->user->create(
-			array(
-				'display_name' => 'tango',
-				'role'         => 'subscriber',
-			)
-		);
-		$yolo    = $this->factory->user->create(
-			array(
-				'display_name' => 'yolo',
-				'role'         => 'author',
-			)
-		);
+
 		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$request->set_param( 'roles', 'author,subscriber' );
 		$response = $this->server->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertEquals( 2, count( $data ) );
-		$this->assertEquals( $tango, $data[0]['id'] );
-		$this->assertEquals( $yolo, $data[1]['id'] );
+		$this->assertEquals( tests_get_shared_author_user()->ID, $data[0]['id'] );
+		$this->assertEquals( tests_get_shared_subscriber_user()->ID, $data[1]['id'] );
+
 		$request->set_param( 'roles', 'author' );
 		$response = $this->server->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertEquals( 1, count( $data ) );
-		$this->assertEquals( $yolo, $data[0]['id'] );
+		$this->assertEquals( tests_get_shared_author_user()->ID, $data[0]['id'] );
 		wp_set_current_user( 0 );
 		$request->set_param( 'roles', 'author' );
 		$response = $this->server->dispatch( $request );
@@ -764,18 +754,14 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
 
 	public function test_get_items_invalid_roles() {
 		wp_set_current_user( self::$user );
-		$lolz    = $this->factory->user->create(
-			array(
-				'display_name' => 'lolz',
-				'role'         => 'author',
-			)
-		);
+
 		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$request->set_param( 'roles', 'ilovesteak,author' );
 		$response = $this->server->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertEquals( 1, count( $data ) );
-		$this->assertEquals( $lolz, $data[0]['id'] );
+		$this->assertEquals( tests_get_shared_author_user()->ID, $data[0]['id'] );
+
 		$request = new WP_REST_Request( 'GET', '/wp/v2/users' );
 		$request->set_param( 'roles', 'steakisgood' );
 		$response = $this->server->dispatch( $request );
diff --git tests/phpunit/tests/user/countUsers.php tests/phpunit/tests/user/countUsers.php
index 8d1efad61a..4b02203865 100644
--- tests/phpunit/tests/user/countUsers.php
+++ tests/phpunit/tests/user/countUsers.php
@@ -12,32 +12,6 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
 	 * @group ms-excluded
 	 */
 	public function test_count_users_is_accurate( $strategy ) {
-		// Setup users
-		$admin       = self::factory()->user->create(
-			array(
-				'role' => 'administrator',
-			)
-		);
-		$editor      = self::factory()->user->create(
-			array(
-				'role' => 'editor',
-			)
-		);
-		$author      = self::factory()->user->create(
-			array(
-				'role' => 'author',
-			)
-		);
-		$contributor = self::factory()->user->create(
-			array(
-				'role' => 'contributor',
-			)
-		);
-		$subscriber  = self::factory()->user->create(
-			array(
-				'role' => 'subscriber',
-			)
-		);
 		$none        = self::factory()->user->create(
 			array(
 				'role' => '',
@@ -52,10 +26,10 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
 		// Test user counts
 		$count = count_users( $strategy );
 
-		$this->assertEquals( 8, $count['total_users'] );
+		$this->assertEquals( 7, $count['total_users'] );
 		$this->assertEquals(
 			array(
-				'administrator' => 2,
+				'administrator' => 1,
 				'editor'        => 1,
 				'author'        => 1,
 				'contributor'   => 1,
@@ -131,14 +105,14 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
 		// Test users counts on root site
 		$count = count_users( $strategy );
 
-		$this->assertEquals( 8, $count['total_users'] );
+		$this->assertEquals( 12, $count['total_users'] );
 		$this->assertEquals(
 			array(
 				'administrator' => 2,
-				'editor'        => 1,
-				'author'        => 1,
-				'contributor'   => 1,
-				'subscriber'    => 1,
+				'editor'        => 2,
+				'author'        => 2,
+				'contributor'   => 2,
+				'subscriber'    => 2,
 				'none'          => 2,
 			), $count['avail_roles']
 		);
@@ -207,13 +181,7 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
 	 * @dataProvider data_count_users_strategies
 	 */
 	public function test_count_users_is_accurate_with_multiple_roles( $strategy ) {
-
-		// Setup users
-		$admin  = self::factory()->user->create(
-			array(
-				'role' => 'administrator',
-			)
-		);
+		// Setup user
 		$editor = self::factory()->user->create(
 			array(
 				'role' => 'editor',
@@ -232,12 +200,14 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
 		// Test user counts
 		$count = count_users( $strategy );
 
-		$this->assertEquals( 3, $count['total_users'] );
+		$this->assertEquals( 6, $count['total_users'] );
 		$this->assertEquals(
 			array(
-				'administrator' => 2,
-				'editor'        => 1,
-				'author'        => 1,
+				'administrator' => 1,
+				'editor'        => 2,
+				'author'        => 2,
+				'contributor'   => 1,
+				'subscriber'    => 1,
 				'none'          => 0,
 			), $count['avail_roles']
 		);
diff --git tests/phpunit/tests/user/listAuthors.php tests/phpunit/tests/user/listAuthors.php
index 1568c34680..14881ba1a9 100644
--- tests/phpunit/tests/user/listAuthors.php
+++ tests/phpunit/tests/user/listAuthors.php
@@ -148,7 +148,15 @@ class Tests_User_ListAuthors extends WP_UnitTestCase {
 
 	function test_wp_list_authors_hide_empty() {
 		$fred_id                = self::$fred_id;
-		$expected['hide_empty'] = '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li><li><a href="' . get_author_posts_url( $fred_id ) . '" title="Posts by fred">fred</a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';
+		$expected['hide_empty']  = '<li><a href="' . get_author_posts_url( tests_get_shared_author_user()->ID ) . '" title="Posts by ' . tests_get_shared_author_user()->user_nicename . '">' . tests_get_shared_author_user()->user_nicename . '</a></li>';
+		$expected['hide_empty'] .= '<li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li>';
+		$expected['hide_empty'] .= '<li><a href="' . get_author_posts_url( tests_get_shared_contributor_user()->ID ) . '" title="Posts by ' . tests_get_shared_contributor_user()->user_nicename . '">' . tests_get_shared_contributor_user()->user_nicename . '</a></li>';
+		$expected['hide_empty'] .= '<li><a href="' . get_author_posts_url( tests_get_shared_editor_user()->ID ) . '" title="Posts by ' . tests_get_shared_editor_user()->user_nicename . '">' . tests_get_shared_editor_user()->user_nicename . '</a></li>';
+		$expected['hide_empty'] .= '<li><a href="' . get_author_posts_url( $fred_id ) . '" title="Posts by fred">fred</a></li>';
+		$expected['hide_empty'] .= '<li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li>';
+		$expected['hide_empty'] .= '<li><a href="' . get_author_posts_url( tests_get_shared_subscriber_user()->ID ) . '" title="Posts by ' . tests_get_shared_subscriber_user()->user_nicename . '">' . tests_get_shared_subscriber_user()->user_nicename . '</a></li>';
+		$expected['hide_empty'] .= '<li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';
+
 		$this->AssertEquals(
 			$expected['hide_empty'], wp_list_authors(
 				array(
diff --git tests/phpunit/tests/user/query.php tests/phpunit/tests/user/query.php
index 64c110606e..34f0371bba 100644
--- tests/phpunit/tests/user/query.php
+++ tests/phpunit/tests/user/query.php
@@ -131,7 +131,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		$users = $users->get_results();
 
 		// +1 for the default user created during installation.
-		$this->assertEquals( 13, count( $users ) );
+		$this->assertEquals( 17, count( $users ) );
 		foreach ( $users as $user ) {
 			$this->assertInstanceOf( 'WP_User', $user );
 		}
@@ -143,7 +143,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 		$users = $users->get_results();
-		$this->assertEquals( 13, count( $users ) );
+		$this->assertEquals( 17, count( $users ) );
 		foreach ( $users as $user ) {
 			$this->assertInstanceOf( 'WP_User', $user );
 		}
@@ -156,7 +156,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		$users       = new WP_User_Query( array( 'blog_id' => get_current_blog_id() ) );
 		$total_users = $users->get_total();
 
-		$this->assertSame( 13, $total_users );
+		$this->assertSame( 17, $total_users );
 	}
 
 	/**
@@ -496,7 +496,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		// +1 for the default user created by the test suite.
 		$users = new WP_User_Query( array( 'blog_id' => get_current_blog_id() ) );
 		$users = $users->get_results();
-		$this->assertEquals( 13, count( $users ) );
+		$this->assertEquals( 17, count( $users ) );
 
 		$users = new WP_User_Query(
 			array(
@@ -523,7 +523,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 		$users = $users->get_results();
-		$this->assertEquals( 13, count( $users ) );
+		$this->assertEquals( 17, count( $users ) );
 	}
 
 	/**
@@ -1133,7 +1133,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		);
 
 		$foundCount    = count( $q->get_results() );
-		$expectedCount = 10; // 13 total users minus 3 from query
+		$expectedCount = 14; // 13 total users minus 3 from query
 
 		$this->assertContains( "AND user_nicename NOT IN ( 'peter','paul','mary' )", $q->query_where );
 		$this->assertEquals( $expectedCount, $foundCount );
@@ -1234,7 +1234,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		);
 
 		$foundCount    = count( $q->get_results() );
-		$expectedCount = 10; // 13 total users minus 3 from query
+		$expectedCount = 14; // 13 total users minus 3 from query
 
 		$this->assertContains( "AND user_login NOT IN ( '$user_login1','$user_login2','$user_login3' )", $q->query_where );
 		$this->assertEquals( $expectedCount, $foundCount );
@@ -1308,7 +1308,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		$wp_user_search = new WP_User_Query( array( 'role' => 'subscriber' ) );
 		$users          = $wp_user_search->get_results();
 
-		$this->assertEquals( 2, count( $users ) );
+		$this->assertEquals( 3, count( $users ) );
 	}
 
 	/**
@@ -1317,7 +1317,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 	public function test_get_multiple_roles_by_user_query() {
 		$wp_user_search = new WP_User_Query( array( 'role__in' => array( 'subscriber', 'editor' ) ) );
 		$users          = $wp_user_search->get_results();
-		$this->assertEquals( 5, count( $users ) );
+		$this->assertEquals( 7, count( $users ) );
 	}
 
 	/**
@@ -1330,7 +1330,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertEquals( 2, count( $users ) );
+		$this->assertEquals( 3, count( $users ) );
 	}
 
 	/**
@@ -1352,7 +1352,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertEqualSets( self::$editor_ids, $users );
+		$this->assertEqualSets( array_merge( array( tests_get_shared_editor_user()->ID ), self::$editor_ids) , $users );
 	}
 
 
@@ -1366,7 +1366,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertEquals( 2, count( $users ) );
+		$this->assertEquals( 3, count( $users ) );
 	}
 
 	/**
@@ -1401,7 +1401,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		$users = $users->get_results();
 
 		// +1 for the default user created during installation.
-		$this->assertEquals( 8, count( $users ) );
+		$this->assertEquals( 10, count( $users ) );
 		foreach ( $users as $user ) {
 			$this->assertInstanceOf( 'WP_User', $user );
 		}
@@ -1491,7 +1491,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		);
 
 		// +1 for the default user created during installation.
-		$this->assertEquals( 11, count( $users ) );
+		$this->assertEquals( 14, count( $users ) );
 
 		$users = get_users(
 			array(
@@ -1500,7 +1500,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		);
 
 		// +1 for the default user created during installation.
-		$this->assertEquals( 10, count( $users ) );
+		$this->assertEquals( 13, count( $users ) );
 	}
 
 	/**
@@ -1518,7 +1518,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertEquals( 5, count( $users ) );
+		$this->assertEquals( 6, count( $users ) );
 
 		$users = get_users(
 			array(
@@ -1527,7 +1527,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertEquals( 3, count( $users ) );
+		$this->assertEquals( 4, count( $users ) );
 	}
 
 	/**
@@ -1544,7 +1544,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertEquals( 1, count( $users ) );
+		$this->assertEquals( 2, count( $users ) );
 	}
 
 	/**
@@ -1562,7 +1562,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		);
 
 		// +1 for the default user created during installation.
-		$this->assertEquals( 12, count( $users ) );
+		$this->assertEquals( 15, count( $users ) );
 
 		$users = get_users(
 			array(
@@ -1571,7 +1571,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		);
 
 		// +1 for the default user created during installation.
-		$this->assertEquals( 10, count( $users ) );
+		$this->assertEquals( 13, count( $users ) );
 	}
 
 	/**
diff --git tests/phpunit/tests/xmlrpc/wp/getUsers.php tests/phpunit/tests/xmlrpc/wp/getUsers.php
index bddafcf39a..192b4b38d8 100644
--- tests/phpunit/tests/xmlrpc/wp/getUsers.php
+++ tests/phpunit/tests/xmlrpc/wp/getUsers.php
@@ -66,7 +66,7 @@ class Tests_XMLRPC_wp_getUsers extends WP_XMLRPC_UnitTestCase {
 		$filter  = array( 'role' => 'editor' );
 		$results = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator', $filter ) );
 		$this->assertNotIXRError( $results );
-		$this->assertCount( 1, $results );
+		$this->assertCount( 2, $results );
 		$this->assertEquals( $editor_id, $results[0]['user_id'] );
 
 		// test 'authors', which should return all non-subscribers