diff --git a/tests/generators/index.html b/tests/generators/index.html
index dbff605dc..63c4461d8 100644
--- a/tests/generators/index.html
+++ b/tests/generators/index.html
@@ -59,6 +59,8 @@
 <script src="../../generators/dart/colour.js"></script>
 <script src="../../generators/dart/variables.js"></script>
 <script src="../../generators/dart/procedures.js"></script>
+<script src="../../style/classic.js"></script>
+
 
 <script src="unittest.js"></script>
 <script src="../../msg/messages.js"></script>
@@ -89,6 +91,7 @@ function start() {
        zoom: {controls: true, wheel: true}
        });
   changeIndex();
+  Blockly.setStyle(Blockly.Styles.Classic);
 }
 
 /*
diff --git a/tests/generators/run_generators_in_browser.js b/tests/generators/run_generators_in_browser.js
index 1349dc736..4983b3e62 100644
--- a/tests/generators/run_generators_in_browser.js
+++ b/tests/generators/run_generators_in_browser.js
@@ -35,11 +35,11 @@ var fs = require('fs');
  */
 function runLangGeneratorInBrowser(browser, filename, codegenFn) {
   return browser
-      .pause(9000)
+      .pause(5000)
       .then(function() {
         this.execute(codegenFn)
       })
-      .pause(90000)
+      .pause(10000)
       .getValue("#importExport")
       .then(function(result) {
         fs.writeFile(filename, result, function(err) {
@@ -80,7 +80,7 @@ function runGeneratorsInBrowser() {
           loadSelected();
         })
       })
-      .pause(50000)
+      .pause(10000)
       .then(function() {
         return runLangGeneratorInBrowser(this, prefix + '.js', function() {
           toJavaScript();
@@ -106,7 +106,7 @@ function runGeneratorsInBrowser() {
           toPhp();
         });
       })
-      .pause(50000)
+      .pause(10000)
       .catch(function(e) {
         console.error('Error: ', e);
 
diff --git a/tests/scripts/run_generators.sh b/tests/scripts/run_generators.sh
index de68d499f..9d556acad 100755
--- a/tests/scripts/run_generators.sh
+++ b/tests/scripts/run_generators.sh
@@ -46,7 +46,7 @@ done
 
 
 # Clean up.
-#rm -r $TMP_DIR
+rm -r $TMP_DIR
 
 if [ "$FAILURE_COUNT" -eq "0" ]; then
   echo -e "${BOLD_GREEN}All generator tests passed.${ANSI_RESET}"