diff --git a/core/blockly.js b/core/blockly.js
index 811279c5776..9c344d7e069 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -742,7 +742,7 @@ exports.zelos = zelos;
 // Blockly.Msg module - so make sure it is, but only if there is not
 // yet a Blockly global variable.
 if (!('Blockly' in globalThis)) {
-  globalThis['Blockly'] = {Msg};
+  globalThis['Blockly'] = {'Msg': Msg};
 }
 
 // Temporary hack to copy accessor properties from exports to the
diff --git a/tests/compile/main.js b/tests/compile/main.js
index 58b5be016c2..f7ab99e7a76 100644
--- a/tests/compile/main.js
+++ b/tests/compile/main.js
@@ -11,16 +11,8 @@ goog.require('Blockly');
 goog.require('Blockly.geras.Renderer');
 goog.require('Blockly.VerticalFlyout');
 // Blocks
-goog.require('Blockly.Constants.Logic');
-goog.require('Blockly.Constants.Loops');
-goog.require('Blockly.Constants.Math');
-goog.require('Blockly.Constants.TestBlocks');
-goog.require('Blockly.Constants.Text');
-goog.require('Blockly.Constants.Lists');
-goog.require('Blockly.Constants.Colour');
-goog.require('Blockly.Constants.Variables');
-goog.require('Blockly.Constants.VariablesDynamic');
-goog.require('Blockly.blocks.procedures');
+goog.require('Blockly.blocks.all');
+goog.require('Blockly.blocks.testBlocks');
 
 Main.init = function() {
   Blockly.inject('blocklyDiv', {
diff --git a/tests/compile/test_blocks.js b/tests/compile/test_blocks.js
index 3be623f18ff..9cf7efd6895 100644
--- a/tests/compile/test_blocks.js
+++ b/tests/compile/test_blocks.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-goog.provide('Blockly.Constants.TestBlocks');
+goog.provide('Blockly.blocks.testBlocks');
 
 goog.require('Blockly');