diff --git a/pkg/skaffold/hooks/render_test.go b/pkg/skaffold/hooks/render_test.go
index 336d62ff05e..b7d8ae69253 100644
--- a/pkg/skaffold/hooks/render_test.go
+++ b/pkg/skaffold/hooks/render_test.go
@@ -52,74 +52,74 @@ func TestRenderHooks(t *testing.T) {
 		preHostHookOut    string
 		postHostHookOut   string
 	}{
-		//{
-		//	description: "test on linux machine match",
-		//	hooks: latest.RenderHooks{
-		//		PreHooks: []latest.RenderHookItem{
-		//			{
-		//				HostHook: &latest.HostHook{
-		//					OS:      []string{"linux", "darwin"},
-		//					Command: []string{"sh", "-c", "echo pre-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
-		//				},
-		//			},
-		//		},
-		//		PostHooks: []latest.PostRenderHookItem{
-		//			{
-		//				HostHook: &latest.PostRenderHostHook{
-		//					OS:      []string{"linux", "darwin"},
-		//					Command: []string{"sh", "-c", "echo post-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
-		//				},
-		//			},
-		//		},
-		//	},
-		//	preHostHookOut:  "pre-hook running with SKAFFOLD_KUBE_CONTEXT=context1,SKAFFOLD_NAMESPACES=np1,np2",
-		//	postHostHookOut: "post-hook running with SKAFFOLD_KUBE_CONTEXT=context1,SKAFFOLD_NAMESPACES=np1,np2",
-		//},
-		//{
-		//	description:       "test on windows machine non-match",
-		//	requiresWindowsOS: true,
-		//	hooks: latest.RenderHooks{
-		//		PreHooks: []latest.RenderHookItem{
-		//			{
-		//				HostHook: &latest.HostHook{
-		//					OS:      []string{"linux", "darwin"},
-		//					Command: []string{"sh", "-c", "echo pre-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
-		//				},
-		//			},
-		//		},
-		//		PostHooks: []latest.PostRenderHookItem{
-		//			{
-		//				HostHook: &latest.PostRenderHostHook{
-		//					OS:      []string{"linux", "darwin"},
-		//					Command: []string{"sh", "-c", "echo post-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
-		//				},
-		//			},
-		//		},
-		//	},
-		//	shouldSkipErr: true,
-		//},
-		//{
-		//	description: "test on linux non match",
-		//	hooks: latest.RenderHooks{
-		//		PreHooks: []latest.RenderHookItem{
-		//			{
-		//				HostHook: &latest.HostHook{
-		//					OS:      []string{"windows"},
-		//					Command: []string{"pwsh", "-Command", "echo pre-hook running with SKAFFOLD_KUBE_CONTEXT=%SKAFFOLD_KUBE_CONTEXT%,SKAFFOLD_NAMESPACES=%SKAFFOLD_NAMESPACES%"},
-		//				},
-		//			},
-		//		},
-		//		PostHooks: []latest.PostRenderHookItem{
-		//			{
-		//				HostHook: &latest.PostRenderHostHook{
-		//					OS:      []string{"windows"},
-		//					Command: []string{"pwsh", "-Command", "echo post-hook running with SKAFFOLD_KUBE_CONTEXT=%SKAFFOLD_KUBE_CONTEXT%,SKAFFOLD_NAMESPACES=%SKAFFOLD_NAMESPACES%"},
-		//				},
-		//			},
-		//		},
-		//	},
-		//	shouldSkipErr: true,
-		//},
+		{
+			description: "test on linux machine match",
+			hooks: latest.RenderHooks{
+				PreHooks: []latest.RenderHookItem{
+					{
+						HostHook: &latest.HostHook{
+							OS:      []string{"linux", "darwin"},
+							Command: []string{"sh", "-c", "echo pre-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
+						},
+					},
+				},
+				PostHooks: []latest.PostRenderHookItem{
+					{
+						HostHook: &latest.PostRenderHostHook{
+							OS:      []string{"linux", "darwin"},
+							Command: []string{"sh", "-c", "echo post-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
+						},
+					},
+				},
+			},
+			preHostHookOut:  "pre-hook running with SKAFFOLD_KUBE_CONTEXT=context1,SKAFFOLD_NAMESPACES=np1,np2",
+			postHostHookOut: "post-hook running with SKAFFOLD_KUBE_CONTEXT=context1,SKAFFOLD_NAMESPACES=np1,np2",
+		},
+		{
+			description:       "test on windows machine non-match",
+			requiresWindowsOS: true,
+			hooks: latest.RenderHooks{
+				PreHooks: []latest.RenderHookItem{
+					{
+						HostHook: &latest.HostHook{
+							OS:      []string{"linux", "darwin"},
+							Command: []string{"sh", "-c", "echo pre-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
+						},
+					},
+				},
+				PostHooks: []latest.PostRenderHookItem{
+					{
+						HostHook: &latest.PostRenderHostHook{
+							OS:      []string{"linux", "darwin"},
+							Command: []string{"sh", "-c", "echo post-hook running with SKAFFOLD_KUBE_CONTEXT=$SKAFFOLD_KUBE_CONTEXT,SKAFFOLD_NAMESPACES=$SKAFFOLD_NAMESPACES"},
+						},
+					},
+				},
+			},
+			shouldSkipErr: true,
+		},
+		{
+			description: "test on linux non match",
+			hooks: latest.RenderHooks{
+				PreHooks: []latest.RenderHookItem{
+					{
+						HostHook: &latest.HostHook{
+							OS:      []string{"windows"},
+							Command: []string{"pwsh", "-Command", "echo pre-hook running with SKAFFOLD_KUBE_CONTEXT=%SKAFFOLD_KUBE_CONTEXT%,SKAFFOLD_NAMESPACES=%SKAFFOLD_NAMESPACES%"},
+						},
+					},
+				},
+				PostHooks: []latest.PostRenderHookItem{
+					{
+						HostHook: &latest.PostRenderHostHook{
+							OS:      []string{"windows"},
+							Command: []string{"pwsh", "-Command", "echo post-hook running with SKAFFOLD_KUBE_CONTEXT=%SKAFFOLD_KUBE_CONTEXT%,SKAFFOLD_NAMESPACES=%SKAFFOLD_NAMESPACES%"},
+						},
+					},
+				},
+			},
+			shouldSkipErr: true,
+		},
 		{
 			description:       "test on window match",
 			requiresWindowsOS: true,
@@ -154,10 +154,7 @@ func TestRenderHooks(t *testing.T) {
 			preOutFile := filepath.Join(tempDir, "pre")
 
 			defer func(name string) {
-				err := os.Remove(name)
-				if err != nil {
-
-				}
+				_ = os.Remove(name)
 			}(preOutFile)
 			if test.requiresWindowsOS {
 				test.hooks.PreHooks[0].HostHook.Command[2] = test.hooks.PreHooks[0].HostHook.Command[2] + " | Set-Content -Path " + preOutFile
@@ -166,10 +163,7 @@ func TestRenderHooks(t *testing.T) {
 			}
 			postOutFile := filepath.Join(tempDir, "post")
 			defer func(name string) {
-				err := os.Remove(name)
-				if err != nil {
-
-				}
+				_ = os.Remove(name)
 			}(postOutFile)
 			if test.requiresWindowsOS {
 				test.hooks.PostHooks[0].HostHook.Command[2] = test.hooks.PostHooks[0].HostHook.Command[2] + " | Set-Content -Path " + postOutFile