diff --git a/app/templates/components/builds-item.hbs b/app/templates/components/builds-item.hbs
index 946d5d6e..46b11b3e 100644
--- a/app/templates/components/builds-item.hbs
+++ b/app/templates/components/builds-item.hbs
@@ -21,7 +21,7 @@
   </div>
   <div class="row-item row-committer">
     <img class="avatar" src={{build.commit.authorAvatarUrlOrGravatar}} alt="{{build.commit.authorName}} avatar">
-    <span class="label-align">{{build.commit.committerName}}</span>
+    <span class="label-align">{{build.commit.authorName}}</span>
   </div>
 </div>
 
diff --git a/tests/unit/components/builds-item-test.coffee b/tests/unit/components/builds-item-test.coffee
index eb1bbbee..4c449367 100644
--- a/tests/unit/components/builds-item-test.coffee
+++ b/tests/unit/components/builds-item-test.coffee
@@ -32,5 +32,4 @@ test 'it renders', (assert) ->
 
   ok component.$().hasClass('passed'), 'component has right status class'
   equal component.$('.row-branch a').text().trim(), 'foobarbranch', 'component renders branch if event is push'
-  equal component.$('.avatar').attr('src'), 'https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=40&d=https%3A%2F%2Ftravis-ci.org%2Fimages%2Fui%2Fdefault-avatar.png', 'component renders right gravatar image'
   equal component.$('a[title="See the commit on GitHub"]').attr('href'), 'https://github.com/foo/bar/commit/a5e8093098f9c0fb46856b753fb8943c7fbf26f3', 'component generates right commit link'
diff --git a/tests/unit/models/commit-test.coffee b/tests/unit/models/commit-test.coffee
new file mode 100644
index 00000000..d22dddee
--- /dev/null
+++ b/tests/unit/models/commit-test.coffee
@@ -0,0 +1,25 @@
+`import { moduleForModel, test } from 'ember-qunit'`
+
+moduleForModel 'commit', 'Unit | Model | commit', needs: ['model:build']
+
+test 'calculation of avatar urls via Gravatar', ->
+  model = @subject()
+  Ember.run ->
+    model.setProperties
+      authorEmail: 'author@example.com'
+      committerEmail: 'author@example.com'
+      authorAvatarUrl: null
+      committerAvatarUrl: null
+  equal model.get('authorAvatarUrlOrGravatar'), 'https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=40&d=https%3A%2F%2Ftravis-ci.org%2Fimages%2Fui%2Fdefault-avatar.png', 'correctly sets gravatar image'
+  equal model.get('committerAvatarUrlOrGravatar'), 'https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=40&d=https%3A%2F%2Ftravis-ci.org%2Fimages%2Fui%2Fdefault-avatar.png', 'correctly sets gravatar image'
+
+test 'calculation of avatar urls via overriding parameter', ->
+  model = @subject()
+  Ember.run ->
+    model.setProperties
+      authorEmail: 'author@example.com'
+      committerEmail: 'author@example.com'
+      authorAvatarUrl: 'http://example.com/test.jpg'
+      committerAvatarUrl: 'http://example.com/test2.jpg'
+  equal model.get('authorAvatarUrlOrGravatar'), 'http://example.com/test.jpg', 'correctly sets avatar'
+  equal model.get('committerAvatarUrlOrGravatar'), 'http://example.com/test2.jpg', 'correctly sets avatar'