diff --git a/templates/repo/commit_status.tmpl b/templates/repo/commit_status.tmpl
index d52e151247a..6a01b9f342c 100644
--- a/templates/repo/commit_status.tmpl
+++ b/templates/repo/commit_status.tmpl
@@ -1,7 +1,4 @@
-{{if eq .State "pending"}}
-	{{svg "octicon-dot-fill" 18 "commit-status icon text grey"}}
-{{end}}
-{{if eq .State "running"}}
+{{if or (eq .State "pending") (eq .State "running")}}
 	{{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}}
 {{end}}
 {{if eq .State "success"}}
diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go
index 5f580a0268d..9a9836a16fe 100644
--- a/tests/integration/repo_commits_test.go
+++ b/tests/integration/repo_commits_test.go
@@ -110,7 +110,7 @@ func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRec
 }
 
 func TestRepoCommitsWithStatusPending(t *testing.T) {
-	doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "grey")
+	doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "yellow")
 }
 
 func TestRepoCommitsWithStatusSuccess(t *testing.T) {