diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 89857c6e..2c6b626a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: '1.14.0'
-      - run: ./build.sh
+      - run: ./generate.sh
       - name: golangci-lint
         run: |
           go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.28.3
diff --git a/build.sh b/build.sh
index accbca65..401727ee 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 set -e
-command -v genny >> /dev/null || go get github.com/cheekybits/genny
-go generate ./...
-goimports -w caching/gen-caching.go
+./generate.sh
 go build
diff --git a/generate.sh b/generate.sh
new file mode 100755
index 00000000..3bd9606a
--- /dev/null
+++ b/generate.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+command -v genny >> /dev/null || go get github.com/cheekybits/genny
+command -v goimports >> /dev/null || go get golang.org/x/tools/cmd/goimports
+go generate ./...
+goimports -w caching/gen-caching.go
diff --git a/run.sh b/run.sh
index aaf6c1b8..fadd62d4 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -e
 source env.sh
-go generate ./...
-goimports -w caching/gen-caching.go
+./generate.sh
 export AWS_SDK_LOAD_CONFIG=true
 go run main.go "$@"
\ No newline at end of file
diff --git a/test.sh b/test.sh
index 2259c1a0..499a597c 100755
--- a/test.sh
+++ b/test.sh
@@ -3,6 +3,5 @@ set -e
 export TEST=1
 source env.sh
 export AWS_REGION=us-west-2
-go generate ./...
-goimports -w caching/gen-caching.go
+./generate.sh
 UPDATE_SNAPSHOTS=true go test ./... $@
\ No newline at end of file