diff --git a/Tests/images/drawing.emf b/Tests/images/drawing.emf
new file mode 100644
index 000000000..ef751cd51
Binary files /dev/null and b/Tests/images/drawing.emf differ
diff --git a/Tests/images/drawing.wmf b/Tests/images/drawing.wmf
new file mode 100644
index 000000000..d9cfda453
Binary files /dev/null and b/Tests/images/drawing.wmf differ
diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py
new file mode 100644
index 000000000..3809cdbcd
--- /dev/null
+++ b/Tests/test_file_wmf.py
@@ -0,0 +1,19 @@
+from helper import unittest, PillowTestCase
+from PIL import Image
+
+
+class TestFileWmf(PillowTestCase):
+
+    def test_load_raw(self):
+
+        # Test basic EMF load
+        im = Image.open('Tests/images/drawing.emf')
+        im.load()  # should not segfault.
+
+        # Test basic WMF load
+        im = Image.open('Tests/images/drawing.wmf')
+        im.load()  # should not segfault.
+
+
+if __name__ == '__main__':
+    unittest.main()