diff --git a/pagure/templates/commit.html b/pagure/templates/commit.html
index 00a9c93..5b249de 100644
--- a/pagure/templates/commit.html
+++ b/pagure/templates/commit.html
@@ -135,12 +135,15 @@
         {% for flag in flags %}
           <li class="list-group-item">
             <div>
-              <span><a href="{{ flag.url }}">{{ flag.username }}</a></span>
-              <div class="pull-xs-right"><span class="label {%
-                if flag.percent <= 10 %}label-danger{%
-                elif flag.percent <= 90 %}label-warning{%
-                else %}label-success{%
-                endif %}">{{ flag.percent }}%</label></div>
+              <span>
+                <a href="{{ flag.url }}">{{ flag.username }}</a>
+              </span>
+              <div class="pull-xs-right">
+                <span class="label {{ flag | flag2label }}">
+                  {{- flag.status -}}
+                  {%- if flag.percent %} ({{ flag.percent }}%) {%- endif -%}
+                </span>
+              </div>
             </div>
             <small><div class="clearfix">
                 <span>{{ flag.comment }}</span>
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 7c9b325..1c59530 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -683,12 +683,15 @@
         {% for flag in pull_request.flags %}
           <li class="list-group-item">
             <div>
-              <span><a href="{{ flag.url }}">{{ flag.username }}</a></span>
-              <div class="pull-xs-right"><span class="label {%
-                if flag.percent <= 10 %}label-danger{%
-                elif flag.percent <= 90 %}label-warning{%
-                else %}label-success{%
-                endif %}">{{ flag.percent }}%</label></div>
+              <span>
+                <a href="{{ flag.url }}">{{ flag.username }}</a>
+              </span>
+              <div class="pull-xs-right">
+                <span class="label {{ flag | flag2label }}">
+                  {{ flag.status }}
+                  {%- if flag.percent %} ({{ flag.percent }}%) {%- endif %}
+                </span>
+              </div>
             </div>
             <small><div class="clearfix">
                 <span>{{ flag.comment }}</span>
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 66b342a..64a7687 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -652,3 +652,17 @@ def table_get_link_order(column, order_key, order):
     else:
         # Default to descending
         return 'desc'
+
+
+@APP.template_filter('flag2label')
+def flag_to_label(flag):
+    """ For a given flag return the bootstrap label to use
+    """
+    status = {
+        'success': 'label-success',
+        'failure': 'label-danger',
+        'error': 'label-danger',
+        'pending': 'label-info',
+        'canceled': 'label-warning',
+    }
+    return status[flag.status.lower()]