diff --git a/openless-all/app/scripts/aura-skin-contract.test.mjs b/openless-all/app/scripts/aura-skin-contract.test.mjs
index 49146e90..015d9c3e 100644
--- a/openless-all/app/scripts/aura-skin-contract.test.mjs
+++ b/openless-all/app/scripts/aura-skin-contract.test.mjs
@@ -14,9 +14,9 @@ function escapeRegExp(value) {
 function assertUsesClassName(source, className, message) {
   const escapedClassName = escapeRegExp(className);
   const patterns = [
-    new RegExp(`className\\s*=\\s*(?:\\{\\s*)?"[^"]*\\b${escapedClassName}\\b[^"]*"(?:\\s*\\})?`),
-    new RegExp(`className\\s*=\\s*(?:\\{\\s*)?'[^']*\\b${escapedClassName}\\b[^']*'(?:\\s*\\})?`),
-    new RegExp(`className\\s*=\\s*(?:\\{\\s*)?\`[^\`]*\\b${escapedClassName}\\b[^\`]*\`(?:\\s*\\})?`),
+    new RegExp(`className\\s*=\\s*(?:\\{\\s*)?"(?:[^"]*\\s)?${escapedClassName}(?:\\s[^"]*)?"(?:\\s*\\})?`),
+    new RegExp(`className\\s*=\\s*(?:\\{\\s*)?'(?:[^']*\\s)?${escapedClassName}(?:\\s[^']*)?'(?:\\s*\\})?`),
+    new RegExp(`className\\s*=\\s*(?:\\{\\s*)?\`(?:[^\`]*\\s)?${escapedClassName}(?:\\s[^\`]*)?\`(?:\\s*\\})?`),
   ];
 
   assert.ok(patterns.some((pattern) => pattern.test(source)), message);
@@ -26,6 +26,15 @@ assert.throws(
   () => assertUsesClassName('<div>ol-app-shell-bg</div>', 'ol-app-shell-bg', 'sample must require className usage'),
   /sample must require className usage/,
 );
+assert.throws(
+  () =>
+    assertUsesClassName(
+      '<div className="foo-ol-app-shell-bg-bar" />',
+      'ol-app-shell-bg',
+      'sample must require an exact class token',
+    ),
+  /sample must require an exact class token/,
+);
 assertUsesClassName(
   '<div className="foo ol-app-shell-bg bar" />',
   'ol-app-shell-bg',