diff --git a/lib/octicons_react/script/build.js b/lib/octicons_react/script/build.js
index 5e2f26c31..233d41db2 100755
--- a/lib/octicons_react/script/build.js
+++ b/lib/octicons_react/script/build.js
@@ -22,7 +22,7 @@ const icons = Object.entries(octicons)
 }
 
 ${name}.defaultProps = {
-  className: 'octicon',
+  className: 'octicon octicon-${key}',
   size: 16,
   verticalAlign: 'text-bottom'
 }
diff --git a/lib/octicons_react/src/__tests__/__snapshots__/octicon.js.snap b/lib/octicons_react/src/__tests__/__snapshots__/octicon.js.snap
index 6e64ad501..49834dc95 100644
--- a/lib/octicons_react/src/__tests__/__snapshots__/octicon.js.snap
+++ b/lib/octicons_react/src/__tests__/__snapshots__/octicon.js.snap
@@ -3,7 +3,7 @@
 exports[`An icon component matches snapshot 1`] = `
 <svg
   aria-hidden="true"
-  class="octicon"
+  class="octicon octicon-alert"
   fill="currentColor"
   height="16"
   role="img"