diff --git a/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModule.t.sol b/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModule.t.sol
index ae45700..584fc46 100644
--- a/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModule.t.sol
+++ b/test/integration/OwnableValidatorRecovery/EmailRecoveryModule/EmailRecoveryModule.t.sol
@@ -369,7 +369,8 @@ contract OwnableValidatorRecovery_EmailRecoveryModule_Integration_Test is
 
     function test_Recover_RevertWhenUninstallModuleAndRecoverAgainWithKillSwitch() public {
         skipIfCommandHandlerType(CommandHandlerType.SafeRecoveryCommandHandler);
-        if (isAccountTypeSafe()) {
+        string memory currentAccountType = vm.envOr("ACCOUNT_TYPE", string(""));
+        if (currentAccountType != "") {
             vm.skip(true);
         } 
 
diff --git a/test/integration/OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol b/test/integration/OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol
index aeabc00..e3ac729 100644
--- a/test/integration/OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol
+++ b/test/integration/OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol
@@ -483,10 +483,10 @@ contract OwnableValidatorRecovery_UniversalEmailRecoveryModule_Integration_Test
 
     function test_Recover_RevertWhenUninstallModuleAndRecoverAgainWithKillSwitch() public {
         skipIfCommandHandlerType(CommandHandlerType.SafeRecoveryCommandHandler);
-        if (isAccountTypeSafe()) {
+        string memory currentAccountType = vm.envOr("ACCOUNT_TYPE", string(""));
+        if (currentAccountType != "") {
             vm.skip(true);
         } 
-
         executeRecoveryFlowForAccount(accountAddress1, guardians1, recoveryDataHash1, recoveryData1);
         address updatedOwner1 = validator.owners(accountAddress1);
         assertEq(updatedOwner1, newOwner1);