diff --git a/.github/workflows/build-test-linux-x86_64_rtx.yml b/.github/workflows/build-test-linux-x86_64_rtx.yml
index 1f9b605584..6afcb92237 100644
--- a/.github/workflows/build-test-linux-x86_64_rtx.yml
+++ b/.github/workflows/build-test-linux-x86_64_rtx.yml
@@ -77,44 +77,6 @@ jobs:
       architecture: "x86_64"
       use-rtx: true
 
-  tests-py-torchscript-fe:
-    name: Test torchscript frontend [Python]
-    needs: [filter-matrix, build]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - repository: pytorch/tensorrt
-            package-name: torch_tensorrt
-            pre-script: packaging/pre_build_script.sh
-            post-script: packaging/post_build_script.sh
-            smoke-test-script: packaging/smoke_test_script.sh
-    uses: ./.github/workflows/linux-test.yml
-    with:
-      job-name: tests-py-torchscript-fe
-      repository: "pytorch/tensorrt"
-      ref: ""
-      test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
-      build-matrix: ${{ needs.filter-matrix.outputs.matrix }}
-      pre-script: ${{ matrix.pre-script }}
-      use-rtx: true
-      script: |
-        set -euo pipefail
-        export USE_HOST_DEPS=1
-        export CI_BUILD=1
-        export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
-        pushd .
-        cd tests/modules
-        python hub.py
-        popd
-        pushd .
-        cd tests/py/ts
-        python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
-        python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
-        python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
-        popd
-
   tests-py-dynamo-converters:
     name: Test dynamo converters [Python]
     needs: [filter-matrix, build]
diff --git a/.github/workflows/build-test-windows_rtx.yml b/.github/workflows/build-test-windows_rtx.yml
index 137adb252c..6ee14859f5 100644
--- a/.github/workflows/build-test-windows_rtx.yml
+++ b/.github/workflows/build-test-windows_rtx.yml
@@ -87,40 +87,6 @@ jobs:
       use-rtx: true
       timeout: 120
 
-  tests-py-torchscript-fe:
-    name: Test torchscript frontend [Python]
-    needs: [substitute-runner, build]
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - repository: pytorch/tensorrt
-            package-name: torch_tensorrt
-    uses: ./.github/workflows/windows-test.yml
-    with:
-      job-name: tests-py-torchscript-fe
-      repository: ${{ matrix.repository }}
-      ref: ""
-      test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
-      build-matrix: ${{ needs.substitute-runner.outputs.matrix }}
-      pre-script: packaging/driver_upgrade.bat
-      use-rtx: true
-      script: |
-        set -euo pipefail
-        export USE_HOST_DEPS=1
-        export CI_BUILD=1
-        pushd .
-        cd tests/modules
-        python hub.py
-        popd
-        pushd .
-        cd tests/py/ts
-        python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_api_test_results.xml api/
-        python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_models_test_results.xml models/
-        python -m pytest -ra --junitxml=${RUNNER_TEST_RESULTS_DIR}/ts_integrations_test_results.xml integrations/
-        popd
-
   tests-py-dynamo-converters:
     name: Test dynamo converters [Python]
     needs: [substitute-runner, build]
diff --git a/tests/core/runtime/BUILD b/tests/core/runtime/BUILD
index cd02a54b40..f0eb8f263b 100644
--- a/tests/core/runtime/BUILD
+++ b/tests/core/runtime/BUILD
@@ -5,7 +5,27 @@ package(default_visibility = ["//visibility:public"])
 config_setting(
     name = "use_torch_whl",
     flag_values = {
-        "//toolchains/dep_src:torch": "whl"
+        "//toolchains/dep_src:torch": "whl",
+    },
+)
+
+config_setting(
+    name = "sbsa",
+    constraint_values = [
+        "@platforms//cpu:aarch64",
+    ],
+    flag_values = {
+        "//toolchains/dep_collection:compute_libs": "default",
+    },
+)
+
+config_setting(
+    name = "jetpack",
+    constraint_values = [
+        "@platforms//cpu:aarch64",
+    ],
+    flag_values = {
+        "//toolchains/dep_collection:compute_libs": "jetpack",
     },
 )
 
@@ -16,7 +36,6 @@ config_setting(
     ],
 )
 
-
 runtime_test(
     name = "test_multi_device_safe_mode",
 )
diff --git a/tests/util/BUILD b/tests/util/BUILD
index fb33140b7e..1f2b66a711 100644
--- a/tests/util/BUILD
+++ b/tests/util/BUILD
@@ -43,6 +43,27 @@ config_setting(
     },
 )
 
+config_setting(
+    name = "rtx_x86_64",
+    constraint_values = [
+        "@platforms//cpu:x86_64",
+        "@platforms//os:linux",
+    ],
+    flag_values = {
+        "//toolchains/dep_collection:compute_libs": "rtx",
+    },
+)
+
+config_setting(
+    name = "rtx_win",
+    constraint_values = [
+        "@platforms//os:windows",
+    ],
+    flag_values = {
+        "//toolchains/dep_collection:compute_libs": "rtx",
+    },
+)
+
 cc_library(
     name = "util",
     srcs = [