diff --git a/rest-fights/pom.xml b/rest-fights/pom.xml
index 5606e790f..7963fc04d 100644
--- a/rest-fights/pom.xml
+++ b/rest-fights/pom.xml
@@ -320,6 +320,23 @@
         <quarkus.native.enabled>true</quarkus.native.enabled>
         <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
       </properties>
+      <build>
+        <plugins>
+            <plugin>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <version>${surefire-plugin.version}</version>
+              <configuration>
+                <systemPropertyVariables>
+                  <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                  <maven.home>${maven.home}</maven.home>
+                  <pact_do_not_track>true</pact_do_not_track>
+                  <pact.writer.overwrite>true</pact.writer.overwrite>
+                  <quarkus.native.enabled>${quarkus.native.enabled}</quarkus.native.enabled>
+                </systemPropertyVariables>
+              </configuration>
+            </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>it-coverage</id>
diff --git a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/service/FightServiceConsumerContractTests.java b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/service/FightServiceConsumerContractTests.java
index a4716ab3d..86f8f7362 100644
--- a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/service/FightServiceConsumerContractTests.java
+++ b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/service/FightServiceConsumerContractTests.java
@@ -19,6 +19,7 @@
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
 import io.quarkus.panache.mock.PanacheMock;
 import io.quarkus.test.junit.QuarkusTest;
@@ -79,6 +80,7 @@
   implementation = MockServerImplementation.Plugin,
   registryEntry = "protobuf/transport/grpc"
 )
+@DisabledIfSystemProperty(named = "quarkus.native.enabled", matches = "true", disabledReason = "Not sure why, but when native profile is active some of these tests fail")
 public class FightServiceConsumerContractTests extends FightServiceTestsBase {
   private static final String VILLAIN_API_BASE_URI = "/api/villains";
   private static final String VILLAIN_RANDOM_URI = VILLAIN_API_BASE_URI + "/random";
@@ -300,7 +302,6 @@ public V4Pact helloLocationsPact(PactBuilder builder) {
       .toPact();
   }
 
-	//  Disable the location tests for now due to some flakiness that needs some investigation
   @Pact(consumer = "rest-fights", provider = "grpc-locations")
   public V4Pact randomLocationFoundPact(PactBuilder builder) {
     return builder