diff --git a/tests/jsunit/workspace_test.js b/tests/jsunit/workspace_test.js
index 6576f0346..985da6a37 100644
--- a/tests/jsunit/workspace_test.js
+++ b/tests/jsunit/workspace_test.js
@@ -22,66 +22,6 @@ function workspaceTest_tearDown() {
   workspace.dispose();
 }
 
-function test_emptyWorkspace() {
-  workspaceTest_setUp();
-  try {
-    assertEquals('Empty workspace (1).', 0, workspace.getTopBlocks(true).length);
-    assertEquals('Empty workspace (2).', 0, workspace.getTopBlocks(false).length);
-    assertEquals('Empty workspace (3).', 0, workspace.getAllBlocks(false).length);
-    workspace.clear();
-    assertEquals('Empty workspace (4).', 0, workspace.getTopBlocks(true).length);
-    assertEquals('Empty workspace (5).', 0, workspace.getTopBlocks(false).length);
-    assertEquals('Empty workspace (6).', 0, workspace.getAllBlocks(false).length);
-  } finally {
-    workspaceTest_tearDown();
-  }
-}
-
-function test_flatWorkspace() {
-  workspaceTest_setUp();
-  try {
-    var blockA = workspace.newBlock('');
-    assertEquals('One block workspace (1).', 1, workspace.getTopBlocks(true).length);
-    assertEquals('One block workspace (2).', 1, workspace.getTopBlocks(false).length);
-    assertEquals('One block workspace (3).', 1, workspace.getAllBlocks(false).length);
-    var blockB = workspace.newBlock('');
-    assertEquals('Two block workspace (1).', 2, workspace.getTopBlocks(true).length);
-    assertEquals('Two block workspace (2).', 2, workspace.getTopBlocks(false).length);
-    assertEquals('Two block workspace (3).', 2, workspace.getAllBlocks(false).length);
-    blockA.dispose();
-    assertEquals('One block workspace (4).', 1, workspace.getTopBlocks(true).length);
-    assertEquals('One block workspace (5).', 1, workspace.getTopBlocks(false).length);
-    assertEquals('One block workspace (6).', 1, workspace.getAllBlocks(false).length);
-    workspace.clear();
-    assertEquals('Cleared workspace (1).', 0, workspace.getTopBlocks(true).length);
-    assertEquals('Cleared workspace (2).', 0, workspace.getTopBlocks(false).length);
-    assertEquals('Cleared workspace (3).', 0, workspace.getAllBlocks(false).length);
-  } finally {
-    workspaceTest_tearDown();
-  }
-}
-
-function test_maxBlocksWorkspace() {
-  workspaceTest_setUp();
-  try {
-    var blockA = workspace.newBlock('');
-    var blockB = workspace.newBlock('');
-    assertEquals('Infinite capacity.', Infinity, workspace.remainingCapacity());
-    workspace.options.maxBlocks = 3;
-    assertEquals('Three capacity.', 1, workspace.remainingCapacity());
-    workspace.options.maxBlocks = 2;
-    assertEquals('Two capacity.', 0, workspace.remainingCapacity());
-    workspace.options.maxBlocks = 1;
-    assertEquals('One capacity.', -1, workspace.remainingCapacity());
-    workspace.options.maxBlocks = 0;
-    assertEquals('Zero capacity.', -2, workspace.remainingCapacity());
-    workspace.clear();
-    assertEquals('Cleared capacity.', 0, workspace.remainingCapacity());
-  } finally {
-    workspaceTest_tearDown();
-  }
-}
-
 function test_getWorkspaceById() {
   var workspaceA = new Blockly.Workspace();
   var workspaceB = new Blockly.Workspace();
diff --git a/tests/mocha/index.html b/tests/mocha/index.html
index 004ca414d..65a64d1a9 100644
--- a/tests/mocha/index.html
+++ b/tests/mocha/index.html
@@ -62,6 +62,7 @@
     <script src="variable_map_test.js"></script>
     <script src="variable_model_test.js"></script>
     <script src="variables_test.js"></script>
+    <script src="workspace_test.js"></script>
     <script src="xml_procedures_test.js"></script>
     <script src="xml_test.js"></script>
 
diff --git a/tests/mocha/workspace_test.js b/tests/mocha/workspace_test.js
new file mode 100644
index 000000000..42359bbfd
--- /dev/null
+++ b/tests/mocha/workspace_test.js
@@ -0,0 +1,357 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+suite('Workspace', function() {
+  setup(function() {
+    this.workspace = new Blockly.Workspace();
+    Blockly.defineBlocksWithJsonArray([{
+      "type": "get_var_block",
+      "message0": "%1",
+      "args0": [
+        {
+          "type": "field_variable",
+          "name": "VAR",
+          "variableTypes": ["", "type1", "type2"]
+        }
+      ]
+    }]);
+  });
+
+  teardown(function() {
+    delete Blockly.Blocks['get_var_block'];
+    this.workspace.dispose();
+  });
+
+  suite('getTopBlocks(ordered=true)', function() {
+    test('Empty workspace', function() {
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0);
+    });
+
+    test('Flat workspace one block', function() {
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 1);
+    });
+
+    test('Flat workspace one block after dispose', function() {
+      var blockA = this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      blockA.dispose();
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 1);
+    });
+
+    test('Flat workspace two blocks', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 2);
+    });
+
+    test('Clear', function() {
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0,
+          'Clear empty workspace');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(true).length, 0);
+    });
+  });
+
+  suite('getTopBlocks(ordered=false)', function() {
+    test('Empty workspace', function() {
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
+    });
+
+    test('Flat workspace one block', function() {
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 1);
+    });
+
+    test('Flat workspace one block after dispose', function() {
+      var blockA = this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      blockA.dispose();
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 1);
+    });
+
+    test('Flat workspace two blocks', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 2);
+    });
+
+    test('Clear empty workspace', function() {
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
+    });
+
+    test('Clear non-empty workspace', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getTopBlocks(false).length, 0);
+    });
+  });
+
+  suite('getAllBlocks', function() {
+    test('Empty workspace', function() {
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0);
+    });
+
+    test('Flat workspace one block', function() {
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 1);
+    });
+
+    test('Flat workspace one block after dispose', function() {
+      var blockA = this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      blockA.dispose();
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 1);
+    });
+
+    test('Flat workspace two blocks', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 2);
+    });
+
+    test('Clear', function() {
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0,
+          'Clear empty workspace');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.getAllBlocks(true).length, 0);
+    });
+  });
+
+  suite('remainingCapacity', function() {
+    setup(function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+    });
+
+    test('No block limit', function() {
+      chai.assert.equal(this.workspace.remainingCapacity(), Infinity);
+    });
+
+    test('Under block limit', function() {
+      this.workspace.options.maxBlocks = 3;
+      chai.assert.equal(this.workspace.remainingCapacity(), 1);
+      this.workspace.options.maxBlocks = 4;
+      chai.assert.equal(this.workspace.remainingCapacity(), 2);
+    });
+
+    test('At block limit', function() {
+      this.workspace.options.maxBlocks = 2;
+      chai.assert.equal(this.workspace.remainingCapacity(), 0);
+    });
+
+    test('At block limit of 0 after clear', function() {
+      this.workspace.options.maxBlocks = 0;
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.remainingCapacity(), 0);
+    });
+
+    test('Over block limit', function() {
+      this.workspace.options.maxBlocks = 1;
+      chai.assert.equal(this.workspace.remainingCapacity(), -1);
+    });
+
+    test('Over block limit of 0', function() {
+      this.workspace.options.maxBlocks = 0;
+      chai.assert.equal(this.workspace.remainingCapacity(), -2);
+    });
+  });
+
+  suite('remainingCapacityOfType', function() {
+    setup(function() {
+      this.workspace.newBlock('get_var_block');
+      this.workspace.newBlock('get_var_block');
+      this.workspace.options.maxInstances = {};
+    });
+
+    test('No instance limit', function() {
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          Infinity);
+    });
+
+    test('Under instance limit', function() {
+      this.workspace.options.maxInstances['get_var_block'] = 3;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          1, 'With maxInstances limit 3');
+      this.workspace.options.maxInstances['get_var_block'] = 4;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          2, 'With maxInstances limit 4');
+    });
+
+    test('Under instance limit with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 3;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          1, 'With maxInstances limit 3');
+      this.workspace.options.maxInstances['get_var_block'] = 4;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          2, 'With maxInstances limit 4');
+    });
+
+    test('At instance limit', function() {
+      this.workspace.options.maxInstances['get_var_block'] = 2;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0, 'With maxInstances limit 2');
+    });
+
+    test.skip('At instance limit of 0 after clear', function() {
+      // TODO(3837): Un-skip test after resolving.
+      this.workspace.clear();
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0);
+    });
+
+    test('At instance limit with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 2;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0, 'With maxInstances limit 2');
+    });
+
+    test.skip('At instance limit of 0 with multiple block types', function() {
+      // TODO(3837): Un-skip test after resolving.
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      this.workspace.clear();
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          0);
+    });
+
+    test('Over instance limit', function() {
+      this.workspace.options.maxInstances['get_var_block'] = 1;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -1,'With maxInstances limit 1');
+    });
+
+    test.skip('Over instance limit of 0', function() {
+      // TODO(3837): Un-skip test after resolving.
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -2,'With maxInstances limit 0');
+    });
+
+    test('Over instance limit with multiple block types', function() {
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 1;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -1,'With maxInstances limit 1');
+    });
+
+    test.skip('Over instance limit of 0 with multiple block types', function() {
+      // TODO(3837): Un-skip test after resolving.
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.newBlock('');
+      this.workspace.options.maxInstances['get_var_block'] = 0;
+      chai.assert.equal(this.workspace.remainingCapacityOfType('get_var_block'),
+          -2,'With maxInstances limit 0');
+    });
+
+    suite.skip('Max blocks and max instance interaction', function() {
+      // TODO(3836): Un-skip test suite after resolving.
+      test('Under block limit and no instance limit', function() {
+        this.workspace.options.maxBlocks = 3;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'), 1);
+      });
+
+      test('At block limit and no instance limit', function() {
+        this.workspace.options.maxBlocks = 2;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'), 0);
+      });
+
+      test.skip('Over block limit of 0 and no instance limit', function() {
+        // TODO(3837|3836): Un-skip test after resolving both.
+        this.workspace.options.maxBlocks = 0;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'), -2);
+      });
+
+      test('Over block limit but under instance limit', function() {
+        this.workspace.options.maxBlocks = 1;
+        this.workspace.options.maxInstances['get_var_block'] = 3;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'),
+            -2,
+            'With maxBlocks limit 1 and maxInstances limit 3');
+      });
+
+      test.skip('Over block limit of 0 but under instance limit', function() {
+        // TODO(3837|3836): Un-skip test after resolving both.
+        this.workspace.options.maxBlocks = 0;
+        this.workspace.options.maxInstances['get_var_block'] = 3;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'),
+            -2,
+            'With maxBlocks limit 0 and maxInstances limit 3');
+      });
+
+      test('Over block limit but at instance limit', function() {
+        this.workspace.options.maxBlocks = 1;
+        this.workspace.options.maxInstances['get_var_block'] = 2;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'),
+            -2,
+            'With maxBlocks limit 1 and maxInstances limit 2');
+      });
+
+      test('Over block limit and over instance limit', function() {
+        this.workspace.options.maxBlocks = 1;
+        this.workspace.options.maxInstances['get_var_block'] = 1;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'),
+            -1,
+            'With maxBlocks limit 1 and maxInstances limit 1');
+      });
+
+      test.skip('Over block limit of 0 and over instance limit', function() {
+        // TODO(3837|3836): Un-skip test after resolving both.
+        this.workspace.options.maxBlocks = 0;
+        this.workspace.options.maxInstances['get_var_block'] = 1;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'),
+            -2,
+            'With maxBlocks limit 0 and maxInstances limit 1');
+      });
+
+      test('Over block limit and over instance limit of 0', function() {
+        this.workspace.options.maxBlocks = 1;
+        this.workspace.options.maxInstances['get_var_block'] = 0;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'),
+            -1,
+            'With maxBlocks limit 1 and maxInstances limit 0');
+      });
+
+      test.skip('Over block limit of 0 and over instance limit of 0', function() {
+        // TODO(3837|3836): Un-skip test after resolving both.
+        this.workspace.options.maxBlocks = 0;
+        this.workspace.options.maxInstances['get_var_block'] = 0;
+        chai.assert.equal(
+            this.workspace.remainingCapacityOfType('get_var_block'),-1);
+      });
+    });
+  });
+
+});