diff --git a/oraclecloud-certificates/src/test/groovy/io/micronaut/oraclecloud/certificates/OracleCloudCertificateIntegrationSpec.groovy b/oraclecloud-certificates/src/test/groovy/io/micronaut/oraclecloud/certificates/OracleCloudCertificateIntegrationSpec.groovy
index 6ffbd5886..8ecbe49c8 100644
--- a/oraclecloud-certificates/src/test/groovy/io/micronaut/oraclecloud/certificates/OracleCloudCertificateIntegrationSpec.groovy
+++ b/oraclecloud-certificates/src/test/groovy/io/micronaut/oraclecloud/certificates/OracleCloudCertificateIntegrationSpec.groovy
@@ -7,7 +7,6 @@ import com.oracle.bmc.certificates.responses.GetCertificateBundleResponse
 import io.micronaut.context.annotation.Context
 import io.micronaut.context.annotation.Primary
 import io.micronaut.context.annotation.Property
-import io.micronaut.context.env.Environment
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.MediaType
@@ -22,7 +21,7 @@ import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import jakarta.inject.Inject
 import spock.lang.Specification
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 @Property(name="oci.certificates.enabled", value = "true")
 @Property(name="micronaut.server.dual-protocol", value = "true")
 @Property(name="micronaut.server.ssl.enabled", value = "true")
diff --git a/oraclecloud-common/src/main/java/io/micronaut/oraclecloud/core/OracleCloudCoreFactory.java b/oraclecloud-common/src/main/java/io/micronaut/oraclecloud/core/OracleCloudCoreFactory.java
index d8444dd9d..f2f9943d7 100644
--- a/oraclecloud-common/src/main/java/io/micronaut/oraclecloud/core/OracleCloudCoreFactory.java
+++ b/oraclecloud-common/src/main/java/io/micronaut/oraclecloud/core/OracleCloudCoreFactory.java
@@ -199,20 +199,21 @@ protected ClientConfiguration.ClientConfigurationBuilder configurationBuilder(
     @Primary
     @Context
     @BootstrapContextCompatible
-    protected TenancyIdProvider tenantIdProvider(@Nullable BasicAuthenticationDetailsProvider authenticationDetailsProvider, OracleCloudMetadataConfiguration metadataConfiguration) {
+    protected TenancyIdProvider tenantIdProvider(@Nullable BasicAuthenticationDetailsProvider authenticationDetailsProvider, @Nullable OracleCloudMetadataConfiguration metadataConfiguration) {
         if (authenticationDetailsProvider == null) {
             throw new DisabledBeanException("Invalid Oracle Cloud Configuration. If you are running locally ensure the CLI is configured by running: oci setup config");
         }
+        final OracleCloudMetadataConfiguration cfg = Optional.ofNullable(metadataConfiguration).orElse(new OracleCloudMetadataConfiguration());
         return () -> {
-            if (authenticationDetailsProvider instanceof AuthenticationDetailsProvider) {
-                return ((AuthenticationDetailsProvider) authenticationDetailsProvider).getTenantId();
-            } else if (authenticationDetailsProvider instanceof ResourcePrincipalAuthenticationDetailsProvider) {
-                return ((ResourcePrincipalAuthenticationDetailsProvider) authenticationDetailsProvider).getStringClaim(ResourcePrincipalAuthenticationDetailsProvider.ClaimKeys.TENANT_ID_CLAIM_KEY);
+            if (authenticationDetailsProvider instanceof AuthenticationDetailsProvider a) {
+                return a.getTenantId();
+            } else if (authenticationDetailsProvider instanceof ResourcePrincipalAuthenticationDetailsProvider r) {
+                return r.getStringClaim(ResourcePrincipalAuthenticationDetailsProvider.ClaimKeys.TENANT_ID_CLAIM_KEY);
             } else if (authenticationDetailsProvider instanceof InstancePrincipalsAuthenticationDetailsProvider) {
                 URLBasedX509CertificateSupplier urlBasedX509CertificateSupplier;
                 String tenantId;
                 try {
-                    String baseMetadataUrl = metadataConfiguration.getBaseUrl();
+                    String baseMetadataUrl = cfg.getBaseUrl();
                     urlBasedX509CertificateSupplier = new URLBasedX509CertificateSupplier(
                             new URL(baseMetadataUrl + "identity/cert.pem"),
                             new URL(baseMetadataUrl + "identity/key.pem"),
@@ -256,6 +257,7 @@ protected ClientConfiguration clientConfiguration(ClientConfiguration.ClientConf
     @Requires(property = OracleCloudConfigFileConfigurationProperties.PREFIX + ".session-token", notEquals = StringUtils.FALSE, defaultValue = StringUtils.FALSE)
     @Requires(property = OracleCloudConfigFileConfigurationProperties.PREFIX + ".enabled", notEquals = StringUtils.FALSE, defaultValue = StringUtils.TRUE)
     @Primary
+    @BootstrapContextCompatible
     protected SessionTokenAuthenticationDetailsProvider sessionTokenAuthenticationDetailsProvider() throws IOException {
         String profile = getProfile().orElse(null);
         if (getConfigPath().isPresent()) {
diff --git a/oraclecloud-common/src/test/groovy/io/micronaut/discovery/cloud/OracleCloudConfigFileConfigurationPropertiesSpec.groovy b/oraclecloud-common/src/test/groovy/io/micronaut/discovery/cloud/OracleCloudConfigFileConfigurationPropertiesSpec.groovy
index 386d97b8a..a0945af9b 100644
--- a/oraclecloud-common/src/test/groovy/io/micronaut/discovery/cloud/OracleCloudConfigFileConfigurationPropertiesSpec.groovy
+++ b/oraclecloud-common/src/test/groovy/io/micronaut/discovery/cloud/OracleCloudConfigFileConfigurationPropertiesSpec.groovy
@@ -41,7 +41,7 @@ security_token_file=${testPath}/oci_api_key.pem
         given:
         def ctx = ApplicationContext.run([
                 (OracleCloudConfigFileConfigurationProperties.PREFIX + ".config-path"): ociConfig.absolutePath
-        ], Environment.ORACLE_CLOUD)
+        ])
 
         expect:
         ctx.containsBean(ConfigFileAuthenticationDetailsProvider)
@@ -56,7 +56,7 @@ security_token_file=${testPath}/oci_api_key.pem
         def ctx = ApplicationContext.run([
                 (OracleCloudConfigFileConfigurationProperties.PREFIX + ".config-path"): ociConfig.absolutePath,
                 (OracleCloudConfigFileConfigurationProperties.PREFIX + ".enabled"): false
-        ], Environment.ORACLE_CLOUD)
+        ])
 
         expect:
         !ctx.containsBean(ConfigFileAuthenticationDetailsProvider)
@@ -71,7 +71,7 @@ security_token_file=${testPath}/oci_api_key.pem
         def ctx = ApplicationContext.run([
                 (OracleCloudConfigFileConfigurationProperties.PREFIX + ".config-path"): ociConfig.absolutePath,
                 (OracleCloudConfigFileConfigurationProperties.PREFIX + ".session-token"): true
-        ], Environment.ORACLE_CLOUD)
+        ])
 
         expect:
         !ctx.containsBean(ConfigFileAuthenticationDetailsProvider)
diff --git a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/InstancePrincipalConfigurationTest.java b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/InstancePrincipalConfigurationTest.java
index cfd87f7ff..daea81037 100644
--- a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/InstancePrincipalConfigurationTest.java
+++ b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/InstancePrincipalConfigurationTest.java
@@ -4,7 +4,6 @@
 import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider;
 import io.micronaut.aop.InterceptedProxy;
 import io.micronaut.context.annotation.Property;
-import io.micronaut.context.env.Environment;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.test.annotation.MockBean;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
@@ -16,9 +15,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 @Property(name = InstancePrincipalConfiguration.PREFIX + ".enabled", value = StringUtils.TRUE)
-class InstancePrincipalConfigurationTest {
+public class InstancePrincipalConfigurationTest {
 
     @Inject
     InstancePrincipalConfiguration configuration;
diff --git a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCoreDefaultConfigTest.java b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCoreDefaultConfigTest.java
index 04f5b403d..adca96a2f 100644
--- a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCoreDefaultConfigTest.java
+++ b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCoreDefaultConfigTest.java
@@ -1,15 +1,14 @@
 package io.micronaut.oraclecloud.core;
 
 import com.oracle.bmc.ClientConfiguration;
-import io.micronaut.context.env.Environment;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
-class OracleCloudCoreDefaultConfigTest {
+@MicronautTest
+public class OracleCloudCoreDefaultConfigTest {
 
     /*
      * This tests that the default configurations can be setup.
diff --git a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomAuthConfigTest.java b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomAuthConfigTest.java
index 5e28860f0..4d3d12c70 100644
--- a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomAuthConfigTest.java
+++ b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomAuthConfigTest.java
@@ -4,17 +4,16 @@
 import com.oracle.bmc.auth.AuthenticationDetailsProvider;
 import com.oracle.bmc.auth.SimpleAuthenticationDetailsProvider;
 import io.micronaut.context.annotation.Property;
-import io.micronaut.context.env.Environment;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 @Property(name = "oci.tenantId", value = "something")
 @Property(name = "oci.region", value = "ap-mumbai-1")
 @Property(name = "oci.passphrase", value = "junk")
-class OracleCloudCustomAuthConfigTest {
+public class OracleCloudCustomAuthConfigTest {
 
     @Test
     void testCustomAuth(AuthenticationDetailsProvider provider) {
diff --git a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomConfigTest.java b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomConfigTest.java
index 5a417faee..e4403d9e0 100644
--- a/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomConfigTest.java
+++ b/oraclecloud-common/src/test/java/io/micronaut/oraclecloud/core/OracleCloudCustomConfigTest.java
@@ -2,15 +2,14 @@
 
 import com.oracle.bmc.ClientConfiguration;
 import io.micronaut.context.annotation.Property;
-import io.micronaut.context.env.Environment;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 @Property(name = "oci.client.readTimeoutMillis", value = "25000")
-class OracleCloudCustomConfigTest {
+public class OracleCloudCustomConfigTest {
 
     @Test
     void testCustomConfig(
diff --git a/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/MockFnHttpServerSpec.groovy b/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/MockFnHttpServerSpec.groovy
index 7130e3b4d..b06cb9465 100644
--- a/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/MockFnHttpServerSpec.groovy
+++ b/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/MockFnHttpServerSpec.groovy
@@ -1,6 +1,5 @@
 package io.micronaut.oraclecloud.function.http
 
-import io.micronaut.context.env.Environment
 import io.micronaut.core.type.Argument
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpStatus
@@ -16,7 +15,7 @@ import jakarta.inject.Inject
  * @author Pavol Gressa
  * @since 2.3*
  */
-@MicronautTest(environments = ["custom-env", Environment.ORACLE_CLOUD])
+@MicronautTest(environments = ["custom-env"])
 class MockFnHttpServerSpec extends Specification {
 
     @Inject
diff --git a/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/ParameterBindingSpec.groovy b/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/ParameterBindingSpec.groovy
index fa9525c2d..1f636fc51 100644
--- a/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/ParameterBindingSpec.groovy
+++ b/oraclecloud-function-http/src/test/groovy/io/micronaut/oraclecloud/function/http/ParameterBindingSpec.groovy
@@ -1,6 +1,5 @@
 package io.micronaut.oraclecloud.function.http
 
-import io.micronaut.context.env.Environment
 import io.micronaut.http.HttpHeaders
 import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpStatus
@@ -14,7 +13,7 @@ import spock.lang.Specification
 
 import jakarta.inject.Inject
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 class ParameterBindingSpec extends Specification {
 
     @Inject
diff --git a/oraclecloud-function-http/src/test/java/io/micronaut/oraclecloud/function/http/ParameterBindingTest.java b/oraclecloud-function-http/src/test/java/io/micronaut/oraclecloud/function/http/ParameterBindingTest.java
index af7f85047..032757e53 100644
--- a/oraclecloud-function-http/src/test/java/io/micronaut/oraclecloud/function/http/ParameterBindingTest.java
+++ b/oraclecloud-function-http/src/test/java/io/micronaut/oraclecloud/function/http/ParameterBindingTest.java
@@ -1,7 +1,6 @@
 package io.micronaut.oraclecloud.function.http;
 
 import io.micronaut.context.annotation.Property;
-import io.micronaut.context.env.Environment;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.client.HttpClient;
@@ -14,9 +13,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 @Property(name = "fn.test.config.foo.bar", value = "good")
-class ParameterBindingTest {
+public class ParameterBindingTest {
 
     @Client("/")
     @Inject
diff --git a/oraclecloud-logging/src/test/groovy/io/micronaut/oraclecloud/logging/OracleCloudLoggingSpec.groovy b/oraclecloud-logging/src/test/groovy/io/micronaut/oraclecloud/logging/OracleCloudLoggingSpec.groovy
index cac72c7b0..17fd67dfa 100644
--- a/oraclecloud-logging/src/test/groovy/io/micronaut/oraclecloud/logging/OracleCloudLoggingSpec.groovy
+++ b/oraclecloud-logging/src/test/groovy/io/micronaut/oraclecloud/logging/OracleCloudLoggingSpec.groovy
@@ -13,7 +13,6 @@ import com.oracle.bmc.loggingingestion.responses.PutLogsResponse
 import io.micronaut.context.annotation.Property
 import io.micronaut.context.annotation.Replaces
 import io.micronaut.context.annotation.Requires
-import io.micronaut.context.env.Environment
 import io.micronaut.context.event.ApplicationEventPublisher
 import io.micronaut.runtime.ApplicationConfiguration
 import io.micronaut.runtime.server.EmbeddedServer
@@ -25,7 +24,7 @@ import org.slf4j.LoggerFactory
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 @Property(name = "spec.name", value = "OracleCloudLoggingSpec")
 @Property(name = "oci.logging.logId", value = "test-logId-from-application-config")
 class OracleCloudLoggingSpec extends Specification {
diff --git a/oraclecloud-micrometer/src/test/groovy/io/micronaut/oraclecloud/monitoring/OracleCloudMeterRegistryFactoryTest.groovy b/oraclecloud-micrometer/src/test/groovy/io/micronaut/oraclecloud/monitoring/OracleCloudMeterRegistryFactoryTest.groovy
index f272149cf..c76537b47 100644
--- a/oraclecloud-micrometer/src/test/groovy/io/micronaut/oraclecloud/monitoring/OracleCloudMeterRegistryFactoryTest.groovy
+++ b/oraclecloud-micrometer/src/test/groovy/io/micronaut/oraclecloud/monitoring/OracleCloudMeterRegistryFactoryTest.groovy
@@ -11,7 +11,7 @@ import io.micronaut.oraclecloud.monitoring.micrometer.OracleCloudRawMeterRegistr
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import spock.lang.Specification
 
-@MicronautTest(startApplication = false, environments = Environment.ORACLE_CLOUD)
+@MicronautTest(startApplication = false)
 @Property(name = "micronaut.metrics.export.oraclecloud.enabled", value = "false")
 @Requires(beans = AuthenticationDetailsProvider)
 class OracleCloudMeterRegistryFactoryTest extends Specification {
diff --git a/oraclecloud-oke-workload-identity/src/test/java/io/micronaut/oraclecloud/oke/workload/identity/OkeWorkloadIdentityConfigurationTest.java b/oraclecloud-oke-workload-identity/src/test/java/io/micronaut/oraclecloud/oke/workload/identity/OkeWorkloadIdentityConfigurationTest.java
index 06997689a..7e108032a 100644
--- a/oraclecloud-oke-workload-identity/src/test/java/io/micronaut/oraclecloud/oke/workload/identity/OkeWorkloadIdentityConfigurationTest.java
+++ b/oraclecloud-oke-workload-identity/src/test/java/io/micronaut/oraclecloud/oke/workload/identity/OkeWorkloadIdentityConfigurationTest.java
@@ -4,7 +4,6 @@
 import com.oracle.bmc.auth.okeworkloadidentity.OkeWorkloadIdentityAuthenticationDetailsProvider;
 import io.micronaut.aop.InterceptedProxy;
 import io.micronaut.context.annotation.Property;
-import io.micronaut.context.env.Environment;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.oraclecloud.core.OracleCloudCoreFactory;
 import io.micronaut.test.annotation.MockBean;
@@ -16,9 +15,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 @Property(name = OracleCloudCoreFactory.OKE_WORKLOAD_IDENTITY_PREFIX + ".enabled", value = StringUtils.TRUE)
-class OkeWorkloadIdentityConfigurationTest {
+public class OkeWorkloadIdentityConfigurationTest {
 
     @Inject
     OkeWorkloadIdentityConfiguration configuration;
diff --git a/oraclecloud-sdk-reactor/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageReactorClientTest.java b/oraclecloud-sdk-reactor/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageReactorClientTest.java
index 97a6acffd..6b6b7e3b2 100644
--- a/oraclecloud-sdk-reactor/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageReactorClientTest.java
+++ b/oraclecloud-sdk-reactor/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageReactorClientTest.java
@@ -16,14 +16,13 @@
 import com.oracle.bmc.responses.AsyncHandler;
 import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Replaces;
-import io.micronaut.context.env.Environment;
 import io.micronaut.oraclecloud.clients.reactor.objectstorage.ObjectStorageReactorClient;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 public class ObjectStorageReactorClientTest {
 
     @Test
diff --git a/oraclecloud-sdk-rxjava2/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageRxClientTest.java b/oraclecloud-sdk-rxjava2/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageRxClientTest.java
index 5c8cb2e93..fbcfecfe9 100644
--- a/oraclecloud-sdk-rxjava2/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageRxClientTest.java
+++ b/oraclecloud-sdk-rxjava2/src/test/java/io/micronaut/oraclecloud/objectstorage/ObjectStorageRxClientTest.java
@@ -6,7 +6,6 @@
 import com.oracle.bmc.objectstorage.requests.ListBucketsRequest;
 import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Replaces;
-import io.micronaut.context.env.Environment;
 import io.micronaut.oraclecloud.clients.rxjava2.objectstorage.ObjectStorageRxClient;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;
@@ -18,8 +17,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
-class ObjectStorageRxClientTest {
+@MicronautTest
+public class ObjectStorageRxClientTest {
 
     @Test
     void testObjectStorageClientRx(ObjectStorageRxClient objectStorageRxClient) {
diff --git a/oraclecloud-vault/src/test/groovy/io/micronaut/oraclecloud/discovery/vault/OracleCloudVaultConfigurationSpec.groovy b/oraclecloud-vault/src/test/groovy/io/micronaut/oraclecloud/discovery/vault/OracleCloudVaultConfigurationSpec.groovy
index c95fb0593..ca16febe0 100644
--- a/oraclecloud-vault/src/test/groovy/io/micronaut/oraclecloud/discovery/vault/OracleCloudVaultConfigurationSpec.groovy
+++ b/oraclecloud-vault/src/test/groovy/io/micronaut/oraclecloud/discovery/vault/OracleCloudVaultConfigurationSpec.groovy
@@ -21,7 +21,7 @@ class OracleCloudVaultConfigurationSpec extends Specification {
                 'oci.vault.vaults'               : [
                         ['ocid'            : 'ocid1.vault.oc1.phx....',
                          'compartment-ocid': 'ocid1.compartment.oc1....']
-                ]], Environment.ORACLE_CLOUD)
+                ]])
         OracleCloudVaultConfiguration config = ctx.getBean(OracleCloudVaultConfiguration)
 
         expect:
@@ -42,7 +42,7 @@ class OracleCloudVaultConfigurationSpec extends Specification {
                 'oci.vault.vaults'               : [
                         ['ocid'            : 'ocid1.vault.oc1.phx....',
                          'compartment-ocid': 'ocid1.compartment.oc1....']
-                ]], Environment.ORACLE_CLOUD)
+                ]])
 
         when:
         ctx.getBean(OracleCloudVaultConfigurationClient)
diff --git a/test-suite-graal-logging/src/test/java/example/LoggingTest.java b/test-suite-graal-logging/src/test/java/example/LoggingTest.java
index 446fdc369..52f3085a5 100644
--- a/test-suite-graal-logging/src/test/java/example/LoggingTest.java
+++ b/test-suite-graal-logging/src/test/java/example/LoggingTest.java
@@ -1,6 +1,5 @@
 package example;
 
-import io.micronaut.context.env.Environment;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
@@ -12,7 +11,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 public class LoggingTest {
 
     public static final Logger log = LoggerFactory.getLogger("LoggingTest");
diff --git a/test-suite-java/src/test/java/example/HikariPoolAtpTest.java b/test-suite-java/src/test/java/example/HikariPoolAtpTest.java
index fbef026f4..3b4e076fb 100644
--- a/test-suite-java/src/test/java/example/HikariPoolAtpTest.java
+++ b/test-suite-java/src/test/java/example/HikariPoolAtpTest.java
@@ -15,7 +15,7 @@
 import java.sql.SQLException;
 import java.util.Map;
 
-@MicronautTest(startApplication = false, environments = Environment.ORACLE_CLOUD)
+@MicronautTest(startApplication = false)
 @Requires(property = "atp.user")
 @Requires(property = "atp.pass")
 @Requires(property = "atp.ocid")
diff --git a/test-suite-java/src/test/java/example/MicrometerTest.java b/test-suite-java/src/test/java/example/MicrometerTest.java
index 913acfe11..52882bb01 100644
--- a/test-suite-java/src/test/java/example/MicrometerTest.java
+++ b/test-suite-java/src/test/java/example/MicrometerTest.java
@@ -13,7 +13,7 @@
 
 import java.util.Map;
 
-@MicronautTest(startApplication = false, environments = Environment.ORACLE_CLOUD)
+@MicronautTest(startApplication = false)
 @Requires(beans = AuthenticationDetailsProvider.class)
 @Property(name = "micronaut.metrics.export.oraclecloud.enabled", value = "false")
 @Requires(property = "monitoring.compartment.ocid")
diff --git a/test-suite-java/src/test/java/example/VaultSerializationTest.java b/test-suite-java/src/test/java/example/VaultSerializationTest.java
index 9d9d7a058..f4c2d0180 100644
--- a/test-suite-java/src/test/java/example/VaultSerializationTest.java
+++ b/test-suite-java/src/test/java/example/VaultSerializationTest.java
@@ -1,7 +1,6 @@
 package example;
 
 import com.oracle.bmc.vault.model.SecretSummary;
-import io.micronaut.context.env.Environment;
 import io.micronaut.json.JsonMapper;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;
@@ -11,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@MicronautTest(environments = Environment.ORACLE_CLOUD)
+@MicronautTest
 public class VaultSerializationTest {
     @Test
     void testSerialization(JsonMapper jsonMapper) throws IOException {
diff --git a/test-suite-java/src/test/java/example/VaultTest.java b/test-suite-java/src/test/java/example/VaultTest.java
index 82d903b55..d6d93304f 100644
--- a/test-suite-java/src/test/java/example/VaultTest.java
+++ b/test-suite-java/src/test/java/example/VaultTest.java
@@ -14,7 +14,7 @@
 import java.util.ArrayList;
 import java.util.Map;
 
-@MicronautTest(startApplication = false, environments = Environment.ORACLE_CLOUD)
+@MicronautTest(startApplication = false)
 @Requires(property = "vault.ocid")
 @Requires(property = "vault.secrets.compartment.ocid")
 @Requires(property = "vault.secret.name")