diff --git a/Tests/large_memory_test.py b/Tests/large_memory_test.py
index 148841ec2..57ef67b1c 100644
--- a/Tests/large_memory_test.py
+++ b/Tests/large_memory_test.py
@@ -1,4 +1,4 @@
-from tester import *
+from helper import *
 
 # This test is not run automatically.
 #
@@ -6,22 +6,31 @@ from tester import *
 # second test.  Running this automatically would amount to a denial of
 # service on our testing infrastructure.  I expect this test to fail
 # on any 32 bit machine, as well as any smallish things (like
-# raspberrypis). It does succeed on a 3gb Ubuntu 12.04x64 VM on python
-# 2.7 an 3.2
+# Raspberry Pis). It does succeed on a 3gb Ubuntu 12.04x64 VM on Python
+# 2.7 an 3.2.
 
 from PIL import Image
-ydim = 32769
-xdim = 48000
-f = tempfile('temp.png')
+YDIM = 32769
+XDIM = 48000
 
-def _write_png(xdim,ydim):
-    im = Image.new('L',(xdim,ydim),(0))
-    im.save(f)
-    success()
 
-def test_large():
-    """ succeeded prepatch"""
-    _write_png(xdim,ydim)
-def test_2gpx():
-    """failed prepatch"""
-    _write_png(xdim,xdim)
+class TestImage(PillowTestCase):
+
+    def _write_png(self, XDIM, YDIM):
+        f = self.tempfile('temp.png')
+        im = Image.new('L', (XDIM, YDIM), (0))
+        im.save(f)
+
+    def test_large(self):
+        """ succeeded prepatch"""
+        self._write_png(XDIM, YDIM)
+
+    def test_2gpx(self):
+        """failed prepatch"""
+        self._write_png(XDIM, XDIM)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
+# End of file