diff --git a/plugins/block-dynamic-connection/test/dynamic_if.mocha.js b/plugins/block-dynamic-connection/test/dynamic_if.mocha.js
index b22a2085ff..e43aa389dd 100644
--- a/plugins/block-dynamic-connection/test/dynamic_if.mocha.js
+++ b/plugins/block-dynamic-connection/test/dynamic_if.mocha.js
@@ -6,7 +6,7 @@
 
 const chai = require('chai');
 const {testHelpers} = require('@blockly/dev-tools');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {overrideOldBlockDefinitions} = require('../src/index');
 
 const assert = chai.assert;
diff --git a/plugins/block-dynamic-connection/test/dynamic_list_create.mocha.js b/plugins/block-dynamic-connection/test/dynamic_list_create.mocha.js
index cb6667366e..ff0c1c6195 100644
--- a/plugins/block-dynamic-connection/test/dynamic_list_create.mocha.js
+++ b/plugins/block-dynamic-connection/test/dynamic_list_create.mocha.js
@@ -1,3 +1,4 @@
+
 /**
  * @license
  * Copyright 2021 Google LLC
@@ -6,7 +7,7 @@
 
 const chai = require('chai');
 const {testHelpers} = require('@blockly/dev-tools');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {overrideOldBlockDefinitions} = require('../src/index');
 
 const assert = chai.assert;
diff --git a/plugins/block-dynamic-connection/test/dynamic_text_join.mocha.js b/plugins/block-dynamic-connection/test/dynamic_text_join.mocha.js
index d50413e23a..58d6c34cda 100644
--- a/plugins/block-dynamic-connection/test/dynamic_text_join.mocha.js
+++ b/plugins/block-dynamic-connection/test/dynamic_text_join.mocha.js
@@ -1,3 +1,4 @@
+
 /**
  * @license
  * Copyright 2021 Google LLC
@@ -6,7 +7,7 @@
 
 const chai = require('chai');
 const {testHelpers} = require('@blockly/dev-tools');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {overrideOldBlockDefinitions} = require('../src/index');
 
 const assert = chai.assert;
diff --git a/plugins/block-plus-minus/test/if.mocha.js b/plugins/block-plus-minus/test/if.mocha.js
index ec4d780b59..a4bec1f9d2 100644
--- a/plugins/block-plus-minus/test/if.mocha.js
+++ b/plugins/block-plus-minus/test/if.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const {testHelpers} = require('@blockly/dev-tools');
 const {runPlusMinusTestSuite} = require('./test_helpers.mocha');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {dartGenerator} = require('blockly/dart');
 const {javascriptGenerator} = require('blockly/javascript');
 const {luaGenerator} = require('blockly/lua');
diff --git a/plugins/block-plus-minus/test/list_create.mocha.js b/plugins/block-plus-minus/test/list_create.mocha.js
index c9a03f6bd3..402aee8cd9 100644
--- a/plugins/block-plus-minus/test/list_create.mocha.js
+++ b/plugins/block-plus-minus/test/list_create.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const {testHelpers} = require('@blockly/dev-tools');
 const {runPlusMinusTestSuite} = require('./test_helpers.mocha');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {dartGenerator} = require('blockly/dart');
 const {javascriptGenerator} = require('blockly/javascript');
 const {luaGenerator} = require('blockly/lua');
diff --git a/plugins/block-plus-minus/test/procedures.mocha.js b/plugins/block-plus-minus/test/procedures.mocha.js
index 6bfce05922..c4795799ac 100644
--- a/plugins/block-plus-minus/test/procedures.mocha.js
+++ b/plugins/block-plus-minus/test/procedures.mocha.js
@@ -6,7 +6,7 @@
 
 const chai = require('chai');
 const sinon = require('sinon');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {testHelpers} = require('@blockly/dev-tools');
 const procedureTestHelpers = require('./procedures_test_helpers.mocha');
 const {dartGenerator} = require('blockly/dart');
diff --git a/plugins/block-plus-minus/test/procedures_test_helpers.mocha.js b/plugins/block-plus-minus/test/procedures_test_helpers.mocha.js
index f7bcae8fd1..12dc415a91 100644
--- a/plugins/block-plus-minus/test/procedures_test_helpers.mocha.js
+++ b/plugins/block-plus-minus/test/procedures_test_helpers.mocha.js
@@ -5,7 +5,7 @@
  */
 
 const chai = require('chai');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 
 require('../src/index');
 const assert = chai.assert;
diff --git a/plugins/block-plus-minus/test/text_join.mocha.js b/plugins/block-plus-minus/test/text_join.mocha.js
index 3587f77e18..434f883190 100644
--- a/plugins/block-plus-minus/test/text_join.mocha.js
+++ b/plugins/block-plus-minus/test/text_join.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const {testHelpers} = require('@blockly/dev-tools');
 const {runPlusMinusTestSuite} = require('./test_helpers.mocha');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {dartGenerator} = require('blockly/dart');
 const {javascriptGenerator} = require('blockly/javascript');
 const {luaGenerator} = require('blockly/lua');
diff --git a/plugins/block-shareable-procedures/test/data_models.mocha.js b/plugins/block-shareable-procedures/test/data_models.mocha.js
index 19bba816a5..99459b356f 100644
--- a/plugins/block-shareable-procedures/test/data_models.mocha.js
+++ b/plugins/block-shareable-procedures/test/data_models.mocha.js
@@ -8,7 +8,7 @@ const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
 const eventTestHelpers = require('./event_test_helpers');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
 const {ObservableParameterModel} = require('../src/observable_parameter_model');
 const {ProcedureCreate} = require('../src/events_procedure_create');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_change_return.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_change_return.mocha.js
index 02257d0fd0..280286ff25 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_change_return.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_change_return.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const eventTestHelpers = require('./event_test_helpers');
 const {testHelpers} = require('@blockly/dev-tools');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_create.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_create.mocha.js
index dbe0ac6eee..10a161ff12 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_create.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_create.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {testHelpers} = require('@blockly/dev-tools');
 const eventTestHelpers = require('./event_test_helpers');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_delete.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_delete.mocha.js
index 16e0474e33..f8353060bc 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_delete.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_delete.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const eventTestHelpers = require('./event_test_helpers');
 const {testHelpers} = require('@blockly/dev-tools');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_enable.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_enable.mocha.js
index 46e11f332c..fe6fc2f244 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_enable.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_enable.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const eventTestHelpers = require('./event_test_helpers');
 const {testHelpers} = require('@blockly/dev-tools');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_parameter_create.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_parameter_create.mocha.js
index e0e7a7d3ef..5a47900b6c 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_parameter_create.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_parameter_create.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const eventTestHelpers = require('./event_test_helpers');
 const {testHelpers} = require('@blockly/dev-tools');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_parameter_delete.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_parameter_delete.mocha.js
index 36f59bd35b..1a5f0a16a2 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_parameter_delete.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_parameter_delete.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const eventTestHelpers = require('./event_test_helpers');
 const {testHelpers} = require('@blockly/dev-tools');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_parameter_rename.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_parameter_rename.mocha.js
index 6557efe905..4505d69dfb 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_parameter_rename.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_parameter_rename.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const eventTestHelpers = require('./event_test_helpers');
 const {testHelpers} = require('@blockly/dev-tools');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/event_procedure_rename.mocha.js b/plugins/block-shareable-procedures/test/event_procedure_rename.mocha.js
index 1230223f05..4eeeeb59c7 100644
--- a/plugins/block-shareable-procedures/test/event_procedure_rename.mocha.js
+++ b/plugins/block-shareable-procedures/test/event_procedure_rename.mocha.js
@@ -7,7 +7,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const assert = chai.assert;
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const eventTestHelpers = require('./event_test_helpers');
 const {testHelpers} = require('@blockly/dev-tools');
 const {ObservableProcedureModel} = require('../src/observable_procedure_model');
diff --git a/plugins/block-shareable-procedures/test/procedure_blocks.mocha.js b/plugins/block-shareable-procedures/test/procedure_blocks.mocha.js
index a8a13fc50f..a9925f8b80 100644
--- a/plugins/block-shareable-procedures/test/procedure_blocks.mocha.js
+++ b/plugins/block-shareable-procedures/test/procedure_blocks.mocha.js
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const chai = require('chai');
 const assert = chai.assert;
 const sinon = require('sinon');
diff --git a/plugins/field-dependent-dropdown/test/field_dependent_dropdown.mocha.js b/plugins/field-dependent-dropdown/test/field_dependent_dropdown.mocha.js
index 9453fa9b8d..61d32499a6 100644
--- a/plugins/field-dependent-dropdown/test/field_dependent_dropdown.mocha.js
+++ b/plugins/field-dependent-dropdown/test/field_dependent_dropdown.mocha.js
@@ -6,7 +6,7 @@
 
 const chai = require('chai');
 const sinon = require('sinon');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 require('./field_dependent_dropdown_test_block');
 
 const assert = chai.assert;
diff --git a/plugins/keyboard-navigation/test/navigation_modify_test.mocha.js b/plugins/keyboard-navigation/test/navigation_modify_test.mocha.js
index 35c1878f6d..492b98f9c5 100644
--- a/plugins/keyboard-navigation/test/navigation_modify_test.mocha.js
+++ b/plugins/keyboard-navigation/test/navigation_modify_test.mocha.js
@@ -5,7 +5,7 @@
  */
 
 const chai = require('chai');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {Navigation} = require('../src/navigation');
 const assert = chai.assert;
 const {testHelpers} = require('@blockly/dev-tools');
diff --git a/plugins/keyboard-navigation/test/navigation_test.mocha.js b/plugins/keyboard-navigation/test/navigation_test.mocha.js
index b9f936c11f..369c0526c6 100644
--- a/plugins/keyboard-navigation/test/navigation_test.mocha.js
+++ b/plugins/keyboard-navigation/test/navigation_test.mocha.js
@@ -13,7 +13,7 @@
 const chai = require('chai');
 const sinon = require('sinon');
 
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const {NavigationController, Constants} = require('../src/index');
 const {
   createNavigationWorkspace,
diff --git a/plugins/keyboard-navigation/test/shortcuts_test.mocha.js b/plugins/keyboard-navigation/test/shortcuts_test.mocha.js
index 0404398188..4e19095210 100644
--- a/plugins/keyboard-navigation/test/shortcuts_test.mocha.js
+++ b/plugins/keyboard-navigation/test/shortcuts_test.mocha.js
@@ -7,7 +7,7 @@
 const sinon = require('sinon');
 const chai = require('chai');
 
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 
 const {NavigationController} = require('../src/index');
 const {
diff --git a/plugins/modal/test/modal_test.mocha.js b/plugins/modal/test/modal_test.mocha.js
index 2ef4eb346d..8282af49d8 100644
--- a/plugins/modal/test/modal_test.mocha.js
+++ b/plugins/modal/test/modal_test.mocha.js
@@ -10,7 +10,7 @@
  */
 
 const assert = require('assert');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const sinon = require('sinon');
 
 const Modal = require('../src/index.js').Modal;
diff --git a/plugins/strict-connection-checker/test/checker_test.mocha.js b/plugins/strict-connection-checker/test/checker_test.mocha.js
index 6c71e220ba..d089ccaf6d 100644
--- a/plugins/strict-connection-checker/test/checker_test.mocha.js
+++ b/plugins/strict-connection-checker/test/checker_test.mocha.js
@@ -11,7 +11,7 @@
  */
 
 const chai = require('chai');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 
 const StrictConnectionChecker =
   require('../src/index.js').StrictConnectionChecker;
diff --git a/plugins/suggested-blocks/test/suggested_blocks.mocha.js b/plugins/suggested-blocks/test/suggested_blocks.mocha.js
index 17d9fe4f6a..91e8628cb9 100644
--- a/plugins/suggested-blocks/test/suggested_blocks.mocha.js
+++ b/plugins/suggested-blocks/test/suggested_blocks.mocha.js
@@ -6,7 +6,7 @@
 
 const {assert} = require('chai');
 const sinon = require('sinon');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const SuggestedBlocks = require('../src/index');
 
 const STANDARD_TEST_CASE = {
diff --git a/plugins/typed-variable-modal/test/typed_variable_modal_test.mocha.js b/plugins/typed-variable-modal/test/typed_variable_modal_test.mocha.js
index 322aacd570..0a4fd44b25 100644
--- a/plugins/typed-variable-modal/test/typed_variable_modal_test.mocha.js
+++ b/plugins/typed-variable-modal/test/typed_variable_modal_test.mocha.js
@@ -10,7 +10,7 @@
  */
 
 const assert = require('assert');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const sinon = require('sinon');
 
 const {TypedVariableModal} = require('../src/index.js');
diff --git a/plugins/workspace-search/test/workspace_search_test.mocha.js b/plugins/workspace-search/test/workspace_search_test.mocha.js
index 9177b1ab66..fea76c17da 100644
--- a/plugins/workspace-search/test/workspace_search_test.mocha.js
+++ b/plugins/workspace-search/test/workspace_search_test.mocha.js
@@ -10,7 +10,7 @@
  */
 
 const assert = require('assert');
-const Blockly = require('blockly/node');
+const Blockly = require('blockly');
 const sinon = require('sinon');
 
 const {WorkspaceSearch} = require('../src/index');