diff --git a/build.gradle b/build.gradle
index 6e35604..9c4014b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -261,7 +261,7 @@ List<Provider<RegularFile>> plugins = [
     task "${baseName}#oldVersionClusterTask$i"(type: StandaloneRestIntegTestTask) {
         useCluster testClusters."${baseName}$i"
         filter {
-            includeTestsMatching "org.opensearch.index.codecs.customcodecs.bwc.*IT"
+            includeTestsMatching "org.opensearch.index.codec.customcodecs.bwc.*"
         }
         systemProperty 'tests.rest.bwcsuite', 'old_cluster'
         systemProperty 'tests.rest.bwcsuite_round', 'old'
@@ -281,7 +281,7 @@ task "${baseName}#mixedClusterTask"(type: StandaloneRestIntegTestTask) {
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.index.codecs.customcodecs.bwc.*IT"
+        includeTestsMatching "org.opensearch.index.codec.customcodecs.bwc.*"
     }
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'first'
@@ -300,7 +300,7 @@ task "${baseName}#twoThirdsUpgradedClusterTask"(type: StandaloneRestIntegTestTas
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.index.codecs.customcodecs.bwc.*IT"
+        includeTestsMatching "org.opensearch.index.codec.customcodecs.bwc.*"
     }
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
     systemProperty 'tests.rest.bwcsuite_round', 'second'
@@ -319,7 +319,7 @@ task "${baseName}#rollingUpgradeClusterTask"(type: StandaloneRestIntegTestTask)
         testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.index.codecs.customcodecs.bwc.*IT"
+        includeTestsMatching "org.opensearch.index.codec.customcodecs.bwc.*"
     }
     mustRunAfter "${baseName}#mixedClusterTask"
     systemProperty 'tests.rest.bwcsuite', 'mixed_cluster'
@@ -338,7 +338,7 @@ task "${baseName}#fullRestartClusterTask"(type: StandaloneRestIntegTestTask) {
         testClusters."${baseName}1".upgradeAllNodesAndPluginsToNextVersion(plugins)
     }
     filter {
-        includeTestsMatching "org.opensearch.index.codecs.customcodecs.bwc.*IT"
+        includeTestsMatching "org.opensearch.index.codec.customcodecs.bwc.*"
     }
     systemProperty 'tests.rest.bwcsuite', 'upgraded_cluster'
     systemProperty 'tests.plugin_bwc_version', bwcVersion