diff --git a/.gitignore b/.gitignore
index ec07599f..76b7e66d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Binaries
 cmd/fission-bundle/fission-bundle
 cmd/fission-cli/fission
+cmd/fission-cli/fission-cli
 cmd/fetcher/fetcher
 cmd/builder/builder
 cmd/preupgradechecks/pre-upgrade-checks
diff --git a/.travis.yml b/.travis.yml
index 49f2e4bd..c60961c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,6 @@ before_script:
   - hack/verify-gofmt.sh
   - hack/verify-govet.sh
   - helm lint charts/fission-all/ charts/fission-core/
-  - go build -o cmd/fission-cli/fission ./cmd/fission-cli/
   - hack/runtests.sh
 
 script:
diff --git a/preupgradechecks/pre-upgrade-checks b/preupgradechecks/pre-upgrade-checks
deleted file mode 100755
index b58ae371..00000000
Binary files a/preupgradechecks/pre-upgrade-checks and /dev/null differ
diff --git a/test/test_utils.sh b/test/test_utils.sh
index 27dc026e..f40a27ee 100755
--- a/test/test_utils.sh
+++ b/test/test_utils.sh
@@ -137,7 +137,7 @@ build_and_push_env_builder() {
 build_fission_cli() {
     travis_fold_start build_fission_cli "fission cli"
     pushd $ROOT/cmd/fission-cli
-    go build .
+    go build -ldflags "-X github.com/fission/fission/pkg/info.GitCommit=$(getGitCommit) -X github.com/fission/fission/pkg/info.BuildDate=$(getDate) -X github.com/fission/fission/pkg/info.Version=$(getVersion)" -o $HOME/tool/fission .
     popd
     travis_fold_end build_fission_cli
 }
@@ -153,9 +153,6 @@ set_environment() {
     export FISSION_URL=http://$(kubectl -n $ns get svc controller -o jsonpath='{...ip}')
     export FISSION_ROUTER=$(kubectl -n $ns get svc router -o jsonpath='{...ip}')
     export FISSION_NATS_STREAMING_URL="http://defaultFissionAuthToken@$(kubectl -n $ns get svc nats-streaming -o jsonpath='{...ip}:{.spec.ports[0].port}')"
-
-    # set path to include cli
-    export PATH=$ROOT/cmd/fission-cli:$PATH
 }
 
 generate_test_id() {
@@ -543,6 +540,10 @@ install_and_test() {
 
     wait_for_services $id
     set_environment $id
+
+    # ensure we run tests against with the same git commit version of CLI & server
+    fission --version|grep "gitcommit"|tr -d ' '|uniq -c|grep "2 gitcommit"
+
     run_all_tests $id
 
     dump_logs $id