diff --git a/test/integration/shell_int_test.go b/test/integration/shell_int_test.go
index ca8e352fc7..ca22b3beb2 100644
--- a/test/integration/shell_int_test.go
+++ b/test/integration/shell_int_test.go
@@ -42,7 +42,7 @@ func (suite *ShellIntegrationTestSuite) TestShell() {
 		cp := ts.SpawnWithOpts(
 			e2e.OptArgs("shell", arg),
 		)
-		cp.Expect("Activated", termtest.OptExpectTimeout(90*time.Second))
+		cp.Expect("Activated")
 		cp.ExpectInput()
 
 		cp.SendLine("python3 --version")
@@ -93,13 +93,13 @@ func (suite *ShellIntegrationTestSuite) TestDefaultShell() {
 		e2e.OptArgs("use", "ActiveState-CLI/small-python"),
 		e2e.OptAppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),
 	)
-	cp.Expect("Switched to project")
+	cp.Expect("Switched to project", termtest.OptExpectTimeout(90*time.Second))
 	cp.ExpectExitCode(0)
 
 	cp = ts.SpawnWithOpts(
 		e2e.OptArgs("shell"),
 	)
-	cp.Expect("Activated", termtest.OptExpectTimeout(90*time.Second))
+	cp.Expect("Activated")
 	cp.ExpectInput()
 	cp.SendLine("exit")
 	cp.ExpectExitCode(0)
@@ -114,7 +114,7 @@ func (suite *ShellIntegrationTestSuite) TestCwdShell() {
 	cp := ts.SpawnWithOpts(
 		e2e.OptArgs("activate", "ActiveState-CLI/small-python"),
 	)
-	cp.Expect("Activated", termtest.OptExpectTimeout(90*time.Second))
+	cp.Expect("Activated")
 	cp.ExpectInput()
 	cp.SendLine("exit")
 	cp.ExpectExitCode(0)
@@ -123,7 +123,7 @@ func (suite *ShellIntegrationTestSuite) TestCwdShell() {
 		e2e.OptArgs("shell"),
 		e2e.OptWD(filepath.Join(ts.Dirs.Work, "small-python")),
 	)
-	cp.Expect("Activated", termtest.OptExpectTimeout(90*time.Second))
+	cp.Expect("Activated")
 	cp.ExpectInput()
 	cp.SendLine("exit")
 	cp.ExpectExitCode(0)
@@ -138,7 +138,7 @@ func (suite *ShellIntegrationTestSuite) TestCd() {
 	cp := ts.SpawnWithOpts(
 		e2e.OptArgs("activate", "ActiveState-CLI/small-python"),
 	)
-	cp.Expect("Activated", termtest.OptExpectTimeout(90*time.Second))
+	cp.Expect("Activated")
 	cp.ExpectInput()
 	cp.SendLine("exit")
 	cp.ExpectExitCode(0)
@@ -151,7 +151,7 @@ func (suite *ShellIntegrationTestSuite) TestCd() {
 		e2e.OptArgs("shell", "ActiveState-CLI/small-python"),
 		e2e.OptWD(subdir),
 	)
-	cp.Expect("Activated", termtest.OptExpectTimeout(90*time.Second))
+	cp.Expect("Activated")
 	cp.ExpectInput()
 	if runtime.GOOS != "windows" {
 		cp.SendLine("pwd")
@@ -165,7 +165,7 @@ func (suite *ShellIntegrationTestSuite) TestCd() {
 		e2e.OptArgs("shell", "ActiveState-CLI/small-python", "--cd"),
 		e2e.OptWD(subdir),
 	)
-	cp.Expect("Activated", termtest.OptExpectTimeout(90*time.Second))
+	cp.Expect("Activated")
 	cp.ExpectInput()
 	if runtime.GOOS != "windows" {
 		cp.SendLine("ls")