diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 1c398864744..729f962bb18 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -485,7 +485,8 @@ def fill_one_test_result(shortname, resultset, html_str):
         if result.returncode > 0:
           tooltip = 'returncode: %d ' % result.returncode
         if result.message:
-          tooltip = '%smessage: %s' % (tooltip, result.message)     
+          escaped_msg = result.message.replace('"', '"')
+          tooltip = '%smessage: %s' % (tooltip, escaped_msg)     
       if result.state == 'FAILED':
         html_str = '%s<td bgcolor=\"red\">' % html_str
         if tooltip:  
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 3d33f93fb18..9006fca1c40 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -908,9 +908,9 @@ if forever:
     have_files_changed = lambda: dw.most_recent_change() != initial_time
     previous_success = success
     success = _build_and_run(check_cancelled=have_files_changed,
-                                        newline_on_success=False,
-                                        travis=args.travis,
-                                        cache=test_cache) == 0
+                             newline_on_success=False,
+                             travis=args.travis,
+                             cache=test_cache) == 0
     if not previous_success and success:
       jobset.message('SUCCESS',
                      'All tests are now passing properly',