diff --git a/Tests/check_tiff_crashes.py b/Tests/check_tiff_crashes.py
deleted file mode 100644
index f4eb04375..000000000
--- a/Tests/check_tiff_crashes.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-# Reproductions/tests for crashes/read errors in TiffDecode.c
-
-# When run in python, all of these images should fail for
-# one reason or another, either as a buffer overrun,
-# unrecognized datastream, or truncated image file.
-# There shouldn't be any segfaults.
-#
-# if run like
-# `valgrind --tool=memcheck python check_tiff_crashes.py  2>&1 | grep TiffDecode.c`
-# the output should be empty. There may be python issues
-# in the valgrind especially if run in a debug python
-# version.
-
-
-from PIL import Image
-
-repro_read_strip = (
-    "images/crash_1.tif",
-    "images/crash_2.tif",
-)
-
-for path in repro_read_strip:
-    with Image.open(path) as im:
-        try:
-            im.load()
-        except Exception as msg:
-            print(msg)
diff --git a/Tests/images/crash_1.tif b/Tests/images/crash_1.tif
deleted file mode 100644
index 230d4439a..000000000
Binary files a/Tests/images/crash_1.tif and /dev/null differ
diff --git a/Tests/images/crash_2.tif b/Tests/images/crash_2.tif
deleted file mode 100644
index 26c00d0ff..000000000
Binary files a/Tests/images/crash_2.tif and /dev/null differ
diff --git a/Tests/test_tiff_crashes.py b/Tests/test_tiff_crashes.py
new file mode 100644
index 000000000..9c293e014
--- /dev/null
+++ b/Tests/test_tiff_crashes.py
@@ -0,0 +1,36 @@
+# Reproductions/tests for crashes/read errors in TiffDecode.c
+
+# When run in Python, all of these images should fail for
+# one reason or another, either as a buffer overrun,
+# unrecognized datastream, or truncated image file.
+# There shouldn't be any segfaults.
+#
+# if run like
+# `valgrind --tool=memcheck pytest test_tiff_crashes.py 2>&1 | grep TiffDecode.c`
+# the output should be empty. There may be Python issues
+# in the valgrind especially if run in a debug Python
+# version.
+
+import pytest
+
+from PIL import Image
+
+from .helper import on_ci
+
+
+@pytest.mark.parametrize(
+    "test_file", ["Tests/images/crash_1.tif", "Tests/images/crash_2.tif"]
+)
+@pytest.mark.filterwarnings("ignore:Possibly corrupt EXIF data")
+@pytest.mark.filterwarnings("ignore:Metadata warning")
+def test_tiff_crashes(test_file):
+    try:
+        with Image.open(test_file) as im:
+            im.load()
+    except FileNotFoundError:
+        if not on_ci():
+            pytest.skip("test image not found")
+            return
+        raise
+    except OSError:
+        pass