diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
index e47ca7805beda3d80049a75c28890f8c11273a6c..e1e8f2ddebb709e17d8a977668f420d803247558 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
@@ -38,16 +38,6 @@ class CustomerForm extends Form
      */
     protected $validationText = '.mage-error[for="%s"]';
 
-    /**
-     * Data mapping
-     *
-     * @var array
-     */
-    protected $boolToStringMapping = [
-        1 => 'Yes',
-        0 => 'No',
-    ];
-
     /**
      * Click on save button.
      *
@@ -134,7 +124,7 @@ class CustomerForm extends Form
             $mapping['change_email']['selector'],
             $mapping['change_email']['strategy'],
             'checkbox'
-        )->setValue($this->boolToStringMapping[$value]);
+        )->setValue($value ?  "Yes" : "No");
     }
 
     /**
@@ -150,7 +140,7 @@ class CustomerForm extends Form
             $mapping['change_password']['selector'],
             $mapping['change_password']['strategy'],
             'checkbox'
-        )->setValue($this->boolToStringMapping[$value]);
+        )->setValue($value ?  "Yes" : "No");
     }
 
     /**