diff --git a/tests/commands/conftest.py b/tests/commands/conftest.py
index 1aef2d30..46f8a8f6 100644
--- a/tests/commands/conftest.py
+++ b/tests/commands/conftest.py
@@ -49,7 +49,7 @@ def run_start_args(request):
         config=param.get('config'),
         start_rethinkdb=param.get('start_rethinkdb', False),
         allow_temp_keypair=param.get('allow_temp_keypair', False),
-        initialize_database=param.get('initialize_database', True),
+        skip_initialize_database=param.get('skip_initialize_database', False),
     )
 
 
diff --git a/tests/commands/rethinkdb/test_commands.py b/tests/commands/rethinkdb/test_commands.py
index 29a84972..c8990582 100644
--- a/tests/commands/rethinkdb/test_commands.py
+++ b/tests/commands/rethinkdb/test_commands.py
@@ -14,7 +14,7 @@ def test_bigchain_run_start_with_rethinkdb(mock_start_rethinkdb,
     from bigchaindb import config
     from bigchaindb.commands.bigchaindb import run_start
     args = Namespace(start_rethinkdb=True, allow_temp_keypair=False, config=None, yes=True,
-                     initialize_database=True)
+                     skip_initialize_database=False)
     run_start(args)
 
     mock_start_rethinkdb.assert_called_with()
diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py
index 15aa9302..423e4614 100644
--- a/tests/commands/test_commands.py
+++ b/tests/commands/test_commands.py
@@ -40,7 +40,7 @@ def test_bigchain_run_start(mock_run_configure,
     from bigchaindb import config
     from bigchaindb.commands.bigchaindb import run_start
     args = Namespace(start_rethinkdb=False, allow_temp_keypair=False, config=None, yes=True,
-                     initialize_database=True)
+                     skip_initialize_database=False)
     run_start(args)
     mocked_setup_logging.assert_called_once_with(user_log_config=config['log'])
 
@@ -290,7 +290,7 @@ def test_allow_temp_keypair_generates_one_on_the_fly(
     bigchaindb.config['keypair'] = {'private': None, 'public': None}
 
     args = Namespace(allow_temp_keypair=True, start_rethinkdb=False, config=None, yes=True,
-                     initialize_database=True)
+                     skip_initialize_database=False)
     run_start(args)
 
     mocked_setup_logging.assert_called_once_with(
@@ -317,7 +317,7 @@ def test_allow_temp_keypair_doesnt_override_if_keypair_found(mock_gen_keypair,
     assert isinstance(original_private_key, str)
 
     args = Namespace(allow_temp_keypair=True, start_rethinkdb=False, config=None, yes=True,
-                     initialize_database=True)
+                     skip_initialize_database=False)
     run_start(args)
 
     mocked_setup_logging.assert_called_once_with(