diff --git a/CHANGELOG.md b/CHANGELOG.md
index 975fb5e9af52..507fccc40faa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ BUG FIXES:
    [[GH-4216](https://github.com/hashicorp/nomad/issues/4216)]
  * core: Improve tracking of node connections even if the address being used to
    contact the server changes [[GH-4222](https://github.com/hashicorp/nomad/issues/4222)]
+ * api: Fix an issue in which the autopilot configuration could not be updated
+   [GH-4220]
  * client: Populate access time and modify time when unarchiving tar archives
    that do not specify them explicitly [[GH-4217](https://github.com/hashicorp/nomad/issues/4217)]
  * driver/exec: Create process group for Windows process and send Ctrl-Break
diff --git a/GNUmakefile b/GNUmakefile
index 048951b0586d..e6dcbfd9b349 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -261,6 +261,9 @@ clean: ## Remove build artifacts
 
 .PHONY: travis
 travis: ## Run Nomad test suites with output to prevent timeouts under Travis CI
+	@if [ ! $(SKIP_NOMAD_TESTS) ]; then \
+		make generate; \
+	fi
 	@sh -C "$(PROJECT_ROOT)/scripts/travis.sh"
 
 .PHONY: testcluster
diff --git a/nomad/structs/generate.sh b/nomad/structs/generate.sh
new file mode 100755
index 000000000000..34147c918334
--- /dev/null
+++ b/nomad/structs/generate.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+FILES="$(ls *[!_test].go | tr '\n' ' ')"
+codecgen -d 100 -o structs.generated.go ${FILES}
diff --git a/nomad/structs/structs_codegen.go b/nomad/structs/structs_codegen.go
index bdc324bb5c5e..f883d9314c44 100644
--- a/nomad/structs/structs_codegen.go
+++ b/nomad/structs/structs_codegen.go
@@ -1,3 +1,3 @@
 package structs
 
-//go:generate codecgen -d 100 -o structs.generated.go structs.go
+//go:generate ./generate.sh