diff --git a/cmd/kubeadm/app/util/BUILD b/cmd/kubeadm/app/util/BUILD
index 681f8fa8179..f63f79b587c 100644
--- a/cmd/kubeadm/app/util/BUILD
+++ b/cmd/kubeadm/app/util/BUILD
@@ -37,13 +37,18 @@ go_test(
         "arguments_test.go",
         "endpoint_test.go",
         "error_test.go",
+        "marshal_test.go",
         "template_test.go",
         "version_test.go",
     ],
     embed = [":go_default_library"],
     deps = [
         "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
+        "//cmd/kubeadm/app/apis/kubeadm/scheme:go_default_library",
+        "//cmd/kubeadm/app/apis/kubeadm/v1alpha1:go_default_library",
         "//cmd/kubeadm/app/preflight:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
     ],
 )
 
diff --git a/cmd/kubeadm/app/util/marshal_test.go b/cmd/kubeadm/app/util/marshal_test.go
new file mode 100644
index 00000000000..33c37afc5ab
--- /dev/null
+++ b/cmd/kubeadm/app/util/marshal_test.go
@@ -0,0 +1,125 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package util
+
+import (
+	"reflect"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme"
+	kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
+)
+
+func TestMarshalUnmarshalYaml(t *testing.T) {
+	pod := &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "someName",
+			Namespace: "testNamespace",
+			Labels: map[string]string{
+				"test": "yes",
+			},
+		},
+		Spec: corev1.PodSpec{
+			RestartPolicy: corev1.RestartPolicyAlways,
+		},
+	}
+
+	bytes, err := MarshalToYaml(pod, corev1.SchemeGroupVersion)
+	if err != nil {
+		t.Fatalf("unexpected error marshalling: %v", err)
+	}
+
+	t.Logf("\n%s", bytes)
+
+	obj2, err := UnmarshalFromYaml(bytes, corev1.SchemeGroupVersion)
+	if err != nil {
+		t.Fatalf("unexpected error marshalling: %v", err)
+	}
+
+	pod2, ok := obj2.(*corev1.Pod)
+	if !ok {
+		t.Fatal("did not get a Pod")
+	}
+
+	if pod2.Name != pod.Name {
+		t.Errorf("expected %q, got %q", pod.Name, pod2.Name)
+	}
+
+	if pod2.Namespace != pod.Namespace {
+		t.Errorf("expected %q, got %q", pod.Namespace, pod2.Namespace)
+	}
+
+	if !reflect.DeepEqual(pod2.Labels, pod.Labels) {
+		t.Errorf("expected %v, got %v", pod.Labels, pod2.Labels)
+	}
+
+	if pod2.Spec.RestartPolicy != pod.Spec.RestartPolicy {
+		t.Errorf("expected %q, got %q", pod.Spec.RestartPolicy, pod2.Spec.RestartPolicy)
+	}
+}
+
+func TestMarshalUnmarshalToYamlForCodecs(t *testing.T) {
+	cfg := &kubeadmapiext.MasterConfiguration{
+		API: kubeadmapiext.API{
+			AdvertiseAddress: "10.100.0.1",
+			BindPort:         4332,
+		},
+		NodeName:      "testNode",
+		NoTaintMaster: true,
+		Networking: kubeadmapiext.Networking{
+			ServiceSubnet: "10.100.0.0/24",
+			PodSubnet:     "10.100.1.0/24",
+		},
+	}
+
+	bytes, err := MarshalToYamlForCodecs(cfg, kubeadmapiext.SchemeGroupVersion, scheme.Codecs)
+	if err != nil {
+		t.Fatalf("unexpected error marshalling MasterConfiguration: %v", err)
+	}
+	t.Logf("\n%s", bytes)
+
+	obj, err := UnmarshalFromYamlForCodecs(bytes, kubeadmapiext.SchemeGroupVersion, scheme.Codecs)
+	if err != nil {
+		t.Fatalf("unexpected error unmarshalling MasterConfiguration: %v", err)
+	}
+
+	cfg2, ok := obj.(*kubeadmapiext.MasterConfiguration)
+	if !ok {
+		t.Fatal("did not get MasterConfiguration back")
+	}
+
+	if cfg2.API.AdvertiseAddress != cfg.API.AdvertiseAddress {
+		t.Errorf("expected %q, got %q", cfg.API.AdvertiseAddress, cfg2.API.AdvertiseAddress)
+	}
+	if cfg2.API.BindPort != cfg.API.BindPort {
+		t.Errorf("expected %d, got %d", cfg.API.BindPort, cfg2.API.BindPort)
+	}
+	if cfg2.NodeName != cfg.NodeName {
+		t.Errorf("expected %q, got %q", cfg.NodeName, cfg2.NodeName)
+	}
+	if cfg2.NoTaintMaster != cfg.NoTaintMaster {
+		t.Errorf("expected %v, got %v", cfg.NoTaintMaster, cfg2.NoTaintMaster)
+	}
+	if cfg2.Networking.ServiceSubnet != cfg.Networking.ServiceSubnet {
+		t.Errorf("expected %v, got %v", cfg.Networking.ServiceSubnet, cfg2.Networking.ServiceSubnet)
+	}
+	if cfg2.Networking.PodSubnet != cfg.Networking.PodSubnet {
+		t.Errorf("expected %v, got %v", cfg.Networking.PodSubnet, cfg2.Networking.PodSubnet)
+	}
+}