diff --git a/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php b/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php
index a1ec8db..724a573 100644
--- a/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php
+++ b/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php
@@ -8,7 +8,7 @@
 namespace Drupal\user_form_test\Form;
 
 use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Session\AccountInterface;
+use Drupal\user\Plugin\Core\Entity\User;
 
 /**
  * Base class for implementing system configuration forms.
@@ -28,8 +28,8 @@ public function getFormID() {
    * @param Drupal\user\Plugin\Core\Entity\User $account
    *   The user account.
    */
-  public function buildForm(array $form, array &$form_state, AccountInterface $account = NULL) {
-    $user = user_load($account->id());
+  public function buildForm(array $form, array &$form_state, User $user = NULL) {
+    $user = $user->getBCEntity();
     $user->user_form_test_field = '';
     $form_state['user'] = $user ;
     $form['user_form_test_field'] = array(
diff --git a/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml b/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml
index 841fbc5..0d294e2 100644
--- a/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml
+++ b/core/modules/user/tests/modules/user_form_test/user_form_test.routing.yml
@@ -4,6 +4,3 @@ user_form_test_current_password:
     _form: '\Drupal\user_form_test\Form\TestCurrentPassword'
   requirements:
     _permission: 'administer users'
-  options:
-    converters:
-      user: 'user'