diff --git a/components/prism-markdown.js b/components/prism-markdown.js
index 0b6b28c7cf..6b3bd5c850 100644
--- a/components/prism-markdown.js
+++ b/components/prism-markdown.js
@@ -85,12 +85,6 @@
 				lookbehind: true,
 				alias: 'keyword'
 			},
-			{
-				// `code`
-				// ``code``
-				pattern: /``.+?``|`[^`\r\n]+`/,
-				alias: 'keyword'
-			},
 			{
 				// ```optional language
 				// code block
@@ -218,6 +212,14 @@
 				'punctuation': /~~?/
 			}
 		},
+		'code-snippet': {
+			// `code`
+			// ``code``
+			pattern: /(^|[^\\`])(?:``[^`\r\n]+(?:`[^`\r\n]+)*``(?!`)|`[^`\r\n]+`(?!`))/,
+			lookbehind: true,
+			greedy: true,
+			alias: ['code', 'keyword']
+		},
 		'url': {
 			// [example](http://example.com "Optional title")
 			// [example][id]
@@ -249,7 +251,7 @@
 	});
 
 	['url', 'bold', 'italic', 'strike'].forEach(function (token) {
-		['url', 'bold', 'italic', 'strike'].forEach(function (inside) {
+		['url', 'bold', 'italic', 'strike', 'code-snippet'].forEach(function (inside) {
 			if (token !== inside) {
 				Prism.languages.markdown[token].inside.content.inside[inside] = Prism.languages.markdown[inside];
 			}
diff --git a/components/prism-markdown.min.js b/components/prism-markdown.min.js
index 4d266b1403..037af8b933 100644
--- a/components/prism-markdown.min.js
+++ b/components/prism-markdown.min.js
@@ -1 +1 @@
-!function(u){function n(n){return n=n.replace(/<inner>/g,function(){return"(?:\\\\.|[^\\\\\n\r]|(?:\n|\r\n?)(?![\r\n]))"}),RegExp("((?:^|[^\\\\])(?:\\\\{2})*)(?:"+n+")")}var e="(?:\\\\.|``(?:[^`\r\n]|`(?!`))+``|`[^`\r\n]+`|[^\\\\|\r\n`])+",t="\\|?__(?:\\|__)+\\|?(?:(?:\n|\r\n?)|(?![^]))".replace(/__/g,function(){return e}),a="\\|?[ \t]*:?-{3,}:?[ \t]*(?:\\|[ \t]*:?-{3,}:?[ \t]*)+\\|?(?:\n|\r\n?)";u.languages.markdown=u.languages.extend("markup",{}),u.languages.insertBefore("markdown","prolog",{"front-matter-block":{pattern:/(^(?:\s*[\r\n])?)---(?!.)[\s\S]*?[\r\n]---(?!.)/,lookbehind:!0,greedy:!0,inside:{punctuation:/^---|---$/,"font-matter":{pattern:/\S+(?:\s+\S+)*/,alias:["yaml","language-yaml"],inside:u.languages.yaml}}},blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},table:{pattern:RegExp("^"+t+a+"(?:"+t+")*","m"),inside:{"table-data-rows":{pattern:RegExp("^("+t+a+")(?:"+t+")*$"),lookbehind:!0,inside:{"table-data":{pattern:RegExp(e),inside:u.languages.markdown},punctuation:/\|/}},"table-line":{pattern:RegExp("^("+t+")"+a+"$"),lookbehind:!0,inside:{punctuation:/\||:?-{3,}:?/}},"table-header-row":{pattern:RegExp("^"+t+"$"),inside:{"table-header":{pattern:RegExp(e),alias:"important",inside:u.languages.markdown},punctuation:/\|/}}}},code:[{pattern:/((?:^|\n)[ \t]*\n|(?:^|\r\n?)[ \t]*\r\n?)(?: {4}|\t).+(?:(?:\n|\r\n?)(?: {4}|\t).+)*/,lookbehind:!0,alias:"keyword"},{pattern:/``.+?``|`[^`\r\n]+`/,alias:"keyword"},{pattern:/^```[\s\S]*?^```$/m,greedy:!0,inside:{"code-block":{pattern:/^(```.*(?:\n|\r\n?))[\s\S]+?(?=(?:\n|\r\n?)^```$)/m,lookbehind:!0},"code-language":{pattern:/^(```).+/,lookbehind:!0},punctuation:/```/}}],title:[{pattern:/\S.*(?:\n|\r\n?)(?:==+|--+)(?=[ \t]*$)/m,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:n("\\b__(?:(?!_)<inner>|_(?:(?!_)<inner>)+_)+__\\b|\\*\\*(?:(?!\\*)<inner>|\\*(?:(?!\\*)<inner>)+\\*)+\\*\\*"),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^..)[\s\S]+(?=..$)/,lookbehind:!0,inside:{}},punctuation:/\*\*|__/}},italic:{pattern:n("\\b_(?:(?!_)<inner>|__(?:(?!_)<inner>)+__)+_\\b|\\*(?:(?!\\*)<inner>|\\*\\*(?:(?!\\*)<inner>)+\\*\\*)+\\*"),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^.)[\s\S]+(?=.$)/,lookbehind:!0,inside:{}},punctuation:/[*_]/}},strike:{pattern:n("(~~?)(?:(?!~)<inner>)+\\2"),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^~~?)[\s\S]+(?=\1$)/,lookbehind:!0,inside:{}},punctuation:/~~?/}},url:{pattern:n('!?\\[(?:(?!\\])<inner>)+\\](?:\\([^\\s)]+(?:[\t ]+"(?:\\\\.|[^"\\\\])*")?\\)|[ \t]?\\[(?:(?!\\])<inner>)+\\])'),lookbehind:!0,greedy:!0,inside:{operator:/^!/,content:{pattern:/(^\[)[^\]]+(?=\])/,lookbehind:!0,inside:{}},variable:{pattern:/(^\][ \t]?\[)[^\]]+(?=\]$)/,lookbehind:!0},url:{pattern:/(^\]\()[^\s)]+/,lookbehind:!0},string:{pattern:/(^[ \t]+)"(?:\\.|[^"\\])*"(?=\)$)/,lookbehind:!0}}}}),["url","bold","italic","strike"].forEach(function(e){["url","bold","italic","strike"].forEach(function(n){e!==n&&(u.languages.markdown[e].inside.content.inside[n]=u.languages.markdown[n])})}),u.hooks.add("after-tokenize",function(n){"markdown"!==n.language&&"md"!==n.language||!function n(e){if(e&&"string"!=typeof e)for(var t=0,a=e.length;t<a;t++){var i=e[t];if("code"===i.type){var r=i.content[1],o=i.content[3];if(r&&o&&"code-language"===r.type&&"code-block"===o.type&&"string"==typeof r.content){var l=r.content.replace(/\b#/g,"sharp").replace(/\b\+\+/g,"pp"),s="language-"+(l=(/[a-z][\w-]*/i.exec(l)||[""])[0].toLowerCase());o.alias?"string"==typeof o.alias?o.alias=[o.alias,s]:o.alias.push(s):o.alias=[s]}}else n(i.content)}}(n.tokens)}),u.hooks.add("wrap",function(n){if("code-block"===n.type){for(var e="",t=0,a=n.classes.length;t<a;t++){var i=n.classes[t],r=/language-(.+)/.exec(i);if(r){e=r[1];break}}var o=u.languages[e];if(o){var l=document.createElement("div");l.innerHTML=n.content;var s=l.textContent;n.content=u.highlight(s,o,e)}else if(e&&"none"!==e&&u.plugins.autoloader){var d="md-"+(new Date).valueOf()+"-"+Math.floor(1e16*Math.random());n.attributes.id=d,u.plugins.autoloader.loadLanguages(e,function(){var n=document.getElementById(d);n&&(n.innerHTML=u.highlight(n.textContent,u.languages[e],e))})}}}),u.languages.md=u.languages.markdown}(Prism);
\ No newline at end of file
+!function(p){function n(n){return n=n.replace(/<inner>/g,function(){return"(?:\\\\.|[^\\\\\n\r]|(?:\n|\r\n?)(?![\r\n]))"}),RegExp("((?:^|[^\\\\])(?:\\\\{2})*)(?:"+n+")")}var e="(?:\\\\.|``(?:[^`\r\n]|`(?!`))+``|`[^`\r\n]+`|[^\\\\|\r\n`])+",t="\\|?__(?:\\|__)+\\|?(?:(?:\n|\r\n?)|(?![^]))".replace(/__/g,function(){return e}),a="\\|?[ \t]*:?-{3,}:?[ \t]*(?:\\|[ \t]*:?-{3,}:?[ \t]*)+\\|?(?:\n|\r\n?)";p.languages.markdown=p.languages.extend("markup",{}),p.languages.insertBefore("markdown","prolog",{"front-matter-block":{pattern:/(^(?:\s*[\r\n])?)---(?!.)[\s\S]*?[\r\n]---(?!.)/,lookbehind:!0,greedy:!0,inside:{punctuation:/^---|---$/,"font-matter":{pattern:/\S+(?:\s+\S+)*/,alias:["yaml","language-yaml"],inside:p.languages.yaml}}},blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},table:{pattern:RegExp("^"+t+a+"(?:"+t+")*","m"),inside:{"table-data-rows":{pattern:RegExp("^("+t+a+")(?:"+t+")*$"),lookbehind:!0,inside:{"table-data":{pattern:RegExp(e),inside:p.languages.markdown},punctuation:/\|/}},"table-line":{pattern:RegExp("^("+t+")"+a+"$"),lookbehind:!0,inside:{punctuation:/\||:?-{3,}:?/}},"table-header-row":{pattern:RegExp("^"+t+"$"),inside:{"table-header":{pattern:RegExp(e),alias:"important",inside:p.languages.markdown},punctuation:/\|/}}}},code:[{pattern:/((?:^|\n)[ \t]*\n|(?:^|\r\n?)[ \t]*\r\n?)(?: {4}|\t).+(?:(?:\n|\r\n?)(?: {4}|\t).+)*/,lookbehind:!0,alias:"keyword"},{pattern:/^```[\s\S]*?^```$/m,greedy:!0,inside:{"code-block":{pattern:/^(```.*(?:\n|\r\n?))[\s\S]+?(?=(?:\n|\r\n?)^```$)/m,lookbehind:!0},"code-language":{pattern:/^(```).+/,lookbehind:!0},punctuation:/```/}}],title:[{pattern:/\S.*(?:\n|\r\n?)(?:==+|--+)(?=[ \t]*$)/m,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:n("\\b__(?:(?!_)<inner>|_(?:(?!_)<inner>)+_)+__\\b|\\*\\*(?:(?!\\*)<inner>|\\*(?:(?!\\*)<inner>)+\\*)+\\*\\*"),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^..)[\s\S]+(?=..$)/,lookbehind:!0,inside:{}},punctuation:/\*\*|__/}},italic:{pattern:n("\\b_(?:(?!_)<inner>|__(?:(?!_)<inner>)+__)+_\\b|\\*(?:(?!\\*)<inner>|\\*\\*(?:(?!\\*)<inner>)+\\*\\*)+\\*"),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^.)[\s\S]+(?=.$)/,lookbehind:!0,inside:{}},punctuation:/[*_]/}},strike:{pattern:n("(~~?)(?:(?!~)<inner>)+\\2"),lookbehind:!0,greedy:!0,inside:{content:{pattern:/(^~~?)[\s\S]+(?=\1$)/,lookbehind:!0,inside:{}},punctuation:/~~?/}},"code-snippet":{pattern:/(^|[^\\`])(?:``[^`\r\n]+(?:`[^`\r\n]+)*``(?!`)|`[^`\r\n]+`(?!`))/,lookbehind:!0,greedy:!0,alias:["code","keyword"]},url:{pattern:n('!?\\[(?:(?!\\])<inner>)+\\](?:\\([^\\s)]+(?:[\t ]+"(?:\\\\.|[^"\\\\])*")?\\)|[ \t]?\\[(?:(?!\\])<inner>)+\\])'),lookbehind:!0,greedy:!0,inside:{operator:/^!/,content:{pattern:/(^\[)[^\]]+(?=\])/,lookbehind:!0,inside:{}},variable:{pattern:/(^\][ \t]?\[)[^\]]+(?=\]$)/,lookbehind:!0},url:{pattern:/(^\]\()[^\s)]+/,lookbehind:!0},string:{pattern:/(^[ \t]+)"(?:\\.|[^"\\])*"(?=\)$)/,lookbehind:!0}}}}),["url","bold","italic","strike"].forEach(function(e){["url","bold","italic","strike","code-snippet"].forEach(function(n){e!==n&&(p.languages.markdown[e].inside.content.inside[n]=p.languages.markdown[n])})}),p.hooks.add("after-tokenize",function(n){"markdown"!==n.language&&"md"!==n.language||!function n(e){if(e&&"string"!=typeof e)for(var t=0,a=e.length;t<a;t++){var i=e[t];if("code"===i.type){var r=i.content[1],o=i.content[3];if(r&&o&&"code-language"===r.type&&"code-block"===o.type&&"string"==typeof r.content){var l=r.content.replace(/\b#/g,"sharp").replace(/\b\+\+/g,"pp"),d="language-"+(l=(/[a-z][\w-]*/i.exec(l)||[""])[0].toLowerCase());o.alias?"string"==typeof o.alias?o.alias=[o.alias,d]:o.alias.push(d):o.alias=[d]}}else n(i.content)}}(n.tokens)}),p.hooks.add("wrap",function(n){if("code-block"===n.type){for(var e="",t=0,a=n.classes.length;t<a;t++){var i=n.classes[t],r=/language-(.+)/.exec(i);if(r){e=r[1];break}}var o=p.languages[e];if(o){var l=document.createElement("div");l.innerHTML=n.content;var d=l.textContent;n.content=p.highlight(d,o,e)}else if(e&&"none"!==e&&p.plugins.autoloader){var s="md-"+(new Date).valueOf()+"-"+Math.floor(1e16*Math.random());n.attributes.id=s,p.plugins.autoloader.loadLanguages(e,function(){var n=document.getElementById(s);n&&(n.innerHTML=p.highlight(n.textContent,p.languages[e],e))})}}}),p.languages.md=p.languages.markdown}(Prism);
\ No newline at end of file
diff --git a/tests/languages/markdown/bold_feature.test b/tests/languages/markdown/bold_feature.test
index 2b48e77d6b..9bfef198e4 100644
--- a/tests/languages/markdown/bold_feature.test
+++ b/tests/languages/markdown/bold_feature.test
@@ -10,12 +10,14 @@ __foo _bar_ baz__
 __foo ~bar~ baz__
 __foo ~~bar~~ baz__
 __foo[bar](baz)__
+__foo `bar`__
 
 **foo *bar* baz**
 **foo _bar_ baz**
 **foo ~bar~ baz**
 **foo ~~bar~~ baz**
 **foo[bar](baz)**
+**foo `bar`**
 
 not__bold__ __this__either
 
@@ -109,6 +111,14 @@ not__bold__ __this__either
 		]],
 		["punctuation", "__"]
 	]],
+	["bold", [
+		["punctuation", "__"],
+		["content", [
+			"foo ",
+			["code-snippet", "`bar`"]
+		]],
+		["punctuation", "__"]
+	]],
 
 	["bold", [
 		["punctuation", "**"],
@@ -176,6 +186,14 @@ not__bold__ __this__either
 		]],
 		["punctuation", "**"]
 	]],
+	["bold", [
+		["punctuation", "**"],
+		["content", [
+			"foo ",
+			["code-snippet", "`bar`"]
+		]],
+		["punctuation", "**"]
+	]],
 
 	"\r\n\r\nnot__bold__ __this__either"
 ]
diff --git a/tests/languages/markdown/code_feature.test b/tests/languages/markdown/code_feature.test
index 3f7abf3e0a..b2e5a77f83 100644
--- a/tests/languages/markdown/code_feature.test
+++ b/tests/languages/markdown/code_feature.test
@@ -13,14 +13,15 @@ var a = 0;
 ----------------------------------------------------
 
 [
-	["code", "`foo bar baz`"],
-	["code", "``foo `bar` baz``"],
+	["code-snippet", "`foo bar baz`"],
+	["code-snippet", "``foo `bar` baz``"],
+
 	["code", "    foobar"],
+
 	["code", "\tfoobar\r\n\tcontinuous"],
 
 	["code", [
-		["punctuation", "```"],
-		["code-language", " js"],
+		["punctuation", "```"], ["code-language", " js"],
 		["code-block", "var a = 0;"],
 		["punctuation", "```"]
 	]]
diff --git a/tests/languages/markdown/issue2966.test b/tests/languages/markdown/issue2966.test
new file mode 100644
index 0000000000..a4a10c0264
--- /dev/null
+++ b/tests/languages/markdown/issue2966.test
@@ -0,0 +1,17 @@
+* foo
+* `asd` afsdfsdfsdf
+* foo
+    * foo
+    * `REM`
+    * foo
+
+----------------------------------------------------
+
+[
+	["list", "*"], " foo\r\n",
+	["list", "*"], ["code-snippet", "`asd`"], " afsdfsdfsdf\r\n",
+	["list", "*"], " foo\r\n    ",
+	["list", "*"], " foo\r\n    ",
+	["list", "*"], ["code-snippet", "`REM`"],
+	["list", "*"], " foo"
+]
diff --git a/tests/languages/markdown/italic_feature.test b/tests/languages/markdown/italic_feature.test
index af60ee09a4..c513d58e1a 100644
--- a/tests/languages/markdown/italic_feature.test
+++ b/tests/languages/markdown/italic_feature.test
@@ -10,12 +10,14 @@ _foo **bar** baz_
 _foo ~bar~ baz_
 _foo ~~bar~~ baz_
 _foo[bar](baz)_
+_foo `bar`_
 
 *foo __bar__ baz*
 *foo **bar** baz*
 *foo ~bar~ baz*
 *foo ~~bar~~ baz*
 *foo[bar](baz)*
+*foo `bar`*
 
 not_italic_ _this_either
 
@@ -109,6 +111,14 @@ not_italic_ _this_either
 		]],
 		["punctuation", "_"]
 	]],
+	["italic", [
+		["punctuation", "_"],
+		["content", [
+			"foo ",
+			["code-snippet", "`bar`"]
+		]],
+		["punctuation", "_"]
+	]],
 
 	["italic", [
 		["punctuation", "*"],
@@ -176,6 +186,14 @@ not_italic_ _this_either
 		]],
 		["punctuation", "*"]
 	]],
+	["italic", [
+		["punctuation", "*"],
+		["content", [
+			"foo ",
+			["code-snippet", "`bar`"]
+		]],
+		["punctuation", "*"]
+	]],
 
 	"\r\n\r\nnot_italic_ _this_either"
 ]
diff --git a/tests/languages/markdown/strike_feature.test b/tests/languages/markdown/strike_feature.test
index e1af2cacdd..9aeda5f231 100644
--- a/tests/languages/markdown/strike_feature.test
+++ b/tests/languages/markdown/strike_feature.test
@@ -10,12 +10,14 @@ bar~
 ~foo **bar** baz~
 ~foo __bar__ baz~
 ~foo[bar](baz)~
+~foo `bar`~
 
 ~~foo *bar* baz~~
 ~~foo _bar_ baz~~
 ~~foo **bar** baz~~
 ~~foo __bar__ baz~~
 ~~foo[bar](baz)~~
+~~foo `bar`~~
 
 ----------------------------------------------------
 
@@ -107,6 +109,14 @@ bar~
 		]],
 		["punctuation", "~"]
 	]],
+	["strike", [
+		["punctuation", "~"],
+		["content", [
+			"foo ",
+			["code-snippet", "`bar`"]
+		]],
+		["punctuation", "~"]
+	]],
 
 	["strike", [
 		["punctuation", "~~"],
@@ -173,6 +183,14 @@ bar~
 			]]
 		]],
 		["punctuation", "~~"]
+	]],
+	["strike", [
+		["punctuation", "~~"],
+		["content", [
+			"foo ",
+			["code-snippet", "`bar`"]
+		]],
+		["punctuation", "~~"]
 	]]
 ]
 
diff --git a/tests/languages/markdown/table_feature.test b/tests/languages/markdown/table_feature.test
index 3182f1b1c4..f4b3365a89 100644
--- a/tests/languages/markdown/table_feature.test
+++ b/tests/languages/markdown/table_feature.test
@@ -19,17 +19,11 @@ Markdown | Less | Pretty
 	["table", [
 		["table-header-row", [
 			["punctuation", "|"],
-			["table-header", [
-				" Tables        "
-			]],
+			["table-header", [" Tables        "]],
 			["punctuation", "|"],
-			["table-header", [
-				" Are           "
-			]],
+			["table-header", [" Are           "]],
 			["punctuation", "|"],
-			["table-header", [
-				" Cool  "
-			]],
+			["table-header", [" Cool  "]],
 			["punctuation", "|"]
 		]],
 		["table-line", [
@@ -43,60 +37,38 @@ Markdown | Less | Pretty
 		]],
 		["table-data-rows", [
 			["punctuation", "|"],
-			["table-data", [
-				" col 3 is      "
-			]],
+			["table-data", [" col 3 is      "]],
 			["punctuation", "|"],
-			["table-data", [
-				" right-aligned "
-			]],
+			["table-data", [" right-aligned "]],
 			["punctuation", "|"],
-			["table-data", [
-				" $1600 "
-			]],
+			["table-data", [" $1600 "]],
 			["punctuation", "|"],
+
 			["punctuation", "|"],
-			["table-data", [
-				" col 2 is      "
-			]],
+			["table-data", [" col 2 is      "]],
 			["punctuation", "|"],
-			["table-data", [
-				" centered      "
-			]],
+			["table-data", [" centered      "]],
 			["punctuation", "|"],
-			["table-data", [
-				"   $12 "
-			]],
+			["table-data", ["   $12 "]],
 			["punctuation", "|"],
+
 			["punctuation", "|"],
-			["table-data", [
-				" zebra stripes "
-			]],
+			["table-data", [" zebra stripes "]],
 			["punctuation", "|"],
-			["table-data", [
-				" are neat      "
-			]],
+			["table-data", [" are neat      "]],
 			["punctuation", "|"],
-			["table-data", [
-				"    $1 "
-			]],
+			["table-data", ["    $1 "]],
 			["punctuation", "|"]
 		]]
 	]],
 
 	["table", [
 		["table-header-row", [
-			["table-header", [
-				"Markdown "
-			]],
+			["table-header", ["Markdown "]],
 			["punctuation", "|"],
-			["table-header", [
-				" Less "
-			]],
+			["table-header", [" Less "]],
 			["punctuation", "|"],
-			["table-header", [
-				" Pretty"
-			]]
+			["table-header", [" Pretty"]]
 		]],
 		["table-line", [
 			["punctuation", "---"],
@@ -109,50 +81,37 @@ Markdown | Less | Pretty
 			["table-data", [
 				["italic", [
 					["punctuation", "*"],
-					["content", [
-						"Still"
-					]],
+					["content", ["Still"]],
 					["punctuation", "*"]
 				]]
 			]],
 			["punctuation", "|"],
 			["table-data", [
-				["code", "`renders`"]
+				["code-snippet", "`renders`"]
 			]],
 			["punctuation", "|"],
 			["table-data", [
 				["bold", [
 					["punctuation", "**"],
-					["content", [
-						"nicely"
-					]],
+					["content", ["nicely"]],
 					["punctuation", "**"]
 				]]
 			]],
-			["table-data", [
-				"1 "
-			]],
+
+			["table-data", ["1 "]],
 			["punctuation", "|"],
-			["table-data", [
-				" 2 "
-			]],
+			["table-data", [" 2 "]],
 			["punctuation", "|"],
-			["table-data", [
-				" 3"
-			]]
+			["table-data", [" 3"]]
 		]]
 	]],
 
 	["table", [
 		["table-header-row", [
 			["punctuation", "|"],
-			["table-header", [
-				"Abc "
-			]],
+			["table-header", ["Abc "]],
 			["punctuation", "|"],
-			["table-header", [
-				" Def   "
-			]],
+			["table-header", [" Def   "]],
 			["punctuation", "|"]
 		]],
 		["table-line", [
@@ -163,12 +122,10 @@ Markdown | Less | Pretty
 		["table-data-rows", [
 			["punctuation", "|"],
 			["table-data", [
-				["code", "`` `. ``"]
+				["code-snippet", "`` `. ``"]
 			]],
 			["punctuation", "|"],
-			["table-data", [
-				"2"
-			]],
+			["table-data", ["2"]],
 			["punctuation", "|"]
 		]]
 	]]
diff --git a/tests/languages/markdown/url_feature.test b/tests/languages/markdown/url_feature.test
index 6f49a3ccd7..bc72965bcd 100644
--- a/tests/languages/markdown/url_feature.test
+++ b/tests/languages/markdown/url_feature.test
@@ -12,6 +12,8 @@ bar](http://prismjs.com)
 [foo __bar__ baz](http://prismjs.com)
 [foo ~bar~ baz](http://prismjs.com)
 [foo ~~bar~~ baz](http://prismjs.com)
+[foo `bar` baz](http://prismjs.com)
+[`bar`](http://prismjs.com)
 
 ----------------------------------------------------
 
@@ -144,6 +146,26 @@ bar](http://prismjs.com)
 		"](",
 		["url", "http://prismjs.com"],
 		")"
+	]],
+	["url", [
+		"[",
+		["content", [
+			"foo ",
+			["code-snippet", "`bar`"],
+			" baz"
+		]],
+		"](",
+		["url", "http://prismjs.com"],
+		")"
+	]],
+	["url", [
+		"[",
+		["content", [
+			["code-snippet", "`bar`"]
+		]],
+		"](",
+		["url", "http://prismjs.com"],
+		")"
 	]]
 ]