diff --git a/PIL/Image.py b/PIL/Image.py
index 64f4613585b..4283b640cd4 100644
--- a/PIL/Image.py
+++ b/PIL/Image.py
@@ -1572,7 +1572,7 @@ def rotate(self, angle, resample=NEAREST, expand=0):
 
         # Fast paths regardless of filter
         if angle == 0:
-            return self._new(self.im)
+            return self.copy()
         if angle == 180:
             return self.transpose(ROTATE_180)
         if angle == 90 and expand:
diff --git a/Tests/test_image_rotate.py b/Tests/test_image_rotate.py
index 26c0bd7299d..3b2319fb0e8 100644
--- a/Tests/test_image_rotate.py
+++ b/Tests/test_image_rotate.py
@@ -11,11 +11,14 @@ def rotate(im, mode, angle):
             self.assertEqual(out.size, im.size)  # default rotate clips output
             out = im.rotate(angle, expand=1)
             self.assertEqual(out.mode, mode)
-            self.assertNotEqual(out.size, im.size)
+            if angle % 180 == 0:
+                self.assertEqual(out.size, im.size)
+            else:
+                self.assertNotEqual(out.size, im.size)
         for mode in "1", "P", "L", "RGB", "I", "F":
             im = hopper(mode)
             rotate(im, mode, 45)
-        for angle in 90, 270:
+        for angle in 0, 90, 180, 270:
             im = Image.open('Tests/images/test-card.png')
             rotate(im, im.mode, angle)