Index: /trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php
===================================================================
--- /trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php	(revision 64366)
+++ /trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php	(revision 64367)
@@ -31,6 +31,4 @@
 	protected static $num_notes      = 10;
 
-	protected $endpoint;
-
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		add_role(
@@ -170,5 +168,4 @@
 	public function set_up() {
 		parent::set_up();
-		$this->endpoint = new WP_REST_Comments_Controller();
 		wp_create_initial_comment_meta();
 
@@ -648,8 +645,6 @@
 		wp_set_current_user( 0 );
 
-		$post_id = self::factory()->post->create( array( 'post_status' => 'private' ) );
-
 		$request = new WP_REST_Request( $method, '/wp/v2/comments' );
-		$request->set_param( 'post', $post_id );
+		$request->set_param( 'post', self::$private_id );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_cannot_read_post', $response, 401 );
@@ -1682,10 +1677,8 @@
 	 */
 	public function test_create_comment_with_invalid_type() {
-		$post_id = self::factory()->post->create();
-
-		wp_set_current_user( self::$admin_id );
-
-		$params = array(
-			'post'         => $post_id,
+		wp_set_current_user( self::$admin_id );
+
+		$params = array(
+			'post'         => self::$post_id,
 			'author'       => self::$admin_id,
 			'author_name'  => 'Comic Book Guy',
@@ -1706,10 +1699,8 @@
 
 	public function test_create_comment_invalid_email() {
-		$post_id = self::factory()->post->create();
-
-		wp_set_current_user( self::$admin_id );
-
-		$params = array(
-			'post'         => $post_id,
+		wp_set_current_user( self::$admin_id );
+
+		$params = array(
+			'post'         => self::$post_id,
 			'author'       => self::$admin_id,
 			'author_name'  => 'Comic Book Guy',
@@ -2522,6 +2513,4 @@
 
 	public function test_update_item_no_content() {
-		$post_id = self::factory()->post->create();
-
 		wp_set_current_user( self::$admin_id );
 
@@ -2544,6 +2533,4 @@
 	 */
 	public function test_update_item_no_content_allow_empty_comment_filter() {
-		$post_id = self::factory()->post->create();
-
 		wp_set_current_user( self::$admin_id );
 
@@ -3878,8 +3865,7 @@
 	public function test_cannot_create_with_non_valid_comment_type() {
 		wp_set_current_user( self::$admin_id );
-		$post_id = self::factory()->post->create();
-
-		$params = array(
-			'post'         => $post_id,
+
+		$params = array(
+			'post'         => self::$post_id,
 			'author_name'  => 'Ishmael',
 			'author_email' => 'herman-melville@earthlink.net',