diff --git a/addon/initializers/showdown-extensions.js b/addon/initializers/showdown-extensions.js
index d71d9ad..0c4c3f2 100644
--- a/addon/initializers/showdown-extensions.js
+++ b/addon/initializers/showdown-extensions.js
@@ -58,7 +58,7 @@ export function initialize(/* application */) {
 
         let preBlock = `<pre class="language-${language}"><code ${language ? `class="${language} language-${language}"` : ''}>${highlightedCodeBlock}</code></pre>`;
 
-        let autoExecuteLanguages = fieldGuideConfig.autoExecuteLanguages || ['html', 'handlebars', 'hbs'];
+        let autoExecuteLanguages = fieldGuideConfig.autoExecuteLanguages || ['html', 'handlebars', 'hbs', 'glimmer'];
 
         let selfExecutingBlock = `<div class="self-executing-code-block">
   <div class="example">
diff --git a/index.js b/index.js
index 72ded25..31442e6 100644
--- a/index.js
+++ b/index.js
@@ -53,6 +53,7 @@ module.exports = {
           'http',
           'javascript',
           'json',
+          'markup',
           'markup-templating',
           'ruby',
           'scss'
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
index 523bad6..e1e8d5e 100644
--- a/tests/dummy/app/app.js
+++ b/tests/dummy/app/app.js
@@ -1,8 +1,11 @@
+/* global Prism */
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'dummy/config/environment';
 
+import { setup } from 'ember-prism';
+
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
@@ -10,3 +13,7 @@ export default class App extends Application {
 }
 
 loadInitializers(App, config.modulePrefix);
+setup();
+
+Prism.languages.hbs = Prism.languages.glimmer;
+Prism.languages.html = Prism.languages.glimmer;