diff --git a/Jenkinsfile b/Jenkinsfile
index 17245e1d9b..12691e7108 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -85,11 +85,6 @@ pipeline {
               sh """#!/bin/bash -ex
               mkdir -p \$(dirname $GO_PROJECT) && ln -sf $WORKSPACE $GO_PROJECT
 
-              # TODO: Remove me.
-              go get github.com/segmentio/terraform-docs
-              go get github.com/s-urbaniak/terraform-examples
-              go get github.com/bronze1man/yaml2json
-
               cd $GO_PROJECT/
               make structure-check
               make bin/smoke
diff --git a/images/tectonic-builder/Dockerfile b/images/tectonic-builder/Dockerfile
index fa63fa1ec5..41c8d181b2 100644
--- a/images/tectonic-builder/Dockerfile
+++ b/images/tectonic-builder/Dockerfile
@@ -22,6 +22,11 @@ FROM golang:1.8.3-stretch
 RUN go get -u github.com/golang/lint/golint
 RUN go get github.com/jstemmer/go-junit-report
 
+### Tools used by 'make structure-check'
+RUN go get github.com/segmentio/terraform-docs
+RUN go get github.com/s-urbaniak/terraform-examples
+RUN go get github.com/bronze1man/yaml2json
+
 ### License parser
 RUN go get github.com/coreos/license-bill-of-materials