diff --git a/internal/backend/remote/backend_context_test.go b/internal/backend/remote/backend_context_test.go
index f3a133421a..c85a45154d 100644
--- a/internal/backend/remote/backend_context_test.go
+++ b/internal/backend/remote/backend_context_test.go
@@ -2,11 +2,12 @@ package remote
 
 import (
 	"context"
-	"github.com/hashicorp/terraform/internal/terraform"
-	"github.com/hashicorp/terraform/internal/tfdiags"
 	"reflect"
 	"testing"
 
+	"github.com/hashicorp/terraform/internal/terraform"
+	"github.com/hashicorp/terraform/internal/tfdiags"
+
 	tfe "github.com/hashicorp/go-tfe"
 	"github.com/hashicorp/terraform/internal/backend"
 	"github.com/hashicorp/terraform/internal/command/arguments"
diff --git a/internal/registry/regsrc/friendly_host.go b/internal/registry/regsrc/friendly_host.go
index c9bc40bee8..4ac22db87d 100644
--- a/internal/registry/regsrc/friendly_host.go
+++ b/internal/registry/regsrc/friendly_host.go
@@ -4,7 +4,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/terraform-svchost"
+	svchost "github.com/hashicorp/terraform-svchost"
 )
 
 var (