diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 345797afb..6fe9c2452 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -437,6 +437,12 @@ void ProtoConverter::visit(NullaryOp const& _x)
 	case NullaryOp::GASLIMIT:
 		m_output << "gaslimit()";
 		break;
+	case NullaryOp::SELFBALANCE:
+		m_output << "selfbalance()";
+		break;
+	case NullaryOp::CHAINID:
+		m_output << "chainid()";
+		break;
 	}
 }
 
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index 6871a63ac..b7ce8c57a 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -237,6 +237,8 @@ message NullaryOp {
     NUMBER = 14;
     DIFFICULTY = 15;
     GASLIMIT = 16;
+    SELFBALANCE = 17;
+    CHAINID = 18;
   }
   required NOp op = 1;
 }
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 557073766..57441e942 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -70,7 +70,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 
 	// AssemblyStack entry point
 	AssemblyStack stack(
-		langutil::EVMVersion(),
+		langutil::EVMVersion(langutil::EVMVersion::istanbul()),
 		AssemblyStack::Language::StrictAssembly,
 		dev::solidity::OptimiserSettings::full()
 	);
@@ -95,7 +95,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
 		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion())
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(langutil::EVMVersion::istanbul()))
 	);
 
 	if (termReason == yulFuzzerUtil::TerminationReason::StepLimitReached)
@@ -105,7 +105,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	termReason = yulFuzzerUtil::interpret(
 		os2,
 		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion(langutil::EVMVersion::istanbul())),
 		(yul::test::yul_fuzzer::yulFuzzerUtil::maxSteps * 4)
 	);