diff --git a/tests/test_pagure_flask_ui_no_master_branch.py b/tests/test_pagure_flask_ui_no_master_branch.py
index 8700210..af288c7 100644
--- a/tests/test_pagure_flask_ui_no_master_branch.py
+++ b/tests/test_pagure_flask_ui_no_master_branch.py
@@ -226,7 +226,8 @@ class PagureFlaskNoMasterBranchtests(tests.SimplePagureTest):
           </li>
         </ol>''',  output_text)
         self.assertIn(
-            '<td class="cell2"><pre><code>foo</code></pre></td>', output_text
+            '<pre class="syntaxhighlightblock"><code>foo\n bar</code></pre>',
+            output_text
         )
 
     @patch('pagure.lib.notify.send_email')
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 311df42..f60746a 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -2227,12 +2227,9 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/test/blob/master/f/sources')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn('<table class="code_table">', output_text)
         self.assertIn(
-            '<tr><td class="cell1"><a id="_1" href="#_1" data-line-number="1"></a></td>',
+            '<pre class="syntaxhighlightblock"><code>foo\n bar</code></pre>',
             output_text)
-        self.assertIn(
-            '<td class="cell2"><pre><code> bar</code></pre></td>', output_text)
 
         # Empty files should also be displayed
         tests.add_content_to_git(
@@ -2327,12 +2324,8 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertIn(
             '</span>&nbsp; Šource',
             output_text)
-        self.assertIn('<table class="code_table">', output_text)
-        self.assertIn(
-            '<tr><td class="cell1"><a id="_1" href="#_1" '
-            'data-line-number="1"></a></td>', output_text)
         self.assertIn(
-            '<td class="cell2"><pre><code>Row 0</code></pre></td>',
+            '<pre class="syntaxhighlightblock"><code>Row 0\n</code></pre>',
             output_text
         )
 
@@ -2371,13 +2364,10 @@ class PagureFlaskRepotests(tests.Modeltests):
         output = self.app.get('/fork/pingou/test3/blob/master/f/sources')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn('<table class="code_table">', output_text)
-        self.assertIn(
-            '<tr><td class="cell1"><a id="_1" href="#_1" data-line-number="1"></a></td>',
-            output_text)
         self.assertIn(
-            '<td class="cell2"><pre><code> barRow 0</code></pre></td>',
-            output_text)
+            '<pre class="syntaxhighlightblock"><code>foo\n barRow 0\n'
+            'Row 1\nRow 2\nRow 3\nRow 4\nRow 5\nRow 6\nRow 7\nRow 8\n'
+            'Row 9\n</code></pre>', output_text)
 
     @patch(
         'pagure.lib.encoding_utils.decode',
diff --git a/tests/test_pagure_flask_ui_repo_view_file.py b/tests/test_pagure_flask_ui_repo_view_file.py
index cd551b3..06baca2 100644
--- a/tests/test_pagure_flask_ui_repo_view_file.py
+++ b/tests/test_pagure_flask_ui_repo_view_file.py
@@ -99,14 +99,10 @@ class PagureFlaskRepoViewFiletests(LocalBasetests):
         output = self.app.get('/test/blob/master/f/sources')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertTrue('<table class="code_table">' in output_text)
-        self.assertTrue(
-            '<tr><td class="cell1"><a id="_1" href="#_1" '
-            'data-line-number="1"></a></td>'
-            in output_text)
         self.assertIn(
-            '<td class="cell2"><pre><code> bar</code></pre></td>',
-             output_text)
+            '<pre class="syntaxhighlightblock"><code>foo\n bar</code></pre>',
+            output_text
+        )
 
     def test_view_file_empty_file(self):
         """ Test the view_file with an empty file. """
@@ -217,12 +213,8 @@ class PagureFlaskRepoViewFiletests(LocalBasetests):
         self.assertEqual(output.headers['Content-Type'].lower(),
                          'text/html; charset=utf-8')
         self.assertIn('</span>&nbsp; Šource', output_text)
-        self.assertIn('<table class="code_table">', output_text)
-        self.assertIn(
-            '<tr><td class="cell1"><a id="_1" href="#_1" '
-            'data-line-number="1"></a></td>', output_text)
         self.assertIn(
-            '<td class="cell2"><pre><code>Row 0</code></pre></td>',
+            '<pre class="syntaxhighlightblock"><code>Row 0\n</code></pre>',
             output_text
         )
 
@@ -321,14 +313,11 @@ class PagureFlaskRepoViewFileForktests(LocalBasetests):
         output = self.app.get('/fork/pingou/test/blob/master/f/sources')
         self.assertEqual(output.status_code, 200)
         output_text = output.get_data(as_text=True)
-        self.assertIn('<table class="code_table">', output_text)
         self.assertIn(
-            '<tr><td class="cell1"><a id="_1" href="#_1" '
-            'data-line-number="1"></a></td>',
-            output_text)
-        self.assertIn(
-            '<td class="cell2"><pre><code> barRow 0</code></pre></td>',
-            output_text)
+            '<pre class="syntaxhighlightblock"><code>foo\n barRow 0\n'
+            'Row 1\nRow 2\nRow 3\nRow 4\nRow 5\nRow 6\nRow 7\nRow 8\n'
+            'Row 9\n</code></pre>', output_text
+        )
 
     def test_view_file_fork_and_edit_on_fork_logged_out(self):
         """ Test the view_file on a text file on a fork when logged out. """
diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py
index 43f657f..56421d3 100644
--- a/tests/test_pagure_flask_ui_slash_branch_name.py
+++ b/tests/test_pagure_flask_ui_slash_branch_name.py
@@ -228,7 +228,9 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest):
           </li>
         </ol>''', output_text)
         self.assertIn(
-            '<td class="cell2"><pre><code>*~</code></pre></td>', output_text)
+            '<pre class="syntaxhighlightblock"><code>*~</code></pre>',
+            output_text
+        )
 
     @patch('pagure.lib.notify.send_email')
     def test_view_raw_file(self, send_email):