diff --git a/ci_build/azure_pipelines/onnxruntime_nightly_test.yml b/ci_build/azure_pipelines/onnxruntime_nightly_test.yml
index 22f781d7e..12f0d03f1 100644
--- a/ci_build/azure_pipelines/onnxruntime_nightly_test.yml
+++ b/ci_build/azure_pipelines/onnxruntime_nightly_test.yml
@@ -3,25 +3,11 @@
 stages:
   - stage:
     jobs:
-    - template: 'templates/job_generator.yml'
-      parameters:
-        python_versions: ['3.7']
-        tf_versions: ['2.5.0', '2.3.0']
-        onnx_opsets: ['']
-        onnx_backends: {onnxruntime: ['nightly']}
-        skip_tflite_tests: 'False'
-        skip_tf_tests: 'True'
-        job:
-          steps:
-          - template: 'unit_test.yml'
-        report_coverage: 'True'
-
     - template: 'templates/job_generator.yml'
       parameters:
         platforms: ['linux', 'windows']
         python_versions: [3.7']
-        tf_versions: ['1.15.2','2.1.0']
-        onnx_opsets: ['']
+        tf_versions: ['1.15.5']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -32,8 +18,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.8']
-        tf_versions: ['2.7.3']
-        onnx_opsets: ['']
+        tf_versions: ['2.8.0', '2.9.0', '2.13.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -44,8 +29,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.9']
-        tf_versions: ['2.8.0']
-        onnx_opsets: ['']
+        tf_versions: ['2.10.0', '2.12.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
@@ -56,8 +40,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.10']
-        tf_versions: ['2.9.1']
-        onnx_opsets: ['']
+        tf_versions: ['2.8.0', '2.13.0']
         onnx_backends: {onnxruntime: ['nightly']}
         job:
           steps:
diff --git a/ci_build/azure_pipelines/unit_test-matrix.yml b/ci_build/azure_pipelines/unit_test-matrix.yml
index 793c148fb..ca931d959 100644
--- a/ci_build/azure_pipelines/unit_test-matrix.yml
+++ b/ci_build/azure_pipelines/unit_test-matrix.yml
@@ -34,7 +34,6 @@ stages:
         platforms: ['linux', 'windows']
         python_versions: ['3.8']
         tf_versions: ['2.12.0']
-        onnx_opsets: ['']
         job:
           steps:
           - template: 'unit_test.yml'
@@ -45,7 +44,6 @@ stages:
         platforms: ['linux', 'windows']
         python_versions: ['3.9']
         tf_versions: ['2.9.0', '2.10.0',]
-        onnx_opsets: ['']
         job:
           steps:
           - template: 'unit_test.yml'
@@ -56,7 +54,6 @@ stages:
         platforms: ['linux', 'windows']
         python_versions: ['3.10']
         tf_versions: ['2.8.0', '2.11.0', '2.13.0']
-        onnx_opsets: ['']
         job:
           steps:
           - template: 'unit_test.yml'