diff --git a/manila/common/config.py b/manila/common/config.py
index 30825b4308..81bdae7fda 100644
--- a/manila/common/config.py
+++ b/manila/common/config.py
@@ -77,22 +77,6 @@ global_opts = [
     cfg.ListOpt('osapi_share_extension',
                 default=['manila.api.contrib.standard_extensions'],
                 help='The osapi share extensions to load.'),
-    cfg.StrOpt('sqlite_db',
-               default='manila.sqlite',
-               help='The filename to use with sqlite.'),
-    cfg.BoolOpt('sqlite_synchronous',
-                default=True,
-                help='If passed, use synchronous mode for sqlite.'),
-    cfg.IntOpt('sql_idle_timeout',
-               default=3600,
-               help='Timeout before idle SQL connections are reaped.'),
-    cfg.IntOpt('sql_max_retries',
-               default=10,
-               help='Maximum database connection retries during startup. '
-                    '(setting -1 implies an infinite retry count).'),
-    cfg.IntOpt('sql_retry_interval',
-               default=10,
-               help='Interval between retries of opening a SQL connection.'),
     cfg.StrOpt('scheduler_manager',
                default='manila.scheduler.manager.SchedulerManager',
                help='Full class name for the scheduler manager.'),
diff --git a/manila/test.py b/manila/test.py
index ab2273ad41..d488c45c7c 100644
--- a/manila/test.py
+++ b/manila/test.py
@@ -48,6 +48,9 @@ test_opts = [
     cfg.StrOpt('sqlite_clean_db',
                default='clean.sqlite',
                help='File name of clean sqlite database.'),
+    cfg.StrOpt('sqlite_db',
+               default='manila.sqlite',
+               help='The filename to use with sqlite.'),
 ]
 
 CONF = cfg.CONF