diff --git a/tests/phpunit/includes/testcase-xmlrpc.php b/tests/phpunit/includes/testcase-xmlrpc.php
index 9d268ce562..38305ba1ec 100644
--- a/tests/phpunit/includes/testcase-xmlrpc.php
+++ b/tests/phpunit/includes/testcase-xmlrpc.php
@@ -11,14 +11,12 @@ class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
 
 		add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
 
-		$this->myxmlrpcserver = new WP_XMLRPC_Server_UnitTestable();
+		$this->myxmlrpcserver = new wp_xmlrpc_server();
 	}
 
 	function tearDown() {
 		remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
 
-		 $this->myxmlrpcserver->reset_failed_auth();
-
 		$this->remove_added_uploads();
 
 		parent::tearDown();
@@ -31,10 +29,5 @@ class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
 			'role'       => $role
 		));
 	}
-}
 
-class WP_XMLRPC_Server_UnitTestable extends wp_xmlrpc_server {
-	public function reset_failed_auth() {
-		$this->auth_failed = false;
-	}
 }
\ No newline at end of file