diff --git a/internal/upstream/main.go b/internal/upstream/main.go
index c5a2e34d25..fdb8b56b15 100644
--- a/internal/upstream/main.go
+++ b/internal/upstream/main.go
@@ -32,7 +32,7 @@ func main() {
 	flag.Parse()
 
 	log.Printf("upstream listening HTTP/1.1 on %d\n", upstreamPort)
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	http.HandleFunc("/", func(w http.ResponseWriter, _ *http.Request) {
 		if _, err := w.Write([]byte(hello)); err != nil {
 			log.Println(err)
 		}
diff --git a/pkg/server/v3/delta_test.go b/pkg/server/v3/delta_test.go
index 285039b0af..813862ef59 100644
--- a/pkg/server/v3/delta_test.go
+++ b/pkg/server/v3/delta_test.go
@@ -439,7 +439,7 @@ func TestDeltaCallbackError(t *testing.T) {
 			config.deltaResources = makeDeltaResources()
 
 			s := server.NewServer(context.Background(), config, server.CallbackFuncs{
-				DeltaStreamOpenFunc: func(ctx context.Context, i int64, s string) error {
+				DeltaStreamOpenFunc: func(context.Context, int64, string) error {
 					return errors.New("stream open error")
 				},
 			})
diff --git a/pkg/server/v3/server_test.go b/pkg/server/v3/server_test.go
index d3c4e0f81b..e35534a615 100644
--- a/pkg/server/v3/server_test.go
+++ b/pkg/server/v3/server_test.go
@@ -371,20 +371,20 @@ func TestFetch(t *testing.T) {
 	callbackError := false
 
 	cb := server.CallbackFuncs{
-		StreamOpenFunc: func(ctx context.Context, i int64, s string) error {
+		StreamOpenFunc: func(context.Context, int64, string) error {
 			if callbackError {
 				return errors.New("stream open error")
 			}
 			return nil
 		},
-		FetchRequestFunc: func(ctx context.Context, request *discovery.DiscoveryRequest) error {
+		FetchRequestFunc: func(context.Context, *discovery.DiscoveryRequest) error {
 			if callbackError {
 				return errors.New("fetch request error")
 			}
 			requestCount++
 			return nil
 		},
-		FetchResponseFunc: func(request *discovery.DiscoveryRequest, response *discovery.DiscoveryResponse) {
+		FetchResponseFunc: func(*discovery.DiscoveryRequest, *discovery.DiscoveryResponse) {
 			responseCount++
 		},
 	}
@@ -666,7 +666,7 @@ func TestCallbackError(t *testing.T) {
 			config.responses = makeResponses()
 
 			s := server.NewServer(context.Background(), config, server.CallbackFuncs{
-				StreamOpenFunc: func(ctx context.Context, i int64, s string) error {
+				StreamOpenFunc: func(context.Context, int64, string) error {
 					return errors.New("stream open error")
 				},
 			})