diff --git a/tests/phpunit/tests/wp.php b/tests/phpunit/tests/wp/addQueryVar.php
similarity index 61%
rename from tests/phpunit/tests/wp.php
rename to tests/phpunit/tests/wp/addQueryVar.php
index 4fbb182a50..421c76a665 100644
--- a/tests/phpunit/tests/wp.php
+++ b/tests/phpunit/tests/wp/addQueryVar.php
@@ -2,8 +2,11 @@
 
 /**
  * @group wp
+ *
+ * @covers WP::add_query_var
  */
-class Tests_WP extends WP_UnitTestCase {
+class Tests_WP_AddQueryVar extends WP_UnitTestCase {
+
 	/**
 	 * @var WP
 	 */
@@ -25,14 +28,4 @@ class Tests_WP extends WP_UnitTestCase {
 		$this->assertContains( 'test', $this->wp->public_query_vars );
 		$this->assertContains( 'test2', $this->wp->public_query_vars );
 	}
-
-	public function test_remove_query_var() {
-		$public_qv_count = count( $this->wp->public_query_vars );
-
-		$this->wp->add_query_var( 'test' );
-		$this->assertContains( 'test', $this->wp->public_query_vars );
-		$this->wp->remove_query_var( 'test' );
-
-		$this->assertCount( $public_qv_count, $this->wp->public_query_vars );
-	}
 }
diff --git a/tests/phpunit/tests/wp/parseRequest.php b/tests/phpunit/tests/wp/parseRequest.php
index edf65cb660..a34a873e89 100644
--- a/tests/phpunit/tests/wp/parseRequest.php
+++ b/tests/phpunit/tests/wp/parseRequest.php
@@ -2,9 +2,11 @@
 
 /**
  * @group wp
+ *
  * @covers WP::parse_request
  */
 class Tests_WP_ParseRequest extends WP_UnitTestCase {
+
 	/**
 	 * @var WP
 	 */
diff --git a/tests/phpunit/tests/wp/removeQueryVar.php b/tests/phpunit/tests/wp/removeQueryVar.php
new file mode 100644
index 0000000000..56d82c1774
--- /dev/null
+++ b/tests/phpunit/tests/wp/removeQueryVar.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @group wp
+ *
+ * @covers WP::remove_query_var
+ */
+class Tests_WP_RemoveQueryVar extends WP_UnitTestCase {
+
+	/**
+	 * @var WP
+	 */
+	protected $wp;
+
+	public function set_up() {
+		parent::set_up();
+		$this->wp = new WP();
+	}
+
+	public function test_remove_query_var() {
+		$public_qv_count = count( $this->wp->public_query_vars );
+
+		$this->wp->add_query_var( 'test' );
+		$this->assertContains( 'test', $this->wp->public_query_vars );
+		$this->wp->remove_query_var( 'test' );
+
+		$this->assertCount( $public_qv_count, $this->wp->public_query_vars );
+	}
+}
diff --git a/tests/phpunit/tests/wp/sendHeaders.php b/tests/phpunit/tests/wp/sendHeaders.php
index 84feb74d1d..b5fc56bf20 100644
--- a/tests/phpunit/tests/wp/sendHeaders.php
+++ b/tests/phpunit/tests/wp/sendHeaders.php
@@ -2,6 +2,7 @@
 
 /**
  * @group wp
+ *
  * @covers WP::send_headers
  */
 class Tests_WP_SendHeaders extends WP_UnitTestCase {