diff --git a/.tool-versions b/.tool-versions
index 04d1890dbf..4d2467643e 100755
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,5 +1,5 @@
-erlang 26.0.2
-elixir 1.15.5-otp-26
-just 1.14.0
-yarn 1.22.19
-nodejs 20.6.1
+erlang       26.0.2
+elixir       1.15.5-otp-26
+just         1.14.0
+yarn         1.22.19
+nodejs       20.6.1
diff --git a/deps-test-browser.sh b/deps-test-browser.sh
new file mode 100644
index 0000000000..ad42258b19
--- /dev/null
+++ b/deps-test-browser.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+# from https://github.com/elixir-wallaby/wallaby/issues/468#issuecomment-810518368
+
+install_path="/usr/local/bin/chromedriver"
+chromedriver_path=$(command -v chromedriver)
+
+function get_download_url {
+ major_version=$1
+ platform=$2
+ curl -s curl "https://googlechromelabs.github.io/chrome-for-testing/latest-versions-per-milestone-with-downloads.json" \
+    | jq -r '.milestones."'$major_version'".downloads.chromedriver | .[] | select(.platform | contains("'$platform'")) | .url'
+}
+
+function download_chromedriver {
+  download_url=$1  
+  platform=$2
+  curl -s $download_url -o "chromedriver_${platform}.zip"
+}
+
+function install_chromedriver_executable {
+  platform=$1
+  unzip -oq "chromedriver_${platform}.zip"
+  sudo mv "chromedriver-${platform}/chromedriver" ${install_path}
+  rm "chromedriver_${platform}.zip"
+  rm -rf "chromedriver-${platform}"
+}
+
+unameOut="$(uname -s)"
+case "${unameOut}" in
+    Linux*)     chrome_path="/usr/bin/google-chrome";;
+    Darwin*)    chrome_path="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome";;
+esac
+chromedriver_version=$("${chromedriver_path}" --version)
+chrome_version=$("${chrome_path}" --version)
+
+chromedriver_major_version=$("${chromedriver_path}" --version | cut -f 2 -d " " | cut -f 1 -d ".")
+chrome_major_version=$("${chrome_path}" --version | cut -f 3 -d " " | cut -f 1 -d ".")
+
+if [ "${chromedriver_major_version}" == "${chrome_major_version}" ]; then
+  echo "Chromedriver matches chrome version ✓"
+  exit 0
+else
+  echo "Wallaby often fails with 'invalid session id' if Chromedriver and Chrome have different versions."
+  echo "Chromedriver version: ${chromedriver_major_version} (${chromedriver_version} at ${chromedriver_path})"
+  echo "Chrome version      : ${chrome_major_version} (${chrome_version} at ${chrome_path})"
+
+  echo ""
+  echo "Install chromedriver version ${chrome_major_version}? [y/n]"
+  read install
+  echo "install = $install"
+
+  if [[ "$install" == "y" ]]; then
+
+    echo "What platform are you running? (eg: linux64, mac-arm64, mac-x64, win64...)"
+    read platform
+
+    # unfortunately rtx doesn't seem to know how to install recent version, so we download manually instead
+    # rtx install chromedriver ${chrome_major_version}
+    # rtx local chromedriver ${chrome_major_version}
+
+    echo "determining latest chromedriver version ${chrome_major_version} for $platform ..."
+    url=$(get_download_url $chrome_major_version $platform)
+    echo "downloading ${url}..."
+    $(download_chromedriver $url $platform)
+    echo "installing chromedriver (requires sudo)..."
+    $(install_chromedriver_executable $platform)
+    echo "Done :)"
+  else
+    exit 1
+  fi
+fi
\ No newline at end of file
diff --git a/flavours/classic/config/test.exs b/flavours/classic/config/test.exs
index 93416e0b16..3b2fcf5216 100755
--- a/flavours/classic/config/test.exs
+++ b/flavours/classic/config/test.exs
@@ -97,8 +97,17 @@ config :exsync,
   src_monitor: false,
   extra_extensions: [".leex", ".heex", ".js", ".css", ".sface"]
 
-# for headless browser testing:
-config :bonfire, sql_sandbox: true
+# use Ecto sandbox?
+config :bonfire,
+  sql_sandbox:
+    System.get_env("START_SERVER") != "yes" and System.get_env("TEST_INSTANCE") != "yes"
+
+{chromedriver_path, _} = System.cmd("command", ["-v", "chromedriver"])
+
+chromedriver_path =
+  (chromedriver_path || "/usr/local/bin/chromedriver")
+  |> String.trim()
+  |> IO.inspect(label: "chromedriver_path")
 
 config :wallaby,
   otp_app: :bonfire,
@@ -107,7 +116,7 @@ config :wallaby,
   screenshot_on_failure: true,
   chromedriver: [
     # point to your chromedriver path
-    path: "assets/node_modules/chromedriver/bin/chromedriver",
+    path: chromedriver_path,
     # change to false if you want to see the browser in action
     headless: true
   ]