diff --git a/.circleci/config.yml b/.circleci/config.yml
index 29d7bcc58e..7583967536 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ orbs:
 executors:
   go:
     docker:
-      - image: circleci/golang:1.14
+      - image: circleci/golang:1.15
     environment:
       CONSUL_VERSION: 1.7.2
       GOMAXPROCS: 4
diff --git a/.go-version b/.go-version
index 52e779f28f..42cf0675c5 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.14.7
+1.15.2
diff --git a/go.sum b/go.sum
index f33b5faed9..d8d5e210a8 100644
--- a/go.sum
+++ b/go.sum
@@ -283,8 +283,6 @@ github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb h1:ZbgmOQt8DOg796fi
 github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE=
 github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk=
 github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A=
-github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 h1:hjyO2JsNZUKT1ym+FAdlBEkGPevazYsmVgIMw7dVELg=
-github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
 github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0=
 github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
 github.com/hashicorp/vault v0.10.4 h1:4x0lHxui/ZRp/B3E0Auv1QNBJpzETqHR2kQD3mHSBJU=
diff --git a/helper/schema/provider_test.go b/helper/schema/provider_test.go
index 01ee82a1f4..1f9b5e8bf8 100644
--- a/helper/schema/provider_test.go
+++ b/helper/schema/provider_test.go
@@ -341,7 +341,7 @@ func TestProviderDiff_timeoutInvalidValue(t *testing.T) {
 	if err == nil {
 		t.Fatal("Expected provider.Diff to fail with invalid timeout value")
 	}
-	expectedErrMsg := "time: invalid duration invalid"
+	expectedErrMsg := `time: invalid duration "invalid"`
 	if !strings.Contains(err.Error(), expectedErrMsg) {
 		t.Fatalf("Unexpected error message: %q\nExpected message to contain %q",
 			err.Error(),