diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index b4b67ba17..3b341a656 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -244,6 +244,7 @@ try:
         md = markdown.Markdown(
             extensions=extensions, extension_configs=extension_configs
         )
+        md_filter_add_syntax_highlight(md)
         return md.convert(text)
 except ImportError:
     apply_markdown = None
@@ -274,6 +275,12 @@ except ImportError:
         return None
 
 if markdown is not None and pygments is not None:
+    # starting from this blogpost and modified to support current markdown extensions API
+    # https://zerokspot.com/weblog/2008/06/18/syntax-highlighting-in-markdown-with-pygments/
+
+    from markdown.preprocessors import Preprocessor
+    import re
+
     class CodeBlockPreprocessor(Preprocessor):
         pattern = re.compile(
             r'^\s*@@ (.+?) @@\s*(.+?)^\s*@@', re.M|re.S)
diff --git a/tests/test_description.py b/tests/test_description.py
index 4df14ac55..a97550ed8 100644
--- a/tests/test_description.py
+++ b/tests/test_description.py
@@ -24,11 +24,36 @@ another header
 
 indented
 
-# hash style header #"""
+# hash style header #
+
+@@ json @@
+[{
+    "alpha": 1,
+    "beta: "this is a string"
+}]
+@@"""
 
 # If markdown is installed we also test it's working
 # (and that our wrapped forces '=' to h2 and '-' to h3)
 
+MARKED_DOWN_HILITE = """
+<div class="highlight"><pre><span></span><span \
+class="p">[{</span><br />    <span class="nt">&quot;alpha&quot;</span><span\
+ class="p">:</span> <span class="mi">1</span><span class="p">,</span><br />\
+    <span class="nt">&quot;beta: &quot;</span><span class="err">this</span>\
+ <span class="err">is</span> <span class="err">a</span> <span class="err">\
+string&quot;</span><br /><span class="p">}]</span><br /></pre></div>
+
+<p><br /></p>"""
+
+MARKED_DOWN_NOT_HILITE = """
+<p>@@ json @@
+[{
+    "alpha": 1,
+    "beta: "this is a string"
+}]
+@@</p>"""
+
 # We support markdown < 2.1 and markdown >= 2.1
 MARKED_DOWN_lt_21 = """<h2>an example docstring</h2>
 <ul>
@@ -39,7 +64,7 @@ MARKED_DOWN_lt_21 = """<h2>an example docstring</h2>
 <pre><code>code block
 </code></pre>
 <p>indented</p>
-<h2 id="hash_style_header">hash style header</h2>"""
+<h2 id="hash_style_header">hash style header</h2>%s"""
 
 MARKED_DOWN_gte_21 = """<h2 id="an-example-docstring">an example docstring</h2>
 <ul>
@@ -50,7 +75,7 @@ MARKED_DOWN_gte_21 = """<h2 id="an-example-docstring">an example docstring</h2>
 <pre><code>code block
 </code></pre>
 <p>indented</p>
-<h2 id="hash-style-header">hash style header</h2>"""
+<h2 id="hash-style-header">hash style header</h2>%s"""
 
 
 class TestViewNamesAndDescriptions(TestCase):
@@ -78,7 +103,14 @@ class TestViewNamesAndDescriptions(TestCase):
 
             indented
 
-            # hash style header #"""
+            # hash style header #
+
+            @@ json @@
+            [{
+                "alpha": 1,
+                "beta: "this is a string"
+            }]
+            @@"""
 
         assert MockView().get_view_description() == DESCRIPTION
 
@@ -118,8 +150,16 @@ class TestViewNamesAndDescriptions(TestCase):
         Ensure markdown to HTML works as expected.
         """
         if apply_markdown:
-            gte_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_gte_21
-            lt_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_lt_21
+            gte_21_match = (
+                apply_markdown(DESCRIPTION) == (
+                    MARKED_DOWN_gte_21 % MARKED_DOWN_HILITE) or
+                apply_markdown(DESCRIPTION) == (
+                    MARKED_DOWN_gte_21 % MARKED_DOWN_NOT_HILITE))
+            lt_21_match = (
+                apply_markdown(DESCRIPTION) == (
+                    MARKED_DOWN_lt_21 % MARKED_DOWN_HILITE) or
+                apply_markdown(DESCRIPTION) == (
+                    MARKED_DOWN_lt_21 % MARKED_DOWN_NOT_HILITE))
             assert gte_21_match or lt_21_match