diff --git a/gocode/flyweight/src/baseline-bigendian/Car_test.go b/gocode/flyweight/src/baseline-bigendian/Car_test.go
index d06ed4102a..bd1cadabd9 100644
--- a/gocode/flyweight/src/baseline-bigendian/Car_test.go
+++ b/gocode/flyweight/src/baseline-bigendian/Car_test.go
@@ -74,8 +74,8 @@ func TestEncodeDecodeCar(t *testing.T) {
 	out.WrapForDecode(
 		data[:],
 		0,
-		uint64(in.SbeSchemaVersion()),
 		uint64(in.SbeBlockLength()),
+		uint64(in.SbeSchemaVersion()),
 		uint64(len(data)),
 	)
 
diff --git a/gocode/flyweight/src/baseline/Car_test.go b/gocode/flyweight/src/baseline/Car_test.go
index 9aa2127b7a..3f9bd2e23f 100644
--- a/gocode/flyweight/src/baseline/Car_test.go
+++ b/gocode/flyweight/src/baseline/Car_test.go
@@ -69,8 +69,8 @@ func TestEncodeDecodeCar(t *testing.T) {
 	out.WrapForDecode(
 		data[:],
 		0,
-		uint64(in.SbeSchemaVersion()),
 		uint64(in.SbeBlockLength()),
+		uint64(in.SbeSchemaVersion()),
 		uint64(len(data)),
 	)
 
diff --git a/gocode/flyweight/src/composite/Composite_test.go b/gocode/flyweight/src/composite/Composite_test.go
index d7bf75235f..af2871e5b7 100644
--- a/gocode/flyweight/src/composite/Composite_test.go
+++ b/gocode/flyweight/src/composite/Composite_test.go
@@ -40,8 +40,8 @@ func TestEncodeDecode(t *testing.T) {
 	out.WrapForDecode(
 		data[:],
 		0,
-		uint64(in.SbeSchemaVersion()),
 		uint64(in.SbeBlockLength()),
+		uint64(in.SbeSchemaVersion()),
 		uint64(len(data)),
 	)
 
diff --git a/gocode/flyweight/src/composite_elements/Message_test.go b/gocode/flyweight/src/composite_elements/Message_test.go
index 90dfe20f98..c878941764 100644
--- a/gocode/flyweight/src/composite_elements/Message_test.go
+++ b/gocode/flyweight/src/composite_elements/Message_test.go
@@ -22,8 +22,8 @@ func TestEncodeDecodeMsg(t *testing.T) {
 	out.WrapForDecode(
 		data[:],
 		0,
-		uint64(in.SbeSchemaVersion()),
 		uint64(in.SbeBlockLength()),
+		uint64(in.SbeSchemaVersion()),
 		uint64(len(data)),
 	)
 
@@ -52,8 +52,8 @@ func TestEncodeDecodeMsg2(t *testing.T) {
 	out.WrapForDecode(
 		data[:],
 		0,
-		uint64(in.SbeSchemaVersion()),
 		uint64(in.SbeBlockLength()),
+		uint64(in.SbeSchemaVersion()),
 		uint64(len(data)),
 	)
 
@@ -78,8 +78,8 @@ func TestEncodeDecodeMsg3(t *testing.T) {
 	out.WrapForDecode(
 		data[:],
 		0,
-		uint64(in.SbeSchemaVersion()),
 		uint64(in.SbeBlockLength()),
+		uint64(in.SbeSchemaVersion()),
 		uint64(len(data)),
 	)