Index: tests/phpunit/tests/admin/includesListTable.php
===================================================================
--- tests/phpunit/tests/admin/includesListTable.php	(revision 39474)
+++ tests/phpunit/tests/admin/includesListTable.php	(working copy)
@@ -16,9 +16,7 @@
 
 	function setUp() {
 		parent::setUp();
-		set_current_screen( 'edit-page' );
-		$GLOBALS['hook_suffix'] = '';
-		$this->table = _get_list_table( 'WP_Posts_List_Table' );
+		$this->table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => 'edit-page' ) );
 	}
 
 	public static function wpSetUpBeforeClass( $factory ) {
Index: tests/phpunit/tests/multisite/wpMSSitesListTable.php
===================================================================
--- tests/phpunit/tests/multisite/wpMSSitesListTable.php	(revision 39474)
+++ tests/phpunit/tests/multisite/wpMSSitesListTable.php	(working copy)
@@ -16,7 +16,7 @@
 
 	function setUp() {
 		parent::setUp();
-		$this->table = _get_list_table( 'WP_MS_Sites_List_Table' );
+		$this->table = _get_list_table( 'WP_MS_Sites_List_Table', array( 'screen' => 'ms-sites' ) );
 	}
 
 	public static function wpSetUpBeforeClass( $factory ) {