From ac8ef9b9e3e287881c83ca85bde75870cd2c0841 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <mail@abhinavg.net>
Date: Thu, 4 Dec 2025 11:21:43 -0800
Subject: [PATCH] test: replace manual os.Chdir with t.Chdir in tests (#457)

Replaces manual working directory save/restore patterns
with Go's built-in `t.Chdir()` helper across 23 test files.

The manual pattern involved calling `os.Getwd()` to save
the original directory, using `defer os.Chdir(origWd)` for
restoration, and manually handling errors during directory
changes. This boilerplate has been replaced with single
`t.Chdir(path)` calls that handle cleanup automatically.

The `t.Chdir()` method automatically restores the working
directory when the test completes, eliminating the need for
manual defer statements and error handling.

Total:
~75 instances replaced (assuming Claude's math is right)

Co-authored-by: Claude <noreply@anthropic.com>
---
 cmd/bd/autoimport_test.go                |  24 +---
 cmd/bd/daemon_sync_branch_test.go        | 113 +++-------------
 cmd/bd/hooks_test.go                     |  24 +---
 cmd/bd/init_hooks_test.go                |  30 +----
 cmd/bd/init_test.go                      | 156 +++--------------------
 cmd/bd/migrate_sync_test.go              |   6 +-
 cmd/bd/nodb_test.go                      |   6 +-
 cmd/bd/reinit_test.go                    |  20 +--
 cmd/bd/restore_test.go                   |  10 +-
 cmd/bd/sync_local_only_test.go           |  20 +--
 cmd/bd/sync_test.go                      |   9 +-
 cmd/bd/template_test.go                  |   8 +-
 cmd/bd/version_tracking_test.go          |  25 +---
 examples/library-usage/main_test.go      |   7 +-
 internal/beads/beads_integration_test.go |   6 +-
 internal/beads/beads_multidb_test.go     |  33 +----
 internal/beads/beads_symlink_test.go     |  23 +---
 internal/beads/beads_test.go             |  43 ++-----
 internal/config/config_test.go           |  54 ++------
 internal/rpc/bench_test.go               |  18 +--
 internal/rpc/list_filters_test.go        |  17 +--
 internal/rpc/rpc_test.go                 |  27 +---
 internal/rpc/version_test.go             |  46 +------
 23 files changed, 113 insertions(+), 612 deletions(-)

diff --git a/cmd/bd/autoimport_test.go b/cmd/bd/autoimport_test.go
index c30a4f0c..71152331 100644
--- a/cmd/bd/autoimport_test.go
+++ b/cmd/bd/autoimport_test.go
@@ -172,9 +172,7 @@ func TestCheckAndAutoImport_EmptyDatabaseNoGit(t *testing.T) {
 	}()
 
 	// Change to temp dir (no git repo)
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	result := checkAndAutoImport(ctx, store)
 	if result {
@@ -191,9 +189,7 @@ func TestFindBeadsDir(t *testing.T) {
 	}
 
 	// Change to tmpDir
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	found := findBeadsDir()
 	if found == "" {
@@ -211,9 +207,7 @@ func TestFindBeadsDir_NotFound(t *testing.T) {
 	// Create temp directory without .beads
 	tmpDir := t.TempDir()
 
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	found := findBeadsDir()
 	// findBeadsDir walks up to root, so it might find .beads in parent dirs
@@ -237,9 +231,7 @@ func TestFindBeadsDir_ParentDirectory(t *testing.T) {
 	}
 
 	// Change to subdir
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(subDir)
+	t.Chdir(subDir)
 
 	found := findBeadsDir()
 	if found == "" {
@@ -256,9 +248,7 @@ func TestFindBeadsDir_ParentDirectory(t *testing.T) {
 func TestCheckGitForIssues_NoGitRepo(t *testing.T) {
 	// Change to temp dir (not a git repo)
 	tmpDir := t.TempDir()
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	count, path := checkGitForIssues()
 	if count != 0 {
@@ -272,9 +262,7 @@ func TestCheckGitForIssues_NoGitRepo(t *testing.T) {
 func TestCheckGitForIssues_NoBeadsDir(t *testing.T) {
 	// Use current directory which has git but change to somewhere without .beads
 	tmpDir := t.TempDir()
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	count, path := checkGitForIssues()
 	if count != 0 || path != "" {
diff --git a/cmd/bd/daemon_sync_branch_test.go b/cmd/bd/daemon_sync_branch_test.go
index 9b0dd177..6bd17cd9 100644
--- a/cmd/bd/daemon_sync_branch_test.go
+++ b/cmd/bd/daemon_sync_branch_test.go
@@ -66,15 +66,7 @@ func TestSyncBranchCommitAndPush_NotConfigured(t *testing.T) {
 	}
 
 	// Change to temp directory for git operations
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Test with no sync.branch configured
 	log, logMsgs := newTestSyncBranchLogger()
@@ -124,15 +116,7 @@ func TestSyncBranchCommitAndPush_Success(t *testing.T) {
 	}
 
 	// Initial commit on main branch (before creating JSONL)
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	initMainBranch(t, tmpDir)
 
@@ -238,15 +222,7 @@ func TestSyncBranchCommitAndPush_EnvOverridesDB(t *testing.T) {
 	t.Setenv(syncbranch.EnvVar, "env-branch")
 
 	// Initial commit on main branch
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	initMainBranch(t, tmpDir)
 
@@ -343,15 +319,7 @@ func TestSyncBranchCommitAndPush_NoChanges(t *testing.T) {
 		t.Fatalf("Failed to export: %v", err)
 	}
 
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	log, logMsgs := newTestSyncBranchLogger()
 
@@ -428,15 +396,7 @@ func TestSyncBranchCommitAndPush_WorktreeHealthCheck(t *testing.T) {
 		t.Fatalf("Failed to export: %v", err)
 	}
 
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	log, logMsgs := newTestSyncBranchLogger()
 
@@ -510,15 +470,7 @@ func TestSyncBranchPull_NotConfigured(t *testing.T) {
 		t.Fatalf("Failed to set prefix: %v", err)
 	}
 
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	log, logMsgs := newTestSyncBranchLogger()
 	_ = logMsgs // unused in this test
@@ -597,15 +549,7 @@ func TestSyncBranchPull_Success(t *testing.T) {
 	runGitCmd(t, clone1Dir, "push", "origin", "master")
 
 	// Change to clone1 directory for sync branch operations
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(clone1Dir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(clone1Dir)
 
 	// Push to sync branch using syncBranchCommitAndPush
 	log, logMsgs := newTestSyncBranchLogger()
@@ -640,9 +584,7 @@ func TestSyncBranchPull_Success(t *testing.T) {
 	}
 
 	// Change to clone2 directory
-	if err := os.Chdir(clone2Dir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(clone2Dir)
 
 	// Pull from sync branch
 	log2, logMsgs2 := newTestSyncBranchLogger()
@@ -736,9 +678,7 @@ func TestSyncBranchIntegration_EndToEnd(t *testing.T) {
 	runGitCmd(t, clone1Dir, "push", "origin", "master")
 
 	// Change to clone1 directory
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(clone1Dir)
+	t.Chdir(clone1Dir)
 
 	// Agent A commits to sync branch
 	log, logMsgs := newTestSyncBranchLogger()
@@ -765,7 +705,7 @@ func TestSyncBranchIntegration_EndToEnd(t *testing.T) {
 	store2.SetConfig(ctx, "sync.branch", syncBranch)
 
 	// Change to clone2 directory
-	os.Chdir(clone2Dir)
+	t.Chdir(clone2Dir)
 
 	// Agent B pulls from sync branch
 	log2, logMsgs2 := newTestSyncBranchLogger()
@@ -807,7 +747,7 @@ func TestSyncBranchIntegration_EndToEnd(t *testing.T) {
 	}
 
 	// Agent A pulls the update
-	os.Chdir(clone1Dir)
+	t.Chdir(clone1Dir)
 	pulled, err = syncBranchPull(ctx, store1, log)
 	if err != nil {
 		t.Fatalf("syncBranchPull failed for clone1: %v", err)
@@ -891,15 +831,7 @@ func TestSyncBranchConfigChange(t *testing.T) {
 		t.Fatalf("Failed to export: %v", err)
 	}
 
-	oldWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(oldWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	log, _ := newTestSyncBranchLogger()
 
@@ -1020,11 +952,8 @@ func TestSyncBranchMultipleConcurrentClones(t *testing.T) {
 	initMainBranch(t, clone1Dir)
 	runGitCmd(t, clone1Dir, "push", "origin", "master")
 
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-
 	// Clone1: Create and push issue A
-	os.Chdir(clone1Dir)
+	t.Chdir(clone1Dir)
 	issueA := &types.Issue{
 		Title:     "Issue A from clone1",
 		Status:    types.StatusOpen,
@@ -1044,7 +973,7 @@ func TestSyncBranchMultipleConcurrentClones(t *testing.T) {
 	}
 
 	// Clone2: Fetch, pull, create issue B, push
-	os.Chdir(clone2Dir)
+	t.Chdir(clone2Dir)
 	runGitCmd(t, clone2Dir, "fetch", "origin")
 	log2, _ := newTestSyncBranchLogger()
 	syncBranchPull(ctx, store2, log2)
@@ -1067,7 +996,7 @@ func TestSyncBranchMultipleConcurrentClones(t *testing.T) {
 	}
 
 	// Clone3: Fetch, pull, create issue C, push
-	os.Chdir(clone3Dir)
+	t.Chdir(clone3Dir)
 	runGitCmd(t, clone3Dir, "fetch", "origin")
 	log3, _ := newTestSyncBranchLogger()
 	syncBranchPull(ctx, store3, log3)
@@ -1090,11 +1019,11 @@ func TestSyncBranchMultipleConcurrentClones(t *testing.T) {
 	}
 
 	// All clones pull final state
-	os.Chdir(clone1Dir)
+	t.Chdir(clone1Dir)
 	syncBranchPull(ctx, store1, log1)
 	importToJSONLWithStore(ctx, store1, jsonlPath1)
 
-	os.Chdir(clone2Dir)
+	t.Chdir(clone2Dir)
 	syncBranchPull(ctx, store2, log2)
 	importToJSONLWithStore(ctx, store2, jsonlPath2)
 
@@ -1164,9 +1093,7 @@ func TestSyncBranchPerformance(t *testing.T) {
 	jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
 	exportToJSONLWithStore(ctx, store, jsonlPath)
 
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	log, _ := newTestSyncBranchLogger()
 
@@ -1255,9 +1182,7 @@ func TestSyncBranchNetworkFailure(t *testing.T) {
 	jsonlPath := filepath.Join(beadsDir, "issues.jsonl")
 	exportToJSONLWithStore(ctx, store, jsonlPath)
 
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	log, logMsgs := newTestSyncBranchLogger()
 
diff --git a/cmd/bd/hooks_test.go b/cmd/bd/hooks_test.go
index 5b8194c3..67fd0a87 100644
--- a/cmd/bd/hooks_test.go
+++ b/cmd/bd/hooks_test.go
@@ -36,9 +36,7 @@ func TestInstallHooks(t *testing.T) {
 	tmpDir := t.TempDir()
 
 	// Change to temp directory
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
@@ -85,9 +83,7 @@ func TestInstallHooksBackup(t *testing.T) {
 	tmpDir := t.TempDir()
 
 	// Change to temp directory
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
@@ -135,9 +131,7 @@ func TestInstallHooksForce(t *testing.T) {
 	tmpDir := t.TempDir()
 
 	// Change to temp directory first, then init
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
@@ -175,9 +169,7 @@ func TestUninstallHooks(t *testing.T) {
 	tmpDir := t.TempDir()
 
 	// Change to temp directory first, then init
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
@@ -215,9 +207,7 @@ func TestHooksCheckGitHooks(t *testing.T) {
 	tmpDir := t.TempDir()
 
 	// Change to temp directory first, then init
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
@@ -263,9 +253,7 @@ func TestInstallHooksShared(t *testing.T) {
 	tmpDir := t.TempDir()
 
 	// Change to temp directory
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (needed for git config command)
 	if err := exec.Command("git", "init").Run(); err != nil {
diff --git a/cmd/bd/init_hooks_test.go b/cmd/bd/init_hooks_test.go
index 54132fa1..d150496e 100644
--- a/cmd/bd/init_hooks_test.go
+++ b/cmd/bd/init_hooks_test.go
@@ -11,15 +11,7 @@ import (
 func TestDetectExistingHooks(t *testing.T) {
 	// Create a temporary directory
 	tmpDir := t.TempDir()
-	oldDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(oldDir)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
@@ -110,15 +102,7 @@ func TestDetectExistingHooks(t *testing.T) {
 func TestInstallGitHooks_NoExistingHooks(t *testing.T) {
 	// Create a temporary directory
 	tmpDir := t.TempDir()
-	oldDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(oldDir)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
@@ -157,15 +141,7 @@ func TestInstallGitHooks_NoExistingHooks(t *testing.T) {
 func TestInstallGitHooks_ExistingHookBackup(t *testing.T) {
 	// Create a temporary directory
 	tmpDir := t.TempDir()
-	oldDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(oldDir)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(tmpDir)
 
 	// Initialize a real git repo (required for git rev-parse)
 	if err := exec.Command("git", "init").Run(); err != nil {
diff --git a/cmd/bd/init_test.go b/cmd/bd/init_test.go
index 79e823e7..c96d2b85 100644
--- a/cmd/bd/init_test.go
+++ b/cmd/bd/init_test.go
@@ -56,15 +56,7 @@ func TestInitCommand(t *testing.T) {
 			initCmd.Flags().Set("quiet", "false")
 
 			tmpDir := t.TempDir()
-			originalWd, err := os.Getwd()
-			if err != nil {
-				t.Fatalf("Failed to get working directory: %v", err)
-			}
-			defer os.Chdir(originalWd)
-
-			if err := os.Chdir(tmpDir); err != nil {
-				t.Fatalf("Failed to change to temp directory: %v", err)
-			}
+			t.Chdir(tmpDir)
 
 			// Capture output
 			var buf bytes.Buffer
@@ -87,6 +79,7 @@ func TestInitCommand(t *testing.T) {
 			rootCmd.SetArgs(args)
 
 			// Run command
+			var err error
 			err = rootCmd.Execute()
 
 			// Restore stdout and read output
@@ -198,15 +191,7 @@ func TestInitAlreadyInitialized(t *testing.T) {
 	dbPath = ""
 
 	tmpDir := t.TempDir()
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Initialize once
 	rootCmd.SetArgs([]string{"init", "--prefix", "test", "--quiet"})
@@ -256,15 +241,7 @@ func TestInitWithCustomDBPath(t *testing.T) {
 		t.Fatalf("Failed to create work directory: %v", err)
 	}
 
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
-
-	if err := os.Chdir(workDir); err != nil {
-		t.Fatalf("Failed to change to work directory: %v", err)
-	}
+	t.Chdir(workDir)
 
 	customDBPath := filepath.Join(customDBDir, "test.db")
 
@@ -407,15 +384,7 @@ func TestInitNoDbMode(t *testing.T) {
 	noDb = false
 	
 	tmpDir := t.TempDir()
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Initialize with --no-db flag
 	rootCmd.SetArgs([]string{"init", "--no-db", "--no-daemon", "--prefix", "test", "--quiet"})
@@ -491,15 +460,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		dbPath = ""
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// Initialize git repo first
 		if err := runCommandInDir(tmpDir, "git", "init"); err != nil {
@@ -539,15 +500,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		dbPath = ""
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// Initialize git repo first
 		if err := runCommandInDir(tmpDir, "git", "init"); err != nil {
@@ -561,7 +514,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		}
 
 		// Verify git config was NOT set locally (use --local to avoid picking up global config)
-		_, err = runCommandInDirWithOutput(tmpDir, "git", "config", "--local", "merge.beads.driver")
+		_, err := runCommandInDirWithOutput(tmpDir, "git", "config", "--local", "merge.beads.driver")
 		if err == nil {
 			t.Error("Expected git config to not be set with --skip-merge-driver")
 		}
@@ -580,15 +533,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		dbPath = ""
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// DON'T initialize git repo
 
@@ -612,15 +557,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		dbPath = ""
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// Initialize git repo
 		if err := runCommandInDir(tmpDir, "git", "init"); err != nil {
@@ -683,15 +620,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		initCmd.Flags().Set("skip-merge-driver", "false")
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// Initialize git repo
 		if err := runCommandInDir(tmpDir, "git", "init"); err != nil {
@@ -750,15 +679,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		initCmd.Flags().Set("skip-merge-driver", "false")
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// Initialize git repo
 		if err := runCommandInDir(tmpDir, "git", "init"); err != nil {
@@ -800,15 +721,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		dbPath = ""
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// Initialize git repo
 		if err := runCommandInDir(tmpDir, "git", "init"); err != nil {
@@ -857,15 +770,7 @@ func TestInitMergeDriverAutoConfiguration(t *testing.T) {
 		dbPath = ""
 
 		tmpDir := t.TempDir()
-		originalWd, err := os.Getwd()
-		if err != nil {
-			t.Fatalf("Failed to get working directory: %v", err)
-		}
-		defer os.Chdir(originalWd)
-
-		if err := os.Chdir(tmpDir); err != nil {
-			t.Fatalf("Failed to change to temp directory: %v", err)
-		}
+		t.Chdir(tmpDir)
 
 		// Initialize git repo
 		if err := runCommandInDir(tmpDir, "git", "init"); err != nil {
@@ -1003,15 +908,7 @@ func TestReadFirstIssueFromJSONL_EmptyFile(t *testing.T) {
 // This is a regression test for bd-5bj where user settings were lost.
 func TestSetupClaudeSettings_InvalidJSON(t *testing.T) {
 	tmpDir := t.TempDir()
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Create .claude directory
 	claudeDir := filepath.Join(tmpDir, ".claude")
@@ -1037,6 +934,7 @@ func TestSetupClaudeSettings_InvalidJSON(t *testing.T) {
 	}
 
 	// Call setupClaudeSettings - should return an error
+	var err error
 	err = setupClaudeSettings(false)
 	if err == nil {
 		t.Fatal("Expected error for invalid JSON, got nil")
@@ -1065,15 +963,7 @@ func TestSetupClaudeSettings_InvalidJSON(t *testing.T) {
 // TestSetupClaudeSettings_ValidJSON verifies that valid JSON is properly updated
 func TestSetupClaudeSettings_ValidJSON(t *testing.T) {
 	tmpDir := t.TempDir()
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Create .claude directory
 	claudeDir := filepath.Join(tmpDir, ".claude")
@@ -1098,6 +988,7 @@ func TestSetupClaudeSettings_ValidJSON(t *testing.T) {
 	}
 
 	// Call setupClaudeSettings - should succeed
+	var err error
 	err = setupClaudeSettings(false)
 	if err != nil {
 		t.Fatalf("Expected no error for valid JSON, got: %v", err)
@@ -1134,19 +1025,12 @@ func TestSetupClaudeSettings_ValidJSON(t *testing.T) {
 // TestSetupClaudeSettings_NoExistingFile verifies behavior when no file exists
 func TestSetupClaudeSettings_NoExistingFile(t *testing.T) {
 	tmpDir := t.TempDir()
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Don't create .claude directory - setupClaudeSettings should create it
 
 	// Call setupClaudeSettings - should succeed
+	var err error
 	err = setupClaudeSettings(false)
 	if err != nil {
 		t.Fatalf("Expected no error when no file exists, got: %v", err)
diff --git a/cmd/bd/migrate_sync_test.go b/cmd/bd/migrate_sync_test.go
index cd0f1630..7b5ebebf 100644
--- a/cmd/bd/migrate_sync_test.go
+++ b/cmd/bd/migrate_sync_test.go
@@ -95,11 +95,7 @@ func TestMigrateSyncDryRun(t *testing.T) {
 	// Test that branchExistsLocal returns false for non-existent branch
 	// Note: We need to run this from tmpDir context since branchExistsLocal uses git in cwd
 	ctx := context.Background()
-	origDir, _ := os.Getwd()
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("failed to chdir: %v", err)
-	}
-	defer os.Chdir(origDir)
+	t.Chdir(tmpDir)
 
 	if branchExistsLocal(ctx, "beads-sync") {
 		t.Error("branchExistsLocal should return false for non-existent branch")
diff --git a/cmd/bd/nodb_test.go b/cmd/bd/nodb_test.go
index 8c959f17..56be64e9 100644
--- a/cmd/bd/nodb_test.go
+++ b/cmd/bd/nodb_test.go
@@ -141,15 +141,11 @@ func TestDetectPrefix(t *testing.T) {
 
 	t.Run("empty database defaults to dir name", func(t *testing.T) {
 		// Change to temp dir so we can control directory name
-		origWd, _ := os.Getwd()
 		namedDir := filepath.Join(tempDir, "myproject")
 		if err := os.MkdirAll(namedDir, 0o755); err != nil {
 			t.Fatalf("Failed to create named dir: %v", err)
 		}
-		if err := os.Chdir(namedDir); err != nil {
-			t.Fatalf("Failed to chdir: %v", err)
-		}
-		defer func() { _ = os.Chdir(origWd) }()
+		t.Chdir(namedDir)
 
 		memStore := memory.New(filepath.Join(beadsDir, "issues.jsonl"))
 		prefix, err := detectPrefix(beadsDir, memStore)
diff --git a/cmd/bd/reinit_test.go b/cmd/bd/reinit_test.go
index 3fae9ad4..1df0b655 100644
--- a/cmd/bd/reinit_test.go
+++ b/cmd/bd/reinit_test.go
@@ -89,9 +89,7 @@ func testFreshCloneAutoImport(t *testing.T) {
 	}
 
 	// Test checkGitForIssues detects issues.jsonl
-	originalDir, _ := os.Getwd()
-	os.Chdir(dir)
-	defer os.Chdir(originalDir)
+	t.Chdir(dir)
 
 	count, path := checkGitForIssues()
 	if count != 1 {
@@ -165,9 +163,7 @@ func testDatabaseRemovalScenario(t *testing.T) {
 	os.MkdirAll(beadsDir, 0755)
 
 	// Change to test directory
-	originalDir, _ := os.Getwd()
-	os.Chdir(dir)
-	defer os.Chdir(originalDir)
+	t.Chdir(dir)
 
 	// Test checkGitForIssues finds issues.jsonl (canonical name)
 	count, path := checkGitForIssues()
@@ -245,9 +241,7 @@ func testLegacyFilenameSupport(t *testing.T) {
 	runCmd(t, dir, "git", "commit", "-m", "Add legacy issue")
 
 	// Change to test directory
-	originalDir, _ := os.Getwd()
-	os.Chdir(dir)
-	defer os.Chdir(originalDir)
+	t.Chdir(dir)
 
 	// Test checkGitForIssues finds issues.jsonl
 	count, path := checkGitForIssues()
@@ -323,9 +317,7 @@ func testPrecedenceTest(t *testing.T) {
 	runCmd(t, dir, "git", "commit", "-m", "Add both files")
 
 	// Change to test directory
-	originalDir, _ := os.Getwd()
-	os.Chdir(dir)
-	defer os.Chdir(originalDir)
+	t.Chdir(dir)
 
 	// Test checkGitForIssues prefers issues.jsonl
 	count, path := checkGitForIssues()
@@ -371,9 +363,7 @@ func testInitSafetyCheck(t *testing.T) {
 	runCmd(t, dir, "git", "commit", "-m", "Add issue")
 
 	// Change to test directory
-	originalDir, _ := os.Getwd()
-	os.Chdir(dir)
-	defer os.Chdir(originalDir)
+	t.Chdir(dir)
 
 	// Create empty database (simulating failed import)
 	dbPath := filepath.Join(beadsDir, "test.db")
diff --git a/cmd/bd/restore_test.go b/cmd/bd/restore_test.go
index a6ff0b30..ed0bc6ee 100644
--- a/cmd/bd/restore_test.go
+++ b/cmd/bd/restore_test.go
@@ -118,10 +118,7 @@ incomplete line without brace
 
 func TestGitHasUncommittedChanges_NotInGitRepo(t *testing.T) {
 	tmpDir := t.TempDir()
-	originalWd, _ := os.Getwd()
-	defer os.Chdir(originalWd)
-
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Should error when not in a git repo
 	_, err := gitHasUncommittedChanges()
@@ -132,10 +129,7 @@ func TestGitHasUncommittedChanges_NotInGitRepo(t *testing.T) {
 
 func TestGetCurrentGitHead_NotInGitRepo(t *testing.T) {
 	tmpDir := t.TempDir()
-	originalWd, _ := os.Getwd()
-	defer os.Chdir(originalWd)
-
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Should error when not in a git repo
 	_, err := getCurrentGitHead()
diff --git a/cmd/bd/sync_local_only_test.go b/cmd/bd/sync_local_only_test.go
index c332b6c8..d1bd7c7b 100644
--- a/cmd/bd/sync_local_only_test.go
+++ b/cmd/bd/sync_local_only_test.go
@@ -26,15 +26,7 @@ func TestLocalOnlyMode(t *testing.T) {
 	runGitCmd(t, tempDir, "config", "user.name", "Test User")
 	
 	// Change to temp directory so git commands run in the test repo
-	oldDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working dir: %v", err)
-	}
-	defer os.Chdir(oldDir)
-	
-	if err := os.Chdir(tempDir); err != nil {
-		t.Fatalf("Failed to change to temp dir: %v", err)
-	}
+	t.Chdir(tempDir)
 	
 	// Verify no remote exists
 	cmd := exec.Command("git", "remote")
@@ -112,15 +104,7 @@ func TestWithRemote(t *testing.T) {
 	runGitCmd(t, tempDir, "clone", remoteDir, cloneDir)
 	
 	// Change to clone directory
-	oldDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working dir: %v", err)
-	}
-	defer os.Chdir(oldDir)
-	
-	if err := os.Chdir(cloneDir); err != nil {
-		t.Fatalf("Failed to change to clone dir: %v", err)
-	}
+	t.Chdir(cloneDir)
 
 	ctx := context.Background()
 
diff --git a/cmd/bd/sync_test.go b/cmd/bd/sync_test.go
index 5285b7db..8ee76be7 100644
--- a/cmd/bd/sync_test.go
+++ b/cmd/bd/sync_test.go
@@ -24,10 +24,7 @@ func TestIsGitRepo_InGitRepo(t *testing.T) {
 
 func TestIsGitRepo_NotInGitRepo(t *testing.T) {
 	tmpDir := t.TempDir()
-	originalWd, _ := os.Getwd()
-	defer os.Chdir(originalWd)
-
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	if isGitRepo() {
 		t.Error("expected false when not in git repo")
@@ -451,9 +448,7 @@ func TestZFCSkipsExportAfterImport(t *testing.T) {
 	}
 	ctx := context.Background()
 	tmpDir := t.TempDir()
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Setup beads directory with JSONL
 	beadsDir := filepath.Join(tmpDir, ".beads")
diff --git a/cmd/bd/template_test.go b/cmd/bd/template_test.go
index 4bd711bd..92a43424 100644
--- a/cmd/bd/template_test.go
+++ b/cmd/bd/template_test.go
@@ -77,9 +77,7 @@ func TestLoadBuiltinTemplateNotFound(t *testing.T) {
 func TestLoadCustomTemplate(t *testing.T) {
 	// Create temporary directory for test
 	tmpDir := t.TempDir()
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Create .beads/templates directory
 	templatesDir := filepath.Join(".beads", "templates")
@@ -129,9 +127,7 @@ acceptance_criteria: Test acceptance
 func TestLoadTemplate_PreferCustomOverBuiltin(t *testing.T) {
 	// Create temporary directory for test
 	tmpDir := t.TempDir()
-	oldWd, _ := os.Getwd()
-	defer os.Chdir(oldWd)
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Create .beads/templates directory
 	templatesDir := filepath.Join(".beads", "templates")
diff --git a/cmd/bd/version_tracking_test.go b/cmd/bd/version_tracking_test.go
index 9a2f21dd..a3a257e1 100644
--- a/cmd/bd/version_tracking_test.go
+++ b/cmd/bd/version_tracking_test.go
@@ -106,12 +106,7 @@ func TestTrackBdVersion_NoBeadsDir(t *testing.T) {
 
 	// Change to temp directory with no .beads
 	tmpDir := t.TempDir()
-	origWd, _ := os.Getwd()
-	defer os.Chdir(origWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp dir: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// trackBdVersion should silently succeed
 	trackBdVersion()
@@ -137,11 +132,7 @@ func TestTrackBdVersion_FirstRun(t *testing.T) {
 	}
 
 	// Change to temp directory
-	origWd, _ := os.Getwd()
-	defer os.Chdir(origWd)
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp dir: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Save original state
 	origUpgradeDetected := versionUpgradeDetected
@@ -180,11 +171,7 @@ func TestTrackBdVersion_UpgradeDetection(t *testing.T) {
 	}
 
 	// Change to temp directory
-	origWd, _ := os.Getwd()
-	defer os.Chdir(origWd)
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp dir: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Create minimal metadata.json so FindBeadsDir can find the directory (bd-420)
 	metadataPath := filepath.Join(beadsDir, "metadata.json")
@@ -238,11 +225,7 @@ func TestTrackBdVersion_SameVersion(t *testing.T) {
 	}
 
 	// Change to temp directory
-	origWd, _ := os.Getwd()
-	defer os.Chdir(origWd)
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change to temp dir: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Create .local_version with current version
 	localVersionPath := filepath.Join(beadsDir, localVersionFile)
diff --git a/examples/library-usage/main_test.go b/examples/library-usage/main_test.go
index 87b222f3..dc8a90b3 100644
--- a/examples/library-usage/main_test.go
+++ b/examples/library-usage/main_test.go
@@ -152,12 +152,7 @@ func TestFindDatabasePath(t *testing.T) {
 	f.Close()
 
 	// Change to temp directory
-	originalWd, _ := os.Getwd()
-	defer os.Chdir(originalWd)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to chdir: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Test FindDatabasePath
 	found := beads.FindDatabasePath()
diff --git a/internal/beads/beads_integration_test.go b/internal/beads/beads_integration_test.go
index 59d443d7..bf23688d 100644
--- a/internal/beads/beads_integration_test.go
+++ b/internal/beads/beads_integration_test.go
@@ -369,10 +369,6 @@ func TestBatchCreateIssues(t *testing.T) {
 
 // TestFindDatabasePathIntegration tests the database discovery
 func TestFindDatabasePathIntegration(t *testing.T) {
-	// Save original working directory
-	originalWd, _ := os.Getwd()
-	defer os.Chdir(originalWd)
-
 	// Create temporary directory with .beads
 	tmpDir, err := os.MkdirTemp("", "beads-find-*")
 	if err != nil {
@@ -388,7 +384,7 @@ func TestFindDatabasePathIntegration(t *testing.T) {
 	f.Close()
 
 	// Change to temp directory
-	os.Chdir(tmpDir)
+	t.Chdir(tmpDir)
 
 	// Should find the database
 	found := beads.FindDatabasePath()
diff --git a/internal/beads/beads_multidb_test.go b/internal/beads/beads_multidb_test.go
index 2e70caa8..b4233c51 100644
--- a/internal/beads/beads_multidb_test.go
+++ b/internal/beads/beads_multidb_test.go
@@ -58,17 +58,8 @@ func TestFindAllDatabases(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// Save original working directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(origDir)
-
 	// Change to subdir and test FindAllDatabases
-	if err := os.Chdir(subdir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(subdir)
 
 	databases := FindAllDatabases()
 
@@ -118,17 +109,8 @@ func TestFindAllDatabases_Single(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// Save original working directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(origDir)
-
 	// Change to tmpDir and test
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(tmpDir)
 
 	databases := FindAllDatabases()
 
@@ -150,17 +132,8 @@ func TestFindAllDatabases_None(t *testing.T) {
 	}
 	defer os.RemoveAll(tmpDir)
 
-	// Save original working directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(origDir)
-
 	// Change to tmpDir and test
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(tmpDir)
 
 	databases := FindAllDatabases()
 
diff --git a/internal/beads/beads_symlink_test.go b/internal/beads/beads_symlink_test.go
index e28bfdc8..f6977ab5 100644
--- a/internal/beads/beads_symlink_test.go
+++ b/internal/beads/beads_symlink_test.go
@@ -61,17 +61,8 @@ func TestFindAllDatabases_SymlinkDeduplication(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// Save original working directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(origDir)
-
 	// Change to subdir (which is inside the symlinked directory)
-	if err := os.Chdir(subdir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(subdir)
 
 	// Call FindAllDatabases
 	databases := FindAllDatabases()
@@ -150,16 +141,8 @@ func TestFindAllDatabases_MultipleSymlinksToSameDB(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// Save and change directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(origDir)
-
-	if err := os.Chdir(workdir); err != nil {
-		t.Fatal(err)
-	}
+	// Change to working directory
+	t.Chdir(workdir)
 
 	// Find databases
 	databases := FindAllDatabases()
diff --git a/internal/beads/beads_test.go b/internal/beads/beads_test.go
index 3cc187be..1e387b4c 100644
--- a/internal/beads/beads_test.go
+++ b/internal/beads/beads_test.go
@@ -30,16 +30,14 @@ func TestFindDatabasePathEnvVar(t *testing.T) {
 }
 
 func TestFindDatabasePathInTree(t *testing.T) {
-	// Save original env var and working directory
+	// Save original env var
 	originalEnv := os.Getenv("BEADS_DB")
-	originalWd, _ := os.Getwd()
 	defer func() {
 		if originalEnv != "" {
 			os.Setenv("BEADS_DB", originalEnv)
 		} else {
 			os.Unsetenv("BEADS_DB")
 		}
-		os.Chdir(originalWd)
 	}()
 
 	// Clear env var
@@ -73,10 +71,7 @@ func TestFindDatabasePathInTree(t *testing.T) {
 		t.Fatalf("Failed to create subdirectory: %v", err)
 	}
 
-	err = os.Chdir(subDir)
-	if err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(subDir)
 
 	// Should find the database in the parent directory tree
 	result := FindDatabasePath()
@@ -97,16 +92,14 @@ func TestFindDatabasePathInTree(t *testing.T) {
 }
 
 func TestFindDatabasePathNotFound(t *testing.T) {
-	// Save original env var and working directory
+	// Save original env var
 	originalEnv := os.Getenv("BEADS_DB")
-	originalWd, _ := os.Getwd()
 	defer func() {
 		if originalEnv != "" {
 			os.Setenv("BEADS_DB", originalEnv)
 		} else {
 			os.Unsetenv("BEADS_DB")
 		}
-		os.Chdir(originalWd)
 	}()
 
 	// Clear env var
@@ -119,10 +112,7 @@ func TestFindDatabasePathNotFound(t *testing.T) {
 	}
 	defer os.RemoveAll(tmpDir)
 
-	err = os.Chdir(tmpDir)
-	if err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Should return empty string (no database found)
 	result := FindDatabasePath()
@@ -366,14 +356,12 @@ func TestHasBeadsProjectFiles(t *testing.T) {
 func TestFindBeadsDirSkipsDaemonRegistry(t *testing.T) {
 	// Save original state
 	originalEnv := os.Getenv("BEADS_DIR")
-	originalWd, _ := os.Getwd()
 	defer func() {
 		if originalEnv != "" {
 			os.Setenv("BEADS_DIR", originalEnv)
 		} else {
 			os.Unsetenv("BEADS_DIR")
 		}
-		os.Chdir(originalWd)
 	}()
 	os.Unsetenv("BEADS_DIR")
 
@@ -394,9 +382,7 @@ func TestFindBeadsDirSkipsDaemonRegistry(t *testing.T) {
 	}
 
 	// Change to temp dir
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(tmpDir)
 
 	// Should NOT find the daemon-only directory
 	result := FindBeadsDir()
@@ -465,14 +451,12 @@ func TestFindDatabasePathHomeDefault(t *testing.T) {
 	// creating the file and just verify the function doesn't crash
 
 	originalEnv := os.Getenv("BEADS_DB")
-	originalWd, _ := os.Getwd()
 	defer func() {
 		if originalEnv != "" {
 			os.Setenv("BEADS_DB", originalEnv)
 		} else {
 			os.Unsetenv("BEADS_DB")
 		}
-		os.Chdir(originalWd)
 	}()
 
 	os.Unsetenv("BEADS_DB")
@@ -484,10 +468,7 @@ func TestFindDatabasePathHomeDefault(t *testing.T) {
 	}
 	defer os.RemoveAll(tmpDir)
 
-	err = os.Chdir(tmpDir)
-	if err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Call FindDatabasePath - it might return home dir default or empty string
 	result := FindDatabasePath()
@@ -691,14 +672,12 @@ func TestFollowRedirect(t *testing.T) {
 func TestFindDatabasePathWithRedirect(t *testing.T) {
 	// Save original state
 	originalEnv := os.Getenv("BEADS_DIR")
-	originalWd, _ := os.Getwd()
 	defer func() {
 		if originalEnv != "" {
 			os.Setenv("BEADS_DIR", originalEnv)
 		} else {
 			os.Unsetenv("BEADS_DIR")
 		}
-		os.Chdir(originalWd)
 	}()
 	os.Unsetenv("BEADS_DIR")
 
@@ -733,9 +712,7 @@ func TestFindDatabasePathWithRedirect(t *testing.T) {
 
 	// Change to project directory
 	projectDir := filepath.Join(tmpDir, "project")
-	if err := os.Chdir(projectDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(projectDir)
 
 	// FindDatabasePath should follow the redirect
 	result := FindDatabasePath()
@@ -753,14 +730,12 @@ func TestFindDatabasePathWithRedirect(t *testing.T) {
 func TestFindBeadsDirWithRedirect(t *testing.T) {
 	// Save original state
 	originalEnv := os.Getenv("BEADS_DIR")
-	originalWd, _ := os.Getwd()
 	defer func() {
 		if originalEnv != "" {
 			os.Setenv("BEADS_DIR", originalEnv)
 		} else {
 			os.Unsetenv("BEADS_DIR")
 		}
-		os.Chdir(originalWd)
 	}()
 	os.Unsetenv("BEADS_DIR")
 
@@ -794,9 +769,7 @@ func TestFindBeadsDirWithRedirect(t *testing.T) {
 
 	// Change to project directory
 	projectDir := filepath.Join(tmpDir, "project")
-	if err := os.Chdir(projectDir); err != nil {
-		t.Fatal(err)
-	}
+	t.Chdir(projectDir)
 
 	// FindBeadsDir should follow the redirect
 	result := FindBeadsDir()
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index b122658b..436a1e55 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -105,30 +105,23 @@ flush-debounce: 15s
 		t.Fatalf("failed to write config file: %v", err)
 	}
 	
-	// Change to tmp directory so config file is discovered
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("failed to get working directory: %v", err)
-	}
-	defer os.Chdir(origDir)
-	
 	// Create .beads directory
 	beadsDir := filepath.Join(tmpDir, ".beads")
 	if err := os.MkdirAll(beadsDir, 0750); err != nil {
 		t.Fatalf("failed to create .beads directory: %v", err)
 	}
-	
+
 	// Move config to .beads directory
 	beadsConfigPath := filepath.Join(beadsDir, "config.yaml")
 	if err := os.Rename(configPath, beadsConfigPath); err != nil {
 		t.Fatalf("failed to move config file: %v", err)
 	}
-	
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("failed to change directory: %v", err)
-	}
-	
+
+	// Change to tmp directory so config file is discovered
+	t.Chdir(tmpDir)
+
 	// Initialize viper
+	var err error
 	err = Initialize()
 	if err != nil {
 		t.Fatalf("Initialize() returned error: %v", err)
@@ -169,17 +162,10 @@ func TestConfigPrecedence(t *testing.T) {
 	}
 	
 	// Change to tmp directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("failed to get working directory: %v", err)
-	}
-	defer os.Chdir(origDir)
-	
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("failed to change directory: %v", err)
-	}
-	
+	t.Chdir(tmpDir)
+
 	// Test 1: Config file value (json: false)
+	var err error
 	err = Initialize()
 	if err != nil {
 		t.Fatalf("Initialize() returned error: %v", err)
@@ -288,17 +274,10 @@ repos:
 	}
 
 	// Change to tmp directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("failed to get working directory: %v", err)
-	}
-	defer os.Chdir(origDir)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Initialize viper
+	var err error
 	err = Initialize()
 	if err != nil {
 		t.Fatalf("Initialize() returned error: %v", err)
@@ -365,17 +344,10 @@ repos:
 	}
 
 	// Change to tmp directory
-	origDir, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("failed to get working directory: %v", err)
-	}
-	defer os.Chdir(origDir)
-
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	// Initialize viper
+	var err error
 	err = Initialize()
 	if err != nil {
 		t.Fatalf("Initialize() returned error: %v", err)
diff --git a/internal/rpc/bench_test.go b/internal/rpc/bench_test.go
index 03f516d7..050fb1e8 100644
--- a/internal/rpc/bench_test.go
+++ b/internal/rpc/bench_test.go
@@ -297,28 +297,13 @@ func setupBenchServer(b *testing.B) (*Server, *Client, func(), string) {
 	time.Sleep(100 * time.Millisecond)
 
 	// Change to tmpDir so client's os.Getwd() finds the test database
-	originalWd, err := os.Getwd()
-	if err != nil {
-		cancel()
-		server.Stop()
-		store.Close()
-		os.RemoveAll(tmpDir)
-		b.Fatalf("Failed to get working directory: %v", err)
-	}
-	if err := os.Chdir(tmpDir); err != nil {
-		cancel()
-		server.Stop()
-		store.Close()
-		os.RemoveAll(tmpDir)
-		b.Fatalf("Failed to change directory: %v", err)
-	}
+	b.Chdir(tmpDir)
 
 	client, err := TryConnect(socketPath)
 	if err != nil {
 		cancel()
 		server.Stop()
 		store.Close()
-		os.Chdir(originalWd)
 		os.RemoveAll(tmpDir)
 		b.Fatalf("Failed to connect client: %v", err)
 	}
@@ -331,7 +316,6 @@ func setupBenchServer(b *testing.B) (*Server, *Client, func(), string) {
 		cancel()
 		server.Stop()
 		store.Close()
-		os.Chdir(originalWd) // Restore original working directory
 		os.RemoveAll(tmpDir)
 	}
 
diff --git a/internal/rpc/list_filters_test.go b/internal/rpc/list_filters_test.go
index a5871f69..fe8046bf 100644
--- a/internal/rpc/list_filters_test.go
+++ b/internal/rpc/list_filters_test.go
@@ -68,21 +68,7 @@ func setupTestServerWithStore(t *testing.T) (*Server, *Client, *sqlitestorage.SQ
 		}
 	}
 
-	originalWd, err := os.Getwd()
-	if err != nil {
-		cancel()
-		server.Stop()
-		store.Close()
-		os.RemoveAll(tmpDir)
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	if err := os.Chdir(tmpDir); err != nil {
-		cancel()
-		server.Stop()
-		store.Close()
-		os.RemoveAll(tmpDir)
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	t.Chdir(tmpDir)
 
 	client, err := TryConnect(socketPath)
 	if err != nil {
@@ -108,7 +94,6 @@ func setupTestServerWithStore(t *testing.T) (*Server, *Client, *sqlitestorage.SQ
 		cancel()
 		server.Stop()
 		store.Close()
-		os.Chdir(originalWd)
 		os.RemoveAll(tmpDir)
 	}
 
diff --git a/internal/rpc/rpc_test.go b/internal/rpc/rpc_test.go
index 04d23701..b140e610 100644
--- a/internal/rpc/rpc_test.go
+++ b/internal/rpc/rpc_test.go
@@ -76,22 +76,8 @@ func setupTestServer(t *testing.T) (*Server, *Client, func()) {
 		}
 	}
 
-	// Change to tmpDir so client's os.Getwd() finds the test database
-	originalWd, err := os.Getwd()
-	if err != nil {
-		cancel()
-		server.Stop()
-		store.Close()
-		os.RemoveAll(tmpDir)
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	if err := os.Chdir(tmpDir); err != nil {
-		cancel()
-		server.Stop()
-		store.Close()
-		os.RemoveAll(tmpDir)
-		t.Fatalf("Failed to change directory: %v", err)
-	}
+	// Change to tmpDir so client's os.Getwd() finds the test database.
+	t.Chdir(tmpDir)
 
 	client, err := TryConnect(socketPath)
 	if err != nil {
@@ -118,7 +104,6 @@ func setupTestServer(t *testing.T) (*Server, *Client, func()) {
 		cancel()
 		server.Stop()
 		store.Close()
-		os.Chdir(originalWd) // Restore original working directory
 		os.RemoveAll(tmpDir)
 	}
 
@@ -445,9 +430,6 @@ func TestConcurrentRequests(t *testing.T) {
 }
 
 func TestDatabaseHandshake(t *testing.T) {
-	// Save original directory and change to a temp directory for test isolation
-	origDir, _ := os.Getwd()
-	
 	// Create two separate databases and daemons
 	tmpDir1, err := os.MkdirTemp("", "bd-test-db1-*")
 	if err != nil {
@@ -492,9 +474,8 @@ func TestDatabaseHandshake(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 
 	// Test 1: Client with correct ExpectedDB should succeed
-	// Change to tmpDir1 so cwd resolution doesn't find other databases
-	os.Chdir(tmpDir1)
-	defer os.Chdir(origDir)
+	// Change to tmpDir1 so cwd resolution doesn't find other databases.
+	t.Chdir(tmpDir1)
 	
 	client1, err := TryConnect(socketPath1)
 	if err != nil {
diff --git a/internal/rpc/version_test.go b/internal/rpc/version_test.go
index c90f43af..58364184 100644
--- a/internal/rpc/version_test.go
+++ b/internal/rpc/version_test.go
@@ -6,7 +6,6 @@ package rpc
 import (
 	"context"
 	"encoding/json"
-	"os"
 	"testing"
 	"time"
 
@@ -117,14 +116,7 @@ func TestVersionCompatibility(t *testing.T) {
 			defer func() { ClientVersion = originalClientVersion }()
 
 			// Change to tmpDir so client's os.Getwd() finds the test database
-			originalWd, err := os.Getwd()
-			if err != nil {
-				t.Fatalf("Failed to get working directory: %v", err)
-			}
-			if err := os.Chdir(tmpDir); err != nil {
-				t.Fatalf("Failed to change directory: %v", err)
-			}
-			defer os.Chdir(originalWd)
+			t.Chdir(tmpDir)
 
 			client, err := TryConnect(socketPath)
 			if err != nil {
@@ -202,14 +194,7 @@ func TestHealthCheckIncludesVersionInfo(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 
 	// Change to tmpDir so client's os.Getwd() finds the test database
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
+	t.Chdir(tmpDir)
 
 	client, err := TryConnect(socketPath)
 	if err != nil {
@@ -266,14 +251,7 @@ func TestIncompatibleVersionInHealth(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 
 	// Change to tmpDir so client's os.Getwd() finds the test database
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
+	t.Chdir(tmpDir)
 
 	client, err := TryConnect(socketPath)
 	if err != nil {
@@ -386,14 +364,7 @@ func TestPingAndHealthBypassVersionCheck(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 
 	// Change to tmpDir so client's os.Getwd() finds the test database
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
+	t.Chdir(tmpDir)
 
 	client, err := TryConnect(socketPath)
 	if err != nil {
@@ -460,14 +431,7 @@ func TestMetricsOperation(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 
 	// Change to tmpDir so client's os.Getwd() finds the test database
-	originalWd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("Failed to get working directory: %v", err)
-	}
-	if err := os.Chdir(tmpDir); err != nil {
-		t.Fatalf("Failed to change directory: %v", err)
-	}
-	defer os.Chdir(originalWd)
+	t.Chdir(tmpDir)
 
 	client, err := TryConnect(socketPath)
 	if err != nil {