diff --git a/tests/phpunit/tests/adminbar.php b/tests/phpunit/tests/adminbar.php
index 22c3328582616..044c9be9413bc 100644
--- a/tests/phpunit/tests/adminbar.php
+++ b/tests/phpunit/tests/adminbar.php
@@ -36,6 +36,13 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		self::$user_ids[] = self::$no_role_id;
 	}
 
+	public function tear_down() {
+		unregister_post_type( 'content' );
+		unregister_post_type( 'foo-non-public' );
+
+		parent::tear_down();
+	}
+
 	/**
 	 * @ticket 21117
 	 */
@@ -51,8 +58,6 @@ public function test_content_post_type() {
 		$nodes = $admin_bar->get_nodes();
 		$this->assertFalse( $nodes['new-content']->parent );
 		$this->assertSame( 'new-content', $nodes['add-new-content']->parent );
-
-		_unregister_post_type( 'content' );
 	}
 
 	/**
@@ -556,8 +561,6 @@ public function test_admin_bar_has_no_archives_link_for_non_public_cpt() {
 		$wp_admin_bar = $this->get_standard_admin_bar();
 		$node         = $wp_admin_bar->get_node( 'archive' );
 
-		unregister_post_type( 'foo-non-public' );
-
 		$this->assertNull( $node );
 	}
 
@@ -579,8 +582,6 @@ public function test_admin_bar_has_no_archives_link_for_cpt_without_archive() {
 		$wp_admin_bar = $this->get_standard_admin_bar();
 		$node         = $wp_admin_bar->get_node( 'archive' );
 
-		unregister_post_type( 'foo-non-public' );
-
 		$this->assertNull( $node );
 	}
 
@@ -602,8 +603,6 @@ public function test_admin_bar_has_no_archives_link_for_cpt_not_shown_in_admin_b
 		$wp_admin_bar = $this->get_standard_admin_bar();
 		$node         = $wp_admin_bar->get_node( 'archive' );
 
-		unregister_post_type( 'foo-non-public' );
-
 		$this->assertNull( $node );
 	}