diff --git a/Tests/test_features.py b/Tests/test_features.py
index 01c5d6495..8da22088e 100644
--- a/Tests/test_features.py
+++ b/Tests/test_features.py
@@ -7,7 +7,8 @@ class TestFeatures(PillowTestCase):
 
     def test_check_features(self):
         for feature in features.modules:
-            self.assertTrue(features.check_module(feature) in [True, False, None])
+            self.assertTrue(
+                features.check_module(feature) in [True, False, None])
         for feature in features.codecs:
             self.assertTrue(features.check_codec(feature) in [True, False])
 
@@ -15,6 +16,19 @@ class TestFeatures(PillowTestCase):
         self.assertTrue(type(features.get_supported_modules()) is list)
         self.assertTrue(type(features.get_supported_codecs()) is list)
 
+    def test_unsupported_codec(self):
+        # Arrange
+        codec = "unsupported_codec"
+        # Act / Assert
+        self.assertRaises(ValueError, lambda: features.check_codec(codec))
+
+    def test_unsupported_module(self):
+        # Arrange
+        module = "unsupported_module"
+        # Act / Assert
+        self.assertRaises(ValueError, lambda: features.check_module(module))
+
+
 if __name__ == '__main__':
     unittest.main()