diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml b/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml
index 650836edeb3..bbc7fcfd1bd 100644
--- a/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml
+++ b/acceptance/bundle/deploy/files/no-snapshot-sync/out.test.toml
@@ -1,3 +1,3 @@
-Local = false
+Local = true
 Cloud = true
 EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]
diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/test.toml b/acceptance/bundle/deploy/files/no-snapshot-sync/test.toml
index 7653e8c8194..e2a0ac696d1 100644
--- a/acceptance/bundle/deploy/files/no-snapshot-sync/test.toml
+++ b/acceptance/bundle/deploy/files/no-snapshot-sync/test.toml
@@ -1,4 +1,4 @@
-Local = false
+Local = true
 Cloud = true
 
 Ignore = [
diff --git a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt
index 8ac61e622b7..e769969ddca 100644
--- a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt
+++ b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt
@@ -23,7 +23,7 @@ Updating deployment state...
 Deployment complete!
 
 >>> musterr [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py
-Error: Workspace path not found
+Error: Path (/Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py) doesn't exist.
 
 === Removing the sync snapshot forces a full re-upload, restoring the python_file
 >>> rm -rf .databricks/bundle/default/sync-snapshots
diff --git a/acceptance/selftest/server/output.txt b/acceptance/selftest/server/output.txt
index 7147f9c9bef..01748017e83 100644
--- a/acceptance/selftest/server/output.txt
+++ b/acceptance/selftest/server/output.txt
@@ -16,6 +16,6 @@ custom
 response
 
 >>> errcode [CLI] workspace get-status /a/b/c
-Error: Workspace path not found
+Error: Path (/a/b/c) doesn't exist.
 
 Exit code: 1
diff --git a/acceptance/workspace/repos/delete_by_path/output.txt b/acceptance/workspace/repos/delete_by_path/output.txt
index 3f888863e06..d522cbd027d 100644
--- a/acceptance/workspace/repos/delete_by_path/output.txt
+++ b/acceptance/workspace/repos/delete_by_path/output.txt
@@ -14,6 +14,6 @@
 >>> [CLI] repos delete /Repos/me@databricks.com/test-repo
 
 >>> [CLI] repos get /Repos/me@databricks.com/test-repo -o json
-Error: failed to look up repo by path: Workspace path not found
+Error: failed to look up repo by path: Path (/Repos/me@databricks.com/test-repo) doesn't exist.
 
 Exit code: 1
diff --git a/acceptance/workspace/repos/get_errors/output.txt b/acceptance/workspace/repos/get_errors/output.txt
index 5eda2b1b643..443f30491f3 100644
--- a/acceptance/workspace/repos/get_errors/output.txt
+++ b/acceptance/workspace/repos/get_errors/output.txt
@@ -1,6 +1,6 @@
 
 >>> [CLI] repos get /Repos/me@databricks.com/doesnotexist -o json
-Error: failed to look up repo by path: Workspace path not found
+Error: failed to look up repo by path: Path (/Repos/me@databricks.com/doesnotexist) doesn't exist.
 
 >>> [CLI] repos get /not-a-repo -o json
 Error: object at path "/not-a-repo" is not a repo
diff --git a/libs/testserver/fake_workspace.go b/libs/testserver/fake_workspace.go
index d2925fb1e38..4fb2e1b9da7 100644
--- a/libs/testserver/fake_workspace.go
+++ b/libs/testserver/fake_workspace.go
@@ -363,9 +363,10 @@ func (s *FakeWorkspace) WorkspaceGetStatus(path string) Response {
 			},
 		}
 	} else {
+		// Match the real Workspace API wording, which echoes the requested path.
 		return Response{
 			StatusCode: 404,
-			Body:       map[string]string{"message": "Workspace path not found"},
+			Body:       map[string]string{"message": fmt.Sprintf("Path (%s) doesn't exist.", path)},
 		}
 	}
 }