diff --git a/ecs-agent/daemonimages/csidriver/util/utils_test.go b/ecs-agent/daemonimages/csidriver/util/utils_linux_test.go
similarity index 97%
rename from ecs-agent/daemonimages/csidriver/util/utils_test.go
rename to ecs-agent/daemonimages/csidriver/util/utils_linux_test.go
index c0e502306d..e884570250 100644
--- a/ecs-agent/daemonimages/csidriver/util/utils_test.go
+++ b/ecs-agent/daemonimages/csidriver/util/utils_linux_test.go
@@ -1,3 +1,6 @@
+//go:build linux && unit
+// +build linux,unit
+
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License"). You may
diff --git a/ecs-agent/daemonimages/csidriver/util/utils_windows_test.go b/ecs-agent/daemonimages/csidriver/util/utils_windows_test.go
new file mode 100644
index 0000000000..6911ec0b96
--- /dev/null
+++ b/ecs-agent/daemonimages/csidriver/util/utils_windows_test.go
@@ -0,0 +1,61 @@
+//go:build windows && unit
+// +build windows,unit
+
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//	http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package util
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseEndpoint(t *testing.T) {
+	testCases := []struct {
+		name      string
+		endpoint  string
+		expScheme string
+		expAddr   string
+		expErr    error
+	}{
+		{
+			name:      "valid unix endpoint 1",
+			endpoint:  "unix:.\csi\csi.sock",
+			expScheme: "unix",
+			expAddr:   "/csi/csi.sock",
+		},
+		{
+			name:     "invalid endpoint",
+			endpoint: "http://127.0.0.1",
+			expErr:   fmt.Errorf("unsupported protocol: http"),
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			scheme, addr, err := ParseEndpoint(tc.endpoint)
+
+			if tc.expErr != nil {
+				assert.EqualError(t, err, tc.expErr.Error())
+			} else {
+				assert.Nil(t, err)
+				assert.Equal(t, scheme, tc.expScheme, "scheme mismatches")
+				assert.Equal(t, addr, tc.expAddr, "address mismatches")
+			}
+		})
+	}
+
+}