diff --git a/bodhi/server/services/updates.py b/bodhi/server/services/updates.py
index 8f3a6045dd..49b848187c 100644
--- a/bodhi/server/services/updates.py
+++ b/bodhi/server/services/updates.py
@@ -561,7 +561,7 @@ def new_update(request):
                                 error_handler=bodhi.server.services.errors.json_handler)
 def waive_test_results(request):
     """
-    Waive test results on a given update when gating is on.
+    Waive all blocking test results on a given update when gating is on.
 
     Args:
         request (pyramid.request): The current request.
diff --git a/bodhi/server/templates/update.html b/bodhi/server/templates/update.html
index b1f26e84a6..8e72b76861 100644
--- a/bodhi/server/templates/update.html
+++ b/bodhi/server/templates/update.html
@@ -55,8 +55,6 @@
     var missing_tests = {};
 
     // handle Greenwave decision
-
-    // Handle unstatisfied requirements
     var handle_unsatisfied_reqs = function(data){
         $.each(data['unsatisfied_requirements'], function(i, req) {
             if (req.type == 'test-result-missing') {
@@ -68,6 +66,7 @@
             if ($.inArray(req.testcase, requirements) == -1) {
                 requirements.push(req.testcase);
             }
+            $('#failed_requirements').append('<li class="list-group-item">' + req.item + '</li>');
         });
     };
 
@@ -1118,17 +1117,26 @@ <h3>Test Cases</h3>
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h3 class="modal-title" id="waiveModalLabel">Waive Test Results</h3>
+        <h3 class="modal-title" id="waiveModalLabel">Waive All Test Results</h3>
         </button>
       </div>
       <div class="modal-body">
-          <div class="form-group">
-            <textarea class="form-control" id="waive_comment" name="waive_comment"></textarea>
+          <div class="row">
+            <div class="col-sm-offset-2 col-sm-10">
+              <p>Submitting this will waive the following test results blocking this update:</p>
+              <ul id="failed_requirements" class="list-group list-group-flush"></ul>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="waive_comment" class="col-sm-2 col-form-label">Comment</label>
+            <div class="col-sm-10">
+              <textarea class="form-control" id="waive_comment" name="waive_comment" placeholder="A reason for the waiver..." required></textarea>
+            </div>
           </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-        <button type="submit" class="btn btn-primary">Waive Test Results</button>
+        <button type="submit" class="btn btn-primary">Waive</button>
       </div>
     </div>
     </form>