diff --git a/.travis.yml b/.travis.yml
index 2d3d5d5dcd0..d4bd2b75ea6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,36 +5,20 @@ language: go
 matrix:
   include:
     - go: 1.4
-      env:
-        - KUBE_TEST_API_VERSIONS="v1"
-          KUBE_TEST_ETCD_PREFIXES="registry"
-    - go: 1.3
-      env:
-        - KUBE_TEST_API_VERSIONS="v1beta3"
-          KUBE_TEST_ETCD_PREFIXES="kubernetes.io/registry"
 
 install:
-  - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
-  - go get github.com/mattn/goveralls
+  - go get github.com/tools/godep
   - ./hack/travis/install-etcd.sh
+  - ./hack/build-go.sh
+
+script:
   - ./hack/verify-gofmt.sh
   - ./hack/verify-boilerplate.sh
   - ./hack/verify-description.sh
-  - ./hack/travis/install-std-race.sh
-  - ./hack/build-go.sh
-  - GOPATH=$PWD/Godeps/_workspace:$GOPATH go install ./...
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
-
-before_script:
-  - npm install karma karma-junit-reporter karma-phantomjs-launcher karma-jasmine
-
-script:
-  - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" KUBE_TEST_ETCD_PREFIXES="${KUBE_TEST_ETCD_PREFIXES}" ./hack/test-go.sh -- -p=2
-  - node_modules/karma/bin/karma start www/master/karma.conf.js --single-run --browsers PhantomJS
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-cmd.sh
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-update-storage-objects.sh
+  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-conversions.sh
+  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-deep-copies.sh
+  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
+  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
 
 notifications:
   irc: "chat.freenode.net#google-containers"
diff --git a/shippable.yml b/shippable.yml
index 1f440e7a681..8df9fa35f65 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -21,17 +21,20 @@ before_install:
   - export GOPATH=$SHIPPABLE_GOPATH
 
 install:
-  - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
+  - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
+  - go get github.com/tools/godep
   - ./hack/travis/install-etcd.sh
   - ./hack/verify-gofmt.sh
   - ./hack/verify-boilerplate.sh
   - ./hack/verify-description.sh
   - ./hack/travis/install-std-race.sh
   - ./hack/build-go.sh
-  - GOPATH=$PWD/Godeps/_workspace:$GOPATH go install ./...
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
-  - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
+  - PATH=$GOPATH/bin:$PATH godep go install ./...
+  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-conversions.sh
+  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-deep-copies.sh
+  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-gendocs.sh
+  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
 
 script:
   - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_ETCD_PREFIXES="${KUBE_TEST_ETCD_PREFIXES}" KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" ./hack/test-go.sh -- -p=2