diff --git a/bigchaindb/__init__.py b/bigchaindb/__init__.py
index 1be419b3..4c555e47 100644
--- a/bigchaindb/__init__.py
+++ b/bigchaindb/__init__.py
@@ -17,7 +17,10 @@ _base_database_rethinkdb = {
 # _base_database_rethinkdb.keys() or _base_database_mongodb.keys()
 # because dicts are unordered. I tried to configure
 
-_base_database_rethinkdb_keys = ('host', 'port', 'name')
+_database_keys_map = {
+    'mongodb': ('host', 'port', 'name', 'replicaset'),
+    'rethinkdb': ('host', 'port', 'name')
+}
 
 _base_database_mongodb = {
     'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'),
@@ -29,9 +32,6 @@ _base_database_mongodb = {
     'password': os.environ.get('BIGCHAINDB_DATABASE_PASSWORD')
 }
 
-_base_database_mongodb_keys = ('host', 'port', 'name', 'replicaset',
-                               'ssl', 'login', 'password')
-
 _database_rethinkdb = {
     'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb'),
     'connection_timeout': 5000,
@@ -46,11 +46,6 @@ _database_mongodb = {
 }
 _database_mongodb.update(_base_database_mongodb)
 
-_database_keys_map = {
-    'mongodb': _base_database_mongodb_keys,
-    'rethinkdb': _base_database_rethinkdb_keys
-}
-
 _database_map = {
     'mongodb': _database_mongodb,
     'rethinkdb': _database_rethinkdb
diff --git a/tests/test_config_utils.py b/tests/test_config_utils.py
index 51e4d595..04c70325 100644
--- a/tests/test_config_utils.py
+++ b/tests/test_config_utils.py
@@ -11,7 +11,6 @@ ORIGINAL_CONFIG = copy.deepcopy(bigchaindb._config)
 
 @pytest.fixture(scope='function', autouse=True)
 def clean_config(monkeypatch, request):
-
     import bigchaindb
     original_config = copy.deepcopy(ORIGINAL_CONFIG)
     backend = request.config.getoption('--database-backend')
@@ -19,15 +18,6 @@ def clean_config(monkeypatch, request):
     monkeypatch.setattr('bigchaindb.config', original_config)
 
 
-def test_ordered_keys_match_database_config():
-    import bigchaindb
-
-    assert set(bigchaindb._base_database_rethinkdb.keys()) ==\
-        set(bigchaindb._base_database_rethinkdb_keys)
-    assert set(bigchaindb._base_database_mongodb.keys()) ==\
-        set(bigchaindb._base_database_mongodb_keys)
-
-
 def test_bigchain_instance_is_initialized_when_conf_provided(request):
     import bigchaindb
     from bigchaindb import config_utils