diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 0e1c0bf..300377a 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -95,7 +95,7 @@ jobs:
   e2e-test:
     strategy:
       matrix:
-        os: [ ubuntu-latest ] # TODO: once kind is available for macos, test against it
+        os: [ ubuntu-latest ]
     name: e2e test
     runs-on: ${{ matrix.os }}
     steps:
@@ -107,8 +107,10 @@ jobs:
         with:
           go-version: 1.16.5
 
-      - name: setup kind cluster
-        uses: engineerd/setup-kind@v0.5.0
+      - uses: debianmaster/actions-k3s@master
+        id: k3s
+        with:
+          version: 'v1.21.2-k3s1'
 
       - uses: actions/cache@v2
         with:
diff --git a/src/istioctl/donwload_script.go b/src/istioctl/donwload_script.go
index 9e360b7..49e9949 100644
--- a/src/istioctl/donwload_script.go
+++ b/src/istioctl/donwload_script.go
@@ -88,12 +88,7 @@ ARCH_SUPPORTED=$(echo "$ISTIO_VERSION" | awk  '{ ARCH_SUPPORTED=substr($0, 1, 3)
 ARCH_UNSUPPORTED="1.5"
 
 if [ "${OS}" = "Linux" ] ; then
-  # This checks if 1.6 <= 1.5 or 1.4 <= 1.5
-  if [ "$(expr "${ARCH_SUPPORTED}" \<= "${ARCH_UNSUPPORTED}")" -eq 1 ]; then
-    without_arch
-  else
-    with_arch
-  fi
+  with_arch
 elif [ "x${OS}" = "xDarwin" ] ; then
   without_arch
 else