diff --git a/test/driver.js b/test/driver.js
index 108ff0eadb..9ee68fac02 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -25,10 +25,12 @@ function test(name, run, expectedFail) {
 function testCM(name, run, opts, expectedFail) {
   return test("core_" + name, function() {
     var place = document.getElementById("testground"), cm = CodeMirror(place, opts);
+    var successful = false;
     try {
       run(cm);
+      successful = true;
     } finally {
-      if (debug) {
+      if ((debug && !successful) || verbose) {
         place.style.visibility = "";
       } else {
         place.removeChild(cm.getWrapperElement());
diff --git a/test/index.html b/test/index.html
index af12d844f0..85fc7b8d48 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,6 +15,12 @@
       .fail {color: #e00;}
       .error {color: #c90;}
       .done {font-weight: bold;}
+      #progress {
+        background: #45d;
+        color: white;
+        font-weight: bold;
+        white-space: pre;
+      }
     </style>
   </head>
   <body>
@@ -23,7 +29,7 @@ <h1>CodeMirror: Test Suite</h1>
     <p>A limited set of programmatic sanity tests for CodeMirror.</p>
 
     <div style="border: 1px solid black; padding: 1px; max-width: 700px;">
-      <div style="background: #45d; white-space: pre; width: 0px; font-weight: bold; color: white;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
+      <div style="width: 0px;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
     </div>
     <p id=status>Please enable JavaScript...</p>
     <div id=output></div>
