diff --git src/bp-core/bp-core-functions.php src/bp-core/bp-core-functions.php
index 6acfb73..34df2c5 100644
--- src/bp-core/bp-core-functions.php
+++ src/bp-core/bp-core-functions.php
@@ -633,7 +633,7 @@ function bp_core_add_page_mappings( $components, $existing = 'keep' ) {
 	$page_titles = array(
 		'activity' => _x( 'Activity', 'Page title for the Activity directory.',       'buddypress' ),
 		'groups'   => _x( 'Groups',   'Page title for the Groups directory.',         'buddypress' ),
-		'sites'    => _x( 'Sites',    'Page title for the Sites directory.',          'buddypress' ),
+		'blogs'    => _x( 'Sites',    'Page title for the Sites directory.',          'buddypress' ),
 		'members'  => _x( 'Members',  'Page title for the Members directory.',        'buddypress' ),
 		'activate' => _x( 'Activate', 'Page title for the user activation screen.',   'buddypress' ),
 		'register' => _x( 'Register', 'Page title for the user registration screen.', 'buddypress' ),
@@ -657,8 +657,8 @@ function bp_core_add_page_mappings( $components, $existing = 'keep' ) {
 	}
 
 	// No need for a Sites directory unless we're on multisite.
-	if ( ! is_multisite() && isset( $pages_to_create['sites'] ) ) {
-		unset( $pages_to_create['sites'] );
+	if ( ! is_multisite() && isset( $pages_to_create['blogs'] ) ) {
+		unset( $pages_to_create['blogs'] );
 	}
 
 	// Members must always have a page, no matter what.
diff --git tests/phpunit/testcases/admin/functions.php tests/phpunit/testcases/admin/functions.php
index cc6ea19..9492d93 100644
--- tests/phpunit/testcases/admin/functions.php
+++ tests/phpunit/testcases/admin/functions.php
@@ -208,11 +208,14 @@ class BP_Tests_Admin_Functions extends BP_UnitTestCase {
 
 		$missing_pages = array();
 		foreach( buddypress()->admin->notices as $notice ) {
+			if ( false !== strpos( $notice['message'], 'BuddyPress is almost ready' ) ) {
+				continue;
+			}
+
 			preg_match_all( '/<strong>(.+?)<\/strong>/', $notice['message'], $missing_pages );
 		}
 
-		$this->assertNotContains( 'Register', $missing_pages[1] );
-		$this->assertNotContains( 'Activate', $missing_pages[1] );
+		$this->assertEmpty( $missing_pages );
 
 		// Reset buddypress() vars
 		$bp->pages = $reset_bp_pages;
diff --git tests/phpunit/testcases/core/functions.php tests/phpunit/testcases/core/functions.php
index c541c02..e1e2820 100644
--- tests/phpunit/testcases/core/functions.php
+++ tests/phpunit/testcases/core/functions.php
@@ -721,4 +721,25 @@ class BP_Tests_Core_Functions extends BP_UnitTestCase {
 		$result      = bp_email_add_link_color_to_template( $content, 'template', 'add-content' );
 		$this->assertContains( $link_color, $result );
 	}
+
+	/**
+	 * @group bp_core_add_page_mappings
+	 */
+	public function test_bp_core_add_page_mappings() {
+		$bp = buddypress();
+		$reset_bp_pages = $bp->pages;
+
+		$expected = array( 'activity', 'groups', 'members' );
+		if ( is_multisite() ) {
+			$expected = array( 'activity', 'blogs', 'groups', 'members' );
+		}
+
+		bp_core_add_page_mappings( $bp->active_components );
+		$bp_pages = array_keys( bp_get_option( 'bp-pages' ) );
+		sort( $bp_pages );
+
+		$this->assertEquals( $expected, $bp_pages );
+
+		$bp->pages = $reset_bp_pages;
+	}
 }