diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d6f1542f..70404396 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,6 +45,21 @@ jobs:
         with:
           version: v1.54.2
 
+  test:
+    name: Xline Operator Test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{env.GO_VERSION}}
+
+    - name: Build and test
+      run: make test
+
   commit:
     name: Commit Message Validation
     runs-on: ubuntu-latest
diff --git a/tests/e2e/cases/ci.sh b/tests/e2e/cases/ci.sh
index 74a724f5..7a24323b 100644
--- a/tests/e2e/cases/ci.sh
+++ b/tests/e2e/cases/ci.sh
@@ -68,7 +68,7 @@ function test::ci::_start() {
   log::info "controller started"
   popd
   log::info "starting xline cluster"
-  k8s::kubectl apply -f "$(dirname "${BASH_SOURCE[0]}")/manifests/cluster.yml" >/dev/null 2>&1
+  k8s::kubectl apply -f "$(dirname "${BASH_SOURCE[0]}")/manifests/cluster.yaml" >/dev/null 2>&1
   k8s::kubectl::wait_resource_creation sts $_TEST_CI_STS_NAME
 }
 
diff --git a/tests/e2e/cases/manifests/cluster.yml b/tests/e2e/cases/manifests/cluster.yaml
similarity index 66%
rename from tests/e2e/cases/manifests/cluster.yml
rename to tests/e2e/cases/manifests/cluster.yaml
index f7450c85..9f95db83 100644
--- a/tests/e2e/cases/manifests/cluster.yml
+++ b/tests/e2e/cases/manifests/cluster.yaml
@@ -3,7 +3,8 @@ kind: XlineCluster
 metadata:
   name: my-xline-cluster
 spec:
-  version: v0.6.0
+  version: v0.6.1
+  # TODO: Replace this image repo with ghcr.io when Xline 0.6.1 is ready
   image: phoenix500526/xline
   imagePullPolicy: IfNotPresent
   replicas: 3