diff --git a/cmd/tvx/codenames_test.go b/cmd/tvx/codenames_test.go
index 0b1de9fc2..00d107707 100644
--- a/cmd/tvx/codenames_test.go
+++ b/cmd/tvx/codenames_test.go
@@ -18,7 +18,7 @@ func TestProtocolCodenames(t *testing.T) {
 		t.Fatal("expected breeze codename")
 	}
 
-	if height := abi.ChainEpoch(build.UpgradeActorsV2Height + 1); GetProtocolCodename(height) != "actorsv2" {
+	if height := build.UpgradeActorsV2Height + 1; GetProtocolCodename(height) != "actorsv2" {
 		t.Fatal("expected actorsv2 codename")
 	}
 
diff --git a/cmd/tvx/exec.go b/cmd/tvx/exec.go
index de7d2a398..89ad23913 100644
--- a/cmd/tvx/exec.go
+++ b/cmd/tvx/exec.go
@@ -76,7 +76,7 @@ func executeTestVector(tv schema.TestVector) error {
 	for _, v := range tv.Pre.Variants {
 		r := new(conformance.LogReporter)
 
-		switch class := tv.Class; class {
+		switch class, v := tv.Class, v; class {
 		case "message":
 			conformance.ExecuteMessageVector(r, &tv, &v)
 		case "tipset":