diff --git a/agent/cache/testing.go b/agent/cache/testing.go
index c96612d94..90a0d7bef 100644
--- a/agent/cache/testing.go
+++ b/agent/cache/testing.go
@@ -60,7 +60,7 @@ func TestCacheNotifyChResult(t testing.T, ch <-chan UpdateEvent, expected ...Upd
 	}
 
 	got := make([]UpdateEvent, 0, expectLen)
-	timeoutCh := time.After(50 * time.Millisecond)
+	timeoutCh := time.After(75 * time.Millisecond)
 
 OUT:
 	for {
@@ -74,7 +74,7 @@ OUT:
 			}
 
 		case <-timeoutCh:
-			t.Fatalf("got %d results on chan in 50ms, want %d", len(got), expectLen)
+			t.Fatalf("timeout while waiting for result: got %d results on chan, want %d", len(got), expectLen)
 		}
 	}
 
diff --git a/agent/cache/watch_test.go b/agent/cache/watch_test.go
index 771a78359..a0bc7be75 100644
--- a/agent/cache/watch_test.go
+++ b/agent/cache/watch_test.go
@@ -258,7 +258,7 @@ func TestCacheNotifyPolling(t *testing.T) {
 	}
 
 	require.Equal(events[0].Result, 42)
-	require.Equal(events[0].Meta.Hit, false)
+	require.Equal(events[0].Meta.Hit && events[1].Meta.Hit, false)
 	require.Equal(events[0].Meta.Index, uint64(1))
 	require.True(events[0].Meta.Age < 50*time.Millisecond)
 	require.NoError(events[0].Err)
diff --git a/agent/consul/acl_test.go b/agent/consul/acl_test.go
index 8e47e0032..e2cc884e6 100644
--- a/agent/consul/acl_test.go
+++ b/agent/consul/acl_test.go
@@ -1639,8 +1639,8 @@ func TestACLResolver_Client(t *testing.T) {
 			// effectively disable caching - so the only way we end up with 1 token read is if they were
 			// being resolved concurrently
 			config.Config.ACLTokenTTL = 0 * time.Second
-			config.Config.ACLPolicyTTL = 30 * time.Millisecond
-			config.Config.ACLRoleTTL = 30 * time.Millisecond
+			config.Config.ACLPolicyTTL = 30 * time.Second
+			config.Config.ACLRoleTTL = 30 * time.Second
 			config.Config.ACLDownPolicy = "extend-cache"
 		})