diff --git a/client/structs/generate.sh b/client/structs/generate.sh
new file mode 100755
index 000000000000..12a8c0ed16ec
--- /dev/null
+++ b/client/structs/generate.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+FILES="$(ls *.go | tr '\n' ' ')"
+codecgen -d 102 -o structs.generated.go ${FILES}
diff --git a/client/structs/structs.go b/client/structs/structs.go
index af28b55ca6c6..22aecd45af23 100644
--- a/client/structs/structs.go
+++ b/client/structs/structs.go
@@ -1,6 +1,6 @@
 package structs
 
-//go:generate codecgen -d 102 -o structs.generated.go structs.go
+//go:generate ./generate.sh
 
 import (
 	"crypto/md5"
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