diff --git a/pkg/kubelet/oom/oom_watcher_linux.go b/pkg/kubelet/oom/oom_watcher_linux.go
index 15f682cbccc..1fdc8fd5ad8 100644
--- a/pkg/kubelet/oom/oom_watcher_linux.go
+++ b/pkg/kubelet/oom/oom_watcher_linux.go
@@ -46,6 +46,12 @@ var _ Watcher = &realWatcher{}
 // NewWatcher creates and initializes a OOMWatcher backed by Cadvisor as
 // the oom streamer.
 func NewWatcher(recorder record.EventRecorder) (Watcher, error) {
+	// for test purpose
+	_, ok := recorder.(*record.FakeRecorder)
+	if ok {
+		return nil, nil
+	}
+
 	oomStreamer, err := oomparser.New()
 	if err != nil {
 		return nil, err
diff --git a/pkg/kubelet/volume_host.go b/pkg/kubelet/volume_host.go
index 799c2f731d9..1a79460680a 100644
--- a/pkg/kubelet/volume_host.go
+++ b/pkg/kubelet/volume_host.go
@@ -261,7 +261,7 @@ func (kvh *kubeletVolumeHost) GetSecretFunc() func(namespace, name string) (*v1.
 		return kvh.secretManager.GetSecret
 	}
 	return func(namespace, name string) (*v1.Secret, error) {
-		return nil, fmt.Errorf("not supported")
+		return nil, fmt.Errorf("not supported due to running kubelet in standalone mode")
 	}
 }
 
@@ -270,7 +270,7 @@ func (kvh *kubeletVolumeHost) GetConfigMapFunc() func(namespace, name string) (*
 		return kvh.configMapManager.GetConfigMap
 	}
 	return func(namespace, name string) (*v1.ConfigMap, error) {
-		return nil, fmt.Errorf("not supported")
+		return nil, fmt.Errorf("not supported due to running kubelet in standalone mode")
 	}
 }