diff --git a/modules/ui/src/app/model/testrun-status.ts b/modules/ui/src/app/model/testrun-status.ts
index 1492160c5..6e43c0344 100644
--- a/modules/ui/src/app/model/testrun-status.ts
+++ b/modules/ui/src/app/model/testrun-status.ts
@@ -61,6 +61,7 @@ export enum StatusOfTestrun {
   SmartReady = 'Smart Ready', // used for Completed
   Idle = 'Idle',
   Monitoring = 'Monitoring',
+  Error = 'Error',
 }
 
 export enum StatusOfTestResult {
@@ -69,7 +70,7 @@ export enum StatusOfTestResult {
   CompliantHigh = 'Compliant (High)',
   SmartReady = 'Smart Ready',
   NonCompliant = 'Non-Compliant', // device does not support feature but feature is required
-  Skipped = 'Skipped',
+  NotPresent = 'Feature Not Present',
   NotStarted = 'Not Started',
   InProgress = 'In Progress',
   Error = 'Error', // test failed to run
diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
index 9d7248656..487153426 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.spec.ts
@@ -67,6 +67,11 @@ describe('ProgressStatusCardComponent', () => {
         StatusOfTestrun.CompliantHigh,
       ];
 
+      const statusesForCompletedFailedClass = [
+        StatusOfTestrun.NonCompliant,
+        StatusOfTestrun.Error,
+      ];
+
       statusesForProgressClass.forEach(testCase => {
         it(`should have class "progress" if status "${testCase}"`, () => {
           const expectedResult = { ...availableClasses, progress: true };
@@ -90,15 +95,17 @@ describe('ProgressStatusCardComponent', () => {
         });
       });
 
-      it('should have class "completed-failed" if status "Non Compliant"', () => {
-        const expectedResult = {
-          ...availableClasses,
-          'completed-failed': true,
-        };
+      statusesForCompletedFailedClass.forEach(testCase => {
+        it(`should have class "completed-failed" if status "${testCase}"`, () => {
+          const expectedResult = {
+            ...availableClasses,
+            'completed-failed': true,
+          };
 
-        const result = component.getClass(StatusOfTestrun.NonCompliant);
+          const result = component.getClass(testCase);
 
-        expect(result).toEqual(expectedResult);
+          expect(result).toEqual(expectedResult);
+        });
       });
 
       it('should have class "canceled" if status "Cancelled"', () => {
diff --git a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts
index 8105fdca6..14f7aec72 100644
--- a/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts
+++ b/modules/ui/src/app/pages/testrun/components/progress-status-card/progress-status-card.component.ts
@@ -46,7 +46,9 @@ export class ProgressStatusCardComponent {
         status === StatusOfTestrun.CompliantLimited ||
         status === StatusOfTestrun.CompliantHigh ||
         status === StatusOfTestrun.SmartReady,
-      'completed-failed': status === StatusOfTestrun.NonCompliant,
+      'completed-failed':
+        status === StatusOfTestrun.NonCompliant ||
+        status === StatusOfTestrun.Error,
       canceled:
         status === StatusOfTestrun.Cancelled ||
         status === StatusOfTestrun.Cancelling,
diff --git a/modules/ui/src/app/services/test-run.service.spec.ts b/modules/ui/src/app/services/test-run.service.spec.ts
index c1d2930d2..6283b87ac 100644
--- a/modules/ui/src/app/services/test-run.service.spec.ts
+++ b/modules/ui/src/app/services/test-run.service.spec.ts
@@ -271,7 +271,7 @@ describe('TestRunService', () => {
     ];
 
     const statusesForGreyRes = [
-      StatusOfTestResult.Skipped,
+      StatusOfTestResult.NotPresent,
       StatusOfTestResult.NotStarted,
     ];
 
diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts
index c7155357f..f47293b1d 100644
--- a/modules/ui/src/app/services/test-run.service.ts
+++ b/modules/ui/src/app/services/test-run.service.ts
@@ -185,7 +185,7 @@ export class TestRunService {
         result === StatusOfTestResult.Info ||
         result === StatusOfTestResult.InProgress,
       grey:
-        result === StatusOfTestResult.Skipped ||
+        result === StatusOfTestResult.NotPresent ||
         result === StatusOfTestResult.NotStarted,
     };
   }