diff --git a/tests/jsunit/index.html b/tests/jsunit/index.html
index 500f2cb37..3987465a6 100644
--- a/tests/jsunit/index.html
+++ b/tests/jsunit/index.html
@@ -23,6 +23,7 @@
     <script src="names_test.js"></script>
     <script src="procedures_test.js"></script>
     <script src="utils_test.js"></script>
+    <script src="variables_test.js"></script>
     <script src="variable_map_test.js"></script>
     <script src="variable_model_test.js"></script>
     <script src="widget_div_test.js"></script>
diff --git a/tests/jsunit/variables_test.js b/tests/jsunit/variables_test.js
new file mode 100644
index 000000000..b6b305bdc
--- /dev/null
+++ b/tests/jsunit/variables_test.js
@@ -0,0 +1,99 @@
+/**
+ * @license
+ * Visual Blocks Editor
+ *
+ * Copyright 2018 Google Inc.
+ * https://developers.google.com/blockly/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Tests for variable utility functions in Blockly
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.require('goog.testing');
+
+function variablesTest_setUp() {
+  defineGetVarBlock();
+  var workspace = new Blockly.Workspace();
+  workspace.createVariable('foo', 'type1', '1');
+  workspace.createVariable('bar', 'type1', '2');
+  workspace.createVariable('baz', 'type1', '3');
+  return workspace;
+}
+
+function variablesTest_tearDown(workspace) {
+  undefineGetVarBlock();
+  workspace.dispose();
+}
+
+function buildVariablesTest(testImpl) {
+  return function() {
+    var workspace = variablesTest_setUp();
+    try {
+      testImpl(workspace);
+    } finally {
+      variablesTest_tearDown(workspace);
+    }
+  };
+}
+
+var test_allUsedVarModels = buildVariablesTest(
+    function(workspace) {
+      createMockVarBlock(workspace, '1');
+      createMockVarBlock(workspace, '2');
+      createMockVarBlock(workspace, '3');
+
+      var result = Blockly.Variables.allUsedVarModels(workspace);
+      assertEquals('Expected three variables in the list of used variables',
+          3, result.length);
+    }
+);
+
+var test_allUsedVarModels_someUnused = buildVariablesTest(
+    function(workspace) {
+      createMockVarBlock(workspace, '2');
+
+      var result = Blockly.Variables.allUsedVarModels(workspace);
+      assertEquals('Expected one variable in the list of used variables',
+          1, result.length);
+      assertEquals('Expected variable with ID 2 in the list of used variables',
+          '2', result[0].getId());
+    }
+);
+
+var test_allUsedVarModels_varUsedTwice = buildVariablesTest(
+    function(workspace) {
+      createMockVarBlock(workspace, '2');
+      createMockVarBlock(workspace, '2');
+
+      var result = Blockly.Variables.allUsedVarModels(workspace);
+      // Using the same variable multiple times should not change the number of
+      // elements in the list.
+      assertEquals('Expected one variable in the list of used variables',
+          1, result.length);
+      assertEquals('Expected variable with ID 2 in the list of used variables',
+          '2', result[0].getId());
+    }
+);
+
+var test_allUsedVarModels_allUnused = buildVariablesTest(
+    function(workspace) {
+      var result = Blockly.Variables.allUsedVarModels(workspace);
+      assertEquals('Expected no variables in the list of used variables',
+          0, result.length);
+    }
+);