diff --git a/packages/venia-ui/lib/components/AccountInformationPage/__tests__/__snapshots__/editForm.spec.js.snap b/packages/venia-ui/lib/components/AccountInformationPage/__tests__/__snapshots__/editForm.spec.js.snap
index dfd8c8f97b..2000e607f9 100644
--- a/packages/venia-ui/lib/components/AccountInformationPage/__tests__/__snapshots__/editForm.spec.js.snap
+++ b/packages/venia-ui/lib/components/AccountInformationPage/__tests__/__snapshots__/editForm.spec.js.snap
@@ -194,7 +194,6 @@ exports[`renders form when shouldShowNewPassword is false 1`] = `
               disabled={false}
               onClick={[Function]}
               onDragStart={[Function]}
-              onKey={true}
               onKeyDown={[Function]}
               onMouseDown={[Function]}
               onMouseEnter={[Function]}
@@ -467,7 +466,6 @@ exports[`renders form when shouldShowNewPassword is true  1`] = `
               disabled={false}
               onClick={[Function]}
               onDragStart={[Function]}
-              onKey={true}
               onKeyDown={[Function]}
               onMouseDown={[Function]}
               onMouseEnter={[Function]}
@@ -559,7 +557,6 @@ exports[`renders form when shouldShowNewPassword is true  1`] = `
               disabled={false}
               onClick={[Function]}
               onDragStart={[Function]}
-              onKey={true}
               onKeyDown={[Function]}
               onMouseDown={[Function]}
               onMouseEnter={[Function]}
diff --git a/packages/venia-ui/lib/components/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/createAccount.spec.js.snap b/packages/venia-ui/lib/components/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/createAccount.spec.js.snap
index 8203add911..a5ee21476a 100644
--- a/packages/venia-ui/lib/components/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/createAccount.spec.js.snap
+++ b/packages/venia-ui/lib/components/CheckoutPage/OrderConfirmationPage/__tests__/__snapshots__/createAccount.spec.js.snap
@@ -199,7 +199,6 @@ exports[`CreateAccount renders CreateAccount component 1`] = `
             disabled={false}
             onClick={[Function]}
             onDragStart={[Function]}
-            onKey={true}
             onKeyDown={[Function]}
             onMouseDown={[Function]}
             onMouseEnter={[Function]}
@@ -530,7 +529,6 @@ exports[`CreateAccount renders errors 1`] = `
             disabled={false}
             onClick={[Function]}
             onDragStart={[Function]}
-            onKey={true}
             onKeyDown={[Function]}
             onMouseDown={[Function]}
             onMouseEnter={[Function]}
diff --git a/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap b/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap
index 4800d3e9d2..3cbc2d1e11 100644
--- a/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap
+++ b/packages/venia-ui/lib/components/CreateAccount/__tests__/__snapshots__/createAccount.spec.js.snap
@@ -142,7 +142,6 @@ exports[`renders the correct tree 1`] = `
           disabled={false}
           onClick={[Function]}
           onDragStart={[Function]}
-          onKey={true}
           onKeyDown={[Function]}
           onMouseDown={[Function]}
           onMouseEnter={[Function]}
@@ -391,7 +390,6 @@ exports[`should not render cancel button if isCancelButtonHidden is true 1`] = `
           disabled={false}
           onClick={[Function]}
           onDragStart={[Function]}
-          onKey={true}
           onKeyDown={[Function]}
           onMouseDown={[Function]}
           onMouseEnter={[Function]}
diff --git a/packages/venia-ui/lib/components/MyAccount/ResetPassword/__tests__/__snapshots__/resetPassword.spec.js.snap b/packages/venia-ui/lib/components/MyAccount/ResetPassword/__tests__/__snapshots__/resetPassword.spec.js.snap
index 4d805f6d4a..cb74241187 100644
--- a/packages/venia-ui/lib/components/MyAccount/ResetPassword/__tests__/__snapshots__/resetPassword.spec.js.snap
+++ b/packages/venia-ui/lib/components/MyAccount/ResetPassword/__tests__/__snapshots__/resetPassword.spec.js.snap
@@ -109,7 +109,6 @@ exports[`should render formErrors 1`] = `
               disabled={false}
               onClick={[Function]}
               onDragStart={[Function]}
-              onKey={true}
               onKeyDown={[Function]}
               onMouseDown={[Function]}
               onMouseEnter={[Function]}
@@ -264,7 +263,6 @@ exports[`should render properly 1`] = `
               disabled={false}
               onClick={[Function]}
               onDragStart={[Function]}
-              onKey={true}
               onKeyDown={[Function]}
               onMouseDown={[Function]}
               onMouseEnter={[Function]}
diff --git a/packages/venia-ui/lib/components/Password/__tests__/__snapshots__/password.spec.js.snap b/packages/venia-ui/lib/components/Password/__tests__/__snapshots__/password.spec.js.snap
index 5ab30aee0f..0303b4bfe7 100644
--- a/packages/venia-ui/lib/components/Password/__tests__/__snapshots__/password.spec.js.snap
+++ b/packages/venia-ui/lib/components/Password/__tests__/__snapshots__/password.spec.js.snap
@@ -80,7 +80,6 @@ exports[`should render show button if visible is false 1`] = `
           disabled={false}
           onClick={[MockFunction]}
           onDragStart={[Function]}
-          onKey={true}
           onKeyDown={[Function]}
           onMouseDown={[Function]}
           onMouseEnter={[Function]}
@@ -162,7 +161,6 @@ exports[`should render toggle button if isToggleButtonHidden is false 1`] = `
           disabled={false}
           onClick={[MockFunction]}
           onDragStart={[Function]}
-          onKey={true}
           onKeyDown={[Function]}
           onMouseDown={[Function]}
           onMouseEnter={[Function]}
diff --git a/packages/venia-ui/lib/components/Password/password.js b/packages/venia-ui/lib/components/Password/password.js
index 48bcc412b7..31266ed3da 100644
--- a/packages/venia-ui/lib/components/Password/password.js
+++ b/packages/venia-ui/lib/components/Password/password.js
@@ -48,7 +48,6 @@ const Password = props => {
             className={classes.passwordButton}
             onClick={togglePasswordVisibility}
             onKeyDown={handleKeypress}
-            onKey
             type="button"
         >
             {visible ? (