diff --git a/cosmwasm/enclaves/execute/src/registration/onchain.rs b/cosmwasm/enclaves/execute/src/registration/onchain.rs
index 058920720..e68b09233 100644
--- a/cosmwasm/enclaves/execute/src/registration/onchain.rs
+++ b/cosmwasm/enclaves/execute/src/registration/onchain.rs
@@ -53,7 +53,7 @@ pub unsafe extern "C" fn ecall_authenticate_new_node(
 
     #[cfg(all(
         feature = "light-client-validation",
-        or(not(feature = "go-tests"), feature = "production")
+        any(not(feature = "go-tests"), feature = "production")
     ))]
     {
         if !check_cert_in_current_block(cert_slice) {
diff --git a/cosmwasm/enclaves/shared/contract-engine/src/contract_operations.rs b/cosmwasm/enclaves/shared/contract-engine/src/contract_operations.rs
index 72e340796..328b090da 100644
--- a/cosmwasm/enclaves/shared/contract-engine/src/contract_operations.rs
+++ b/cosmwasm/enclaves/shared/contract-engine/src/contract_operations.rs
@@ -99,7 +99,7 @@ pub fn init(
 
     #[cfg(all(
         feature = "light-client-validation",
-        or(not(feature = "go-tests"), feature = "production")
+        any(not(feature = "go-tests"), feature = "production")
     ))]
     {
         verify_block_info(&base_env)?;
@@ -349,7 +349,7 @@ pub fn migrate(
 
     #[cfg(all(
         feature = "light-client-validation",
-        or(not(feature = "go-tests"), feature = "production")
+        any(not(feature = "go-tests"), feature = "production")
     ))]
     {
         verify_block_info(&base_env)?;
@@ -527,7 +527,7 @@ pub fn update_admin(
 
     #[cfg(all(
         feature = "light-client-validation",
-        or(not(feature = "go-tests"), feature = "production")
+        any(not(feature = "go-tests"), feature = "production")
     ))]
     {
         verify_block_info(&base_env)?;
@@ -626,7 +626,7 @@ pub fn handle(
 
     #[cfg(all(
         feature = "light-client-validation",
-        or(not(feature = "go-tests"), feature = "production")
+        any(not(feature = "go-tests"), feature = "production")
     ))]
     {
         verify_block_info(&base_env)?;
diff --git a/cosmwasm/enclaves/shared/contract-engine/src/contract_validation.rs b/cosmwasm/enclaves/shared/contract-engine/src/contract_validation.rs
index 43601885a..259bc1517 100644
--- a/cosmwasm/enclaves/shared/contract-engine/src/contract_validation.rs
+++ b/cosmwasm/enclaves/shared/contract-engine/src/contract_validation.rs
@@ -829,7 +829,7 @@ fn verify_input_params(
 
     #[cfg(all(
         feature = "light-client-validation",
-        or(not(feature = "go-tests"), feature = "production")
+        any(not(feature = "go-tests"), feature = "production")
     ))]
     {
         info!("Verifying message in signed block...");