diff --git a/Makefile b/Makefile
index 54d16636..a1e2e262 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,9 @@ test-race:
 	env RACE=true OUT=echovault/testdata make build-modules-test && \
 	CGO_ENABLED=1 go test ./... --race
 
+test-win:
+	docker-compose -f windows_test_env/docker-compose.yaml up
+
 cover:
 	go tool cover -html=./coverage/coverage.out
 
diff --git a/windows_test_env/Dockerfile b/windows_test_env/Dockerfile
new file mode 100644
index 00000000..2bd8a636
--- /dev/null
+++ b/windows_test_env/Dockerfile
@@ -0,0 +1,8 @@
+# run docker-compose from root dir
+FROM golang:latest
+
+WORKDIR /testspace
+
+COPY . ./
+
+CMD make test; make test-race;
diff --git a/windows_test_env/docker-compose.yaml b/windows_test_env/docker-compose.yaml
new file mode 100644
index 00000000..ee2a43fe
--- /dev/null
+++ b/windows_test_env/docker-compose.yaml
@@ -0,0 +1,10 @@
+# run from root dir
+services:
+  test:
+    build: 
+      context: ..
+      dockerfile: windows_test_env/Dockerfile
+    container_name: EchoVault_win_test_env
+    stdin_open: true
+    tty: true
+