diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index 75fe18007c..0f23a21ea2 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -8,7 +8,7 @@ env_vars: {
 
 env_vars: {
     key: "INTEGRATION_TEST_ARGS"
-    value: "-P bigtable-emulator-it,bigtable-prod-it,bigtable-prod-batch-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true"
+    value: "-P bigtable-prod-it,enable-verbose-grpc-logs -Dbigtable.project=gcloud-devel -Dbigtable.instance=google-cloud-bigtable -Dbigtable.table=integration-tests -Dbigtable.kms_key_name=projects/gcloud-devel/locations/us-east1/keyRings/cmek-test-key-ring/cryptoKeys/cmek-test-key -Dbigtable.wait-for-cmek-key-status=true"
 }
 
 env_vars: {
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
index a9eb27bae4..1b3d4f2dee 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
@@ -100,8 +100,10 @@ public class EnhancedBigtableStubSettings extends StubSettings<EnhancedBigtableS
 
   // TODO change this to true when enabling directpath by default
   // For now, Only runs Direct Access Checker if user explicitly sets CBT_ENABLE_DIRECTPATH=true
-  private static final DirectPathConfig DIRECT_PATH_CONFIG =
-      Optional.ofNullable(System.getenv("CBT_ENABLE_DIRECTPATH"))
+  private static DirectPathConfig DIRECT_PATH_CONFIG =
+      Optional.ofNullable(
+              Optional.ofNullable(System.getenv("CBT_ENABLE_DIRECTPATH"))
+                  .orElse(System.getProperty("bigtable.internal.enable-directpath")))
           .map(Boolean::parseBoolean)
           .map(b -> b ? DirectPathConfig.FORCED_ON : DirectPathConfig.FORCED_OFF)
           .orElse(DirectPathConfig.DEFAULT);