diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index 145d30884..66a8e8d31 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -45,10 +45,10 @@ jobs:
           python -m pip freeze
           python -c 'import tensorflow as tf; print(tf.version.VERSION)'
           python -c 'import tensorflow_io as tfio; print(tfio.version.VERSION)'
-          python -m pytest -s -v tests/test_http_eager.py
-          python -m pytest -s -v tests/test_s3_eager.py
+          python -m pytest -s -v tests/test_http.py
+          python -m pytest -s -v tests/test_s3.py
           python -m pytest -s -v tests/test_azure.py
-          python -m pytest -s -v tests/test_gcs_eager.py
+          python -m pytest -s -v tests/test_gcs.py
 
   linux:
     name: Linux ${{ matrix.python }} + ${{ matrix.version }}
@@ -82,10 +82,10 @@ jobs:
           python -m pip freeze
           python -c 'import tensorflow as tf; print(tf.version.VERSION)'
           python -c 'import tensorflow_io as tfio; print(tfio.version.VERSION)'
-          python -m pytest -s -v tests/test_http_eager.py
-          python -m pytest -s -v tests/test_s3_eager.py
+          python -m pytest -s -v tests/test_http.py
+          python -m pytest -s -v tests/test_s3.py
           python -m pytest -s -v tests/test_azure.py
-          if [[ "${{ matrix.version }}" != "tf-nightly:tensorflow-io==0.17.0" ]]; then python -m pytest -s -v tests/test_gcs_eager.py ; fi
+          if [[ "${{ matrix.version }}" != "tf-nightly:tensorflow-io==0.17.0" ]]; then python -m pytest -s -v tests/test_gcs.py ; fi
 
   windows:
     name: Windows ${{ matrix.python }} + ${{ matrix.version }}
@@ -120,4 +120,4 @@ jobs:
           python -m pip freeze
           python -c 'import tensorflow as tf; print(tf.version.VERSION)'
           python -c 'import tensorflow_io as tfio; print(tfio.version.VERSION)'
-          python -m pytest -s -v tests/test_http_eager.py -k remote
+          python -m pytest -s -v tests/test_http.py -k remote
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 67619432d..e94f432c9 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -36,7 +36,7 @@ jobs:
           python -m pip freeze
           python -c 'import tensorflow as tf; print(tf.version.VERSION)'
           python -c 'import tensorflow_io as tfio; print(tfio.version.VERSION)'
-          python -m pytest --benchmark-only -v --import-mode=append $(find . -type f \( -iname "test_*_eager.py" ! \( -iname "test_bigquery_eager.py" \) \))
+          python -m pytest --benchmark-only -v --import-mode=append $(find . -type f \( -iname "test_*_v1.py" ! \( -iname "test_bigquery.py" \) \))
 
   linux:
     name: Linux ${{ matrix.python }} + ${{ matrix.version }}
@@ -70,7 +70,7 @@ jobs:
           python -m pip freeze
           python -c 'import tensorflow as tf; print(tf.version.VERSION)'
           python -c 'import tensorflow_io as tfio; print(tfio.version.VERSION)'
-          python -m pytest --benchmark-only --benchmark-json benchmark.json -v --import-mode=append $(find . -type f \( -iname "test_*_eager.py" ! \( -iname "test_bigquery_eager.py" \) \))
+          python -m pytest --benchmark-only --benchmark-json benchmark.json -v --import-mode=append $(find . -type f \( -iname "test_*_v1.py" ! \( -iname "test_bigquery.py" \) \))
       - name: Store benchmark result
         uses: rhysd/github-action-benchmark@v1
         with:
@@ -78,4 +78,4 @@ jobs:
           tool: 'pytest'
           output-file-path: benchmark.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          auto-push: true
\ No newline at end of file
+          auto-push: true
diff --git a/.github/workflows/build.wheel.sh b/.github/workflows/build.wheel.sh
index afb382cbb..cdcae0a9c 100755
--- a/.github/workflows/build.wheel.sh
+++ b/.github/workflows/build.wheel.sh
@@ -9,7 +9,7 @@ run_test() {
   $entry -m pip install -q pytest pytest-benchmark boto3 fastavro avro-python3 scikit-image pandas pyarrow==3.0.0 google-cloud-pubsub==2.1.0 google-cloud-bigtable==1.6.0 google-cloud-bigquery-storage==1.1.0 google-cloud-bigquery==2.3.1 google-cloud-storage==1.32.0
   (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_*_v1.py" \)))
   (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_*.py" ! \( -iname "test_*_v1.py" -o -iname "test_bigquery.py" \) \)))
-  # GRPC and test_bigquery_eager tests have to be executed separately because of https://github.com/grpc/grpc/issues/20034
+  # GRPC and test_bigquery tests have to be executed separately because of https://github.com/grpc/grpc/issues/20034
   (cd tests && $entry -m pytest --benchmark-disable -v --import-mode=append $(find . -type f \( -iname "test_bigquery.py" \)))
 }