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 dac88fd202c0f418f7667eb072f5a20e944b3710..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
@@ -114,7 +114,7 @@ class CustomerForm extends Form
     /**
      * Set 'Change Email' checkbox value.
      *
-     * @param string $value
+     * @param boolean $value
      * @return void
      */
     public function setChangeEmail($value)
@@ -124,13 +124,13 @@ class CustomerForm extends Form
             $mapping['change_email']['selector'],
             $mapping['change_email']['strategy'],
             'checkbox'
-        )->setValue($value);
+        )->setValue($value ?  "Yes" : "No");
     }
 
     /**
      * Set 'Change Password' checkbox value.
      *
-     * @param string $value
+     * @param boolean $value
      * @return void
      */
     public function setChangePassword($value)
@@ -140,7 +140,7 @@ class CustomerForm extends Form
             $mapping['change_password']['selector'],
             $mapping['change_password']['strategy'],
             'checkbox'
-        )->setValue($value);
+        )->setValue($value ?  "Yes" : "No");
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php
index 5745f76522f14dd086d25aa2ece9de96c23a61c4..225ef6b397aa4b3c9cf70d2d0ef32adccb73edf6 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php
@@ -73,7 +73,7 @@ class SecureChangingCustomerPasswordTest extends Injectable
 
         $this->customerAccountEdit->getAccountMenuBlock()->openMenuItem('Account Information');
         if ($check) {
-            $this->customerAccountEdit->getAccountInfoForm()->SetChangePassword('Yes');
+            $this->customerAccountEdit->getAccountInfoForm()->SetChangePassword(true);
             $this->customerAccountEdit->getAccountInfoForm()->fill($customer);
             $this->customerAccountEdit->getAccountInfoForm()->submit();
         }