diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 85cbe74..313a795 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -299,8 +299,11 @@ where
 {
 	let args = app.clone().get_matches_from(arg_vec);
 	let _ = get_wallet_subcommand(test_dir, wallet_name, args.clone());
+	// Avoid conflicts with local wallets
+	let wallet_dir = PathBuf::from(test_dir).join(format!("{}_bootstrap", wallet_name));
 	let mut config =
-		config::initial_setup_wallet(&ChainTypes::AutomatedTesting, None, true).unwrap();
+		config::initial_setup_wallet(&ChainTypes::AutomatedTesting, Some(wallet_dir), true)
+			.unwrap();
 	let mut wallet_config = config.clone().members.wallet;
 	wallet_config.chain_type = None;
 	wallet_config.api_secret_path = None;
diff --git a/tests/owner_v3_lifecycle.rs b/tests/owner_v3_lifecycle.rs
index bf6711e..363c6ed 100644
--- a/tests/owner_v3_lifecycle.rs
+++ b/tests/owner_v3_lifecycle.rs
@@ -148,7 +148,7 @@ fn owner_v3_lifecycle() -> Result<(), grin_wallet_controller::Error> {
 	let value: ECDHPubkey = res.unwrap();
 	let shared_key = derive_ecdh_key(sec_key_str, &value.ecdh_pubkey);
 
-	// 2) get the top level directory, should default to ~/.grin/auto
+	// 2) get the top level directory
 	let req = include_str!("data/v3_reqs/get_top_level.req.json");
 	let res = send_request_enc::<String>(
 		&JsonId::StrId(String::from("1")),
@@ -159,7 +159,13 @@ fn owner_v3_lifecycle() -> Result<(), grin_wallet_controller::Error> {
 	)?;
 	println!("RES 2: {:?}", res);
 	assert!(res.is_ok());
-	assert!(res.unwrap().contains("auto"));
+	assert_eq!(
+		PathBuf::from(res.unwrap()).canonicalize().unwrap(),
+		PathBuf::from(test_dir)
+			.join("wallet1_bootstrap")
+			.canonicalize()
+			.unwrap()
+	);
 
 	// 3) now set the top level directory to our test wallet dir
 	let req = serde_json::json!({