diff --git a/infra/tf/k8s_infra/nomad.tf b/infra/tf/k8s_infra/nomad.tf
index 15a397375..d6779f328 100644
--- a/infra/tf/k8s_infra/nomad.tf
+++ b/infra/tf/k8s_infra/nomad.tf
@@ -18,7 +18,7 @@ locals {
 	# This value must be 3, 5, or 7. More = better redundancy, but does not make things faster.
 	# 
 	# See https://developer.hashicorp.com/nomad/tutorials/enterprise/production-reference-architecture-vm-with-consul
-	nomad_server_count = 3
+	nomad_server_count = var.deploy_method_cluster ? 3 : 1
 
 	nomad_server_addrs = [for i in range(0, local.nomad_server_count): "127.0.0.1:${6000 + i}"]
 	nomad_server_addrs_escaped = [for addr in local.nomad_server_addrs : "\"${addr}\""]
diff --git a/lib/bolt/core/src/tasks/test.rs b/lib/bolt/core/src/tasks/test.rs
index 0c48e04b3..68cb68844 100644
--- a/lib/bolt/core/src/tasks/test.rs
+++ b/lib/bolt/core/src/tasks/test.rs
@@ -766,6 +766,10 @@ async fn cleanup_nomad_test(ctx: &ProjectContext, test_id: &str, purge: bool) ->
 	let output = cmd.output().await?;
 	ensure!(output.status.success());
 
+	if output.stdout == b"No cluster leader" {
+		panic!("no cluster leader");
+	}
+
 	let jobs: Vec<NomadJob> = serde_json::from_slice(&output.stdout)?;
 
 	// Cleanup jobs