diff --git a/build/cloudbuild.yaml b/build/cloudbuild.yaml
index 1a0b8f9c73..54c6aae78d 100644
--- a/build/cloudbuild.yaml
+++ b/build/cloudbuild.yaml
@@ -34,6 +34,12 @@ steps:
   - 'GOOS=${_GOOS}'
   - 'GOARCH=${_GOARCH}'
   - 'VERSION=${TAG_NAME}'
+- name: "ubuntu"
+  args: ["bash", "build/test.sh"]
+  env:
+  - 'GOOS=${_GOOS}'
+  - 'GOARCH=${_GOARCH}'
+  - 'VERSION=${TAG_NAME}'
 - name: 'gcr.io/cloud-builders/gsutil'
   args: ['-h', 'Content-Type:application/gzip', 'cp', 'kubebuilder-${TAG_NAME}-${_GOOS}-${_GOARCH}.tar.gz', 'gs://kubebuilder-release/kubebuilder-${TAG_NAME}-${_GOOS}-${_GOARCH}.tar.gz']
   env:
diff --git a/build/cloudbuild_local.yaml b/build/cloudbuild_local.yaml
index b08ef5da73..450843ae36 100644
--- a/build/cloudbuild_local.yaml
+++ b/build/cloudbuild_local.yaml
@@ -42,5 +42,11 @@ steps:
   - 'GOOS=${_GOOS}'
   - 'GOARCH=${_GOARCH}'
   - 'VERSION=${TAG_NAME}'
+- name: "ubuntu"
+  args: ["bash", "build/test.sh"]
+  env:
+  - 'GOOS=${_GOOS}'
+  - 'GOARCH=${_GOARCH}'
+  - 'VERSION=${TAG_NAME}'
 - name: "ubuntu"
   args: ["bash", "-c", "ls | grep -v tar.gz | xargs rm -rf"]
diff --git a/build/test.sh b/build/test.sh
new file mode 100755
index 0000000000..8ac8d41cd6
--- /dev/null
+++ b/build/test.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+cp -r /workspace/_output/kubebuilder /tmp/kubebuilder/
+
+export GOPATH=/tmp/go
+mkdir -p $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
+cd $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
+
+# Setup env vars
+export PATH=$PATH:/tmp/kubebuilder/bin/
+export TEST_ASSET_KUBECTL=/tmp/kubebuilder/bin/kubectl
+export TEST_ASSET_KUBE_APISERVER=/tmp/kubebuilder/bin/kube-apiserver
+export TEST_ASSET_ETCD=/tmp/kubebuilder/bin/etcd
+
+# Run the commands
+kubebuilder init repo --domain sample.kubernetes.io
+kubebuilder create resource --group insect --version v1beta1 --kind Bee
+kubebuilder create resource --group insect --version v1beta1 --kind Wasp
+
+# Verify the controller-manager builds and the tests pass
+go install github.com/kubernetes-sigs/kubebuilder-test/cmd/controller-manager
+go build ./cmd/...
+go build ./pkg/...
+go test ./cmd/...
+go test ./pkg/...
diff --git a/test/travis.sh b/test/travis.sh
index a08e9ff766..a5ef29d492 100755
--- a/test/travis.sh
+++ b/test/travis.sh
@@ -17,7 +17,7 @@ cd $GOPATH/src/github.com/kubernetes-sigs/kubebuilder-test/
 # Run the commands
 /tmp/kubebuilder/bin/kubebuilder init repo --domain sample.kubernetes.io
 /tmp/kubebuilder/bin/kubebuilder create resource --group insect --version v1beta1 --kind Bee
-#/tmp/kubebuilder/bin/kubebuilder create resource --group insect --version v1beta1 --kind Wasp
+/tmp/kubebuilder/bin/kubebuilder create resource --group insect --version v1beta1 --kind Wasp
 
 export TEST_ASSET_KUBECTL=/tmp/kubebuilder/bin/kubectl
 export TEST_ASSET_KUBE_APISERVER=/tmp/kubebuilder/bin/kube-apiserver