diff --git a/pkg/kv/cosmosdb/main_test.go b/pkg/kv/cosmosdb/main_test.go
index 00949657e79..83f9e42bce2 100644
--- a/pkg/kv/cosmosdb/main_test.go
+++ b/pkg/kv/cosmosdb/main_test.go
@@ -26,11 +26,11 @@ var (
 )
 
 func TestCosmosDB(t *testing.T) {
-	kvtest.DriverTest(t, func(t testing.TB, ctx context.Context) kv.Store {
-		if runtime.GOOS == "darwin" {
-			t.Skipf("this test hangs for macOS users, and fails. skipping - see Issue#8476 for more details")
-		}
+	if runtime.GOOS != "windows" {
+		t.Skip("Run CosmosDB tests on Widnows only, skipping - see Issue#8476 for more details")
+	}
 
+	kvtest.DriverTest(t, func(t testing.TB, ctx context.Context) kv.Store {
 		t.Helper()
 
 		databaseClient, err := client.NewDatabase(testParams.Database)
@@ -61,8 +61,8 @@ func TestCosmosDB(t *testing.T) {
 }
 
 func TestMain(m *testing.M) {
-	if runtime.GOOS == "darwin" {
-		// this part hangs for macOS users, and fails. skipping - see Issue#8476 for more details
+	if runtime.GOOS != "windows" {
+		// this part hangs for non windows users, and fails. skipping - see Issue#8476 for more details
 		return
 	}