diff --git a/tests/phpunit/tests/admin/includesListTable.php b/tests/phpunit/tests/admin/includesListTable.php
index 39a0b97288..b0be74f28c 100644
--- a/tests/phpunit/tests/admin/includesListTable.php
+++ b/tests/phpunit/tests/admin/includesListTable.php
@@ -16,9 +16,7 @@ class Tests_Admin_includesListTable extends WP_UnitTestCase {
 
 	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 ) {
diff --git a/tests/phpunit/tests/multisite/wpMSSitesListTable.php b/tests/phpunit/tests/multisite/wpMSSitesListTable.php
index de9deb49b4..b170cc956c 100644
--- a/tests/phpunit/tests/multisite/wpMSSitesListTable.php
+++ b/tests/phpunit/tests/multisite/wpMSSitesListTable.php
@@ -16,7 +16,7 @@ class Tests_WP_MS_Sites_List_Table extends WP_UnitTestCase {
 
 	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 ) {