diff --git a/storage/remote/client_test.go b/storage/remote/client_test.go
index 31f23cbb8..73ec875a5 100644
--- a/storage/remote/client_test.go
+++ b/storage/remote/client_test.go
@@ -74,7 +74,7 @@ func TestStoreHTTPErrorHandling(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		err = c.Store(context.TODO(), &prompb.WriteRequest{})
+		err = c.Store(context.Background(), &prompb.WriteRequest{})
 		if !reflect.DeepEqual(err, test.err) {
 			t.Errorf("%d. Unexpected error; want %v, got %v", i, test.err, err)
 		}
diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go
index 780a3689a..7408c1f59 100644
--- a/storage/remote/queue_manager.go
+++ b/storage/remote/queue_manager.go
@@ -420,7 +420,7 @@ func (s *shards) stop(deadline time.Duration) {
 		level.Error(s.qm.logger).Log("msg", "Failed to flush all samples on shutdown")
 	}
 
-	// Force a unclean shutdown.
+	// Force an unclean shutdown.
 	s.cancel()
 	<-s.done
 	return