diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0d9ca12..b989253 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,9 +18,25 @@ env:
   POLKADOT_VERSION: polkadot-stable2506-2
 
 jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Setup Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Install nightly toolchain
+        run: rustup toolchain install nightly
+
+      - name: Cargo fmt
+        run: cargo +nightly fmt --all -- --check
+
   cache-polkadot:
     name: Build and cache Polkadot binaries on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    needs: [fmt]
     strategy:
       matrix:
         os: [ubuntu-24.04, macos-14]
diff --git a/crates/node/src/node_implementations/zombienet.rs b/crates/node/src/node_implementations/zombienet.rs
index 82a3e71..a7023b8 100644
--- a/crates/node/src/node_implementations/zombienet.rs
+++ b/crates/node/src/node_implementations/zombienet.rs
@@ -126,6 +126,7 @@ impl ZombieNode {
 		let working_directory_path = AsRef::<WorkingDirectoryConfiguration>::as_ref(&context);
 		let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
 		let base_directory = working_directory_path.join(Self::BASE_DIRECTORY).join(id.to_string());
+		let base_directory = base_directory.canonicalize().unwrap_or(base_directory);
 		let logs_directory = base_directory.join(Self::LOGS_DIRECTORY);
 		let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet();