diff --git a/smoke-tests/src/libra_smoke.rs b/smoke-tests/src/libra_smoke.rs
index 993a37192..2d462202b 100644
--- a/smoke-tests/src/libra_smoke.rs
+++ b/smoke-tests/src/libra_smoke.rs
@@ -86,9 +86,16 @@ impl LibraSmoke {
         );
         println!("Using diem-node binary at {:?}", &diem_path);
 
+        let mut swarm_path = TempPath::new();
+        swarm_path.create_as_dir()?;
+        swarm_path.persist();
+        println!("Creating swarm at {:?}", swarm_path.path());
+        let swarm_dir = swarm_path.path().to_str().map(|s| s.to_string());
+
         let mut swarm = smoke_test_environment::new_local_swarm_with_release(
             count_vals.unwrap_or(1).into(),
             bundle,
+            swarm_dir,
         )
         .await;
         let chain_name =
diff --git a/smoke-tests/tests/balance.rs b/smoke-tests/tests/balance.rs
index e21f2706e..b2659cc9b 100644
--- a/smoke-tests/tests/balance.rs
+++ b/smoke-tests/tests/balance.rs
@@ -8,7 +8,7 @@ use smoke_test::smoke_test_environment::new_local_swarm_with_release;
 // let's check that this test environment produces same coins as expected in unit tests, and we have the tools to mint and test balances
 async fn sanity_balances() -> anyhow::Result<()> {
     let release = ReleaseTarget::Head.load_bundle().unwrap();
-    let mut swarm = new_local_swarm_with_release(4, release).await;
+    let mut swarm = new_local_swarm_with_release(4, release, None).await;
     let v = swarm.validators_mut().next().unwrap();
     let pri_key = v.account_private_key().as_ref().unwrap();
     let address = v.peer_id().to_owned();
diff --git a/smoke-tests/tests/meta.rs b/smoke-tests/tests/meta.rs
index 74d3de861..6a3d8e5fc 100644
--- a/smoke-tests/tests/meta.rs
+++ b/smoke-tests/tests/meta.rs
@@ -9,7 +9,7 @@ use smoke_test::smoke_test_environment::new_local_swarm_with_release;
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn meta_can_start_swarm() {
     let release = ReleaseTarget::Head.load_bundle().unwrap();
-    let mut swarm = new_local_swarm_with_release(1, release).await;
+    let mut swarm = new_local_swarm_with_release(1, release, None).await;
     let mut public_info = swarm.diem_public_info();
 
     let payload = public_info