diff --git a/Tests/images/rgb_trns_ycbc.j2k b/Tests/images/rgb_trns_ycbc.j2k
new file mode 100644
index 000000000..462729501
Binary files /dev/null and b/Tests/images/rgb_trns_ycbc.j2k differ
diff --git a/Tests/images/rgb_trns_ycbc.jp2 b/Tests/images/rgb_trns_ycbc.jp2
new file mode 100644
index 000000000..dea77c6da
Binary files /dev/null and b/Tests/images/rgb_trns_ycbc.jp2 differ
diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index b11e5e6ab..628c53437 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -1,7 +1,6 @@
 from tester import *
 
 from PIL import Image
-from PIL import ImageFile
 
 codecs = dir(Image.core)
 
@@ -15,18 +14,20 @@ ignore('Not enough memory to handle tile data')
 test_card = Image.open('Tests/images/test-card.png')
 test_card.load()
 
+
 def roundtrip(im, **options):
     out = BytesIO()
     im.save(out, "JPEG2000", **options)
     bytes = out.tell()
     out.seek(0)
     im = Image.open(out)
-    im.bytes = bytes # for testing only
+    im.bytes = bytes  # for testing only
     im.load()
     return im
 
 # ----------------------------------------------------------------------
 
+
 def test_sanity():
     # Internal version number
     assert_match(Image.core.jp2klib_version, '\d+\.\d+\.\d+$')
@@ -36,9 +37,10 @@ def test_sanity():
     assert_equal(im.mode, 'RGB')
     assert_equal(im.size, (640, 480))
     assert_equal(im.format, 'JPEG2000')
-    
+
 # ----------------------------------------------------------------------
 
+
 # These two test pre-written JPEG 2000 files that were not written with
 # PIL (they were made using Adobe Photoshop)
 
@@ -48,6 +50,7 @@ def test_lossless():
     im.save('/tmp/test-card.png')
     assert_image_similar(im, test_card, 1.0e-3)
 
+
 def test_lossy_tiled():
     im = Image.open('Tests/images/test-card-lossy-tiled.jp2')
     im.load()
@@ -55,49 +58,58 @@ def test_lossy_tiled():
 
 # ----------------------------------------------------------------------
 
+
 def test_lossless_rt():
     im = roundtrip(test_card)
     assert_image_equal(im, test_card)
 
+
 def test_lossy_rt():
     im = roundtrip(test_card, quality_layers=[20])
     assert_image_similar(im, test_card, 2.0)
 
+
 def test_tiled_rt():
     im = roundtrip(test_card, tile_size=(128, 128))
     assert_image_equal(im, test_card)
 
+
 def test_tiled_offset_rt():
     im = roundtrip(test_card, tile_size=(128, 128), tile_offset=(0, 0),
                    offset=(32, 32))
     assert_image_equal(im, test_card)
-    
+
+
 def test_irreversible_rt():
     im = roundtrip(test_card, irreversible=True, quality_layers=[20])
     assert_image_similar(im, test_card, 2.0)
 
+
 def test_prog_qual_rt():
     im = roundtrip(test_card, quality_layers=[60, 40, 20], progression='LRCP')
     assert_image_similar(im, test_card, 2.0)
 
+
 def test_prog_res_rt():
     im = roundtrip(test_card, num_resolutions=8, progression='RLCP')
     assert_image_equal(im, test_card)
 
 # ----------------------------------------------------------------------
 
+
 def test_reduce():
     im = Image.open('Tests/images/test-card-lossless.jp2')
     im.reduce = 2
     im.load()
     assert_equal(im.size, (160, 120))
 
+
 def test_layers():
     out = BytesIO()
     test_card.save(out, 'JPEG2000', quality_layers=[100, 50, 10],
                    progression='LRCP')
     out.seek(0)
-    
+
     im = Image.open(out)
     im.layers = 1
     im.load()
@@ -108,3 +120,17 @@ def test_layers():
     im.layers = 3
     im.load()
     assert_image_similar(im, test_card, 0.4)
+
+
+def test_rgba():
+    # Arrange
+    j2k = Image.open('Tests/images/rgb_trns_ycbc.j2k')
+    jp2 = Image.open('Tests/images/rgb_trns_ycbc.jp2')
+
+    # Act
+    j2k.load()
+    jp2.load()
+
+    # Assert
+    assert_equal(j2k.mode, 'RGBA')
+    assert_equal(jp2.mode, 'RGBA')