diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index 14939469a..476010c36 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -4,7 +4,7 @@ from PIL import Image, TiffImagePlugin
 
 codecs = dir(Image.core)
 
-if "group4_encoder" not in codecs or "group4_decoder" not in codecs:
+if "libtiff_encoder" not in codecs or "libtiff_decoder" not in codecs:
     skip("tiff support not available")
 
 def _assert_noerr(im):
diff --git a/Tests/test_file_libtiff_small.py b/Tests/test_file_libtiff_small.py
index e0f014980..2ad71d6e6 100644
--- a/Tests/test_file_libtiff_small.py
+++ b/Tests/test_file_libtiff_small.py
@@ -6,7 +6,7 @@ from test_file_libtiff import _assert_noerr
 
 codecs = dir(Image.core)
 
-if "group4_encoder" not in codecs or "group4_decoder" not in codecs:
+if "libtiff_encoder" not in codecs or "libtiff_decoder" not in codecs:
     skip("tiff support not available")
 
 """ The small lena image was failing on open in the libtiff
diff --git a/_imaging.c b/_imaging.c
index 6bd87293f..ecd67d63c 100644
--- a/_imaging.c
+++ b/_imaging.c
@@ -3317,28 +3317,7 @@ static PyMethodDef functions[] = {
     {"tiff_lzw_decoder", (PyCFunction)PyImaging_TiffLzwDecoderNew, 1},
 #ifdef HAVE_LIBTIFF
     {"libtiff_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_ccitt_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"group3_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"group4_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_jpeg_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_adobe_deflate_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_thunderscan_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_deflate_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_sgilog_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_sgilog24_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-    {"tiff_raw_16_decoder", (PyCFunction)PyImaging_LibTiffDecoderNew, 1},
-
     {"libtiff_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_ccitt_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"group3_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"group4_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_jpeg_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_adobe_deflate_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_thunderscan_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_deflate_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_sgilog_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_sgilog24_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
-    {"tiff_raw_16_encoder", (PyCFunction)PyImaging_LibTiffEncoderNew, 1},
 #endif
     {"msp_decoder", (PyCFunction)PyImaging_MspDecoderNew, 1},
     {"packbits_decoder", (PyCFunction)PyImaging_PackbitsDecoderNew, 1},