diff --git a/.circleci/config.yml b/.circleci/config.yml
index 96f436e3d..16409d3a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,9 +9,6 @@ jobs:
     - image: circleci/golang
     working_directory: /go/src/github.com/facebookincubator/ent
     steps:
-    - run: &goimports_install
-        name: Install goimports
-        command: go get -u golang.org/x/tools/cmd/goimports
     - checkout
     - run:
         name: Dialect tests
@@ -45,7 +42,6 @@ jobs:
         command: conf/gremlin-server.yaml
     steps:
       - checkout
-      - run: *goimports_install
       - run:
           name: Run integration tests
           working_directory: entc/integration
diff --git a/entc/integration/compose/Dockerfile b/entc/integration/compose/Dockerfile
index 87c9d00b0..10d120d53 100644
--- a/entc/integration/compose/Dockerfile
+++ b/entc/integration/compose/Dockerfile
@@ -2,18 +2,12 @@
 # This source code is licensed under the Apache 2.0 license found
 # in the LICENSE file in the root directory of this source tree.
 
-# Multi stage application builder
-FROM golang:1.12.9-alpine
+# Application base
+FROM golang:1.13
 
 # Install tools required to build the project
 RUN apk add --no-cache git gcc musl-dev
 
-# Use public go modules proxy
-ENV GOPROXY https://proxy.golang.org
-
-# Install goimports for entc.
-RUN go get -u golang.org/x/tools/cmd/goimports
-
 # Copy mod files and install dependencies.
 WORKDIR /ent
 COPY go.mod go.sum ./