diff --git a/hack/.golint_failures b/hack/.golint_failures
index 2b401afcb9..103e811e9b 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -588,7 +588,6 @@ staging/src/k8s.io/sample-apiserver/pkg/apis/wardle
 staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1
 staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/fischer
 staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder
-test/e2e/chaosmonkey
 test/e2e/common
 test/e2e/lifecycle/bootstrap
 test/e2e/scalability
diff --git a/test/e2e/chaosmonkey/chaosmonkey.go b/test/e2e/chaosmonkey/chaosmonkey.go
index 9acb5af46e..50c4474d28 100644
--- a/test/e2e/chaosmonkey/chaosmonkey.go
+++ b/test/e2e/chaosmonkey/chaosmonkey.go
@@ -16,13 +16,13 @@ limitations under the License.
 
 package chaosmonkey
 
-import . "github.com/onsi/ginkgo"
+import "github.com/onsi/ginkgo"
 
-// Disruption is the type to construct a chaosmonkey with; see Do for more information.
+// Disruption is the type to construct a Chaosmonkey with; see Do for more information.
 type Disruption func()
 
-// Test is the type to register with a chaosmonkey.  A test will run asynchronously across the
-// chaosmonkey's Disruption.  A Test takes a Semaphore as an argument.  It should call sem.Ready()
+// Test is the type to register with a Chaosmonkey.  A test will run asynchronously across the
+// Chaosmonkey's Disruption.  A Test takes a Semaphore as an argument.  It should call sem.Ready()
 // once it's ready for the disruption to start and should then wait until sem.StopCh (which is a
 // <-chan struct{}) is closed, which signals that the disruption is over.  It should then clean up
 // and return.  See Do and Semaphore for more information.
@@ -37,30 +37,31 @@ type Interface interface {
 	Teardown()
 }
 
-type chaosmonkey struct {
+// Chaosmonkey is the type that holds the necessary content for chaosmonkey test
+type Chaosmonkey struct {
 	disruption Disruption
 	tests      []Test
 }
 
-// New creates and returns a chaosmonkey, with which the caller should register Tests and call Do.
+// New creates and returns a Chaosmonkey, with which the caller should register Tests and call Do.
 // See Do for more information.
-func New(disruption Disruption) *chaosmonkey {
-	return &chaosmonkey{
+func New(disruption Disruption) *Chaosmonkey {
+	return &Chaosmonkey{
 		disruption,
 		[]Test{},
 	}
 }
 
-// Register registers the given Test with the chaosmonkey, so that the test will run over the
+// Register registers the given Test with the Chaosmonkey, so that the test will run over the
 // Disruption.
-func (cm *chaosmonkey) Register(test Test) {
+func (cm *Chaosmonkey) Register(test Test) {
 	cm.tests = append(cm.tests, test)
 }
 
-// RegisterInterface registers the given Interface with the chaosmonkey, so the chaosmonkey will
+// RegisterInterface registers the given Interface with the Chaosmonkey, so the Chaosmonkey will
 // call Setup, Test, and Teardown properly.  Test can tell that the Disruption is finished when
 // stopCh is closed.
-func (cm *chaosmonkey) RegisterInterface(in Interface) {
+func (cm *Chaosmonkey) RegisterInterface(in Interface) {
 	cm.Register(func(sem *Semaphore) {
 		in.Setup()
 		sem.Ready()
@@ -70,11 +71,11 @@ func (cm *chaosmonkey) RegisterInterface(in Interface) {
 }
 
 // Do performs the Disruption while testing the registered Tests.  Once the caller has registered
-// all Tests with the chaosmonkey, they call Do.  Do starts each registered test asynchronously and
+// all Tests with the Chaosmonkey, they call Do.  Do starts each registered test asynchronously and
 // waits for each test to signal that it is ready by calling sem.Ready().  Do will then do the
 // Disruption, and when it's complete, close sem.StopCh to signal to the registered Tests that the
 // Disruption is over, and wait for all Tests to return.
-func (cm *chaosmonkey) Do() {
+func (cm *Chaosmonkey) Do() {
 	sems := []*Semaphore{}
 	// All semaphores have the same StopCh.
 	stopCh := make(chan struct{})
@@ -84,13 +85,13 @@ func (cm *chaosmonkey) Do() {
 		sem := newSemaphore(stopCh)
 		sems = append(sems, sem)
 		go func() {
-			defer GinkgoRecover()
+			defer ginkgo.GinkgoRecover()
 			defer sem.done()
 			test(sem)
 		}()
 	}
 
-	By("Waiting for all async tests to be ready")
+	ginkgo.By("Waiting for all async tests to be ready")
 	for _, sem := range sems {
 		// Wait for test to be ready.  We have to wait for ready *or done* because a test
 		// may panic before signaling that its ready, and we shouldn't block.  Since we
@@ -100,15 +101,15 @@ func (cm *chaosmonkey) Do() {
 
 	defer func() {
 		close(stopCh)
-		By("Waiting for async validations to complete")
+		ginkgo.By("Waiting for async validations to complete")
 		for _, sem := range sems {
 			sem.waitForDone()
 		}
 	}()
 
-	By("Starting disruption")
+	ginkgo.By("Starting disruption")
 	cm.disruption()
-	By("Disruption complete; stopping async validations")
+	ginkgo.By("Disruption complete; stopping async validations")
 }
 
 // Semaphore is taken by a Test and provides: Ready(), for the Test to call when it's ready for the
diff --git a/test/e2e/chaosmonkey/chaosmonkey_test.go b/test/e2e/chaosmonkey/chaosmonkey_test.go
index ead8db2456..f5a9dcf57a 100644
--- a/test/e2e/chaosmonkey/chaosmonkey_test.go
+++ b/test/e2e/chaosmonkey/chaosmonkey_test.go
@@ -22,7 +22,7 @@ import (
 )
 
 func TestDoWithPanic(t *testing.T) {
-	var counter int64 = 0
+	var counter int64
 	cm := New(func() {})
 	tests := []Test{
 		// No panic