diff --git a/.gitignore b/.gitignore
index 872d1cd31..d7ba61e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ Godeps
 *.out
 .mcp.json
 go.work.sum
+.worktrees
diff --git a/.golangci.yml b/.golangci.yml
index a01dcda3c..fcbf5a116 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,6 +2,7 @@ version: "2"
 linters:
   default: all
   disable:
+    - goconst # this linter has gone noisy. Disabled
     - depguard
     - err113
     - funlen
@@ -27,7 +28,7 @@ linters:
     dupl:
       threshold: 200
     goconst:
-      min-len: 2
+      min-len: 8
       min-occurrences: 3
     cyclop:
       max-complexity: 22
diff --git a/internal/assertions/condition_synctest_test.go b/internal/assertions/condition_synctest_test.go
index 4c01a6c7d..414276e27 100644
--- a/internal/assertions/condition_synctest_test.go
+++ b/internal/assertions/condition_synctest_test.go
@@ -507,7 +507,7 @@ func dualEventuallyWithCompleteFalse(t *testing.T) {
 	}
 
 	expectedCalls := int(testTimeout / testTick)
-	if counter < expectedCalls-1 || counter > expectedCalls+1 {
+	if counter < expectedCalls-2 || counter > expectedCalls+1 {
 		t.Errorf("expected %d calls, got %d", expectedCalls, counter)
 	}
 }