diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
index ce34749e39..c3d1829aa3 100644
--- a/.github/workflows/test-integration-unreleased.yml
+++ b/.github/workflows/test-integration-unreleased.yml
@@ -18,10 +18,11 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          # - { ref: '1.x', java: 11 }
-          # - { ref: '2.x', java: 11 }
-          - { ref: '2.0', java: 11 }
-          # - { ref: 'main', java: 11 }
+          - { opensearch_ref: '1.x', java: 11 }
+          - { opensearch_ref: '2.x', java: 11 }
+          - { opensearch_ref: '2.x', java: 17 }
+          - { opensearch_ref: '2.0', java: 11 }
+          - { opensearch_ref: 'main', java: 11 }
     steps:
       - name: Set up JDK ${{ matrix.entry.java }}
         uses: actions/setup-java@v1
@@ -32,7 +33,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: opensearch-project/OpenSearch
-          ref: ${{ matrix.entry.ref }}
+          ref: ${{ matrix.entry.opensearch_ref }}
           path: opensearch
 
       - name: Assemble OpenSearch
@@ -41,7 +42,7 @@ jobs:
           ./gradlew assemble
 
         # This step runs the docker image generated during gradle assemble in OpenSearch. It is tagged as opensearch:test.
-        # Reference: https://github.com/opensearch-project/OpenSearch/blob/2.0/distribution/docker/build.gradle#L190
+        # opensearch_Reference: https://github.com/opensearch-project/OpenSearch/blob/2.0/distribution/docker/build.gradle#L190
       - name: Run Docker Image
         run: |
           docker run -p 9200:9200 -p 9600:9600 -d -e "discovery.type=single-node" -e "bootstrap.memory_lock=true" opensearch:test
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 63c0a3d3ae..648d997dae 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -15,14 +15,14 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          # - { opensearch_version: 1.0.0, java: 11 }
-          # - { opensearch_version: 1.0.1, java: 11 }
-          # - { opensearch_version: 1.1.0, java: 11 }
-          # - { opensearch_version: 1.2.0, java: 11 }
-          # - { opensearch_version: 1.2.1, java: 11 }
-          # - { opensearch_version: 1.2.2, java: 11 }
-          # - { opensearch_version: 1.2.3, java: 11 }
-          # - { opensearch_version: 1.2.4, java: 11 }
+          - { opensearch_version: 1.0.0, java: 11 }
+          - { opensearch_version: 1.0.1, java: 11 }
+          - { opensearch_version: 1.1.0, java: 11 }
+          - { opensearch_version: 1.2.0, java: 11 }
+          - { opensearch_version: 1.2.1, java: 11 }
+          - { opensearch_version: 1.2.2, java: 11 }
+          - { opensearch_version: 1.2.3, java: 11 }
+          - { opensearch_version: 1.2.4, java: 11 }
           - { opensearch_version: 1.3.0, java: 11 }
     steps:
       - name: Set up JDK ${{ matrix.java }}