diff --git a/Makefile b/Makefile
index ff5873accb4..fd2c9ba3b09 100644
--- a/Makefile
+++ b/Makefile
@@ -329,7 +329,7 @@ ALL_GO_DIRS := $(shell             \
         \)                         \
         -type f -name \*.go        \
         | sed 's|^./||'            \
-        | xargs dirname            \
+        | xargs -n1 dirname        \
         | sort -u                  \
 )
 
@@ -413,7 +413,7 @@ ifeq ($(DBG_MAKEFILE),1)
 endif
 DEEPCOPY_DIRS := $(shell                               \
     grep -l '+k8s:deepcopy-gen=' $(ALL_K8S_TAG_FILES)  \
-        | xargs dirname                                \
+        | xargs -n1 dirname                            \
         | sort -u                                      \
 )
 DEEPCOPY_FILES := $(addsuffix /$(DEEPCOPY_FILENAME), $(DEEPCOPY_DIRS))
@@ -522,7 +522,7 @@ endif
 CONVERSION_DIRS := $(shell                                \
     grep '^// *+k8s:conversion-gen=' $(ALL_K8S_TAG_FILES) \
         | cut -f1 -d:                                     \
-        | xargs dirname                                   \
+        | xargs -n1 dirname                               \
         | sort -u                                         \
 )
 
diff --git a/test/e2e_node/jenkins/e2e-node-jenkins.sh b/test/e2e_node/jenkins/e2e-node-jenkins.sh
index 31bce7561ac..02ad86e333f 100755
--- a/test/e2e_node/jenkins/e2e-node-jenkins.sh
+++ b/test/e2e_node/jenkins/e2e-node-jenkins.sh
@@ -28,6 +28,7 @@ set -x
 
 . $1
 
+make generated_files
 go build test/e2e_node/environment/conformance.go
 
 WORKSPACE=${WORKSPACE:-"/tmp/"}