diff --git a/tests/phpunit/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php
index 86d70c3ea2..b1d2ff66f9 100644
--- a/tests/phpunit/tests/user/capabilities.php
+++ b/tests/phpunit/tests/user/capabilities.php
@@ -1509,9 +1509,11 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
                 $this->assertTrue( current_user_can_for_blog( get_current_blog_id(), 'edit_posts' ) );
                 $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'foo_the_bar' ) );
-                if ( ! is_multisite() ) {
-                        $this->assertTrue( current_user_can_for_blog( 12345, 'edit_posts' ) );
-                        return;
-                }
+                $this->assertTrue( current_user_can_for_blog( 12345, 'edit_posts' ) );
+
+                wp_set_current_user( $old_uid );
+        }
+
+        /**
+         * @group ms-required
+         */
+        function test_multisite_current_user_can_for_blog() {
+                global $wpdb;
+
+                $user    = self::$users['administrator'];
+                $old_uid = get_current_user_id();
+                wp_set_current_user( $user->ID );
+
+                $this->assertTrue( current_user_can_for_blog( get_current_blog_id(), 'edit_posts' ) );
+                $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'foo_the_bar' ) );
+
+                $suppress = $wpdb->suppress_errors();
+                $this->assertFalse( current_user_can_for_blog( 12345, 'edit_posts' ) );
@@ -1582,6 +1600,27 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
                 $this->assertFalse( current_user_can( 'edit_post', $post ) );
+                $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post ) );
+                $this->assertFalse( current_user_can( 'edit_post', $post + 1 ) );
+                $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post + 1 ) );
+        }
+
+        /**
+         * @group santilin
+         */
+        function test_editor_can_edit_posts() {
+                $user = self::$users['editor'];
+                wp_set_current_user( $user->ID );
+
+                $post = self::factory()->post->create( array( 'post_author' => $user->ID ) );
+
+                $this->assertTrue( current_user_can( 'edit_post', $post ) );
+                $this->assertFalse( current_user_can( 'edit_post', $post + 1 ) );
+                $this->assertTrue( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post ) );
+                $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'edit_post', $post + 1 ) );
+                if ( is_multisite() ) {
+                        $this->assertFalse( current_user_can_for_blog( 12345, 'edit_post', $post ) );
+                        $this->assertFalse( current_user_can_for_blog( 12345, 'edit_post', $post + 1 ) );
+                } else {
+                        $this->assertTrue( current_user_can_for_blog( 12345, 'edit_post', $post ) );
+                        $this->assertFalse( current_user_can_for_blog( 12345, 'edit_post', $post + 1 ) );
+                }
         }