diff --git a/tests/phpunit/tests/multisite.php b/tests/phpunit/tests/multisite/wpCountSites.php
similarity index 67%
rename from tests/phpunit/tests/multisite.php
rename to tests/phpunit/tests/multisite/wpCountSites.php
index 0445d58fb9..6755cc1208 100644
--- a/tests/phpunit/tests/multisite.php
+++ b/tests/phpunit/tests/multisite/wpCountSites.php
@@ -3,24 +3,10 @@
 if ( is_multisite() ) :
 
 	/**
-	 * A set of unit tests for WordPress Multisite
-	 *
+	 * @group ms-site
 	 * @group multisite
 	 */
-	class Tests_Multisite extends WP_UnitTestCase {
-
-		public function test_wpmu_log_new_registrations() {
-			global $wpdb;
-
-			$user = new WP_User( 1 );
-			$ip   = preg_replace( '/[^0-9., ]/', '', $_SERVER['REMOTE_ADDR'] );
-
-			wpmu_log_new_registrations( 1, 1 );
-
-			// Currently there is no wrapper function for the registration_log.
-			$reg_blog = $wpdb->get_col( $wpdb->prepare( "SELECT email FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.blog_id = 1 AND IP LIKE %s", $ip ) );
-			$this->assertSame( $user->user_email, $reg_blog[ count( $reg_blog ) - 1 ] );
-		}
+	class Tests_Multisite_wpCountSites extends WP_UnitTestCase {
 
 		/**
 		 * @ticket 37392
diff --git a/tests/phpunit/tests/multisite/wpmuLogNewRegistrations.php b/tests/phpunit/tests/multisite/wpmuLogNewRegistrations.php
new file mode 100644
index 0000000000..069aab14f5
--- /dev/null
+++ b/tests/phpunit/tests/multisite/wpmuLogNewRegistrations.php
@@ -0,0 +1,24 @@
+<?php
+
+if ( is_multisite() ) :
+
+	/**
+	 * @group multisite
+	 */
+	class Tests_Multisite_wpmuLogNewRegistrations extends WP_UnitTestCase {
+
+		public function test_wpmu_log_new_registrations() {
+			global $wpdb;
+
+			$user = new WP_User( 1 );
+			$ip   = preg_replace( '/[^0-9., ]/', '', $_SERVER['REMOTE_ADDR'] );
+
+			wpmu_log_new_registrations( 1, 1 );
+
+			// Currently there is no wrapper function for the registration_log.
+			$reg_blog = $wpdb->get_col( $wpdb->prepare( "SELECT email FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.blog_id = 1 AND IP LIKE %s", $ip ) );
+			$this->assertSame( $user->user_email, $reg_blog[ count( $reg_blog ) - 1 ] );
+		}
+	}
+
+endif;