diff --git a/codegen/protocol-test-codegen-local/model/eventstream-rpc.smithy b/codegen/protocol-test-codegen-local/model/eventstream-rpc.smithy
index f0dcfb4e0bb..2c65fc6e7df 100644
--- a/codegen/protocol-test-codegen-local/model/eventstream-rpc.smithy
+++ b/codegen/protocol-test-codegen-local/model/eventstream-rpc.smithy
@@ -1,3 +1,4 @@
+$version: "2"
 namespace aws.protocoltests.eventstream
 
 use aws.protocols#awsJson1_1
@@ -37,6 +38,18 @@ structure TestStruct {
     someInt: Integer,
 }
 
+enum TestEnum {
+    A
+    B
+    C
+}
+
+intEnum TestIntEnum {
+    A = 0
+    B = 1
+    C = 2
+}
+
 structure MessageWithBlob { @eventPayload data: Blob }
 
 structure MessageWithString { @eventPayload data: String }
@@ -50,9 +63,11 @@ structure MessageWithHeaders {
     @eventHeader boolean: Boolean,
     @eventHeader byte: Byte,
     @eventHeader int: Integer,
+    @eventHeader intEnum: TestIntEnum,
     @eventHeader long: Long,
     @eventHeader short: Short,
     @eventHeader string: String,
+    @eventHeader enum: TestEnum,
     @eventHeader timestamp: Timestamp,
 }
 structure MessageWithHeaderAndPayload {
diff --git a/codegen/protocol-test-codegen-local/model/eventstream.smithy b/codegen/protocol-test-codegen-local/model/eventstream.smithy
index 8a68e5d884f..5e10160221a 100644
--- a/codegen/protocol-test-codegen-local/model/eventstream.smithy
+++ b/codegen/protocol-test-codegen-local/model/eventstream.smithy
@@ -1,3 +1,4 @@
+$version: "2"
 namespace aws.protocoltests.eventstream
 
 use aws.protocols#restJson1
@@ -37,6 +38,18 @@ structure TestStruct {
     someInt: Integer,
 }
 
+enum TestEnum {
+    A
+    B
+    C
+}
+
+intEnum TestIntEnum {
+    A = 0
+    B = 1
+    C = 2
+}
+
 structure MessageWithBlob { @eventPayload data: Blob }
 
 structure MessageWithString { @eventPayload data: String }
@@ -50,9 +63,11 @@ structure MessageWithHeaders {
     @eventHeader boolean: Boolean,
     @eventHeader byte: Byte,
     @eventHeader int: Integer,
+    @eventHeader intEnum: TestIntEnum,
     @eventHeader long: Long,
     @eventHeader short: Short,
     @eventHeader string: String,
+    @eventHeader enum: TestEnum,
     @eventHeader timestamp: Timestamp,
 }
 structure MessageWithHeaderAndPayload {