diff --git a/test/data/exiv2-bug836.eps b/test/data/exiv2-bug836.eps
deleted file mode 100644
index 3c6634b9..00000000
Binary files a/test/data/exiv2-bug836.eps and /dev/null differ
diff --git a/tests/bugfixes/redmine/test_issue_836.py b/tests/bugfixes/redmine/test_issue_836.py
deleted file mode 100644
index dd4d6488..00000000
--- a/tests/bugfixes/redmine/test_issue_836.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import unittest
-import os.path
-import shutil
-
-import system_tests
-
-
-RESOURCE_FORK_EXISTS = os.path.exists(
-    os.path.join(system_tests.data_path, "exiv2-bug836.eps/..namedfork/rsrc")
-)
-
-
-@unittest.skipUnless(RESOURCE_FORK_EXISTS,
-                     "File system does not support resource forks")
-@system_tests.CopyFiles("$data_path/exiv2-bug836.eps")
-class WriteMetadataDestroysResourceForkOnMacOSXForBigFiles(
-        metaclass=system_tests.CaseMeta):
-
-    url = "http://dev.exiv2.org/issues/836"
-
-    filename = "$data_path/exiv2-bug836_copy.eps"
-    filename_orig = "$data_path/exiv2-bug836.eps"
-
-    commands = [
-        "$exiv2 -M'set Exif.Photo.UserComment Test' $filename",
-    ]
-
-    def setUp(self):
-        """ Copy the rsrc file into the the resource fork """
-        shutil.copyfile(
-            self.filename_orig + ".rsrc", self.filename + "/..namedfork/rsrc"
-        )
-
-    def post_tests_hook(self):
-        """ Check that the resource fork didn't change """
-        with open(self.filename_orig + ".rsrc", "rb") as rsrc_orig:
-            expected_resource_fork = rsrc_orig.read(-1)
-
-        with open(self.filename + "/..namedfork/rsrc", "rb") as rsrc_f:
-            got_resource_fork = rsrc_f.read(-1)
-
-        self.assertEqual(expected_resource_fork, got_resource_fork)
-
-    stdout = [""]
-    stderr = [""]
-    retval = [0]