diff --git a/builtin/providers/heroku/resource_heroku_addon.go b/builtin/providers/heroku/resource_heroku_addon.go
index 79f776e7d..b2c36bdf9 100644
--- a/builtin/providers/heroku/resource_heroku_addon.go
+++ b/builtin/providers/heroku/resource_heroku_addon.go
@@ -3,8 +3,8 @@ package heroku
 import (
 	"fmt"
 	"log"
-	"sync"
 	"strings"
+	"sync"
 
 	"github.com/cyberdelia/heroku-go/v3"
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/plugin/server.go b/plugin/server.go
index bed02921e..cc81ffb93 100644
--- a/plugin/server.go
+++ b/plugin/server.go
@@ -31,9 +31,9 @@ func Serve(svc interface{}) error {
 	// First check the cookie
 	if os.Getenv(MagicCookieKey) != MagicCookieValue {
 		fmt.Fprintf(os.Stderr,
-			"This binary is a Terraform plugin. These are not meant to be\n" +
-			"executed directly. Please execute `terraform`, which will load\n" +
-			"any plugins automatically.\n")
+			"This binary is a Terraform plugin. These are not meant to be\n"+
+				"executed directly. Please execute `terraform`, which will load\n"+
+				"any plugins automatically.\n")
 		os.Exit(1)
 	}