diff --git a/Tests/test_file_cur.py b/Tests/test_file_cur.py
index 5ae0e7eff..e6d13ef30 100644
--- a/Tests/test_file_cur.py
+++ b/Tests/test_file_cur.py
@@ -26,8 +26,8 @@ class TestFileCur(PillowTestCase):
         no_cursors_file = "Tests/images/no_cursors.cur"
 
         cur = CurImagePlugin.CurImageFile(TEST_FILE)
-        cur.fp = open(no_cursors_file, "rb")
-        self.assertRaises(TypeError, cur._open)
+        with open(no_cursors_file, "rb") as cur.fp:
+            self.assertRaises(TypeError, cur._open)
 
 
 if __name__ == '__main__':
diff --git a/Tests/test_image.py b/Tests/test_image.py
index 27f5ad885..156396451 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -390,7 +390,7 @@ class TestRegistry(PillowTestCase):
     def test_encode_registry(self):
 
         Image.register_encoder('MOCK', mock_encode)
-        self.assert_('MOCK' in Image.ENCODERS)
+        self.assertIn('MOCK', Image.ENCODERS)
 
         enc = Image._getencoder('RGB', 'MOCK', ('args',), extra=('extra',))