diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index 89870e82..81b4e123 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - main
       - "release/v*"
+      - test_upgrade_only_v2
 env:
   AWS_DEFAULT_REGION: us-east-1
   STAGING_ECR_REGISTRY: 611364707713.dkr.ecr.us-west-2.amazonaws.com
diff --git a/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/base/JMXMetricsContractTestBase.java b/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/base/JMXMetricsContractTestBase.java
index 1354b73e..7df02e31 100644
--- a/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/base/JMXMetricsContractTestBase.java
+++ b/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/base/JMXMetricsContractTestBase.java
@@ -83,6 +83,8 @@ protected long getThreshold(String metricName) {
     switch (metricName) {
         // If maximum memory size is undefined, then value is -1
         // https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/MemoryUsage.html#getMax()
+      case JMXMetricsConstants.TOMCAT_THREADS:
+        threshold = -3;
       case JMXMetricsConstants.JVM_HEAP_MAX:
       case JMXMetricsConstants.JVM_NON_HEAP_MAX:
       case JMXMetricsConstants.JVM_POOL_MAX:
diff --git a/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/utils/JMXMetricsConstants.java b/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/utils/JMXMetricsConstants.java
index 149c5bec..104dbc36 100644
--- a/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/utils/JMXMetricsConstants.java
+++ b/appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/utils/JMXMetricsConstants.java
@@ -91,9 +91,8 @@ public class JMXMetricsConstants {
           TOMCAT_REQUEST_COUNT,
           TOMCAT_MAX_TIME,
           TOMCAT_PROCESSING_TIME,
-          //          TODO: Pending on root cause why tomcat.threads can be negative
-          //          TOMCAT_THREADS,
-          TOMCAT_TRAFFIC);
+          TOMCAT_TRAFFIC,
+          TOMCAT_THREADS);
 
   // Kafka Metrics
   public static final String KAFKA_MESSAGE_COUNT = "kafka.message.count";