diff --git a/pom.xml b/pom.xml
index c601a68d5..c304029a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
             <version>1.18.32</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <!-- used so that lombok can generate suppressions for spotbugs. It needs to find it on the relevant classpath -->
             <groupId>com.github.spotbugs</groupId>
@@ -140,6 +140,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <version>1.9.1</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
@@ -435,4 +442,4 @@
             <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java
index c7d99d981..53bcff503 100644
--- a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java
+++ b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdOptionsTest.java
@@ -3,6 +3,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.SetEnvironmentVariable;
 import org.mockito.Mockito;
 
 import java.util.function.Function;
@@ -88,7 +89,7 @@ void testValueProviderForEdgeCase_invalid() {
     }
 
     @Test
-    @Disabled("Currently there is no defined way on how to set environment variables for tests")
+    @SetEnvironmentVariable(key = RESOLVER_ENV_VAR, value = RESOLVER_IN_PROCESS)
     void testInProcessProviderFromEnv_noPortConfigured_defaultsToCorrectPort() {
         FlagdOptions flagdOptions = FlagdOptions.builder().build();
 
@@ -107,7 +108,7 @@ void testInProcessProvider_noPortConfigured_defaultsToCorrectPort() {
     }
 
     @Test
-    @Disabled("Currently there is no defined way on how to set environment variables for tests")
+    @SetEnvironmentVariable(key = RESOLVER_ENV_VAR, value = RESOLVER_IN_PROCESS)
     void testInProcessProviderFromEnv_portConfigured_usesConfiguredPort() {
         FlagdOptions flagdOptions = FlagdOptions.builder()
                 .port(1000)
@@ -118,7 +119,7 @@ void testInProcessProviderFromEnv_portConfigured_usesConfiguredPort() {
     }
 
     @Test
-    @Disabled("Currently there is no defined way on how to set environment variables for tests")
+    @SetEnvironmentVariable(key = RESOLVER_ENV_VAR, value = RESOLVER_RPC)
     void testRpcProviderFromEnv_noPortConfigured_defaultsToCorrectPort() {
         FlagdOptions flagdOptions = FlagdOptions.builder().build();
 
@@ -137,7 +138,7 @@ void testRpcProvider_noPortConfigured_defaultsToCorrectPort() {
     }
 
     @Test
-    @Disabled("Currently there is no defined way on how to set environment variables for tests")
+    @SetEnvironmentVariable(key = RESOLVER_ENV_VAR, value = RESOLVER_RPC)
     void testRpcProviderFromEnv_portConfigured_usesConfiguredPort() {
         FlagdOptions flagdOptions = FlagdOptions.builder()
                 .port(1534)