diff --git a/core/block.js b/core/block.js
index 363feca04..260483c60 100644
--- a/core/block.js
+++ b/core/block.js
@@ -938,7 +938,7 @@ Blockly.Block.prototype.setStyle = function(blockStyleName) {
 
     if (blockStyle) {
       this.style_ = blockStyle;
-      this.colour_ = blockStyle.primaryColour;
+      this.setColour(blockStyle.primaryColour);
       this.secondaryColour_ = blockStyle.secondaryColour;
       this.tertiaryColour_ = blockStyle.tertiaryColour;
     }
diff --git a/tests/jsunit/style_test.js b/tests/jsunit/style_test.js
index 4b7be88b1..11cd1c885 100644
--- a/tests/jsunit/style_test.js
+++ b/tests/jsunit/style_test.js
@@ -120,17 +120,15 @@ function test_setStyleForBlockly() {
   var blockStyles = createBlockStyles();
   var workspace = new Blockly.WorkspaceSvg({});
   var blockA = workspace.newBlock('stack_block');
-  var blocks;
+  var blocks = [blockA];
 
   blockA.setStyle = function(){this.styleName_ = 'styleTwo'};
-  var something = 1;
+  var callCount = 1;
   workspace.refreshToolboxSelection = function(){
-    return ++something;
+    return ++callCount;
   };
   blockA.styleName_ = 'styleOne';
 
-  blocks = [blockA];
-
   setUpMockMethod(mockControl_, Blockly, 'getMainWorkspace', null, [workspace]);
 
   Blockly.setStyle(blockStyles);