diff --git a/.circleci/config.yml b/.circleci/config.yml
index c82e203..13f4867 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,8 @@ jobs:
       - run:
           command: |
             pip install pre-commit==1.21.0 cfgv==2.0.1 zipp==1.1.0 yapf
+            go get golang.org/x/tools/cmd/goimports
+            export GOPATH=~/go/bin && export PATH=$PATH:$GOPATH 
             pre-commit install
             pre-commit run --all-files
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ad2a29a..1b848ef 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,5 +3,5 @@ repos:
     rev: v0.1.10
     hooks:
       - id: terraform-fmt
-      - id: gofmt
+      - id: goimports
 
diff --git a/test/terratest_options.go b/test/terratest_options.go
index 724bd97..875cb01 100644
--- a/test/terratest_options.go
+++ b/test/terratest_options.go
@@ -2,8 +2,9 @@ package test
 
 import (
 	"fmt"
-	"github.com/gruntwork-io/terratest/modules/terraform"
 	"strings"
+
+	"github.com/gruntwork-io/terratest/modules/terraform"
 )
 
 func createTestGKEBasicHelmTerraformOptions(