diff --git a/internal_packages/composer-emojis/lib/emoji-picker.jsx b/internal_packages/composer-emojis/lib/emoji-picker.jsx
index 3c1fd5d4e..e3874700f 100644
--- a/internal_packages/composer-emojis/lib/emoji-picker.jsx
+++ b/internal_packages/composer-emojis/lib/emoji-picker.jsx
@@ -33,8 +33,8 @@ class EmojiPicker extends React.Component {
       this.props.emojiOptions.forEach((emojiOption, i) => {
         const emojiChar = emoji.get(emojiOption);
         const emojiClass = emojiIndex === i ? "btn btn-icon emoji-option" : "btn btn-icon";
-        emojis.push(<button onMouseDown={() => this.onMouseDown(emojiChar)} className={emojiClass}>{emojiChar} :{emojiOption}:</button>);
-        emojis.push(<br />);
+        emojis.push(<button key={emojiChar} onMouseDown={() => this.onMouseDown(emojiChar)} className={emojiClass}>{emojiChar} :{emojiOption}:</button>);
+        emojis.push(<br key={emojiChar+" br"} />);
       })
     }
     return (
diff --git a/internal_packages/message-list/spec/message-participants-spec.cjsx b/internal_packages/message-list/spec/message-participants-spec.cjsx
index 2c95dc5c0..be102b778 100644
--- a/internal_packages/message-list/spec/message-participants-spec.cjsx
+++ b/internal_packages/message-list/spec/message-participants-spec.cjsx
@@ -90,7 +90,7 @@ describe "MessageParticipants", ->
 
     it "uses full names", ->
       to = ReactTestUtils.findRenderedDOMComponentWithClass(@participants, "to-contact")
-      expect(React.findDOMNode(to).innerText.trim()).toEqual "User Two <user2@nylas.com>"
+      expect(React.findDOMNode(to).innerText.trim()).toEqual "User Two<user2@nylas.com>"
 
 
   # TODO: We no longer display "to everyone"