diff --git a/src/components/base/token/token.stories.js b/src/components/base/token/token.stories.js
index 51557934b31a99d337a510047fcebd08361012ae..55c4e76da1479bdf74ebe3381b51a92af9555f6a 100644
--- a/src/components/base/token/token.stories.js
+++ b/src/components/base/token/token.stories.js
@@ -22,5 +22,5 @@ documentedStoriesOf('base|token', readme)
     props: generateProps(),
     components,
     template: `
-      <div class="gl-display-flex"><gl-token :view-only="viewOnly">Token</gl-token></div>`,
+      <gl-token :view-only="viewOnly">Token</gl-token>`,
   }));
diff --git a/src/scss/storybook.scss b/src/scss/storybook.scss
index f386ef150f6deaadac8bf4e06ade6eac69ae4171..75ec0af2f79a7d2a271ee67d0804b268c4552c39 100644
--- a/src/scss/storybook.scss
+++ b/src/scss/storybook.scss
@@ -13,3 +13,9 @@
 @import 'utilities';
 
 @import 'components';
+
+// Storybook-specific styles
+.story-container {
+  @include gl-font-base;
+  @include gl-line-height-normal;
+}
diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-token-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-token-default-1-snap.png
index 67e4530a5204f205cef48e31e1e6152f2d8b2965..8d50033e978a915d44238554033476f271344a8b 100644
Binary files a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-token-default-1-snap.png and b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-token-default-1-snap.png differ