diff --git a/.travis.yml b/.travis.yml
index 31dda1f2471..645f4457788 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: go
 directories:
     - $HOME/.glide/cache
 go:
-  - 1.7
+  - 1.8
 
 addons:
   apt:
@@ -16,7 +16,6 @@ addons:
       - python
       - python-dev
       - python-pip
-      - thrift-compiler
 
 before_install:
   - pip install --user ccm
@@ -27,8 +26,7 @@ install:
   - go get github.com/axw/gocov/gocov
   - go get github.com/mattn/goveralls
   - go get golang.org/x/tools/cmd/cover
-  - go get github.com/uber/tchannel-go/thrift/thrift-gen
-  - ccm create test -v 3.9 -n 1 -s
+  - ccm create test -v 2.2.8 -n 1 -s
   - sudo ln -sf /home/travis/.local/bin/cqlsh /usr/local/bin/cqlsh
 
 script:
diff --git a/Makefile b/Makefile
index 6d9e0db30fc..637c5426b89 100644
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,18 @@ ALL_SRC := $(shell find . -name "*.go" | grep -v -e Godeps -e vendor \
 # all directories with *_test.go files in them
 TEST_DIRS := $(sort $(dir $(filter %_test.go,$(ALL_SRC))))
 
-thriftc: $(THRIFT_GEN_SRC)
+glide:
+	glide install
+
+clean_thrift:
+	rm -rf .gen
+
+thriftc: clean_thrift glide $(THRIFT_GEN_SRC)
 
 bins: thriftc
-	glide install
+	go build -i -o cadence main.go
+
+bins_nothrift: glide
 	go build -i -o cadence main.go
 
 test: bins
@@ -59,7 +67,7 @@ test: bins
 		go test -coverprofile=$@ "$$dir" | tee -a test.log; \
 	done;
 
-cover_profile: clean bins
+cover_profile: clean bins_nothrift
 	@echo Testing packages:
 	@for dir in $(TEST_DIRS); do \
 		mkdir -p $(BUILD)/"$$dir"; \
@@ -77,5 +85,4 @@ cover_ci: cover_profile
 	done
 
 clean:
-	rm -rf .gen
 	rm -rf cadence
diff --git a/glide.lock b/glide.lock
index c29d99313cd..8eefe12fc18 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 4b7007272370a66c16f8b941a0c965718ea5eca9017b3243445c3c760014279a
-updated: 2017-02-21T16:11:34.099769066-08:00
+hash: c38fdef9e213c113d3fc1f62056459a7547db7ca8e17bc6885321c2b9647c134
+updated: 2017-03-02T10:57:09.383624392-08:00
 imports:
 - name: github.com/apache/thrift
-  version: 655b9b6ef86c45b423a194abee2a9cd057a16a74
+  version: c89e172289129a0a700a20f11f4a157b7da789d2
   subpackages:
   - lib/go/thrift
 - name: github.com/benbjohnson/clock
@@ -29,8 +29,7 @@ imports:
 - name: github.com/facebookgo/clock
   version: 600d898af40aa09a7a93ecb9265d87b0504b6f03
 - name: github.com/gocql/gocql
-  version: 8e63066b8432f0fbc02d63b7b04de8da132f0b21
-  repo: gitolite@code.uber.internal:odp/cherami-gocql.git
+  version: 1f874493e9e5aebe46b312593cbd9cb5d3946eda
   subpackages:
   - internal/lru
   - internal/murmur
@@ -99,11 +98,12 @@ imports:
   - relay
   - thrift
   - thrift/gen-go/meta
+  - thrift/thrift-gen
   - tnet
   - trand
   - typed
 - name: golang.org/x/net
-  version: 6b27048ae5e6ad1ef927e72e437531493de612fe
+  version: 906cda9512f77671ab44f8c8563b13a8e707b230
   subpackages:
   - context
 - name: golang.org/x/sys
diff --git a/glide.yaml b/glide.yaml
index 8a9ebb3a7eb..189c3a80573 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -3,8 +3,8 @@ import:
 - package: github.com/uber/tchannel-go
   subpackages:
   - thrift
+  - thrift/thrift-gen
 - package: github.com/gocql/gocql
-  repo: gitolite@code.uber.internal:odp/cherami-gocql.git
   subpackages:
   - internal/lru
   - internal/murmur