diff --git a/lib/ace/layer/text_test.js b/lib/ace/layer/text_test.js
index 7298633a..bbd5d675 100644
--- a/lib/ace/layer/text_test.js
+++ b/lib/ace/layer/text_test.js
@@ -93,7 +93,7 @@ module.exports = {
         assert.equal(
             stringBuilder.join(""),
             "<span class='ace_cjk ace_invisible' style='width:20px'>" + this.textLayer.SPACE_CHAR + "</span>"
-            + "<span class='ace_invisible'>&para;</span>"
+            + "<span class='ace_invisible'>\xB6</span>"
         );
     }
 };
diff --git a/lib/ace/mode/css_tokenizer_test.js b/lib/ace/mode/css_tokenizer_test.js
index ffb39fe9..469c47e3 100644
--- a/lib/ace/mode/css_tokenizer_test.js
+++ b/lib/ace/mode/css_tokenizer_test.js
@@ -78,9 +78,9 @@ module.exports = {
         var tokens = this.tokenizer.getLineTokens("{()}", "start").tokens;
 
         assert.equal(3, tokens.length);
-        assert.equal("lparen", tokens[0].type);
+        assert.equal("paren.lparen", tokens[0].type);
         assert.equal("text", tokens[1].type);
-        assert.equal("rparen", tokens[2].type);
+        assert.equal("paren.rparen", tokens[2].type);
     },
     
     "test for last rule in ruleset to catch capturing group bugs" : function() {
diff --git a/lib/ace/mode/javascript_tokenizer_test.js b/lib/ace/mode/javascript_tokenizer_test.js
index bd745277..856ac3e3 100644
--- a/lib/ace/mode/javascript_tokenizer_test.js
+++ b/lib/ace/mode/javascript_tokenizer_test.js
@@ -95,20 +95,20 @@ module.exports = {
         var tokens = this.tokenizer.getLineTokens(line, "start").tokens;
 
         assert.equal(7, tokens.length);
-        assert.equal("lparen", tokens[0].type);
-        assert.equal("lparen", tokens[1].type);
-        assert.equal("lparen", tokens[2].type);
+        assert.equal("paren.lparen", tokens[0].type);
+        assert.equal("paren.lparen", tokens[1].type);
+        assert.equal("paren.lparen", tokens[2].type);
         assert.equal("text", tokens[3].type);
-        assert.equal("rparen", tokens[4].type);
-        assert.equal("rparen", tokens[5].type);
-        assert.equal("rparen", tokens[6].type);
+        assert.equal("paren.rparen", tokens[4].type);
+        assert.equal("paren.rparen", tokens[5].type);
+        assert.equal("paren.rparen", tokens[6].type);
     },
 
     "test for last rule in ruleset to catch capturing group bugs" : function() {
         var tokens = this.tokenizer.getLineTokens("}", "start").tokens;
 
         assert.equal(1, tokens.length);
-        assert.equal("rparen", tokens[0].type);
+        assert.equal("paren.rparen", tokens[0].type);
     },
 
     "test tokenize arithmetic expression which looks like a regexp": function() {
@@ -160,7 +160,7 @@ module.exports = {
     "test // is not a regexp": function() {
         var tokens = this.tokenizer.getLineTokens("{ // 123", "start").tokens;
         assert.equal(3, tokens.length);
-        assert.equal("lparen", tokens[0].type);
+        assert.equal("paren.lparen", tokens[0].type);
         assert.equal("text", tokens[1].type);
         assert.equal("comment", tokens[2].type);
     }