diff --git a/internal/guest/spec/doc.go b/internal/guest/spec/doc.go
new file mode 100644
index 0000000000..abc59d664f
--- /dev/null
+++ b/internal/guest/spec/doc.go
@@ -0,0 +1,3 @@
+// Package spec encapsulates a number of GCS specific oci spec modifications, e.g.,
+// networking mounts, sandbox path substitutions in guest etc.
+package spec
diff --git a/internal/guest/spec/spec.go b/internal/guest/spec/spec.go
index 842e1822c4..3057a1a351 100644
--- a/internal/guest/spec/spec.go
+++ b/internal/guest/spec/spec.go
@@ -1,10 +1,8 @@
 //go:build linux
 // +build linux
 
-// Package spec encapsulates a number of GCS specific oci spec modifications, e.g.,
-// networking mounts, sandbox path substitutions in guest etc.
-//
 // TODO: consider moving oci spec specific code from /internal/guest/runtime/hcsv2/spec.go
+
 package spec
 
 import (
diff --git a/internal/guest/storage/test/policy/doc.go b/internal/guest/storage/test/policy/doc.go
new file mode 100644
index 0000000000..8cbf7ee3fc
--- /dev/null
+++ b/internal/guest/storage/test/policy/doc.go
@@ -0,0 +1 @@
+package policy
diff --git a/internal/guest/storage/vmbus/doc.go b/internal/guest/storage/vmbus/doc.go
new file mode 100644
index 0000000000..eeacbb6a72
--- /dev/null
+++ b/internal/guest/storage/vmbus/doc.go
@@ -0,0 +1 @@
+package vmbus
diff --git a/test/cri-containerd/disable_vpmem_test.go b/test/cri-containerd/disable_vpmem_test.go
index d40e5f3148..4a6d0a9a00 100644
--- a/test/cri-containerd/disable_vpmem_test.go
+++ b/test/cri-containerd/disable_vpmem_test.go
@@ -1,5 +1,5 @@
-//go:build functional
-// +build functional
+//go:build windows && functional
+// +build windows,functional
 
 package cri_containerd
 
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/guest/spec/doc.go b/test/vendor/github.com/Microsoft/hcsshim/internal/guest/spec/doc.go
new file mode 100644
index 0000000000..abc59d664f
--- /dev/null
+++ b/test/vendor/github.com/Microsoft/hcsshim/internal/guest/spec/doc.go
@@ -0,0 +1,3 @@
+// Package spec encapsulates a number of GCS specific oci spec modifications, e.g.,
+// networking mounts, sandbox path substitutions in guest etc.
+package spec
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/guest/spec/spec.go b/test/vendor/github.com/Microsoft/hcsshim/internal/guest/spec/spec.go
index 842e1822c4..3057a1a351 100644
--- a/test/vendor/github.com/Microsoft/hcsshim/internal/guest/spec/spec.go
+++ b/test/vendor/github.com/Microsoft/hcsshim/internal/guest/spec/spec.go
@@ -1,10 +1,8 @@
 //go:build linux
 // +build linux
 
-// Package spec encapsulates a number of GCS specific oci spec modifications, e.g.,
-// networking mounts, sandbox path substitutions in guest etc.
-//
 // TODO: consider moving oci spec specific code from /internal/guest/runtime/hcsv2/spec.go
+
 package spec
 
 import (