diff --git a/pkg/kube/interface.go b/pkg/kube/interface.go
index 1301bf463..4f24444bd 100644
--- a/pkg/kube/interface.go
+++ b/pkg/kube/interface.go
@@ -29,6 +29,11 @@ import (
 //
 // A KubernetesClient must be concurrency safe.
 type Interface interface {
+	ResourceManager
+	Waiter
+}
+
+type ResourceManager interface {
 	// Create creates one or more resources.
 	Create(resources ResourceList, options ...ClientCreateOption) (*Result, error)
 
@@ -67,7 +72,6 @@ type Waiter interface {
 	// Update updates one or more resources or creates the resource
 	// if it doesn't exist.
 	Update(original, target ResourceList, force bool) (*Result, error)
-
 	// WatchUntilReady watches the resources given and waits until it is ready.
 	//
 	// This method is mainly for hook implementations. It watches for a resource to
diff --git a/pkg/kube/kwait_test.go b/pkg/kube/kwait_test.go
index 1d9a69959..77c469212 100644
--- a/pkg/kube/kwait_test.go
+++ b/pkg/kube/kwait_test.go
@@ -98,7 +98,7 @@ func TestRunHealthChecks(t *testing.T) {
 				err = fakeClient.Tracker().Create(podGVR, pod, pod.GetNamespace())
 				require.NoError(t, err)
 			}
-			c.waiter = &kstatusWaiter{
+			c.Waiter = &kstatusWaiter{
 				sw:  statusWatcher,
 				log: c.Log,
 			}