diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index cd87e5ef3..5adb3226f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -58,10 +58,6 @@
 			"ImportPath": "github.com/evanphx/json-patch",
 			"Rev": "36442dbdb585210f8d5a1b45e67aa323c197d5c4"
 		},
-		{
-			"ImportPath": "github.com/ghodss/yaml",
-			"Rev": "c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/proto",
 			"Rev": "342cbe0a04158f6dcb03ca0079991a51a4248c02"
diff --git a/tools/clientcmd/api/helpers_test.go b/tools/clientcmd/api/helpers_test.go
index 7ec30e5da..48b3cec28 100644
--- a/tools/clientcmd/api/helpers_test.go
+++ b/tools/clientcmd/api/helpers_test.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 )
 
 func newMergedConfig(certFile, certContent, keyFile, keyContent, caFile, caContent string, t *testing.T) Config {
diff --git a/tools/clientcmd/api/types_test.go b/tools/clientcmd/api/types_test.go
index bd3483452..f7190d93e 100644
--- a/tools/clientcmd/api/types_test.go
+++ b/tools/clientcmd/api/types_test.go
@@ -19,7 +19,7 @@ package api
 import (
 	"fmt"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 )
 
 func Example_emptyConfig() {
diff --git a/tools/clientcmd/loader_test.go b/tools/clientcmd/loader_test.go
index 86eccac45..461d970bf 100644
--- a/tools/clientcmd/loader_test.go
+++ b/tools/clientcmd/loader_test.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"