diff --git a/PIL/TiffImagePlugin.py b/PIL/TiffImagePlugin.py
index fe658d22c..11b92747c 100644
--- a/PIL/TiffImagePlugin.py
+++ b/PIL/TiffImagePlugin.py
@@ -984,11 +984,7 @@ def _save(im, fp, filename):
 
     compression = im.encoderinfo.get('compression',im.info.get('compression','raw'))
 
-    libtiff = WRITE_LIBTIFF or compression in ["tiff_ccitt", "group3", "group4",
-                                               "tiff_jpeg", "tiff_adobe_deflate",
-                                               "tiff_thunderscan", "tiff_deflate",
-                                               "tiff_sgilog", "tiff_sgilog24",
-                                               "tiff_raw_16"]
+    libtiff = WRITE_LIBTIFF or compression != 'raw' 
 
     # required for color libtiff images
     ifd[PLANAR_CONFIGURATION] = getattr(im, '_planar_configuration', 1)
diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index a53593a9e..58fa75239 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -258,9 +258,6 @@ def test_compressions():
     im = lena('RGB')
     out = tempfile('temp.tif')
 
-    TiffImagePlugin.READ_LIBTIFF = True
-    TiffImagePlugin.WRITE_LIBTIFF = True
-
     for compression in ('packbits', 'tiff_lzw'):
         im.save(out, compression=compression)
         im2 = Image.open(out)
@@ -270,11 +267,6 @@ def test_compressions():
     im2 = Image.open(out)
     assert_image_similar(im, im2, 30)
                             
-    TiffImagePlugin.READ_LIBTIFF = False
-    TiffImagePlugin.WRITE_LIBTIFF = False
-
-
-
 
 def test_cmyk_save():
     im = lena('CMYK')