diff --git a/tools/generate_driver_list.py b/tools/generate_driver_list.py
index 5f7d9aacd20..23811001737 100755
--- a/tools/generate_driver_list.py
+++ b/tools/generate_driver_list.py
@@ -18,6 +18,11 @@ import argparse
 import os
 
 from cinder.interface import util
+from cinder import objects
+
+
+# Object loading can cause issues loading drivers, force it up front
+objects.register_all()
 
 
 parser = argparse.ArgumentParser(prog="generate_driver_list")