diff --git a/test/e2e-go/cli/goal/expect/goalAccountTest.exp b/test/e2e-go/cli/goal/expect/goalAccountTest.exp
index c8add5a775..234ef5cec0 100644
--- a/test/e2e-go/cli/goal/expect/goalAccountTest.exp
+++ b/test/e2e-go/cli/goal/expect/goalAccountTest.exp
@@ -32,6 +32,8 @@ if { [catch {
     # Determine primary account
     set PRIMARY_ACCOUNT_ADDRESS [::AlgorandGoal::GetHighestFundedAccountForWallet $PRIMARY_WALLET_NAME  $TEST_PRIMARY_NODE_DIR]
 
+    set timeout 30
+
     # try to generate an expired transaction for 5 times before giving up.
     set TEST_TRANSACTION_EXPIRATION 5
     while {$TEST_TRANSACTION_EXPIRATION > 0} {
diff --git a/test/e2e-go/cli/goal/expect/goalClerkGroupTest.exp b/test/e2e-go/cli/goal/expect/goalClerkGroupTest.exp
index 7a86effbd2..c1f6f4d5ec 100644
--- a/test/e2e-go/cli/goal/expect/goalClerkGroupTest.exp
+++ b/test/e2e-go/cli/goal/expect/goalClerkGroupTest.exp
@@ -28,6 +28,7 @@ if { [catch {
     # Determine primary account
     set PRIMARY_ACCOUNT_ADDRESS [::AlgorandGoal::GetHighestFundedAccountForWallet $PRIMARY_WALLET_NAME $TEST_PRIMARY_NODE_DIR]
 
+    set timeout 30
     set FEE_AMOUNT 1000
 
     set TXN_FILE1 "$TEST_PRIMARY_NODE_DIR/txns1"
diff --git a/test/e2e-go/cli/goal/expect/goalNodeTest.exp b/test/e2e-go/cli/goal/expect/goalNodeTest.exp
index deb0a5466d..efab678f1e 100644
--- a/test/e2e-go/cli/goal/expect/goalNodeTest.exp
+++ b/test/e2e-go/cli/goal/expect/goalNodeTest.exp
@@ -79,7 +79,7 @@ if { [catch {
     spawn goal node start -d $TEST_PRIMARY_NODE_DIR
     expect {
         timeout { close; ::AlgorandGoal::Abort "starting node exceeded timeout" }
-        -re {^Algorand node failed to start: node exited with an error code, check node\.log for more details : exit status 1} {
+        -re {^Algorand node failed to start: node exited with an error code, check node\.log for more details : exit status \d+} {
             puts "\nExpected failuire : node failed to start"
             # wait until the eof signal is received
             expect {
diff --git a/test/framework/fixtures/expectFixture.go b/test/framework/fixtures/expectFixture.go
index f926b9052d..2f8cdf420b 100644
--- a/test/framework/fixtures/expectFixture.go
+++ b/test/framework/fixtures/expectFixture.go
@@ -18,6 +18,7 @@ package fixtures
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -113,16 +114,16 @@ func MakeExpectTest(t *testing.T) *ExpectFixture {
 
 // Run Process all expect script files with suffix Test.exp within the current directory
 func (ef *ExpectFixture) Run() {
-	disabledTest := map[string]bool{
-		"pingpongTest.exp": true,
+	disabledTest := map[string]string{
+		"pingpongTest.exp":                    "broken",
+		"listExpiredParticipationKeyTest.exp": "flaky",
 	}
 	for testName := range ef.expectFiles {
 		if match, _ := regexp.MatchString(ef.testFilter, testName); match {
-			if disabledTest[testName] {
-				continue
-			}
-
 			ef.t.Run(testName, func(t *testing.T) {
+				if reason, ok := disabledTest[testName]; ok {
+					t.Skip(fmt.Sprintf("Skipping %s test: %s", testName, reason))
+				}
 				partitiontest.PartitionTest(t) // Check if this expect test should by run, may SKIP
 
 				syncTest := SynchronizedTest(t)