diff --git tests/phpunit/testcases/activity/actions.php tests/phpunit/testcases/activity/actions.php
index 799a8fe..c21a5f7 100644
--- tests/phpunit/testcases/activity/actions.php
+++ tests/phpunit/testcases/activity/actions.php
@@ -23,6 +23,8 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 	 */
 	public function test_bp_activity_catch_transition_post_type_status_publish() {
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		register_post_type( 'foo', array(
 			'label'   => 'foo',
@@ -43,7 +45,7 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 		_unregister_post_type( 'foo' );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->new_foo );
+		$bp->activity->actions = $activity_actions;
 		$bp->activity->track = array();
 	}
 
@@ -53,6 +55,8 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 	 */
 	public function test_bp_activity_catch_transition_post_type_status_publish_to_publish() {
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		register_post_type( 'foo', array(
 			'label'   => 'foo',
@@ -83,7 +87,7 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 		_unregister_post_type( 'foo' );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->new_foo );
+		$bp->activity->actions = $activity_actions;
 		$bp->activity->track = array();
 	}
 
@@ -93,6 +97,8 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 	 */
 	public function test_bp_activity_catch_transition_post_type_status_publish_password() {
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		register_post_type( 'foo', array(
 			'label'   => 'foo',
@@ -121,7 +127,7 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 		_unregister_post_type( 'foo' );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->new_foo );
+		$bp->activity->actions = $activity_actions;
 		$bp->activity->track = array();
 	}
 
@@ -131,6 +137,8 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 	 */
 	public function test_bp_activity_catch_transition_post_type_status_publish_trash() {
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		register_post_type( 'foo', array(
 			'label'   => 'foo',
@@ -156,7 +164,7 @@ class BP_Tests_Activity_Actions extends BP_UnitTestCase {
 		_unregister_post_type( 'foo' );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->new_foo );
+		$bp->activity->actions = $activity_actions;
 		$bp->activity->track = array();
 	}
 
diff --git tests/phpunit/testcases/activity/functions.php tests/phpunit/testcases/activity/functions.php
index 4f8cad6..2b32c7f 100644
--- tests/phpunit/testcases/activity/functions.php
+++ tests/phpunit/testcases/activity/functions.php
@@ -586,6 +586,8 @@ Bar!';
 		}
 
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		register_post_type( 'foo', array(
 			'label'   => 'foo',
@@ -624,7 +626,7 @@ Bar!';
 		_unregister_post_type( 'foo' );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->new_foo );
+		$bp->activity->actions = $activity_actions;
 		$bp->activity->track = array();
 	}
 
@@ -639,6 +641,8 @@ Bar!';
 		}
 
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		$b = $this->factory->blog->create();
 		$u = $this->factory->user->create();
@@ -687,7 +691,7 @@ Bar!';
 		$this->assertSame( $expected, $a_obj->action );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->new_foo );
+		$bp->activity->actions = $activity_actions;
 		$bp->activity->track = array();
 	}
 
@@ -696,8 +700,9 @@ Bar!';
 	 * @group bp_activity_get_actions
 	 */
 	public function test_bp_activity_get_actions_should_sort_by_position() {
-		$old_actions = bp_activity_get_actions();
-		buddypress()->activity->actions = new stdClass;
+		$bp = buddypress();
+		$old_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass;
 
 		register_post_type( 'foo5', array(
 			'public'      => true,
@@ -739,7 +744,7 @@ Bar!';
 		$foo_actions = (array) $actions->foo;
 		$this->assertEquals( $expected, array_values( wp_list_pluck( $foo_actions, 'key' ) ) );
 
-		buddypress()->activity->actions = $old_actions;
+		$bp->activity->actions = $old_actions;
 	}
 
 	/**
@@ -752,6 +757,8 @@ Bar!';
 		}
 
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		$labels = array(
 			'name'                 => 'bars',
@@ -798,7 +805,7 @@ Bar!';
 		_unregister_post_type( 'foo' );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->foo_bar );
+		$bp->activity->actions = $activity_actions;
 		$bp->activity->track = array();
 	}
 
@@ -814,6 +821,7 @@ Bar!';
 
 		$bp = buddypress();
 		$reset = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		$b = $this->factory->blog->create();
 		$u = $this->factory->user->create();
@@ -865,7 +873,7 @@ Bar!';
 		$this->assertSame( $expected, $a_obj->action );
 
 		// Reset globals
-		unset( $bp->activity->actions->activity->new_foo );
+		$bp->activity->actions = $reset;
 		$bp->activity->track = array();
 	}
 
@@ -874,7 +882,11 @@ Bar!';
 	 * @group activity_tracking
 	 */
 	public function test_bp_activity_set_post_type_tracking_args() {
+		global $wp_post_types;
+
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
 
 		add_post_type_support( 'page', 'buddypress-activity' );
 
@@ -905,7 +917,9 @@ Bar!';
 		remove_post_type_support( 'page', 'buddypress-activity' );
 
 		// Reset globals
-		unset( $bp->activity->actions->blogs->new_page );
+		$bp->activity->actions = $activity_actions;
+
+		unset( $wp_post_types['page']->bp_activity );
 		$bp->activity->track = array();
 	}
 
diff --git tests/phpunit/testcases/blogs/activity.php tests/phpunit/testcases/blogs/activity.php
index 96b6ab6..bfb0d2c 100644
--- tests/phpunit/testcases/blogs/activity.php
+++ tests/phpunit/testcases/blogs/activity.php
@@ -7,6 +7,11 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 	 */
 	public function test_bp_blogs_loader_post_tracking_args_filter() {
 		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
+
+		// Make sure regulare actions are populated
+		do_action( 'bp_register_activity_actions' );
 
 		$expected = array( 'new_blog_post', 'new_blog_comment' );
 
@@ -18,6 +23,9 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 		$actions = array_keys( (array) $actions->blogs );
 
 		$this->assertEquals( $expected, $actions );
+
+		// Reset globals
+		$bp->activity->actions = $activity_actions;
 	}
 
 	/**
@@ -54,6 +62,10 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 			return;
 		}
 
+		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
+
 		$u = $this->factory->user->create();
 		$p = $this->factory->post->create( array(
 			'post_author' => $u,
@@ -77,6 +89,10 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 		$expected = sprintf( '%s wrote a new post, %s', $user_link, $post_link );
 
 		$this->assertSame( $expected, $a_obj->action );
+
+		// Reset globals
+		$bp->activity->actions = $activity_actions;
+		$bp->activity->track = array();
 	}
 
 	/**
@@ -88,6 +104,10 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 			return;
 		}
 
+		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
+
 		$u = $this->factory->user->create();
 		$p = $this->factory->post->create( array(
 			'post_author' => $u,
@@ -111,6 +131,10 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 		$expected = sprintf( '%s wrote a new post, %s, on the site %s', $user_link, $post_link, '<a href="' . $blog_url . '">' . bp_blogs_get_blogmeta( $a_obj->item_id, 'name' ) . '</a>' );
 
 		$this->assertSame( $expected, $a_obj->action );
+
+		// Reset globals
+		$bp->activity->actions = $activity_actions;
+		$bp->activity->track = array();
 	}
 
 	/**
@@ -122,6 +146,10 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 			return;
 		}
 
+		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
+
 		$b = $this->factory->blog->create();
 		$u = $this->factory->user->create();
 
@@ -151,6 +179,10 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 		$expected = sprintf( '%s wrote a new post, %s, on the site %s', $user_link, $post_link, '<a href="' . $blog_url . '">' . get_blog_option( $a_obj->item_id, 'blogname' ) . '</a>' );
 
 		$this->assertSame( $expected, $a_obj->action );
+
+		// Reset globals
+		$bp->activity->actions = $activity_actions;
+		$bp->activity->track = array();
 	}
 
 	/**
@@ -233,6 +265,13 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 			return;
 		}
 
+		$bp = buddypress();
+		$activity_actions = $bp->activity->actions;
+		$bp->activity->actions = new stdClass();
+
+		// Make sure the filter will be fired
+		bp_activity_get_actions();
+
 		add_filter( 'bp_blogs_activity_new_post_action', array( $this, 'new_post_passthrough' ), 10, 2 );
 
 		$b = $this->factory->blog->create();
@@ -251,6 +290,10 @@ class BP_Tests_Blogs_Activity extends BP_UnitTestCase {
 		) );
 
 		$this->assertEquals( $this->post_id, $p );
+
+		// Reset globals
+		$bp->activity->actions = $activity_actions;
+		$bp->activity->track = array();
 	}
 
 	/**