diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 826912d39..518eefc71 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -17,9 +17,9 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        go: ["1.19.x", "1.20.x"]
+        go: ["1.20.x", "1.21.x"]
         include:
-        - go: 1.20.x
+        - go: 1.21.x
           os: "ubuntu-latest"
           latest: true
 
diff --git a/docs/go.mod b/docs/go.mod
index fa4977c08..588342cc9 100644
--- a/docs/go.mod
+++ b/docs/go.mod
@@ -1,6 +1,6 @@
 module go.uber.org/fx/docs
 
-go 1.19
+go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.0
diff --git a/go.mod b/go.mod
index 2aa8f5f8e..2d2c7074f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module go.uber.org/fx
 
-go 1.19
+go 1.20
 
 require (
 	github.com/benbjohnson/clock v1.3.0
diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod
index 4ac8c2c4e..325fa3475 100644
--- a/internal/e2e/go.mod
+++ b/internal/e2e/go.mod
@@ -1,6 +1,8 @@
 module go.uber.org/fx/internal/e2e
 
-go 1.20
+go 1.21
+
+toolchain go1.21.0
 
 require (
 	github.com/stretchr/testify v1.8.2
diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum
index 02e268ae5..050a66cb4 100644
--- a/internal/e2e/go.sum
+++ b/internal/e2e/go.sum
@@ -1,8 +1,10 @@
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -18,6 +20,7 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/dig v1.17.0 h1:5Chju+tUvcC+N7N6EV08BJz41UZuO3BmHcN4A287ZLI=
 go.uber.org/dig v1.17.0/go.mod h1:rTxpf7l5I0eBTlE6/9RL+lDybC7WFwY2QH55ZSjy1mU=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
diff --git a/internal/fxreflect/stack_test.go b/internal/fxreflect/stack_test.go
index 62964858b..400c7c2ba 100644
--- a/internal/fxreflect/stack_test.go
+++ b/internal/fxreflect/stack_test.go
@@ -58,7 +58,7 @@ func TestStack(t *testing.T) {
 		}()
 
 		require.True(t, len(frames) > 3, "expected at least three frames")
-		for i, name := range []string{"func2.1.1", "func2.1", "func2"} {
+		for i, name := range []string{"func2.TestStack.func2.1.func2", "func2.1", "func2"} {
 			f := frames[i]
 			assert.Equal(t, "go.uber.org/fx/internal/fxreflect.TestStack."+name, f.Function)
 			assert.Contains(t, f.File, "internal/fxreflect/stack_test.go")
diff --git a/tools/go.mod b/tools/go.mod
index 762160ad2..490b7f495 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,6 +1,6 @@
 module go.uber.org/fx/tools
 
-go 1.19
+go 1.20
 
 require (
 	github.com/bwplotka/mdox v0.9.0