diff --git a/workspace-server/internal/handlers/a2a_proxy_helpers_test.go b/workspace-server/internal/handlers/a2a_proxy_helpers_test.go
index 3c57f8d3..d9dd7722 100644
--- a/workspace-server/internal/handlers/a2a_proxy_helpers_test.go
+++ b/workspace-server/internal/handlers/a2a_proxy_helpers_test.go
@@ -248,7 +248,7 @@ func TestReadUsageMap_MissingUsage(t *testing.T) {
 	m := map[string]json.RawMessage{
 		"other": json.RawMessage(`{}`),
 	}
-	in, out, ok := readUsageMap(m)
+	_, _, ok := readUsageMap(m)
 	if ok {
 		t.Errorf("readUsageMap returned ok=true for missing usage, want false")
 	}
@@ -297,7 +297,7 @@ func TestReadUsageMap_MalformedUsageJSON(t *testing.T) {
 	m := map[string]json.RawMessage{
 		"usage": json.RawMessage(`not valid json`),
 	}
-	in, out, ok := readUsageMap(m)
+	_, _, ok := readUsageMap(m)
 	if ok {
 		t.Errorf("readUsageMap returned ok=true for malformed usage JSON, want false")
 	}
diff --git a/workspace-server/internal/handlers/plugins_helpers_pure_test.go b/workspace-server/internal/handlers/plugins_helpers_pure_test.go
index 9ef499ea..df1e7e08 100644
--- a/workspace-server/internal/handlers/plugins_helpers_pure_test.go
+++ b/workspace-server/internal/handlers/plugins_helpers_pure_test.go
@@ -30,7 +30,7 @@ func TestSupportsRuntime_HyphenUnderscoreNormalized(t *testing.T) {
 	// "claude-code" and "claude_code" are considered equal.
 	info := pluginInfo{Name: "test", Runtimes: []string{"claude-code"}}
 	assert.True(t, info.supportsRuntime("claude_code"))
-	assert.True(t, info.supportsRuntime("anthropic_claude"))
+	assert.True(t, info.supportsRuntime("claude-code")) // symmetric hyphen form
 }
 
 func TestSupportsRuntime_HyphenVsUnderscoreReverse(t *testing.T) {
diff --git a/workspace-server/internal/handlers/workspace_dispatchers_test.go b/workspace-server/internal/handlers/workspace_dispatchers_test.go
index 60380afc..f1506f8d 100644
--- a/workspace-server/internal/handlers/workspace_dispatchers_test.go
+++ b/workspace-server/internal/handlers/workspace_dispatchers_test.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"context"
+	"database/sql"
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"