diff --git a/tests/mocha/connection_test.js b/tests/mocha/connection_test.js
index 2f7fe0907..118d27412 100644
--- a/tests/mocha/connection_test.js
+++ b/tests/mocha/connection_test.js
@@ -1249,10 +1249,6 @@ suite('Connection', function() {
       };
     });
 
-    teardown(function() {
-      sharedTestTeardown.call(this);
-    });
-
     suite('Disconnect from old parent', function() {
       test('Value', function() {
         var oldParent = this.workspace.newBlock('row_block');
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index 19776faad..01771c3c5 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+goog.require('Blockly.WorkspaceComment');
+
 suite('Events', function() {
   setup(function() {
     sharedTestSetup.call(this, {fireEventsNow: false});