diff --git a/Makefile b/Makefile
index 24ef3c1f6..aa6f646ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 export GO111MODULE = on
 
-GOCMD=?go
+GOCMD=go
 GOENV=GOOS=linux GOARCH=amd64 CGO_ENABLED=0
 GOBUILD=$(GOCMD) build -mod=vendor
 GOTEST=$(GOCMD) test -mod=vendor
diff --git a/caching_image.go b/caching_image.go
index 5a921175a..a4e1514fa 100644
--- a/caching_image.go
+++ b/caching_image.go
@@ -4,11 +4,12 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
-	"github.com/buildpack/imgutil"
-	"github.com/pkg/errors"
 	"io"
 	"os"
 
+	"github.com/buildpack/imgutil"
+	"github.com/pkg/errors"
+
 	"github.com/buildpack/lifecycle/cache"
 )
 
diff --git a/utils_test.go b/utils_test.go
index e284ccf1d..73aafe2db 100644
--- a/utils_test.go
+++ b/utils_test.go
@@ -6,10 +6,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/buildpack/lifecycle"
 	"github.com/google/go-cmp/cmp"
 	"github.com/sclevine/spec"
 	"github.com/sclevine/spec/report"
+
+	"github.com/buildpack/lifecycle"
 )
 
 func TestUtils(t *testing.T) {