diff --git a/heat/common/config.py b/heat/common/config.py
index 0b433bfeb9..e84fc74964 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -119,9 +119,12 @@ def register_api_opts():
     rpc.set_defaults(control_exchange='heat')
 
 
+def register_db_opts():
+    cfg.CONF.register_opts(db_opts)
+
+
 def register_engine_opts():
     cfg.CONF.register_opts(engine_opts)
-    cfg.CONF.register_opts(db_opts)
     cfg.CONF.register_opts(service_opts)
     cfg.CONF.register_opts(rpc_opts)
     rpc.set_defaults(control_exchange='heat')
diff --git a/heat/db/__init__.py b/heat/db/__init__.py
index 998253999b..c43bd22c83 100644
--- a/heat/db/__init__.py
+++ b/heat/db/__init__.py
@@ -15,4 +15,8 @@
 
 '''Database abstraction for Heat.'''
 
+from heat.common import config
+
+config.register_db_opts()
+
 from heat.db.api import *
diff --git a/heat/engine/__init__.py b/heat/engine/__init__.py
index 024c1d749f..7675cc57c1 100644
--- a/heat/engine/__init__.py
+++ b/heat/engine/__init__.py
@@ -15,3 +15,5 @@
 from heat.common import config
 
 config.register_engine_opts()
+
+from heat import db  # pyflakes_bypass register DB options