diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 15c11c7..e44281b 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -427,12 +427,12 @@
 def _CheckPNGFormat(input_api, output_api):
   """Checks that .png files have a format that will be considered valid by our
   test runners. If a file ends with .png, then it must be of the form
-  NAME_expected(_(skia|skiapaths))?(_(win|mac|linux))?.pdf.#.png
+  NAME_expected(_skia)?(_(win|mac|linux))?.pdf.#.png
   The expected format used by _CheckPngNames() in testing/corpus/PRESUBMIT.py
   must be the same as this one.
   """
   expected_pattern = input_api.re.compile(
-      r'.+_expected(_(skia|skiapaths))?(_(win|mac|linux))?\.pdf\.\d+.png')
+      r'.+_expected(_skia)?(_(win|mac|linux))?\.pdf\.\d+.png')
   results = []
   for f in input_api.AffectedFiles(include_deletes=False):
     if not f.LocalPath().endswith('.png'):
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 27fb43f..1c637e8 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -56,9 +56,7 @@
         'test_expected.pdf.0.png',
         'test_expected_win.pdf.1.png',
         'test_expected_skia.pdf.2.png',
-        'test_expected_skiapaths.pdf.3.png',
         'test_expected_skia_mac.pdf.4.png',
-        'test_expected_skiapaths_win.pdf.5.png',
         'notpng.cc',  # Check will be skipped for non-PNG files
     ]
     wrong_paths = [
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index a4d6f40..1698259 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -10,7 +10,7 @@
 # Column 1: platform: *, win, mac, linux
 # Column 2: v8 support: *, nov8, v8
 # Column 3: xfa support: *, noxfa, xfa
-# Column 4: rendering support: *, agg, skia, skiapaths
+# Column 4: rendering support: *, agg, skia
 #
 # All columns on a line on a line must match, but filenames may be repeated
 # on subsequent lines to suppress more cases.  Within each column, any one of
@@ -31,7 +31,7 @@
 1_3_callout.pdf * * * *
 
 # TODO(pdfium:1805): Remove after associated bug is fixed
-1_matrix.pdf * * * skia,skiapaths
+1_matrix.pdf * * * skia
 
 1_matrix.pdf mac * * *
 1m_diff_lsjdf.pdf mac * * *
@@ -65,12 +65,7 @@
 8.2_outline.pdf mac * * *
 8.3_presentation.pdf mac * * *
 FRC_10_8.2.2__T8.3_original_file.pdf * * * *
-
-# TODO(pdfium:1858): Remove after associated bug is fixed
-FRC_10_8.2.4_View_C.pdf * * * skiapaths
-
 FRC_11_8.2.2__T8.3_first_last_exchange.pdf * * * *
-
 FRC_12_8.2.2__T8.3_first_outline_obj_ID.pdf * * * *
 FRC_13_8.2.2__T8.3_Count_edit300.pdf * * * *
 FRC_14_8.2.2__T8.3_Count_edit0.pdf * * * *
@@ -141,7 +136,7 @@
 annotation_highlight_no_author.pdf mac * * *
 
 # TODO(pdfium:1871): Remove after associated bug is fixed
-annotation_square_dash.pdf * * * skia,skiapaths
+annotation_square_dash.pdf * * * skia
 
 app_launchurl.pdf mac * * *
 appstoredescription3.1_en_updated.pdf mac * * *
@@ -151,7 +146,7 @@
 bug_0_length_line.pdf mac * * *
 
 # TODO(pdfium:1812): Remove after associated bug is fixed
-bug_0_length_line.pdf * * * skia,skiapaths
+bug_0_length_line.pdf * * * skia
 
 bug_0_width_line.pdf mac * * *
 bug_440132.pdf mac * * *
@@ -390,7 +385,7 @@
 
 # TODO(pdfium:1804): Remove after associated bug is fixed
 # TODO(pdfium:1845): Remove after associated bug is fixed
-xfermodes3.pdf * * * skia,skiapaths
+xfermodes3.pdf * * * skia
 
 zh_file1.pdf mac * * *
 zh_function_list.pdf mac * * *
@@ -472,13 +467,13 @@
 bug_492.in * nov8 * *
 
 # TODO(chromium:725555, skia:9265): Remove after associated bug is fixed
-bug_725555.in * * * skia,skiapaths
+bug_725555.in * * * skia
 
 # TODO(pdfium:983289): Remove after associated bug is fixed
 bug_983289.in * * * agg
 
 # TODO(pdfium:1310): Remove after associated bug is fixed
-radial_shading_point_at_border.in * * * skia,skiapaths
+radial_shading_point_at_border.in * * * skia
 
 # TODO(chromium:1028991): Remove after associated bug is fixed
 reset_button.in * * * *
@@ -490,7 +485,7 @@
 # TODO(pdfium:1107): Remove after associated bug is fixed
 standard_symbols.pdf * * * *
 # TODO(pdfium:1902): Remove after associated bug is fixed
-xfa_bmp_image.in * * * skia,skiapaths
+xfa_bmp_image.in * * * skia
 # TODO(pdfium:1095): Remove after associated bug is fixed
 xfa_example.in win * * *
 # TODO(pdfium:1095): Remove after associated bug is fixed
diff --git a/testing/SUPPRESSIONS_IMAGE_DIFF b/testing/SUPPRESSIONS_IMAGE_DIFF
index 816278e..e501756 100644
--- a/testing/SUPPRESSIONS_IMAGE_DIFF
+++ b/testing/SUPPRESSIONS_IMAGE_DIFF
@@ -10,7 +10,7 @@
 # Column 1: platform: *, win, mac, linux
 # Column 2: v8 support: *, nov8, v8
 # Column 3: xfa support: *, noxfa, xfa
-# Column 4: rendering support: *, agg, skia, skiapaths
+# Column 4: rendering support: *, agg, skia
 #
 # All columns on a line on a line must match, but filenames may be repeated
 # on subsequent lines to suppress more cases.  Within each column, any one of
diff --git a/testing/resources/pixel/bug_1015233_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1015233_expected_skiapaths.pdf.0.png
deleted file mode 100644
index b960985..0000000
--- a/testing/resources/pixel/bug_1015233_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1072440_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1072440_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 1d29cb2..0000000
--- a/testing/resources/pixel/bug_1072440_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_113910_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_113910_expected_skiapaths.pdf.0.png
deleted file mode 100644
index c3e6a65..0000000
--- a/testing/resources/pixel/bug_113910_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1258968_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1258968_expected_skiapaths.pdf.0.png
deleted file mode 100644
index fc9d311..0000000
--- a/testing/resources/pixel/bug_1258968_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1288_2_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1288_2_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 3a8cbee..0000000
--- a/testing/resources/pixel/bug_1288_2_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1355_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1355_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 6bb03ec..0000000
--- a/testing/resources/pixel/bug_1355_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1372651_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1372651_expected_skiapaths.pdf.0.png
deleted file mode 100644
index f33a4a7..0000000
--- a/testing/resources/pixel/bug_1372651_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1402_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_1402_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 38ea7c4..0000000
--- a/testing/resources/pixel/bug_1402_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1402_expected_skiapaths_mac.pdf.0.png b/testing/resources/pixel/bug_1402_expected_skiapaths_mac.pdf.0.png
deleted file mode 100644
index bd0190d..0000000
--- a/testing/resources/pixel/bug_1402_expected_skiapaths_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_632_expected_skiapaths.pdf.1.png b/testing/resources/pixel/bug_632_expected_skiapaths.pdf.1.png
deleted file mode 100644
index 3e66da2..0000000
--- a/testing/resources/pixel/bug_632_expected_skiapaths.pdf.1.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_725389_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_725389_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 1c20777..0000000
--- a/testing/resources/pixel/bug_725389_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_725389_expected_skiapaths_mac.pdf.0.png b/testing/resources/pixel/bug_725389_expected_skiapaths_mac.pdf.0.png
deleted file mode 100644
index 841c05f..0000000
--- a/testing/resources/pixel/bug_725389_expected_skiapaths_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_733528_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_733528_expected_skiapaths.pdf.0.png
deleted file mode 100644
index d18d646..0000000
--- a/testing/resources/pixel/bug_733528_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_2_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_736695_2_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 109b409..0000000
--- a/testing/resources/pixel/bug_736695_2_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_3_expected_skiapaths.pdf.0.png b/testing/resources/pixel/bug_736695_3_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 52177cd..0000000
--- a/testing/resources/pixel/bug_736695_3_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/password_expected_skiapaths.pdf.0.png b/testing/resources/pixel/password_expected_skiapaths.pdf.0.png
deleted file mode 100644
index f1dd5de..0000000
--- a/testing/resources/pixel/password_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets1_expected_skiapaths.pdf.0.png b/testing/resources/pixel/scrollable_widgets1_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 7b142e3..0000000
--- a/testing/resources/pixel/scrollable_widgets1_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets2_expected_skiapaths.pdf.0.png b/testing/resources/pixel/scrollable_widgets2_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 32c7bdc..0000000
--- a/testing/resources/pixel/scrollable_widgets2_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/text_form_custom_font_expected_skiapaths.pdf.0.png b/testing/resources/pixel/text_form_custom_font_expected_skiapaths.pdf.0.png
deleted file mode 100644
index b0554ff..0000000
--- a/testing/resources/pixel/text_form_custom_font_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/barcode_test_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/barcode_test_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 6507e89..0000000
--- a/testing/resources/pixel/xfa_specific/barcode_test_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skiapaths.pdf.0.png
deleted file mode 100644
index fa3f18e..0000000
--- a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skiapaths_mac.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skiapaths_mac.pdf.0.png
deleted file mode 100644
index 5ecc169..0000000
--- a/testing/resources/pixel/xfa_specific/dynamic_list_box_allow_multiple_selection_expected_skiapaths_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 548f3df..0000000
--- a/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skiapaths.pdf.0.png
deleted file mode 100644
index fa03e41..0000000
--- a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skiapaths.pdf.0.png
deleted file mode 100644
index db738e5..0000000
--- a/testing/resources/pixel/xfa_specific/resolve_nodes_0_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 993ebaa..0000000
--- a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skiapaths.pdf.1.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skiapaths.pdf.1.png
deleted file mode 100644
index f621be2..0000000
--- a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_skiapaths.pdf.1.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/use_ahem/xfa_textfield_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/use_ahem/xfa_textfield_expected_skiapaths.pdf.0.png
deleted file mode 100644
index afa8871..0000000
--- a/testing/resources/pixel/xfa_specific/use_ahem/xfa_textfield_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths.pdf.0.png
deleted file mode 100644
index 467aa37..0000000
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths.pdf.1.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths.pdf.1.png
deleted file mode 100644
index cfb099d..0000000
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths.pdf.1.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths_win.pdf.0.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths_win.pdf.0.png
deleted file mode 100644
index 96dfdde..0000000
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths_win.pdf.1.png b/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths_win.pdf.1.png
deleted file mode 100644
index 040de88..0000000
--- a/testing/resources/pixel/xfa_specific/xfa_node_caption_expected_skiapaths_win.pdf.1.png
+++ /dev/null
Binary files differ
diff --git a/testing/tools/pngdiffer.py b/testing/tools/pngdiffer.py
index 7fda9a4..4c371ea 100755
--- a/testing/tools/pngdiffer.py
+++ b/testing/tools/pngdiffer.py
@@ -20,14 +20,10 @@
     DEFAULT:   Used for default expected paths in the format of
                'NAME_expected(_OSNAME)?.pdf.#.png'. For a test, this path always
                exists.
-    SKIA:      Used when Skia or SkiaPaths is enabled, for paths in the format
-               of 'NAME_expected_skia(_OSNAME)?.pdf.#.png'.
-               Such paths only exist when the expected results of Skia or
-               SkiaPaths are different from those of AGG.
-    SKIAPATHS: Used when SkiaPaths is enabled, for path in the format of
-               'NAME_expected_skiapaths(_OSNAME)?.pdf.#.png'.
-               Such paths only exist when the expected results from using AGG,
-               Skia and SkiaPaths are all different from each other.
+    SKIA:      Used when Skia is enabled, for paths in the format of
+               'NAME_expected_skia(_OSNAME)?.pdf.#.png'.
+               Such paths only exist when the expected results of Skia are
+               different from those of AGG.
 
   Always check PathMode in an incrementing order as the modes are listed in
   order of its matching paths' precedence.
@@ -35,7 +31,6 @@
 
   DEFAULT = 0
   SKIA = 1
-  SKIAPATHS = 2
 
 
 @dataclass
@@ -60,9 +55,7 @@
     self.pdfium_diff_path = finder.ExecutablePath('pdfium_diff')
     self.os_name = finder.os_name
     self.reverse_byte_order = reverse_byte_order
-    if 'SKIAPATHS' in features:
-      self.max_path_mode = PathMode.SKIAPATHS
-    elif 'SKIA' in features:
+    if 'SKIA' in features:
       self.max_path_mode = PathMode.SKIA
     else:
       self.max_path_mode = PathMode.DEFAULT
@@ -152,8 +145,8 @@
 
     return image_diffs
 
-  # TODO(crbug.com/pdfium/1508): Add support to automatically generate
-  # Skia/SkiaPaths specific expected results.
+  # TODO(crbug.com/pdfium/1508): Add support to automatically generate Skia
+  # specific expected results.
   def Regenerate(self, input_filename, source_dir, working_dir, platform_only):
     path_templates = PathTemplates(input_filename, source_dir, working_dir,
                                    self.os_name, self.max_path_mode)
@@ -191,7 +184,7 @@
 
   def __init__(self, input_filename, source_dir, working_dir, os_name,
                max_path_mode):
-    assert PathMode.DEFAULT <= max_path_mode <= PathMode.SKIAPATHS, (
+    assert PathMode.DEFAULT <= max_path_mode <= PathMode.SKIA, (
         'Unexpected Maximum PathMode: %d.' % max_path_mode)
 
     input_root, _ = os.path.splitext(input_filename)
@@ -224,8 +217,6 @@
       pass
     elif mode == PathMode.SKIA:
       expected_str += '_skia'
-    elif mode == PathMode.SKIAPATHS:
-      expected_str += '_skiapaths'
     else:
       assert False, 'Unexpected PathMode: %d.' % mode
 
diff --git a/testing/tools/suppressor.py b/testing/tools/suppressor.py
index a5be40a..a7146c5 100755
--- a/testing/tools/suppressor.py
+++ b/testing/tools/suppressor.py
@@ -13,7 +13,6 @@
   def __init__(self, finder, features, js_disabled, xfa_disabled):
     self.has_v8 = not js_disabled and 'V8' in features
     self.has_xfa = not js_disabled and not xfa_disabled and 'XFA' in features
-    self.has_skiapaths = 'SKIAPATHS' in features
     self.has_skia = 'SKIA' in features
     self.suppression_set = self._LoadSuppressedSet('SUPPRESSIONS', finder)
     self.image_suppression_set = self._LoadSuppressedSet(
@@ -22,8 +21,7 @@
   def _LoadSuppressedSet(self, suppressions_filename, finder):
     v8_option = "v8" if self.has_v8 else "nov8"
     xfa_option = "xfa" if self.has_xfa else "noxfa"
-    rendering_option = "skia" if self.has_skia else (
-        "skiapaths" if self.has_skiapaths else "agg")
+    rendering_option = "skia" if self.has_skia else "agg"
     with open(os.path.join(finder.TestingDir(), suppressions_filename)) as f:
       return set(
           self._FilterSuppressions(common.os_name(), v8_option,
diff --git a/testing/tools/test_runner.py b/testing/tools/test_runner.py
index e695979..8ccd395 100644
--- a/testing/tools/test_runner.py
+++ b/testing/tools/test_runner.py
@@ -577,7 +577,7 @@
     return test_function()
 
   # TODO(crbug.com/pdfium/1508): Add support for an option to automatically
-  # generate Skia/SkiaPaths specific expected results.
+  # generate Skia specific expected results.
   def _RegenerateIfNeeded(self):
     if not self.options.regenerate_expected:
       return