diff --git a/octane/handlers/__init__.py b/octane/handlers/__init__.py
index 237d23ee..00b920a6 100644
--- a/octane/handlers/__init__.py
+++ b/octane/handlers/__init__.py
@@ -19,12 +19,10 @@ LOG = logging.getLogger(__name__)
 
 
 class _GetNodesHandlersFactory(object):
-    _extension_manager = None
-
     def __init__(self, name):
         self.name = name
 
-    def on_load_failure_callback(self, endpoint, exc):
+    def on_load_failure_callback(self, manager, endpoint, exc):
         LOG.error('Failed to load %s: %s', endpoint.name, exc)
         raise  # Avoid unexpectedly skipped steps
 
diff --git a/octane/tests/test_handlers.py b/octane/tests/test_handlers.py
new file mode 100644
index 00000000..ba979c71
--- /dev/null
+++ b/octane/tests/test_handlers.py
@@ -0,0 +1,17 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from octane.handlers import upgrade
+
+
+def test_upgrade_handlers_import():
+    upgrade.get_nodes_handlers.extensions