diff --git a/muted-tests.yml b/muted-tests.yml
index a35a6a9927f35..2063ded328215 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -338,12 +338,9 @@ tests:
 - class: org.elasticsearch.index.shard.StoreRecoveryTests
   method: testAddIndices
   issue: https://github.com/elastic/elasticsearch/issues/124104
-- class: org.elasticsearch.xpack.inference.registry.ModelRegistryMetadataTests
-  method: testUpgrade
-  issue: https://github.com/elastic/elasticsearch/issues/125554
-- class: org.elasticsearch.xpack.inference.registry.ModelRegistryMetadataTests
-  method: testAlreadyUpgraded
-  issue: https://github.com/elastic/elasticsearch/issues/125585
+- class: org.elasticsearch.xpack.esql.parser.StatementParserTests
+  method: testInvalidJoinPatterns
+  issue: https://github.com/elastic/elasticsearch/issues/125536
 - class: org.elasticsearch.xpack.security.authz.accesscontrol.IndicesPermissionTests
   method: testAuthorizeDataStreamFailureIndices
   issue: https://github.com/elastic/elasticsearch/issues/125555
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java
index 7bf7bd48e5375..130016dd1696d 100644
--- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java
+++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/registry/ModelRegistryMetadataTests.java
@@ -30,7 +30,7 @@ public static ModelRegistryMetadata randomInstance() {
     }
 
     public static ModelRegistryMetadata randomInstance(boolean isUpgraded) {
-        if (rarely()) {
+        if (rarely() && isUpgraded == false) {
             return ModelRegistryMetadata.EMPTY;
         }
         int size = randomIntBetween(1, 5);