diff --git a/.ci/build b/.ci/build
index 924a96168434..17077248644d 100755
--- a/.ci/build
+++ b/.ci/build
@@ -59,17 +59,20 @@ fi
 
 # If no LOCAL_BUILD environment variable is set, we configure the `go build` command
 # to build for linux OS, amd64 architectures and without CGO enablement.
+BINARY_PATH=${BINARY_PATH}/cluster-autoscaler
+cd "${BINARY_PATH}"
+
 if [[ -z "$LOCAL_BUILD" ]]; then
   go build \
     -a \
     -v \
-    -o ${BINARY_PATH}/cluster-autoscaler/cluster-autoscaler \
-    cluster-autoscaler/main.go
+    -o cluster-autoscaler \
+    main.go
 
 # If the LOCAL_BUILD environment variable is set, we simply run `go build`.
 else
   go build \
     -v \
-    -o ${BINARY_PATH}/cluster-autoscaler/cluster-autoscaler \
-    cluster-autoscaler/main.go
+    -o cluster-autoscaler \
+    main.go
 fi
diff --git a/.ci/test b/.ci/test
index 40a8618199fd..e1ea48fd082e 100755
--- a/.ci/test
+++ b/.ci/test
@@ -50,8 +50,10 @@ fi
 
 ##############################################################################
 
-go test $(go list ./cluster-autoscaler/... | grep -v cloudprovider | grep -v vendor | grep -v integration)
-go test $(go list ./cluster-autoscaler/cloudprovider/mcm/... | grep -v vendor)
+cd cluster-autoscaler
+
+go test $(go list ./... | grep -v cloudprovider | grep -v vendor | grep -v integration)
+go test $(go list ./cloudprovider/mcm/... | grep -v vendor | grep -v integration)
 
 #TODO: Return success failure properly
 echo "CI tests are done"
diff --git a/cluster-autoscaler/FAQ.md b/cluster-autoscaler/FAQ.md
index 4393a1ac0914..39a4dba3ebaf 100644
--- a/cluster-autoscaler/FAQ.md
+++ b/cluster-autoscaler/FAQ.md
@@ -1065,8 +1065,8 @@ Once script is successfully executed, execute following commands to confirm the
 git status 
 
 # Try following steps to confirm the correctness.
-go test $(go list ../cluster-autoscaler/... | grep -v cloudprovider | grep -v vendor)
-go test $(go list ../cluster-autoscaler/cloudprovider/mcm/... | grep -v vendor)
+go test $(go list ../cluster-autoscaler/... | grep -v cloudprovider | grep -v vendor | grep -v integration)
+go test $(go list ../cluster-autoscaler/cloudprovider/mcm/... | grep -v vendor | grep -v integration)
 
 go build main.go
 go run main.go --kubeconfig=kubeconfig.yaml --cloud-provider=mcm --nodes=0:3:ca-test.test-machine-deployment