diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/PasswordStretching/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/PasswordStretching/template.js
index d482eef50ea..87b89a37a00 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/PasswordStretching/template.js
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/PasswordStretching/template.js
@@ -56,9 +56,17 @@ const PasswordStretching = props => {
       </SettingSummary>
       <SettingComponent>
         <SettingWrapper>
-          {currentStretch && <CurrentText>{currentStretch}</CurrentText>}
+          {currentStretch && (
+            <CurrentText data-e2e='currentStretchLabel'>
+              {currentStretch}
+            </CurrentText>
+          )}
           {!updateToggled && (
-            <Button nature='primary' onClick={handleToggle}>
+            <Button
+              nature='primary'
+              onClick={handleToggle}
+              data-e2e='editPasswordStretchingButton'
+            >
               <FormattedMessage
                 id='scenes.securitycenter.advanced.passwordstretching.edit'
                 defaultMessage='Edit'
@@ -73,7 +81,12 @@ const PasswordStretching = props => {
                 validate={validPasswordStretchingNumber}
               />
               <ButtonWrapper>
-                <Button nature='empty' capitalize onClick={handleToggle}>
+                <Button
+                  nature='empty'
+                  capitalize
+                  onClick={handleToggle}
+                  data-e2e='passwordStretchCancelButton'
+                >
                   <FormattedMessage
                     id='scenes.securitycenter.advanced.passwordstretching.cancel'
                     defaultMessage='Cancel'
@@ -84,6 +97,7 @@ const PasswordStretching = props => {
                   nature='primary'
                   capitalize
                   disabled={submitting || invalid}
+                  data-e2e='cancelStretchSaveButton'
                 >
                   <FormattedMessage
                     id='scenes.securitycenter.advanced.passwordstretching.save'
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/Settings/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/Settings/template.js
index 0c64dfda127..6f2f9583e17 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/Settings/template.js
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/Settings/template.js
@@ -62,7 +62,11 @@ const Settings = props => {
     return (
       <SettingWrapper>
         {!updateToggled && (
-          <Button nature='primary' onClick={handleToggle}>
+          <Button
+            nature='primary'
+            onClick={handleToggle}
+            data-e2e='removeSecondPasswordButton'
+          >
             <FormattedMessage
               id='scenes.securitysettings.advanced.secondpasswordwallet.settings.remove'
               defaultMessage='Remove Second Password'
@@ -81,9 +85,15 @@ const Settings = props => {
               name='secondPassword'
               component={PasswordBox}
               validate={[required, validateSecondPassword]}
+              data-e2e='secondPasswordInput'
             />
             <ButtonWrapper>
-              <Button nature='empty' capitalize onClick={handleCancel}>
+              <Button
+                nature='empty'
+                capitalize
+                onClick={handleCancel}
+                data-e2e='removeSecondPasswordCancelButton'
+              >
                 <FormattedMessage
                   id='scenes.securitysettings.advanced.secondpasswordwallet.settings.cancel'
                   defaultMessage='Cancel'
@@ -94,6 +104,7 @@ const Settings = props => {
                 nature='primary'
                 capitalize
                 disabled={submitting || invalid}
+                data-e2e='removeSecondPasswordConfirmationButton'
               >
                 <FormattedMessage
                   id='scenes.securitysettings.advanced.secondpasswordwallet.settings.remove'
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/template.js
index 8e06297d9a6..15ef965eb66 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/template.js
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/SecondPasswordWallet/template.js
@@ -20,7 +20,10 @@ const SecondPasswordWallet = props => {
             id='scenes.security.advanced.secondpassword.title'
             defaultMessage='Second Password'
           />
-          <SettingStatus active={secondPasswordEnabled}>
+          <SettingStatus
+            active={secondPasswordEnabled}
+            data-e2e={`${secondPasswordEnabled}SecondPassword`}
+          >
             {secondPasswordEnabled ? (
               <FormattedMessage
                 id='scenes.security.advanced.secondpassword.enabled'
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/WalletPassword/Settings/template.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/WalletPassword/Settings/template.js
index 6995693dde3..339945241c0 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/WalletPassword/Settings/template.js
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/AdvancedSecurity/WalletPassword/Settings/template.js
@@ -50,7 +50,11 @@ const Settings = props => {
   return (
     <SettingWrapper>
       {!updateToggled && (
-        <Button nature='primary' onClick={handleToggle}>
+        <Button
+          nature='primary'
+          onClick={handleToggle}
+          data-e2e='changeCurrentPassword'
+        >
           <FormattedMessage
             id='scenes.securitysettings.advanced.walletpassword.settings.change'
             defaultMessage='Change'
@@ -72,6 +76,7 @@ const Settings = props => {
                 name='currentPassword'
                 component={PasswordBox}
                 validate={[validCurrentPassword]}
+                data-e2e='currentPasswordInput'
               />
             </FormItemSpaced>
             <FormItemSpaced style={{ marginTop: '12px' }}>
@@ -87,6 +92,7 @@ const Settings = props => {
                 component={PasswordBox}
                 validate={[validStrongPassword, isNotCurrentPassword]}
                 score
+                data-e2e='newPasswordInput'
               />
             </FormItemSpaced>
             <FormItemSpaced style={{ marginTop: '12px' }}>
@@ -101,11 +107,17 @@ const Settings = props => {
                 name='walletPasswordConfirmation'
                 validate={[required, validatePasswordConfirmation]}
                 component={PasswordBox}
+                data-e2e='confirmPasswordInput'
               />
             </FormItemSpaced>
           </FormGroup>
           <ButtonWrapper>
-            <Button nature='empty' capitalize onClick={handleCancel}>
+            <Button
+              nature='empty'
+              capitalize
+              onClick={handleCancel}
+              data-e2e='cancelPasswordChangeButton'
+            >
               <FormattedMessage
                 id='scenes.securitysettings.advanced.walletpassword.settings.cancel'
                 defaultMessage='Cancel'
@@ -116,6 +128,7 @@ const Settings = props => {
               nature='primary'
               capitalize
               disabled={submitting || invalid}
+              data-e2e='confirmPasswordChangeButton'
             >
               <FormattedMessage
                 id='scenes.securitysettings.advanced.walletpassword.settings.save'
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Menu/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Menu/index.js
index 92e0ec7a43e..cd026abfad9 100644
--- a/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Menu/index.js
+++ b/packages/blockchain-wallet-v4-frontend/src/scenes/SecurityCenter/Menu/index.js
@@ -30,7 +30,11 @@ class MenuContainer extends React.PureComponent {
     return (
       <Wrapper>
         <TabMenu>
-          <LinkContainer to='/security-center/basic' activeClassName='active'>
+          <LinkContainer
+            to='/security-center/basic'
+            activeClassName='active'
+            data-e2e='securityCenterBasicLink'
+          >
             <LinkItem>
               <FormattedMessage
                 id='scenes.securitycenter.menu.basic'
@@ -41,6 +45,7 @@ class MenuContainer extends React.PureComponent {
           <LinkContainer
             to='/security-center/advanced'
             activeClassName='active'
+            data-e2e='securityCenterAdvancedLink'
           >
             <LinkItem>
               <FormattedMessage