diff --git a/pkg/providers/codex_provider.go b/pkg/providers/codex_provider.go
index a743d8c69..e3526cfb5 100644
--- a/pkg/providers/codex_provider.go
+++ b/pkg/providers/codex_provider.go
@@ -91,8 +91,8 @@ func (p *CodexProvider) Chat(ctx context.Context, messages []Message, tools []To
 		if evt.Type == "response.completed" || evt.Type == "response.failed" || evt.Type == "response.incomplete" {
 			evtResp := evt.Response
 			if evtResp.ID != "" {
-				cp := evtResp
-				resp = &cp
+				copy := evtResp
+				resp = &copy
 			}
 		}
 	}
diff --git a/pkg/providers/error_classifier_test.go b/pkg/providers/error_classifier_test.go
index d55585f55..34dc3ea3f 100644
--- a/pkg/providers/error_classifier_test.go
+++ b/pkg/providers/error_classifier_test.go
@@ -293,7 +293,7 @@ func TestFailoverError_ErrorString(t *testing.T) {
 func TestFailoverError_Unwrap(t *testing.T) {
 	inner := errors.New("inner error")
 	fe := &FailoverError{Reason: FailoverTimeout, Wrapped: inner}
-	if !errors.Is(inner, fe.Unwrap()) {
+	if !errors.Is(fe.Unwrap(), inner) {
 		t.Error("Unwrap should return wrapped error")
 	}
 }
diff --git a/pkg/tools/message_test.go b/pkg/tools/message_test.go
index 468f4aada..e11c0684d 100644
--- a/pkg/tools/message_test.go
+++ b/pkg/tools/message_test.go
@@ -126,7 +126,7 @@ func TestMessageTool_Execute_SendFailure(t *testing.T) {
 	if result.Err == nil {
 		t.Error("Expected Err to be set")
 	}
-	if !errors.Is(sendErr, result.Err) {
+	if !errors.Is(result.Err, sendErr) {
 		t.Errorf("Expected Err to be sendErr, got %v", result.Err)
 	}
 }