diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index 2d250c583..d8bcc2994 100644
--- a/tests/e2e/e2e_test.go
+++ b/tests/e2e/e2e_test.go
@@ -65,7 +65,7 @@ func (s *E2eSuite) TestContextDefault() {
 		output := s.NewDockerCommand("context", "show").ExecOrDie()
 		Expect(output).To(ContainSubstring("default"))
 		output = s.NewCommand("docker", "context", "ls").ExecOrDie()
-		golden.Assert(s.T(), output, "ls-out-default.golden")
+		golden.Assert(s.T(), output, GoldenFile("ls-out-default"))
 	})
 }
 
@@ -187,7 +187,7 @@ func (s *E2eSuite) TestMockBackend() {
 		currentContext := s.NewDockerCommand("context", "use", "test-example").ExecOrDie()
 		Expect(currentContext).To(ContainSubstring("test-example"))
 		output := s.NewDockerCommand("context", "ls").ExecOrDie()
-		golden.Assert(s.T(), output, "ls-out-test-example.golden")
+		golden.Assert(s.T(), output, GoldenFile("ls-out-test-example"))
 		output = s.NewDockerCommand("context", "show").ExecOrDie()
 		Expect(output).To(ContainSubstring("test-example"))
 	})
diff --git a/tests/e2e/testdata/ls-out-default-windows.golden b/tests/e2e/testdata/ls-out-default-windows.golden
new file mode 100644
index 000000000..d1fad0ef4
--- /dev/null
+++ b/tests/e2e/testdata/ls-out-default-windows.golden
@@ -0,0 +1,2 @@
+NAME                TYPE                DESCRIPTION                               DOCKER ENPOINT                   KUBERNETES ENDPOINT   ORCHESTRATOR
+default *           docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
diff --git a/tests/e2e/testdata/ls-out-test-example-windows.golden b/tests/e2e/testdata/ls-out-test-example-windows.golden
new file mode 100644
index 000000000..b83ef4c10
--- /dev/null
+++ b/tests/e2e/testdata/ls-out-test-example-windows.golden
@@ -0,0 +1,3 @@
+NAME                TYPE                DESCRIPTION                               DOCKER ENPOINT                   KUBERNETES ENDPOINT   ORCHESTRATOR
+default             docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
+test-example *      example                                                                                                              
diff --git a/tests/framework/helper.go b/tests/framework/helper.go
index 2becf2716..cd18b8599 100644
--- a/tests/framework/helper.go
+++ b/tests/framework/helper.go
@@ -28,6 +28,7 @@
 package framework
 
 import (
+	"runtime"
 	"strings"
 
 	"github.com/robpike/filter"
@@ -48,6 +49,13 @@ func Columns(line string) []string {
 	return filter.Choose(strings.Split(line, " "), nonEmptyString).([]string)
 }
 
+func GoldenFile(name string) string {
+	if runtime.GOOS == "windows" {
+		return name + "-windows.golden"
+	}
+	return name + ".golden"
+}
+
 // It runs func
 func It(description string, test func()) {
 	test()