diff --git a/pkg/app/constants_test.go b/pkg/app/constants_test.go
index 48200ea1..90fb8764 100644
--- a/pkg/app/constants_test.go
+++ b/pkg/app/constants_test.go
@@ -1,27 +1,53 @@
 package app
 
 import (
-	"gotest.tools/v3/assert"
-	is "gotest.tools/v3/assert/cmp"
-	"gotest.tools/v3/env"
+	"fmt"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
+// TestIsExplicitSelectorInheritanceEnabled tests the isExplicitSelectorInheritanceEnabled function
 func TestIsExplicitSelectorInheritanceEnabled(t *testing.T) {
-	//env var ExperimentalEnvVar is set
-	assert.Assert(t, is.Equal(os.Getenv(ExperimentalEnvVar), ""))
-	assert.Check(t, !isExplicitSelectorInheritanceEnabled())
+	//env var ExperimentalEnvVar is not set
+	require.Empty(t, os.Getenv(ExperimentalEnvVar))
+	require.False(t, isExplicitSelectorInheritanceEnabled())
 
 	//check for env var ExperimentalEnvVar set to true
-	defer env.Patch(t, ExperimentalEnvVar, "true")()
-	assert.Check(t, isExplicitSelectorInheritanceEnabled())
+	os.Setenv(ExperimentalEnvVar, "true")
+	require.True(t, isExplicitSelectorInheritanceEnabled())
 
 	//check for env var ExperimentalEnvVar set to anything
-	defer env.Patch(t, ExperimentalEnvVar, "foo")()
-	assert.Check(t, !isExplicitSelectorInheritanceEnabled())
+	os.Setenv(ExperimentalEnvVar, "anything")
+	require.False(t, isExplicitSelectorInheritanceEnabled())
 
 	//check for env var ExperimentalEnvVar set to ExperimentalSelectorExplicit
-	defer env.Patch(t, ExperimentalEnvVar, ExperimentalSelectorExplicit)()
-	assert.Check(t, isExplicitSelectorInheritanceEnabled())
+	os.Setenv(ExperimentalEnvVar, ExperimentalSelectorExplicit)
+	require.True(t, isExplicitSelectorInheritanceEnabled())
+
+	// check for env var ExperimentalEnvVar set to a string that contains ExperimentalSelectorExplicit and ExperimentalEnvVar set to true
+	os.Setenv(ExperimentalEnvVar, fmt.Sprintf("%s-%s-%s", "a", ExperimentalSelectorExplicit, "b"))
+	require.True(t, isExplicitSelectorInheritanceEnabled())
+
+	// reset env var
+	defer os.Unsetenv(ExperimentalEnvVar)
+}
+
+// TestExperimentalModeEnabled tests the experimentalModeEnabled function
+func TestExperimentalModeEnabled(t *testing.T) {
+	//env var ExperimentalEnvVar is not set
+	require.Empty(t, os.Getenv(ExperimentalEnvVar))
+	require.False(t, experimentalModeEnabled())
+
+	//check for env var ExperimentalEnvVar set to anything
+	os.Setenv(ExperimentalEnvVar, "anything")
+	require.False(t, experimentalModeEnabled())
+
+	//check for env var ExperimentalEnvVar set to true
+	os.Setenv(ExperimentalEnvVar, "true")
+	require.True(t, experimentalModeEnabled())
+
+	// reset env var
+	defer os.Unsetenv(ExperimentalEnvVar)
 }
diff --git a/pkg/tmpl/expand_secret_ref_test.go b/pkg/tmpl/expand_secret_ref_test.go
index 707e79ae..7d70f396 100644
--- a/pkg/tmpl/expand_secret_ref_test.go
+++ b/pkg/tmpl/expand_secret_ref_test.go
@@ -2,8 +2,10 @@ package tmpl
 
 import (
 	"errors"
+
 	"github.com/golang/mock/gomock"
-	"gotest.tools/assert"
+	"github.com/stretchr/testify/assert"
+
 	"testing"
 )
 
@@ -21,7 +23,7 @@ func Test_fetchSecretValue(t *testing.T) {
 	valsResult["key"] = "key_value"
 	c.EXPECT().Eval(expectArg).Return(valsResult, nil)
 	result, err := fetchSecretValue(secretPath)
-	assert.NilError(t, err)
+	assert.Nil(t, err)
 	assert.Equal(t, result, "key_value")
 }