diff --git a/lib/gitlab/ci/status/build/factory.rb b/lib/gitlab/ci/status/build/factory.rb
index 0b42d5edfc16ece97706837b0b39206e2bf6795c..9b3a97a0f0f1132e715e28cce1a88fb8d2139d48 100644
--- a/lib/gitlab/ci/status/build/factory.rb
+++ b/lib/gitlab/ci/status/build/factory.rb
@@ -9,7 +9,8 @@ module Gitlab
               Status::Build::Canceled,
               Status::Build::Created,
               Status::Build::Pending,
-              Status::Build::Skipped],
+              Status::Build::Skipped,
+              Status::Build::Empty],
              [Status::Build::Cancelable,
               Status::Build::Retryable],
              [Status::Build::Failed],
@@ -17,8 +18,7 @@ module Gitlab
               Status::Build::Play,
               Status::Build::Stop],
              [Status::Build::Action],
-             [Status::Build::Retried],
-             [Status::Build::Empty]]
+             [Status::Build::Retried]]
           end
 
           def self.common_helpers
diff --git a/spec/lib/gitlab/ci/status/build/common_spec.rb b/spec/lib/gitlab/ci/status/build/common_spec.rb
index 2cce7a23ea7f7b4b0c32879ad740a68930951288..ca3c66f0152a854a1982a2d3f44ec978e3f594e2 100644
--- a/spec/lib/gitlab/ci/status/build/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/common_spec.rb
@@ -38,4 +38,10 @@ describe Gitlab::Ci::Status::Build::Common do
       expect(subject.details_path).to include "jobs/#{build.id}"
     end
   end
+
+  describe '#illustration' do
+    it 'provides a fallback empty state illustration' do
+      expect(subject.illustration).not_to be_empty
+    end
+  end
 end
diff --git a/spec/lib/gitlab/ci/status/build/empty_spec.rb b/spec/lib/gitlab/ci/status/build/empty_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..379a5a9849ba84d403979ce574d088bb2da04c8e
--- /dev/null
+++ b/spec/lib/gitlab/ci/status/build/empty_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Status::Build::Empty do
+  let(:build) { create(:ci_build, :running) }
+  let(:status) { double('core status') }
+  let(:user) { double('user') }
+
+  subject { described_class.new(status) }
+
+  describe '#illustration' do
+    it 'provides an empty state illustration' do
+      expect(subject.illustration).not_to be_empty
+    end
+  end
+
+  describe '.matches?' do
+    subject { described_class.matches?(build, user) }
+
+    context 'when a build has trace' do
+      let(:build) { create(:ci_build, :trace_artifact) }
+
+      it { is_expected.to be_falsy }
+    end
+
+    context 'with a build that has not been retried' do
+      let(:build) { create(:ci_build, :running) }
+
+      it { is_expected.to be_truthy }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index 6d5b73bb01b013c60d7910ecc9ff9eb3b11326bb..83d48f1bc73b37885b93ac8e4d1eeb7a2c6caccd 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -75,7 +75,9 @@ describe Gitlab::Ci::Status::Build::Factory do
 
       it 'matches correct extended statuses' do
         expect(factory.extended_statuses)
-          .to eq [Gitlab::Ci::Status::Build::Retryable, Gitlab::Ci::Status::Build::Failed]
+          .to eq [Gitlab::Ci::Status::Build::Empty,
+                  Gitlab::Ci::Status::Build::Retryable,
+                  Gitlab::Ci::Status::Build::Failed]
       end
 
       it 'fabricates a failed build status' do
@@ -94,7 +96,7 @@ describe Gitlab::Ci::Status::Build::Factory do
     end
 
     context 'when build is allowed to fail' do
-      let(:build) { create(:ci_build, :failed, :allowed_to_fail) }
+      let(:build) { create(:ci_build, :failed, :allowed_to_fail, :trace_artifact) }
 
       it 'matches correct core status' do
         expect(factory.core_status).to be_a Gitlab::Ci::Status::Failed
@@ -160,7 +162,8 @@ describe Gitlab::Ci::Status::Build::Factory do
 
     it 'matches correct extended statuses' do
       expect(factory.extended_statuses)
-        .to eq [Gitlab::Ci::Status::Build::Cancelable]
+        .to eq [Gitlab::Ci::Status::Build::Empty,
+                Gitlab::Ci::Status::Build::Cancelable]
     end
 
     it 'fabricates a canceable build status' do