diff --git a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/AnnouncementResourceIT.java b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/AnnouncementResourceIT.java
index 4e5130214706..baabbd5a393d 100644
--- a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/AnnouncementResourceIT.java
+++ b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/AnnouncementResourceIT.java
@@ -50,7 +50,8 @@ public AnnouncementResourceIT() {
     supportsPatch = true;
     supportsOwners = true;
     supportsSearchIndex = false;
-    supportsVersionHistory = true;
+    supportsVersionHistory = false;
+    supportsGetByVersion = false;
   }
 
   @Override
diff --git a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/BaseEntityIT.java b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/BaseEntityIT.java
index 5016dafcf34a..dec08acab14e 100644
--- a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/BaseEntityIT.java
+++ b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/BaseEntityIT.java
@@ -1343,7 +1343,7 @@ private void assertTagsDoNotContain(List<TagLabel> tags, List<TagLabel> unexpect
 
   @Test
   void get_entityVersionHistory_200(TestNamespace ns) {
-    if (!supportsPatch) return; // Version history tests require patch support
+    if (!supportsVersionHistory || !supportsPatch) return;
 
     K createRequest = createMinimalRequest(ns);
     T created = createEntity(createRequest);
@@ -1365,7 +1365,7 @@ void get_entityVersionHistory_200(TestNamespace ns) {
 
   @Test
   void get_entityVersionHistory_paginated_200(TestNamespace ns) {
-    if (!supportsPatch) return;
+    if (!supportsVersionHistory || !supportsPatch) return;
 
     K createRequest = createMinimalRequest(ns);
     T created = createEntity(createRequest);
@@ -1429,7 +1429,7 @@ void get_entityVersionHistory_paginated_200(TestNamespace ns) {
 
   @Test
   void get_specificVersion_200(TestNamespace ns) {
-    if (!supportsPatch) return; // Specific version tests require patch support
+    if (!supportsVersionHistory || !supportsGetByVersion || !supportsPatch) return;
 
     K createRequest = createMinimalRequest(ns);
     T created = createEntity(createRequest);
@@ -1448,7 +1448,7 @@ void get_specificVersion_200(TestNamespace ns) {
 
   @Test
   void get_entityVersionHistory_fieldChanged_200(TestNamespace ns) {
-    if (!supportsPatch) return;
+    if (!supportsVersionHistory || !supportsPatch) return;
 
     K createRequest = createMinimalRequest(ns);
     T created = createEntity(createRequest);
@@ -1505,7 +1505,7 @@ void get_entityVersionHistory_fieldChanged_200(TestNamespace ns) {
 
   @Test
   void get_entityVersionHistory_fieldChanged_ignoresWrongExtensionPrefix(TestNamespace ns) {
-    if (!supportsPatch) return;
+    if (!supportsVersionHistory || !supportsPatch) return;
 
     K createRequest = createMinimalRequest(ns);
     T created = createEntity(createRequest);
@@ -1591,7 +1591,7 @@ void get_entityVersionHistory_paginated_ordersNullVersionNumRowsByVersion(TestNa
 
   @Test
   void get_entityVersionHistory_fieldChanged_matchesNullChangedFieldKeysRows(TestNamespace ns) {
-    if (!supportsPatch) return;
+    if (!supportsVersionHistory || !supportsPatch) return;
 
     K createRequest = createMinimalRequest(ns);
     T created = createEntity(createRequest);
diff --git a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskFormSchemaResourceIT.java b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskFormSchemaResourceIT.java
index 98aabd1d2b98..03b90e0d7537 100644
--- a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskFormSchemaResourceIT.java
+++ b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskFormSchemaResourceIT.java
@@ -43,7 +43,8 @@ public TaskFormSchemaResourceIT() {
     supportsPatch = true;
     supportsOwners = false;
     supportsSearchIndex = false;
-    supportsVersionHistory = true;
+    supportsVersionHistory = false;
+    supportsGetByVersion = false;
   }
 
   private FormSchema buildFormSchema() {
diff --git a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskResourceIT.java b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskResourceIT.java
index e4779ce87269..6f649984ed32 100644
--- a/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskResourceIT.java
+++ b/openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/TaskResourceIT.java
@@ -125,6 +125,8 @@ public TaskResourceIT() {
     supportsPatch = true;
     supportsOwners = false;
     supportsSearchIndex = true;
+    supportsVersionHistory = false;
+    supportsGetByVersion = false;
   }
 
   @Override