diff --git a/cmd/tree.go b/cmd/tree.go
index d2a144c..b5c3387 100644
--- a/cmd/tree.go
+++ b/cmd/tree.go
@@ -211,7 +211,7 @@
 		}
 	}
 	// Check $GOPATH
-	for _, r := range strings.Split(b.GOPATH, ":") {
+	for _, r := range filepath.SplitList(b.GOPATH) {
 		p = filepath.Join(r, "src", filepath.FromSlash(name))
 		if fi, err = os.Stat(p); err == nil && (fi.IsDir() || isLink(fi)) {
 			info.Path = p
@@ -221,7 +221,7 @@
 	}
 
 	// Check $GOROOT
-	for _, r := range strings.Split(b.GOROOT, ":") {
+	for _, r := range filepath.SplitList(b.GOROOT) {
 		p = filepath.Join(r, "src", filepath.FromSlash(name))
 		if fi, err = os.Stat(p); err == nil && (fi.IsDir() || isLink(fi)) {
 			info.Path = p
diff --git a/dependency/resolver.go b/dependency/resolver.go
index 9a992c7..fcd4ddd 100644
--- a/dependency/resolver.go
+++ b/dependency/resolver.go
@@ -476,7 +476,7 @@
 	//}
 
 	// Check $GOPATH
-	for _, rr := range strings.Split(r.BuildContext.GOPATH, ":") {
+	for _, rr := range filepath.SplitList(r.BuildContext.GOPATH) {
 		p = filepath.Join(rr, "src", filepath.FromSlash(name))
 		if pkgExists(p) {
 			info.Path = p
@@ -487,7 +487,7 @@
 	}
 
 	// Check $GOROOT
-	for _, rr := range strings.Split(r.BuildContext.GOROOT, ":") {
+	for _, rr := range filepath.SplitList(r.BuildContext.GOROOT) {
 		p = filepath.Join(rr, "src", filepath.FromSlash(name))
 		if pkgExists(p) {
 			info.Path = p