diff --git a/Tests/helper.py b/Tests/helper.py
index 637e77f9c..34dafa645 100644
--- a/Tests/helper.py
+++ b/Tests/helper.py
@@ -191,11 +191,11 @@ def hopper(mode="RGB", cache={}):
         if mode == "RGB":
             im = Image.open("Tests/images/hopper.ppm")
         elif mode == "F":
-            im = lena("L").convert(mode)
+            im = hopper("L").convert(mode)
         elif mode[:4] == "I;16":
-            im = lena("I").convert(mode)
+            im = hopper("I").convert(mode)
         else:
-            im = lena("RGB").convert(mode)
+            im = hopper("RGB").convert(mode)
     # cache[mode] = im
     return im
 
diff --git a/Tests/test_file_msp.py b/Tests/test_file_msp.py
index a64faad10..2245f9ed6 100644
--- a/Tests/test_file_msp.py
+++ b/Tests/test_file_msp.py
@@ -1,15 +1,16 @@
-from helper import unittest, PillowTestCase, lena
+from helper import unittest, PillowTestCase, hopper
 
 from PIL import Image
 
+TEST_FILE = "Tests/images/hopper.msp"
+
 
 class TestFileMsp(PillowTestCase):
 
     def test_sanity(self):
-
         file = self.tempfile("temp.msp")
 
-        lena("1").save(file)
+        hopper("1").save(file)
 
         im = Image.open(file)
         im.load()
@@ -17,6 +18,23 @@ class TestFileMsp(PillowTestCase):
         self.assertEqual(im.size, (128, 128))
         self.assertEqual(im.format, "MSP")
 
+    def test_open(self):
+        # Arrange
+        # Act
+        im = Image.open(TEST_FILE)
+
+        # Assert
+        self.assertEqual(im.size, (128, 128))
+        self.assert_image_similar(im, hopper("1"), 4)
+
+    def test_cannot_save_save_wrong_mode(self):
+        # Arrange
+        im = hopper()
+        file = self.tempfile("temp.msp")
+
+        # Act/Assert
+        self.assertRaises(IOError, lambda: im.save(file))
+
 
 if __name__ == '__main__':
     unittest.main()