diff --git a/.travis.yml b/.travis.yml
index a88fbb53374..8ce19f688f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ install:
   - ./hack/build-go.sh
 
 script:
-  - ./hack/test-go.sh
+  - KUBE_TIMEOUT='-timeout 60s' ./hack/test-go.sh
   - PATH=$HOME/gopath/bin:./third_party/etcd/bin:$PATH ./hack/test-cmd.sh
   - PATH=$HOME/gopath/bin:./third_party/etcd/bin:$PATH ./hack/test-integration.sh
 
diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go
index ef84085a7e5..3203eccc2fe 100644
--- a/pkg/api/serialization_test.go
+++ b/pkg/api/serialization_test.go
@@ -31,7 +31,7 @@ import (
 	"github.com/google/gofuzz"
 )
 
-var fuzzIters = flag.Int("fuzz_iters", 50, "How many fuzzing iterations to do.")
+var fuzzIters = flag.Int("fuzz_iters", 40, "How many fuzzing iterations to do.")
 
 // apiObjectFuzzer can randomly populate api objects.
 var apiObjectFuzzer = fuzz.New().NilChance(.5).NumElements(1, 1).Funcs(
@@ -166,6 +166,7 @@ func TestTypes(t *testing.T) {
 		for i := 0; i < *fuzzIters; i++ {
 			runTest(t, v1beta1.Codec, item)
 			runTest(t, v1beta2.Codec, item)
+			runTest(t, api.Codec, item)
 		}
 	}
 }