diff --git a/builtin/providers/datadog/resource_datadog_monitor.go b/builtin/providers/datadog/resource_datadog_monitor.go
index 011bef4d90..266c7bf28f 100644
--- a/builtin/providers/datadog/resource_datadog_monitor.go
+++ b/builtin/providers/datadog/resource_datadog_monitor.go
@@ -1,12 +1,12 @@
 package datadog
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 	"strconv"
 	"strings"
 
-	"encoding/json"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/zorkian/go-datadog-api"
 )
diff --git a/builtin/providers/github/resource_github_membership_test.go b/builtin/providers/github/resource_github_membership_test.go
index 670ccb486c..cebad98da9 100644
--- a/builtin/providers/github/resource_github_membership_test.go
+++ b/builtin/providers/github/resource_github_membership_test.go
@@ -2,12 +2,12 @@ package github
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/google/go-github/github"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-	"os"
 )
 
 func TestAccGithubMembership_basic(t *testing.T) {
diff --git a/builtin/providers/github/resource_github_team_membership_test.go b/builtin/providers/github/resource_github_team_membership_test.go
index 4a12e5c9fb..074112b4b4 100644
--- a/builtin/providers/github/resource_github_team_membership_test.go
+++ b/builtin/providers/github/resource_github_team_membership_test.go
@@ -2,12 +2,12 @@ package github
 
 import (
 	"fmt"
+	"os"
 	"testing"
 
 	"github.com/google/go-github/github"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-	"os"
 )
 
 func TestAccGithubTeamMembership_basic(t *testing.T) {
diff --git a/builtin/providers/google/resource_compute_instance_template_test.go b/builtin/providers/google/resource_compute_instance_template_test.go
index f4b96eb771..ec8e2b72fd 100644
--- a/builtin/providers/google/resource_compute_instance_template_test.go
+++ b/builtin/providers/google/resource_compute_instance_template_test.go
@@ -2,13 +2,13 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"google.golang.org/api/compute/v1"
-	"strings"
 )
 
 func TestAccComputeInstanceTemplate_basic(t *testing.T) {
diff --git a/communicator/ssh/password.go b/communicator/ssh/password.go
index 8db6f82da2..8b32c8d4cd 100644
--- a/communicator/ssh/password.go
+++ b/communicator/ssh/password.go
@@ -1,8 +1,9 @@
 package ssh
 
 import (
-	"golang.org/x/crypto/ssh"
 	"log"
+
+	"golang.org/x/crypto/ssh"
 )
 
 // An implementation of ssh.KeyboardInteractiveChallenge that simply sends
diff --git a/communicator/ssh/password_test.go b/communicator/ssh/password_test.go
index 6e3e0a257a..e513716d08 100644
--- a/communicator/ssh/password_test.go
+++ b/communicator/ssh/password_test.go
@@ -1,9 +1,10 @@
 package ssh
 
 import (
-	"golang.org/x/crypto/ssh"
 	"reflect"
 	"testing"
+
+	"golang.org/x/crypto/ssh"
 )
 
 func TestPasswordKeyboardInteractive_Impl(t *testing.T) {