diff --git a/core/gallery/resolve_variant_test.go b/core/gallery/resolve_variant_test.go
index b90cf246f..7bb074a1e 100644
--- a/core/gallery/resolve_variant_test.go
+++ b/core/gallery/resolve_variant_test.go
@@ -779,14 +779,14 @@ var _ = Describe("HostResolveEnv engine preference wiring", func() {
 
 	AfterEach(func() {
 		if origEnv != "" {
-			os.Setenv(capabilityEnv, origEnv)
+			Expect(os.Setenv(capabilityEnv, origEnv)).To(Succeed())
 		} else {
-			os.Unsetenv(capabilityEnv)
+			Expect(os.Unsetenv(capabilityEnv)).To(Succeed())
 		}
 		if origRunFileEnv != "" {
-			os.Setenv(capabilityRunFileEnv, origRunFileEnv)
+			Expect(os.Setenv(capabilityRunFileEnv, origRunFileEnv)).To(Succeed())
 		} else {
-			os.Unsetenv(capabilityRunFileEnv)
+			Expect(os.Unsetenv(capabilityRunFileEnv)).To(Succeed())
 		}
 	})
 
diff --git a/pkg/system/capabilities_test.go b/pkg/system/capabilities_test.go
index efd808090..8d0ffe8f4 100644
--- a/pkg/system/capabilities_test.go
+++ b/pkg/system/capabilities_test.go
@@ -137,9 +137,9 @@ var _ = Describe("BackendPreferenceTokens", func() {
 
 	AfterEach(func() {
 		if origEnv != "" {
-			os.Setenv(capabilityEnv, origEnv)
+			Expect(os.Setenv(capabilityEnv, origEnv)).To(Succeed())
 		} else {
-			os.Unsetenv(capabilityEnv)
+			Expect(os.Unsetenv(capabilityEnv)).To(Succeed())
 		}
 	})
 
@@ -201,9 +201,9 @@ var _ = Describe("EnginePreferenceTokens", func() {
 
 	AfterEach(func() {
 		if origEnv != "" {
-			os.Setenv(capabilityEnv, origEnv)
+			Expect(os.Setenv(capabilityEnv, origEnv)).To(Succeed())
 		} else {
-			os.Unsetenv(capabilityEnv)
+			Expect(os.Unsetenv(capabilityEnv)).To(Succeed())
 		}
 	})
 
@@ -290,9 +290,9 @@ var _ = Describe("CapabilityFilterDisabled", func() {
 
 	AfterEach(func() {
 		if origEnv != "" {
-			os.Setenv(capabilityEnv, origEnv)
+			Expect(os.Setenv(capabilityEnv, origEnv)).To(Succeed())
 		} else {
-			os.Unsetenv(capabilityEnv)
+			Expect(os.Unsetenv(capabilityEnv)).To(Succeed())
 		}
 	})
 
@@ -367,9 +367,9 @@ var _ = Describe("ServingFeaturePreferenceTokens", func() {
 		previous := os.Getenv(capabilityEnv)
 		defer func() {
 			if previous != "" {
-				os.Setenv(capabilityEnv, previous)
+				Expect(os.Setenv(capabilityEnv, previous)).To(Succeed())
 			} else {
-				os.Unsetenv(capabilityEnv)
+				Expect(os.Unsetenv(capabilityEnv)).To(Succeed())
 			}
 		}()