diff --git a/cmd/kubeadm/app/util/net_test.go b/cmd/kubeadm/app/util/net_test.go
index 8d5888349a2..6daf8048f26 100644
--- a/cmd/kubeadm/app/util/net_test.go
+++ b/cmd/kubeadm/app/util/net_test.go
@@ -44,6 +44,12 @@ func TestGetHostname(t *testing.T) {
 			result:      "overridden",
 			expectedErr: nil,
 		},
+		{
+			desc:        "hostname contains spaces",
+			hostname:    " OVERRIDDEN ",
+			result:      "overridden",
+			expectedErr: nil,
+		},
 		{
 			desc:        "hostname contains only spaces",
 			hostname:    " ",
diff --git a/cmd/kubeadm/app/util/version_test.go b/cmd/kubeadm/app/util/version_test.go
index c392a6a2e5d..f7dadaea8a7 100644
--- a/cmd/kubeadm/app/util/version_test.go
+++ b/cmd/kubeadm/app/util/version_test.go
@@ -381,6 +381,11 @@ func TestKubeadmVersion(t *testing.T) {
 			input:        "v1.9",
 			parsingError: true,
 		},
+		{
+			name:         "invalid version with label and stray dot",
+			input:        "v1.8.0-alpha.2.",
+			parsingError: true,
+		},
 		{
 			name:        "invalid version with label and metadata",
 			input:       "v1.8.0-alpha.2.1231+afabd012389d53a",