diff --git a/tests/unit/test_option.py b/tests/unit/test_option.py
index 5facf2a..67e2255 100644
--- a/tests/unit/test_option.py
+++ b/tests/unit/test_option.py
@@ -33,6 +33,9 @@ def test_to_optparse_creates_an_option_as_we_expect(Option):
         'default': None,
         'type': None,
         'dest': 'test',
+        'nargs': None,
+        'const': None,
+        'choices': None,
         'callback': None,
         'callback_args': None,
         'callback_kwargs': None,
diff --git a/tests/unit/test_plugin_type_manager.py b/tests/unit/test_plugin_type_manager.py
index 36fb92a..f64e472 100644
--- a/tests/unit/test_plugin_type_manager.py
+++ b/tests/unit/test_plugin_type_manager.py
@@ -200,8 +200,8 @@ def test_proxies_getitem_to_managers_plugins_dictionary(PluginManager):
         assert type_mgr[key] is plugins[key]
 
 
-class FakePluginTypeManager(manager.NotifierBuilder):
-    """Provide an easy way to test the NotifierBuilder."""
+class FakePluginTypeManager(manager.NotifierBuilderMixin):
+    """Provide an easy way to test the NotifierBuilderMixin."""
 
     def __init__(self, manager):
         """Initialize with our fake manager."""