diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index c9834b05549..152a4c91595 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -24,5 +24,34 @@
 		"mocha-junit-reporter": "^1.17.0",
 		"mocha-multi-reporters": "^1.1.7",
 		"vscode": "1.1.5"
+	},
+	"contributes": {
+		"tokenTypes": [
+			{
+				"id": "testToken",
+				"description": "A test token"
+			}
+		],
+		"tokenModifiers": [
+			{
+				"id": "testModifier",
+				"description": "A test modifier"
+			}
+		],
+		"tokenStyleDefaults": [
+			{
+				"selector": "testToken.testModifier",
+				"light": {
+					"fontStyle": "bold"
+				},
+				"dark": {
+					"fontStyle": "bold"
+				},
+				"highContrast": {
+					"fontStyle": "bold"
+				}
+
+			}
+		]
 	}
 }
diff --git a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts
index 0d7ba63c543..77f6a8586c9 100644
--- a/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts
+++ b/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.ts
@@ -35,7 +35,7 @@ interface ITokenStyleDefaultExtensionPoint {
 	};
 }
 
-const selectorPattern = '^[-_\\w]+|\\*(\\.[-_\\w+]+)*$';
+const selectorPattern = '^([-_\\w]+|\\*)(\\.[-_\\w+]+)*$';
 const colorPattern = '^#([0-9A-Fa-f]{6})([0-9A-Fa-f]{2})?$';
 
 const tokenClassificationRegistry: ITokenClassificationRegistry = getTokenClassificationRegistry();