diff --git a/docker/flags.go b/docker/flags.go
index 29013146f0..3b54612e89 100644
--- a/docker/flags.go
+++ b/docker/flags.go
@@ -29,6 +29,7 @@ func getHomeDir() string {
 }
 
 func getDaemonConfDir() string {
+	// TODO: update for Windows daemon
 	if runtime.GOOS == "windows" {
 		return filepath.Join(os.Getenv("USERPROFILE"), ".docker")
 	}
diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
index bb44942c24..51ebdc9acc 100644
--- a/integration-cli/docker_cli_daemon_test.go
+++ b/integration-cli/docker_cli_daemon_test.go
@@ -354,6 +354,7 @@ func TestDaemonVolumesBindsRefs(t *testing.T) {
 }
 
 func TestDaemonKeyGeneration(t *testing.T) {
+	// TODO: skip or update for Windows daemon
 	os.Remove("/etc/docker/key.json")
 	d := NewDaemon(t)
 	if err := d.Start(); err != nil {