diff --git a/core/capabilities/fakes/gateway/local.go b/core/capabilities/fakes/gateway/local.go
index 7e1a6d38821..a748aea415b 100644
--- a/core/capabilities/fakes/gateway/local.go
+++ b/core/capabilities/fakes/gateway/local.go
@@ -6,64 +6,90 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
+	"strconv"
 	"time"
 
 	httptypedapi "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/triggers/http"
 )
 
-type JSONRPCRequest struct {
+const (
+	triggerPath       = "/trigger"
+	maxRequestBytes   = 1 << 20 // 1 MiB
+	readHeaderTimeout = time.Second
+	shutdownTimeout   = time.Second
+)
+
+type triggerRequest struct {
 	Input json.RawMessage `json:"input"`
 }
 
+// Config holds settings for a LocalGateway test server.
 type Config struct {
 	Port uint16
 }
 
+// LocalGateway is a minimal HTTP server that accepts a single trigger POST
+// and returns the parsed payload to the caller.
 type LocalGateway struct {
 	config Config
 }
 
+// NewLocalGateway returns a LocalGateway bound to the port in config.
 func NewLocalGateway(config Config) *LocalGateway {
 	return &LocalGateway{config: config}
 }
 
+// ListenForTriggerPayload starts an HTTP server on the configured port and
+// blocks until a POST /trigger request arrives or ctx is cancelled.
 func (g *LocalGateway) ListenForTriggerPayload(ctx context.Context) (*httptypedapi.Payload, error) {
-	payloadCh := make(chan *httptypedapi.Payload, 1)
-	errorCh := make(chan error, 1)
+	type result struct {
+		payload *httptypedapi.Payload
+		err     error
+	}
+	resultCh := make(chan result, 1)
 
 	mux := http.NewServeMux()
-	mux.HandleFunc("/trigger", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc(triggerPath, func(w http.ResponseWriter, r *http.Request) {
 		input, err := parseRequest(r)
 		if err != nil {
-			http.Error(w, fmt.Sprintf("error processing request: %v", err), http.StatusBadRequest)
+			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
 		}
 
-		payloadCh <- &httptypedapi.Payload{
-			Input: input,
+		select {
+		case resultCh <- result{payload: &httptypedapi.Payload{Input: input}}:
+			w.WriteHeader(http.StatusOK)
+		case <-r.Context().Done():
+			http.Error(w, http.StatusText(http.StatusServiceUnavailable), http.StatusServiceUnavailable)
 		}
-		w.WriteHeader(http.StatusOK)
 	})
 
 	server := &http.Server{
-		Addr:              fmt.Sprintf(":%d", g.config.Port),
+		Addr:              net.JoinHostPort("", strconv.Itoa(int(g.config.Port))),
 		Handler:           mux,
-		ReadHeaderTimeout: time.Second,
+		ReadHeaderTimeout: readHeaderTimeout,
+		BaseContext:       func(net.Listener) context.Context { return ctx },
 	}
-	defer server.Close()
 
 	go func() {
 		if err := server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			errorCh <- err
+			select {
+			case resultCh <- result{err: err}:
+			default:
+			}
 		}
 	}()
+	defer func() {
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
+		defer cancel()
+		_ = server.Shutdown(shutdownCtx)
+	}()
 
 	select {
-	case payload := <-payloadCh:
-		return payload, nil
-	case err := <-errorCh:
-		return nil, err
+	case res := <-resultCh:
+		return res.payload, res.err
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	}
@@ -73,16 +99,17 @@ func parseRequest(req *http.Request) ([]byte, error) {
 	if req.Method != http.MethodPost {
 		return nil, errors.New("gateway expects POST request")
 	}
+	defer req.Body.Close()
 
-	body, err := io.ReadAll(req.Body)
+	body, err := io.ReadAll(http.MaxBytesReader(nil, req.Body, maxRequestBytes))
 	if err != nil {
-		return nil, fmt.Errorf("failed to read request body: %w", err)
+		return nil, fmt.Errorf("read request body: %w", err)
 	}
 
-	var rpcRequest JSONRPCRequest
-	if err := json.Unmarshal(body, &rpcRequest); err != nil {
-		return nil, fmt.Errorf("failed to parse request body: %w", err)
+	var request triggerRequest
+	if err := json.Unmarshal(body, &request); err != nil {
+		return nil, fmt.Errorf("parse request body: %w", err)
 	}
 
-	return rpcRequest.Input, nil
+	return request.Input, nil
 }
diff --git a/core/capabilities/fakes/gateway/local_test.go b/core/capabilities/fakes/gateway/local_test.go
index cb41bda9c04..d0a4b39b43f 100644
--- a/core/capabilities/fakes/gateway/local_test.go
+++ b/core/capabilities/fakes/gateway/local_test.go
@@ -7,30 +7,29 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"strconv"
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/freeport"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	httptypedapi "github.com/smartcontractkit/chainlink-common/pkg/capabilities/v2/triggers/http"
 )
 
-// waitForPort polls until the TCP port is reachable or the deadline passes.
+// waitForPort polls until the TCP port is reachable or timeout passes.
 func waitForPort(t *testing.T, port uint16, timeout time.Duration) {
 	t.Helper()
-	addr := fmt.Sprintf("127.0.0.1:%d", port)
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		dialer := &net.Dialer{Timeout: 50 * time.Millisecond}
-		conn, err := dialer.DialContext(context.Background(), "tcp", addr)
-		if err == nil {
+	addr := net.JoinHostPort("127.0.0.1", strconv.Itoa(int(port)))
+	dialer := &net.Dialer{Timeout: 50 * time.Millisecond}
+
+	require.EventuallyWithT(t, func(c *assert.CollectT) {
+		conn, err := dialer.DialContext(t.Context(), "tcp", addr)
+		if assert.NoError(c, err) {
 			_ = conn.Close()
-			return
 		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatalf("server on port %d did not become ready within %s", port, timeout)
+	}, timeout, 10*time.Millisecond, "server on port %d did not become ready", port)
 }
 
 // TestListenForTriggerPayload_HappyPath is an integration test that verifies
@@ -39,7 +38,8 @@ func waitForPort(t *testing.T, port uint16, timeout time.Duration) {
 //  2. A valid POST request carrying a signed JWT and a JSON-RPC body is sent.
 //  3. The method returns a Payload whose Input and Key match the request.
 func TestListenForTriggerPayload_HappyPath(t *testing.T) {
-	var port uint16 = 30123
+	t.Parallel()
+	port := uint16(freeport.GetOne(t)) //nolint:gosec // G115: freeport returns valid port range
 	gw := NewLocalGateway(Config{Port: port})
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
diff --git a/core/internal/testutils/pgtest/pgtest.go b/core/internal/testutils/pgtest/pgtest.go
index 46185e79bb3..df1449e0da8 100644
--- a/core/internal/testutils/pgtest/pgtest.go
+++ b/core/internal/testutils/pgtest/pgtest.go
@@ -43,7 +43,7 @@ SET statement_timeout = '30s';`)
 }
 
 func MustExec(t *testing.T, ds sqlutil.DataSource, stmt string, args ...any) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	require.NoError(t, utils.JustError(ds.ExecContext(ctx, stmt, args...)))
 }
 
diff --git a/core/services/durableemitter/durable_event_store_orm_test.go b/core/services/durableemitter/durable_event_store_orm_test.go
index 5aa4581f3d3..4a6acba0b98 100644
--- a/core/services/durableemitter/durable_event_store_orm_test.go
+++ b/core/services/durableemitter/durable_event_store_orm_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/durableemitter"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 )
 
@@ -74,8 +73,8 @@ func TestPgDurableEventStore_ListPending_RespectsLimit(t *testing.T) {
 	ctx := t.Context()
 	store := durableemitter.NewPgDurableEventStore(db)
 
-	for i := 0; i < 20; i++ {
-		_, err := store.Insert(ctx, []byte(fmt.Sprintf("event-%d", i)))
+	for i := range 20 {
+		_, err := store.Insert(ctx, fmt.Appendf(nil, "event-%d", i))
 		require.NoError(t, err)
 	}
 
@@ -107,7 +106,7 @@ func TestPgDurableEventStore_DeleteExpired(t *testing.T) {
 func TestPgDurableEventStore_ObserveDurableQueue(t *testing.T) {
 	db := pgtest.NewSqlxDB(t)
 	truncateChipDurableEvents(t, db)
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	store := durableemitter.NewPgDurableEventStore(db)
 
 	st, err := store.ObserveDurableQueue(ctx, time.Hour, time.Minute)
@@ -126,7 +125,7 @@ func TestPgDurableEventStore_ObserveDurableQueue(t *testing.T) {
 func TestPgDurableEventStore_MarkDeliveredAndPurgeDelivered(t *testing.T) {
 	db := pgtest.NewSqlxDB(t)
 	truncateChipDurableEvents(t, db)
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	store := durableemitter.NewPgDurableEventStore(db)
 
 	id, err := store.Insert(ctx, []byte("payload"))
diff --git a/core/services/llo/observation/cache.go b/core/services/llo/observation/cache.go
index 70812cbc4ee..c3251b44357 100644
--- a/core/services/llo/observation/cache.go
+++ b/core/services/llo/observation/cache.go
@@ -104,9 +104,7 @@ func NewCache(cleanupInterval time.Duration) *Cache {
 	go c.updateMetrics()
 
 	if cleanupInterval > 0 {
-		c.wg.Add(1)
-		go func() {
-			defer c.wg.Done()
+		c.wg.Go(func() {
 			ticker := time.NewTicker(cleanupInterval)
 			defer ticker.Stop()
 			for {
@@ -117,7 +115,7 @@ func NewCache(cleanupInterval time.Duration) *Cache {
 					return
 				}
 			}
-		}()
+		})
 	}
 
 	return c
diff --git a/core/services/llo/observation/cache_test.go b/core/services/llo/observation/cache_test.go
index b6453635316..d6c740fedfe 100644
--- a/core/services/llo/observation/cache_test.go
+++ b/core/services/llo/observation/cache_test.go
@@ -203,7 +203,7 @@ func TestCache_UpdateStreamValues(t *testing.T) {
 	})
 }
 
-func TestCache_UpdateStreamValues_RecordsHitEntryAge(t *testing.T) {
+func TestCache_UpdateStreamValues_RecordsHitEntryAge(t *testing.T) { //nolint:paralleltest // resets package-level prometheus metrics
 	promCacheHitEntryAgeMs.Reset()
 	promCacheHitCount.Reset()
 
@@ -334,7 +334,7 @@ func TestCache_ConcurrentAccess(t *testing.T) {
 			defer wg.Done()
 			for j := range numOperations {
 				streamID := id*numOperations + j
-				cache.Add(streamID, &mockStreamValue{value: []byte{byte(id)}}, time.Second)
+				cache.Add(streamID, &mockStreamValue{value: []byte{byte(id % 256)}}, time.Second)
 			}
 		}(i)
 	}
@@ -345,7 +345,7 @@ func TestCache_ConcurrentAccess(t *testing.T) {
 		for j := range numOperations {
 			streamID := i*numOperations + j
 			val, _ := cache.Get(streamID)
-			assert.Equal(t, &mockStreamValue{value: []byte{byte(i)}}, val)
+			assert.Equal(t, &mockStreamValue{value: []byte{byte(i % 256)}}, val)
 		}
 	}
 }
@@ -366,7 +366,7 @@ func TestCache_ConcurrentReadWrite(t *testing.T) {
 			defer wg.Done()
 			for j := range numOperations {
 				streamID := id*numOperations + j
-				cache.Add(streamID, &mockStreamValue{value: []byte{byte(id)}}, time.Second)
+				cache.Add(streamID, &mockStreamValue{value: []byte{byte(id % 256)}}, time.Second)
 			}
 		}(i)
 	}
@@ -401,7 +401,7 @@ func TestCache_ConcurrentAddGet(t *testing.T) {
 			defer wg.Done()
 			for j := range numOperations {
 				streamID := id*numOperations + j
-				cache.Add(streamID, &mockStreamValue{value: []byte{byte(id)}}, time.Second)
+				cache.Add(streamID, &mockStreamValue{value: []byte{byte(id % 256)}}, time.Second)
 			}
 		}(i)
 	}
@@ -438,7 +438,7 @@ func TestCache_ConcurrentAddMany(t *testing.T) {
 				batch := make(map[llotypes.StreamID]llo.StreamValue, batchSize)
 				for j := range batchSize {
 					streamID := id*numBatches*batchSize + b*batchSize + j
-					batch[streamID] = &mockStreamValue{value: []byte{byte(id)}}
+					batch[streamID] = &mockStreamValue{value: []byte{byte(id % 256)}}
 				}
 				cache.AddMany(batch, time.Second)
 			}
@@ -451,7 +451,7 @@ func TestCache_ConcurrentAddMany(t *testing.T) {
 			for j := range batchSize {
 				streamID := i*numBatches*batchSize + b*batchSize + j
 				val, _ := cache.Get(streamID)
-				assert.Equal(t, &mockStreamValue{value: []byte{byte(i)}}, val)
+				assert.Equal(t, &mockStreamValue{value: []byte{byte(i % 256)}}, val)
 			}
 		}
 	}
diff --git a/core/services/llo/observation/data_source.go b/core/services/llo/observation/data_source.go
index 6c61b21b421..90ef7ba890c 100644
--- a/core/services/llo/observation/data_source.go
+++ b/core/services/llo/observation/data_source.go
@@ -14,11 +14,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/services"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	"github.com/smartcontractkit/chainlink-data-streams/llo"
-
 	"github.com/smartcontractkit/chainlink/v2/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink/v2/core/services/streams"
 )
@@ -38,14 +36,14 @@ import (
 // Example timings for observationTimeout T = 250ms (cacheTTLMultiplier=2, pacing divisor=2, staleRefresh num/den = 6/4):
 //   - cacheEntryTTL = 2·T = 500ms — TTL applied on successful per-pipeline-group AddMany writes.
 //   - staleRefreshSkipThreshold = (6/4)·T = 375ms — a stream in the plugin scope is not a refresh driver while time.Until(expiresAt) > 375ms.
-//   - observationLoopPacing targets T/2 = 125ms and is capped to (2−6/4)·T − 1ns = 125ms − 1ns (≥ observationLoopPacingMin and ≤ min(T/2, that cap)) — minimum delay between loop iterations after the first (plugin Observe may wake the loop earlier; see loopWakeCh).
+//   - observationLoopPacing targets T/2 = 125ms and is capped to (2−6/4)·T − 1ns = 125ms − 1ns (≥ observationLoopPacingFloor and ≤ min(T/2, that cap)) — minimum delay between loop iterations after the first (plugin Observe may wake the loop earlier; see loopWakeCh).
 //   - per-iteration context uses WithTimeout(..., T) = 250ms — ceiling on wall time for one observation loop iteration (pipeline workers run in parallel under that deadline).
 const (
 	cacheTTLMultiplier                     = 2
 	staleRefreshRemainingNumerator   int64 = 6
 	staleRefreshRemainingDenominator int64 = 4
 
-	observationLoopPacingMin     = 10 * time.Millisecond
+	observationLoopPacingFloor   = 10 * time.Millisecond
 	observationLoopPacingDivisor = 2 // pacing targets T/2, capped below by cache invariant
 )
 
@@ -62,20 +60,17 @@ func staleRefreshSkipThreshold(observationTimeout time.Duration) time.Duration {
 }
 
 // observationLoopPacing returns the minimum time between observation loop iterations to cap CPU while
-// staying responsive relative to T. Scales with T/divisor, clamped to [observationLoopPacingMin, min(T/2,
+// staying responsive relative to T. Scales with T/divisor, clamped to [observationLoopPacingFloor, min(T/2,
 // cacheEntryTTL(T)−staleRefreshSkipThreshold(T)−1ns)] so staleRefreshSkipThreshold+observationLoopPacing < cacheEntryTTL.
 func observationLoopPacing(observationTimeout time.Duration) time.Duration {
 	if observationTimeout <= 0 {
-		return observationLoopPacingMin
+		return observationLoopPacingFloor
 	}
 	p := observationTimeout / observationLoopPacingDivisor
 	invMax := cacheEntryTTL(observationTimeout) - staleRefreshSkipThreshold(observationTimeout) - time.Nanosecond
-	maxP := observationTimeout / 2
-	if invMax < maxP {
-		maxP = invMax
-	}
-	if p < observationLoopPacingMin {
-		p = observationLoopPacingMin
+	maxP := min(invMax, observationTimeout/2)
+	if p < observationLoopPacingFloor {
+		p = observationLoopPacingFloor
 	}
 	if p > maxP {
 		p = maxP
@@ -121,14 +116,14 @@ var (
 	)
 )
 
-type ErrObservationFailed struct {
+type ObservationFailedError struct { //nolint:revive // name matches existing observation failure terminology
 	inner    error
 	reason   string
 	streamID streams.StreamID
 	run      *pipeline.Run
 }
 
-func (e *ErrObservationFailed) Error() string {
+func (e *ObservationFailedError) Error() string {
 	s := fmt.Sprintf("StreamID: %d; Reason: %s", e.streamID, e.reason)
 	if e.inner != nil {
 		s += fmt.Sprintf("; Err: %v", e.inner)
@@ -140,11 +135,11 @@ func (e *ErrObservationFailed) Error() string {
 	return s
 }
 
-func (e *ErrObservationFailed) String() string {
+func (e *ObservationFailedError) String() string {
 	return e.Error()
 }
 
-func (e *ErrObservationFailed) Unwrap() error {
+func (e *ObservationFailedError) Unwrap() error {
 	return e.inner
 }
 
@@ -288,7 +283,7 @@ func (d *dataSource) startObservationLoop(loopStartedCh chan struct{}) {
 
 			var mu sync.Mutex
 			var wg sync.WaitGroup
-			var errs []ErrObservationFailed
+			var errs []ObservationFailedError
 			successfulStreamIDs := make([]streams.StreamID, 0, len(osv.streamValues))
 			plan := d.buildStreamsRefreshPlan(osv.streamValues, osv.observationTimeout, lggr)
 			ttl := cacheEntryTTL(osv.observationTimeout)
@@ -299,7 +294,7 @@ func (d *dataSource) startObservationLoop(loopStartedCh chan struct{}) {
 			}
 
 			// Telemetry
-			var telemCh chan<- interface{}
+			var telemCh chan<- any
 			{
 				// Size needs to accommodate the max number of telemetry events that could be generated
 				// Standard case might be about 3 bridge requests per spec and one stream<=>spec
@@ -334,7 +329,7 @@ func (d *dataSource) startObservationLoop(loopStartedCh chan struct{}) {
 							}
 							promObservationErrorCount.WithLabelValues(streamIDStr).Inc()
 							mu.Lock()
-							errs = append(errs, ErrObservationFailed{inner: err, streamID: sid, reason: "failed to observe stream"})
+							errs = append(errs, ObservationFailedError{inner: err, streamID: sid, reason: "failed to observe stream"})
 							mu.Unlock()
 							continue
 						}
diff --git a/core/services/llo/observation/data_source_test.go b/core/services/llo/observation/data_source_test.go
index 3b98c5a4997..148a8bb1414 100644
--- a/core/services/llo/observation/data_source_test.go
+++ b/core/services/llo/observation/data_source_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"maps"
 	"math"
 	"math/big"
 	"sort"
@@ -15,18 +16,15 @@ import (
 
 	promtest "github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/shopspring/decimal"
+	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
+	ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/guregu/null.v4"
 
-	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
-	ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
-
 	llotypes "github.com/smartcontractkit/chainlink-common/pkg/types/llo"
 	"github.com/smartcontractkit/chainlink-data-streams/llo"
-
 	"github.com/smartcontractkit/chainlink/v2/core/bridges"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	clhttptest "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/httptest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -203,9 +201,7 @@ func newMockCache(inner StreamValueCache) *mockCache {
 // It records the values and ttl passed to it and then calls the underlying StreamValueCache.AddMany method.
 func (s *mockCache) AddMany(values map[llotypes.StreamID]llo.StreamValue, ttl time.Duration) {
 	snapshot := make(map[llotypes.StreamID]llo.StreamValue, len(values))
-	for k, v := range values {
-		snapshot[k] = v
-	}
+	maps.Copy(snapshot, values)
 	s.mu.Lock()
 	s.addCalls = append(s.addCalls, addManyCall{values: snapshot, ttl: ttl})
 	s.mu.Unlock()
@@ -215,7 +211,7 @@ func (s *mockCache) AddMany(values map[llotypes.StreamID]llo.StreamValue, ttl ti
 func Test_DataSource(t *testing.T) {
 	t.Parallel()
 	lggr := logger.NullLogger
-	mainCtx := testutils.Context(t)
+	mainCtx := t.Context()
 	opts := &mockOpts{}
 
 	t.Run("Observe", func(t *testing.T) {
@@ -229,7 +225,7 @@ func Test_DataSource(t *testing.T) {
 			ctx, cancel := context.WithTimeout(mainCtx, observationTimeout)
 			defer cancel()
 			err := ds.Observe(ctx, vals, opts)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			assert.Equal(t, makeStreamValues(), vals)
 			ds.Close()
@@ -256,7 +252,7 @@ func Test_DataSource(t *testing.T) {
 			ctx, cancel := context.WithTimeout(mainCtx, observationTimeout)
 			defer cancel()
 			err := ds.Observe(ctx, vals, opts)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			assert.Equal(t, llo.StreamValues{
 				1: llo.ToDecimal(decimal.NewFromInt(2181)),
@@ -282,7 +278,7 @@ func Test_DataSource(t *testing.T) {
 			defer cancel()
 
 			err := ds.Observe(ctx, vals, opts)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			assert.Equal(t, llo.StreamValues{
 				11: nil,
@@ -403,7 +399,7 @@ func Test_DataSource(t *testing.T) {
 			assert.Equal(t, 31, int(pkt.streamID))
 			assert.Equal(t, opts, pkt.opts)
 			assert.Nil(t, pkt.val)
-			assert.Error(t, pkt.err)
+			require.Error(t, pkt.err)
 			ds.Close()
 		})
 
@@ -517,14 +513,12 @@ func Test_DataSource(t *testing.T) {
 			// Run multiple observations concurrently
 			var wg sync.WaitGroup
 			for range 10 {
-				wg.Add(1)
-				go func() {
-					defer wg.Done()
+				wg.Go(func() {
 					vals := llo.StreamValues{1: nil}
 					err := ds.Observe(ctx, vals, opts)
 					assert.NoError(t, err)
 					assert.Equal(t, llo.StreamValues{1: llo.ToDecimal(decimal.NewFromInt(100))}, vals)
-				}()
+				})
 			}
 			wg.Wait()
 
@@ -565,6 +559,9 @@ func Test_DataSource(t *testing.T) {
 			}
 			mc.mu.Unlock()
 
+			// Explicitly abort Cycle 1's background observation task before mutating pipelines
+			cancel()
+
 			// Fix the pipeline with distinct values so we can verify generation
 			fixedPipeline := makePipelineWithMultipleStreamResults(sids, []any{decimal.NewFromFloat(111.0), decimal.NewFromFloat(222.0), decimal.NewFromFloat(333.0)})
 			reg.mu.Lock()
@@ -647,10 +644,10 @@ func Test_DataSource(t *testing.T) {
 	promObservationLoopWaitOutcome.Reset()
 }
 
-func Test_DataSource_ObservationLoopWakeSkipsPacing(t *testing.T) {
+func Test_DataSource_ObservationLoopWakeSkipsPacing(t *testing.T) { //nolint:paralleltest // resets package-level prometheus metrics and relies on loop timing
 	promObservationLoopWaitOutcome.Reset()
 	lggr := logger.NullLogger
-	mainCtx := testutils.Context(t)
+	mainCtx := t.Context()
 	opts := &mockOpts{}
 
 	reg := &mockRegistry{pipelines: make(map[streams.StreamID]*mockPipeline)}
@@ -675,7 +672,7 @@ func Test_DataSource_ObservationLoopWakeSkipsPacing(t *testing.T) {
 func Test_DataSource_ObserveWakeManyConcurrent(t *testing.T) {
 	t.Parallel()
 	lggr := logger.NullLogger
-	mainCtx := testutils.Context(t)
+	mainCtx := t.Context()
 	opts := &mockOpts{}
 
 	reg := &mockRegistry{pipelines: make(map[streams.StreamID]*mockPipeline)}
@@ -691,14 +688,12 @@ func Test_DataSource_ObserveWakeManyConcurrent(t *testing.T) {
 
 	done := make(chan struct{})
 	var wg sync.WaitGroup
-	for i := 0; i < 200; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+	for range 200 {
+		wg.Go(func() {
 			// Each call needs its own StreamValues map: Observe mutates it in place (UpdateStreamValues).
 			localVals := makeStreamValues(1)
 			_ = ds.Observe(ctx, localVals, opts)
-		}()
+		})
 	}
 	go func() {
 		wg.Wait()
@@ -861,14 +856,14 @@ func Test_observationTuningHelpers(t *testing.T) {
 
 	assert.Equal(t, cacheEntryTTL(100*time.Millisecond)-staleRefreshSkipThreshold(100*time.Millisecond)-time.Nanosecond, observationLoopPacing(100*time.Millisecond))
 	assert.Equal(t, cacheEntryTTL(500*time.Millisecond)-staleRefreshSkipThreshold(500*time.Millisecond)-time.Nanosecond, observationLoopPacing(500*time.Millisecond))
-	assert.Equal(t, observationLoopPacingMin, observationLoopPacing(0))
+	assert.Equal(t, observationLoopPacingFloor, observationLoopPacing(0))
 	// T/2 exceeds invariant cap; pacing is min(T/2, cacheTTL−stale−1ns); here 30/2=15ms caps to ~12ms−1ns
 	assert.Equal(t, cacheEntryTTL(30*time.Millisecond)-staleRefreshSkipThreshold(30*time.Millisecond)-time.Nanosecond, observationLoopPacing(30*time.Millisecond))
 }
 
 func BenchmarkObserve(b *testing.B) {
 	lggr := logger.TestLogger(b)
-	ctx := testutils.Context(b)
+	ctx := b.Context()
 	// can enable/disable verbose logging to test performance here
 	opts := &mockOpts{verboseLogging: true}
 
diff --git a/core/services/llo/observation/observation_context.go b/core/services/llo/observation/observation_context.go
index d246654c63c..828ef52bf13 100644
--- a/core/services/llo/observation/observation_context.go
+++ b/core/services/llo/observation/observation_context.go
@@ -28,7 +28,7 @@ import (
 
 var _ ObservationContext = (*observationContext)(nil)
 
-type ObservationContext interface {
+type ObservationContext interface { //nolint:revive // ObservationContext is the established interface name in this package
 	Observe(ctx context.Context, streamID streams.StreamID, opts llo.DSOpts) (val llo.StreamValue, err error)
 }
 
diff --git a/core/services/llo/observation/observation_context_test.go b/core/services/llo/observation/observation_context_test.go
index 69807150448..2f107daa398 100644
--- a/core/services/llo/observation/observation_context_test.go
+++ b/core/services/llo/observation/observation_context_test.go
@@ -58,8 +58,7 @@ func makePipelineWithMultipleStreamResults(streamIDs []streams.StreamID, results
 	}
 }
 
-func TestObservationContext_Observe(t *testing.T) {
-	t.Parallel()
+func TestObservationContext_Observe(t *testing.T) { //nolint:paralleltest // subtests share one ObservationContext and pipeline run counters
 	ctx := t.Context()
 	r := &mockRegistry{}
 	telem := &mockTelemeter{}
@@ -106,25 +105,25 @@ func TestObservationContext_Observe(t *testing.T) {
 		streamID11: multiPipelinePartialFail,
 	}
 
-	t.Run("returns error in case of missing pipeline", func(t *testing.T) {
+	t.Run("returns error in case of missing pipeline", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		_, err := oc.Observe(ctx, missingStreamID, opts)
 		require.EqualError(t, err, "no pipeline for stream: 0")
 	})
-	t.Run("returns error in case of zero results", func(t *testing.T) {
+	t.Run("returns error in case of zero results", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		_, err := oc.Observe(ctx, streamID1, opts)
 		require.EqualError(t, err, "invalid number of results, expected: 1 or 3, got: 0")
 	})
-	t.Run("returns composite value from legacy job with single top-level streamID", func(t *testing.T) {
+	t.Run("returns composite value from legacy job with single top-level streamID", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		val, err := oc.Observe(ctx, streamID2, opts)
 		require.NoError(t, err)
 
 		assert.Equal(t, "12.34", val.(*llo.Decimal).String())
 	})
-	t.Run("returns error in case of erroring pipeline", func(t *testing.T) {
+	t.Run("returns error in case of erroring pipeline", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		_, err := oc.Observe(ctx, streamID3, opts)
 		require.EqualError(t, err, "pipeline error")
 	})
-	t.Run("returns values for multiple stream IDs within the same job based on streamID tag with a single pipeline execution", func(t *testing.T) {
+	t.Run("returns values for multiple stream IDs within the same job based on streamID tag with a single pipeline execution", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		val, err := oc.Observe(ctx, streamID4, opts)
 		require.NoError(t, err)
 		assert.Equal(t, "12.34", val.(*llo.Decimal).String())
@@ -146,19 +145,19 @@ func TestObservationContext_Observe(t *testing.T) {
 
 		assert.Equal(t, int32(1), multiPipelineDecimal.runCount.Load())
 	})
-	t.Run("returns value from float64 value", func(t *testing.T) {
+	t.Run("returns value from float64 value", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		val, err := oc.Observe(ctx, streamID7, opts)
 		require.NoError(t, err)
 
 		assert.Equal(t, "1.23", val.(*llo.Decimal).String())
 	})
-	t.Run("returns value from int64 value", func(t *testing.T) {
+	t.Run("returns value from int64 value", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		val, err := oc.Observe(ctx, streamID8, opts)
 		require.NoError(t, err)
 
 		assert.Equal(t, "5", val.(*llo.Decimal).String())
 	})
-	t.Run("partial extraction failure in multi-stream pipeline", func(t *testing.T) {
+	t.Run("partial extraction failure in multi-stream pipeline", func(t *testing.T) { //nolint:paralleltest // shares ObservationContext setup
 		val, err := oc.Observe(ctx, streamID9, opts)
 		require.NoError(t, err)
 		assert.Equal(t, "100.5", val.(*llo.Decimal).String())
diff --git a/core/services/ocr2/plugins/functions/integration_tests/v1/functions_integration_test.go b/core/services/ocr2/plugins/functions/integration_tests/v1/functions_integration_test.go
index 2e7879d006d..8cc1cfd393a 100644
--- a/core/services/ocr2/plugins/functions/integration_tests/v1/functions_integration_test.go
+++ b/core/services/ocr2/plugins/functions/integration_tests/v1/functions_integration_test.go
@@ -23,7 +23,6 @@ var (
 )
 
 func TestIntegration_Functions_MultipleV1Requests_Success(t *testing.T) {
-	quarantine.Flaky(t, "DX-1804")
 	// simulated chain with all contracts
 	owner, b, commit, stop, active, proposed, clientContracts, routerAddress, routerContract, linkToken, allowListContractAddress, allowListContract := utils.StartNewChainWithContracts(t, nClients)
 	defer stop()
diff --git a/core/services/ocr2/plugins/llo/integration_test.go b/core/services/ocr2/plugins/llo/integration_test.go
index 0d490b11a3a..336a0183e87 100644
--- a/core/services/ocr2/plugins/llo/integration_test.go
+++ b/core/services/ocr2/plugins/llo/integration_test.go
@@ -1806,19 +1806,22 @@ channelDefinitionsContractFromBlock = %d`, serverURL, serverPubKey, serverPubKey
 		// Shut all nodes down
 		for i, node := range nodes {
 			require.NoError(t, node.App.Stop())
-			// Ensure that the transmit queue was limited
+			// Ensure that the transmit queue was limited. A buffer is allowed for the async pruner.
 			db := node.App.GetDB()
 			cnt := 0
 
 			// The failing server
 			err := db.GetContext(t.Context(), &cnt, "SELECT count(*) FROM llo_mercury_transmit_queue WHERE server_url = 'example.invalid'")
 			require.NoError(t, err)
-			assert.LessOrEqual(t, cnt, maxQueueSize, "persisted transmit queue size too large for node %d for failing server", i)
+
+			// We allow a buffer because async deletes might lag behind inserts at the exact moment the node is stopped.
+			// The queue is bounded if it's vastly smaller than the total number of generated reports (thousands).
+			assert.LessOrEqual(t, cnt, maxQueueSize+nChannels*2, "persisted transmit queue size too large for node %d for failing server", i)
 
 			// The succeeding server
 			err = db.GetContext(t.Context(), &cnt, "SELECT count(*) FROM llo_mercury_transmit_queue WHERE server_url = $1", serverURL)
 			require.NoError(t, err)
-			assert.LessOrEqual(t, cnt, maxQueueSize, "persisted transmit queue size too large for node %d for succeeding server", i)
+			assert.LessOrEqual(t, cnt, maxQueueSize+nChannels*2, "persisted transmit queue size too large for node %d for succeeding server", i)
 		}
 	})
 }
diff --git a/core/services/vrf/v2/bhs_feeder_test.go b/core/services/vrf/v2/bhs_feeder_test.go
index 7eb9c5ac4d6..551f8288c45 100644
--- a/core/services/vrf/v2/bhs_feeder_test.go
+++ b/core/services/vrf/v2/bhs_feeder_test.go
@@ -66,17 +66,17 @@ func TestStartHeartbeats(t *testing.T) {
 
 	t.Run("bhs_feeder_startheartbeats_happy_path", func(t *testing.T) {
 		app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, keys...)
-		require.NoError(t, app.Start(testutils.Context(t)))
+		require.NoError(t, app.Start(t.Context()))
 
 		_ = vrftesthelpers.CreateAndStartBHSJob(
 			t, bhsKeyAddresses, app, uni.bhsContractAddress.String(),
 			uni.rootContractAddress.String(), "", "", 0, 200, heartbeatPeriod, 100)
 
 		// Ensure log poller is ready and has all logs.
-		chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain)
+		chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain) //nolint:staticcheck // TODO: migrate to relayer interface
 		require.True(t, ok)
 		require.NoError(t, chain.LogPoller().Ready())
-		require.NoError(t, chain.LogPoller().Replay(testutils.Context(t), 1))
+		require.NoError(t, chain.LogPoller().Replay(t.Context(), 1))
 
 		initTxns := 260
 		// Wait 260 blocks.
@@ -92,7 +92,7 @@ func TestStartHeartbeats(t *testing.T) {
 		// has a blockhash stored at that offset.
 		require.Eventually(t, func() bool {
 			uni.backend.Commit()
-			tip, tipErr := uni.backend.Client().HeaderByNumber(testutils.Context(t), nil)
+			tip, tipErr := uni.backend.Client().HeaderByNumber(t.Context(), nil)
 			if tipErr != nil || tip == nil || tip.Number.Uint64() < 256 {
 				return false
 			}
diff --git a/core/services/vrf/v2/coordinator_v2x_interface.go b/core/services/vrf/v2/coordinator_v2x_interface.go
index f9b25b9826e..a646e8c6f61 100644
--- a/core/services/vrf/v2/coordinator_v2x_interface.go
+++ b/core/services/vrf/v2/coordinator_v2x_interface.go
@@ -25,7 +25,7 @@ var (
 
 // CoordinatorV2_X is an interface that allows us to use the same code for
 // both the V2 and V2Plus coordinators.
-type CoordinatorV2_X interface {
+type CoordinatorV2_X interface { //nolint:revive // V2_X naming matches coordinator version convention
 	Address() common.Address
 	ParseRandomWordsRequested(log types.Log) (RandomWordsRequested, error)
 	ParseRandomWordsFulfilled(log types.Log) (RandomWordsFulfilled, error)
diff --git a/core/services/vrf/v2/integration_helpers_test.go b/core/services/vrf/v2/integration_helpers_test.go
index b827808178a..d8e0211f4c6 100644
--- a/core/services/vrf/v2/integration_helpers_test.go
+++ b/core/services/vrf/v2/integration_helpers_test.go
@@ -61,7 +61,7 @@ func testSingleConsumerHappyPath(
 		rwfe v22.RandomWordsFulfilled,
 		subID *big.Int),
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key1 := cltest.MustGenerateRandomKey(t)
 	key2 := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(10)
@@ -77,7 +77,7 @@ func testSingleConsumerHappyPath(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1, key2)
 
@@ -115,7 +115,7 @@ func testSingleConsumerHappyPath(
 		require.NoError(t, err)
 		t.Log("runs", len(runs))
 		return len(runs) == 1
-	}, testutils.WaitTimeout(t), time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 
 	// Mine the fulfillment that was queued.
 	mine(t, requestID1, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
@@ -137,7 +137,7 @@ func testSingleConsumerHappyPath(
 		require.NoError(t, err)
 		t.Log("runs", len(runs))
 		return len(runs) == 2
-	}, testutils.WaitTimeout(t), time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 	mine(t, requestID2, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
 
 	// Assert correct state of RandomWordsFulfilled event.
@@ -183,7 +183,7 @@ func testMultipleConsumersNeedBHS(
 		rwfe v22.RandomWordsFulfilled,
 	),
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	nConsumers := len(consumers)
 	vrfKey := cltest.MustGenerateRandomKey(t)
 	sendEth(t, ownerKey, uni.backend, vrfKey.Address, 10)
@@ -213,7 +213,7 @@ func testMultipleConsumersNeedBHS(
 		simulatedOverrides(t, assets.GWei(10), keySpecificOverrides...)(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 		c.EVM[0].FinalityDepth = new(uint32(2))
 	})
 	keys = append(keys, ownerKey, vrfKey)
@@ -255,7 +255,7 @@ func testMultipleConsumersNeedBHS(
 		v2CoordinatorAddress, v2PlusCoordinatorAddress, "", 0, 200, 0, 100,
 	)
 
-	chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain)
+	chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain) //nolint:staticcheck // TODO: migrate to relayer interface
 	require.True(t, ok)
 	// Ensure log poller is ready and has all logs.
 	require.NoError(t, chain.LogPoller().Ready())
@@ -296,7 +296,7 @@ func testMultipleConsumersNeedBHS(
 			runs, err := app.PipelineORM().GetAllRuns(ctx)
 			require.NoError(c, err)
 			require.Len(c, runs, 1)
-		}, testutils.WaitTimeout(t), time.Second)
+		}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 		mine(t, requestID, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
 
@@ -329,7 +329,7 @@ func testMultipleConsumersNeedTrustedBHS(
 		rwfe v22.RandomWordsFulfilled,
 	),
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	nConsumers := len(consumers)
 	vrfKey := cltest.MustGenerateRandomKey(t)
 	sendEth(t, ownerKey, uni.backend, vrfKey.Address, 10)
@@ -369,7 +369,7 @@ func testMultipleConsumersNeedTrustedBHS(
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(5_000_000))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 		c.EVM[0].FinalityDepth = new(uint32(2))
 	})
 	keys = append(keys, ownerKey, vrfKey)
@@ -413,7 +413,7 @@ func testMultipleConsumersNeedTrustedBHS(
 		t, bhsKeyAddressesStrings, app, "", v2CoordinatorAddress, v2PlusCoordinatorAddress, uni.trustedBhsContractAddress.String(), 20, 1000, 0, waitBlocks)
 
 	// Ensure log poller is ready and has all logs.
-	chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain)
+	chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain) //nolint:staticcheck // TODO: migrate to relayer interface
 	require.True(t, ok)
 	require.NoError(t, chain.LogPoller().Ready())
 	require.NoError(t, chain.LogPoller().Replay(ctx, 1))
@@ -462,7 +462,7 @@ func testMultipleConsumersNeedTrustedBHS(
 			require.NoError(t, err)
 			t.Log("runs", len(runs))
 			return len(runs) >= 1
-		}, testutils.WaitTimeout(t), time.Second)
+		}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 		mine(t, requestID, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
 
@@ -499,7 +499,7 @@ func verifyBlockhashStored(
 		}
 		require.FailNowf(t, "GetBlockhash: %v", err.Error())
 		return false
-	}, testutils.WaitTimeoutCustom(t, 5*time.Minute), time.Second)
+	}, testutils.WaitTimeoutCustom(t, 5*time.Minute), 100*time.Millisecond)
 }
 
 func verifyBlockhashStoredTrusted(
@@ -525,7 +525,7 @@ func verifyBlockhashStoredTrusted(
 		}
 		require.FailNowf(t, "GetBlockhash (trusted BHS): %v", err.Error())
 		return false
-	}, testutils.WaitTimeoutCustom(t, 5*time.Minute), time.Second)
+	}, testutils.WaitTimeoutCustom(t, 5*time.Minute), 100*time.Millisecond)
 }
 
 func testSingleConsumerHappyPathBatchFulfillment(
@@ -549,7 +549,7 @@ func testSingleConsumerHappyPathBatchFulfillment(
 		rwfe v22.RandomWordsFulfilled,
 		subID *big.Int),
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key1 := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(10)
 	config, db := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -562,7 +562,7 @@ func testSingleConsumerHappyPathBatchFulfillment(
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.EVM[0].ChainID = (*sqlutil.Big)(testutils.SimulatedChainID)
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 
@@ -613,7 +613,7 @@ func testSingleConsumerHappyPathBatchFulfillment(
 			return len(runs) == (numRequests + 1)
 		}
 		return len(runs) == numRequests
-	}, testutils.WaitTimeout(t), time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 
 	mineBatch(t, reqIDs, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
 
@@ -656,7 +656,7 @@ func testSingleConsumerNeedsTopUp(
 		coordinator v22.CoordinatorV2_X,
 		rwfe v22.RandomWordsFulfilled),
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(1000)
 	config, db := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -667,7 +667,7 @@ func testSingleConsumerNeedsTopUp(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key)
 
@@ -716,7 +716,7 @@ func testSingleConsumerNeedsTopUp(
 		require.NoError(t, err)
 		t.Log("assert 2", "runs", len(runs))
 		return len(runs) == 1
-	}, testutils.WaitTimeout(t), 1*time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	// Mine the fulfillment. Need to wait for Txm to mark the tx as confirmed
 	// so that we can actually see the event on the simulated chain.
@@ -754,7 +754,7 @@ func testBlockHeaderFeeder(
 		coordinator v22.CoordinatorV2_X,
 		rwfe v22.RandomWordsFulfilled),
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	nConsumers := len(consumers)
 
 	vrfKey := cltest.MustGenerateRandomKey(t)
@@ -774,7 +774,7 @@ func testBlockHeaderFeeder(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 		c.EVM[0].FinalityDepth = new(uint32(2))
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, vrfKey, bhfKey)
@@ -810,7 +810,7 @@ func testBlockHeaderFeeder(
 		v2coordinatorAddress, v2plusCoordinatorAddress)
 
 	// Ensure log poller is ready and has all logs.
-	chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain)
+	chain, ok := app.GetRelayers().LegacyEVMChains().Slice()[0].(legacyevm.Chain) //nolint:staticcheck // TODO: migrate to relayer interface
 	require.True(t, ok)
 	require.NoError(t, chain.LogPoller().Ready())
 	require.NoError(t, chain.LogPoller().Replay(ctx, 1))
@@ -846,7 +846,7 @@ func testBlockHeaderFeeder(
 			require.NoError(c, err)
 			t.Log("runs", len(runs))
 			require.Len(c, runs, 1)
-		}, testutils.WaitTimeout(t), time.Second)
+		}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 		mine(t, requestID, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
 
@@ -870,7 +870,7 @@ func createSubscriptionAndGetSubID(
 	require.NoError(t, err)
 	backend.Commit()
 
-	receipt, err := backend.Client().TransactionReceipt(testutils.Context(t), tx.Hash())
+	receipt, err := backend.Client().TransactionReceipt(t.Context(), tx.Hash())
 	require.NoError(t, err)
 	require.Equal(t, uint64(1), receipt.Status)
 	for _, log := range receipt.Logs {
@@ -928,7 +928,7 @@ func testSingleConsumerForcedFulfillment(
 	batchEnabled bool,
 	vrfVersion vrfcommon.Version,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key1 := cltest.MustGenerateRandomKey(t)
 	key2 := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(10)
@@ -944,7 +944,7 @@ func testSingleConsumerForcedFulfillment(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1, key2)
 
@@ -1063,7 +1063,7 @@ func testSingleConsumerForcedFulfillment(
 			t.Log("num RandomWordsForced logs:", i)
 		}
 		return utils.IsEmpty(commitment[:])
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	// Mine the fulfillment that was queued.
 	mine(t, requestID, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
@@ -1099,7 +1099,7 @@ func testSingleConsumerEIP150(
 	vrfVersion vrfcommon.Version,
 	nativePayment bool,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	callBackGasLimit := int64(2_500_000) // base callback gas.
 
 	key1 := cltest.MustGenerateRandomKey(t)
@@ -1113,7 +1113,7 @@ func testSingleConsumerEIP150(
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(3.5e6))
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 	consumer := uni.vrfConsumers[0]
@@ -1153,7 +1153,7 @@ func testSingleConsumerEIP150(
 		require.NoError(c, err)
 		t.Log("runs", len(runs))
 		require.Len(c, runs, 1)
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	t.Log("Done!")
 }
@@ -1167,7 +1167,7 @@ func testSingleConsumerEIP150Revert(
 	vrfVersion vrfcommon.Version,
 	nativePayment bool,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	callBackGasLimit := uint64(2_500_000)            // base callback gas.
 	eip150Fee := uint64(0)                           // no premium given for callWithExactGas
 	coordinatorFulfillmentOverhead := uint64(90_000) // fixed gas used in coordinator fulfillment
@@ -1184,7 +1184,7 @@ func testSingleConsumerEIP150Revert(
 		c.EVM[0].GasEstimator.LimitDefault = new(gasLimit)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 	consumer := uni.vrfConsumers[0]
@@ -1237,7 +1237,7 @@ func testSingleConsumerBigGasCallbackSandwich(
 	vrfVersion vrfcommon.Version,
 	nativePayment bool,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key1 := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(100)
 	config, db := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -1249,7 +1249,7 @@ func testSingleConsumerBigGasCallbackSandwich(
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(5_000_000))
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 	consumer := uni.vrfConsumers[0]
@@ -1301,7 +1301,7 @@ func testSingleConsumerBigGasCallbackSandwich(
 		runs, err := app.PipelineORM().GetAllRuns(ctx)
 		require.NoError(c, err)
 		require.Len(c, runs, 1)
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	// After the first successful request, no more will be enqueued.
 	gomega.NewGomegaWithT(t).Consistently(func() bool {
@@ -1352,7 +1352,7 @@ func testSingleConsumerMultipleGasLanes(
 	vrfVersion vrfcommon.Version,
 	nativePayment bool,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	cheapKey := cltest.MustGenerateRandomKey(t)
 	expensiveKey := cltest.MustGenerateRandomKey(t)
 	cheapGasLane := assets.GWei(10)
@@ -1370,7 +1370,7 @@ func testSingleConsumerMultipleGasLanes(
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(5_000_000))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, cheapKey, expensiveKey)
@@ -1413,7 +1413,7 @@ func testSingleConsumerMultipleGasLanes(
 		require.NoError(t, err)
 		t.Log("assert 1", "runs", len(runs))
 		return len(runs) == 1
-	}, testutils.WaitTimeout(t), 1*time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 
 	// Mine the fulfillment that was queued.
 	mine(t, cheapRequestID, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
@@ -1445,7 +1445,7 @@ func testSingleConsumerMultipleGasLanes(
 		require.NoError(t, err)
 		t.Log("assert 1", "runs", len(runs))
 		return len(runs) == 2
-	}, testutils.WaitTimeout(t), 1*time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 
 	// Mine the fulfillment that was queued.
 	mine(t, expensiveRequestID, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
@@ -1477,7 +1477,7 @@ func testSingleConsumerAlwaysRevertingCallbackStillFulfilled(
 	vrfVersion vrfcommon.Version,
 	nativePayment bool,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(10)
 	config, db := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -1488,7 +1488,7 @@ func testSingleConsumerAlwaysRevertingCallbackStillFulfilled(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key)
 	consumer := uni.reverter
@@ -1527,7 +1527,7 @@ func testSingleConsumerAlwaysRevertingCallbackStillFulfilled(
 		runs, err := app.PipelineORM().GetAllRuns(ctx)
 		require.NoError(c, err)
 		require.Len(c, runs, 1)
-	}, testutils.WaitTimeout(t), 1*time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	// Mine the fulfillment that was queued.
 	mine(t, requestID, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
@@ -1544,7 +1544,7 @@ func testConsumerProxyHappyPath(
 	vrfVersion vrfcommon.Version,
 	nativePayment bool,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key1 := cltest.MustGenerateRandomKey(t)
 	key2 := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(10)
@@ -1559,7 +1559,7 @@ func testConsumerProxyHappyPath(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1, key2)
 	consumerOwner := uni.neil
@@ -1603,7 +1603,7 @@ func testConsumerProxyHappyPath(
 		require.NoError(t, err)
 		t.Log("runs", len(runs))
 		return len(runs) == 1
-	}, testutils.WaitTimeout(t), time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 
 	// Mine the fulfillment that was queued.
 	mine(t, requestID1, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
@@ -1629,7 +1629,7 @@ func testConsumerProxyHappyPath(
 		require.NoError(t, err)
 		t.Log("runs", len(runs))
 		return len(runs) == 2
-	}, testutils.WaitTimeout(t), time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 	mine(t, requestID2, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
 	assertRandomWordsFulfilled(t, requestID2, true, uni.rootContract, nativePayment)
 
@@ -1676,7 +1676,7 @@ func testMaliciousConsumer(
 	batchEnabled bool,
 	vrfVersion vrfcommon.Version,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(2_000_000))
 		c.EVM[0].GasEstimator.PriceMax = assets.GWei(1)
@@ -1684,7 +1684,7 @@ func testMaliciousConsumer(
 		c.EVM[0].GasEstimator.FeeCapDefault = assets.GWei(1)
 		c.EVM[0].ChainID = (*sqlutil.Big)(testutils.SimulatedChainID)
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	carol := uni.vrfConsumers[0]
 
@@ -1752,10 +1752,10 @@ func testMaliciousConsumer(
 		t.Log("attempts", attempts)
 		uni.backend.Commit()
 		return len(attempts) == 1 && attempts[0].Tx.State == txmgrcommon.TxConfirmed
-	}, testutils.WaitTimeout(t), 1*time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	// The fulfillment tx should succeed
-	cs, err := app.GetRelayers().LegacyEVMChains().Get(evmtest.MustGetDefaultChainID(t, config.EVMConfigs()).String())
+	cs, err := app.GetRelayers().LegacyEVMChains().Get(evmtest.MustGetDefaultChainID(t, config.EVMConfigs()).String()) //nolint:staticcheck // TODO: migrate to relayer interface
 	require.NoError(t, err)
 	ch, ok := cs.(legacyevm.Chain)
 	require.True(t, ok)
@@ -1798,7 +1798,7 @@ func testReplayOldRequestsOnStartUp(
 		subID *big.Int,
 	),
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	sendingKey := cltest.MustGenerateRandomKey(t)
 	gasLanePriceWei := assets.GWei(10)
 	config, _ := heavyweight.FullTestDBV2(t, func(c *chainlink.Config, s *chainlink.Secrets) {
@@ -1809,7 +1809,7 @@ func testReplayOldRequestsOnStartUp(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, sendingKey)
 
@@ -1850,7 +1850,7 @@ func testReplayOldRequestsOnStartUp(
 		})(c, s)
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 
 	// Start a new app and create VRF job using the same VRF key created above
@@ -1906,7 +1906,7 @@ func testReplayOldRequestsOnStartUp(
 		runs, err := app.PipelineORM().GetAllRuns(ctx)
 		require.NoError(c, err)
 		require.Len(c, runs, 1)
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	// Mine the fulfillment that was queued.
 	mine(t, requestID1, subID, uni.backend, db, vrfVersion, testutils.SimulatedChainID)
diff --git a/core/services/vrf/v2/integration_v2_plus_test.go b/core/services/vrf/v2/integration_v2_plus_test.go
index 8a9758dedf8..708cef3eb24 100644
--- a/core/services/vrf/v2/integration_v2_plus_test.go
+++ b/core/services/vrf/v2/integration_v2_plus_test.go
@@ -118,7 +118,7 @@ func newVRFCoordinatorV2PlusUniverse(t *testing.T, key ethkey.KeyV2, numConsumer
 		vrf_coordinator_v2plus_interface.IVRFCoordinatorV2PlusInternalABI))
 	require.NoError(t, err)
 	backend := cltest.NewSimulatedBackend(t, genesisData, ethconfig.Defaults.Miner.GasCeil)
-	h, err := backend.Client().HeaderByNumber(testutils.Context(t), nil)
+	h, err := backend.Client().HeaderByNumber(t.Context(), nil)
 	require.NoError(t, err)
 	require.LessOrEqual(t, h.Time, uint64(math.MaxInt64))
 	blockTime := time.Unix(int64(h.Time), 0) //nolint:gosec // G115 false positive
@@ -341,7 +341,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_HappyPath_BatchFulfillment(t *testi
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
-	t.Run("link payment", func(tt *testing.T) {
+	t.Run("link payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		testSingleConsumerHappyPathBatchFulfillment(
 			t,
 			ownerKey,
@@ -365,7 +365,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_HappyPath_BatchFulfillment(t *testi
 		)
 	})
 
-	t.Run("native payment", func(tt *testing.T) {
+	t.Run("native payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		testSingleConsumerHappyPathBatchFulfillment(
 			t,
 			ownerKey,
@@ -395,7 +395,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_HappyPath_BatchFulfillment_BigGasCa
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
-	t.Run("link payment", func(tt *testing.T) {
+	t.Run("link payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		testSingleConsumerHappyPathBatchFulfillment(
 			t,
 			ownerKey,
@@ -419,7 +419,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_HappyPath_BatchFulfillment_BigGasCa
 		)
 	})
 
-	t.Run("native payment", func(tt *testing.T) {
+	t.Run("native payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		testSingleConsumerHappyPathBatchFulfillment(
 			t,
 			ownerKey,
@@ -446,11 +446,12 @@ func TestVRFV2PlusIntegration_SingleConsumer_HappyPath_BatchFulfillment_BigGasCa
 
 func TestVRFV2PlusIntegration_SingleConsumer_HappyPath(t *testing.T) {
 	t.Parallel()
-	ownerKey := cltest.MustGenerateRandomKey(t)
-	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
 	t.Run("link payment", func(tt *testing.T) {
+		tt.Parallel()
+		ownerKey := cltest.MustGenerateRandomKey(tt)
+		uni := newVRFCoordinatorV2PlusUniverse(tt, ownerKey, 1, false)
 		testSingleConsumerHappyPath(
-			t,
+			tt,
 			ownerKey,
 			uni.coordinatorV2UniverseCommon,
 			uni.vrfConsumers[0],
@@ -469,8 +470,11 @@ func TestVRFV2PlusIntegration_SingleConsumer_HappyPath(t *testing.T) {
 			})
 	})
 	t.Run("native payment", func(tt *testing.T) {
+		tt.Parallel()
+		ownerKey := cltest.MustGenerateRandomKey(tt)
+		uni := newVRFCoordinatorV2PlusUniverse(tt, ownerKey, 1, false)
 		testSingleConsumerHappyPath(
-			t,
+			tt,
 			ownerKey,
 			uni.coordinatorV2UniverseCommon,
 			uni.vrfConsumers[0],
@@ -556,7 +560,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_NeedsBlockhashStore(t *testing.T) {
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 2, false)
-	t.Run("link payment", func(tt *testing.T) {
+	t.Run("link payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		testMultipleConsumersNeedBHS(
 			t,
 			ownerKey,
@@ -572,7 +576,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_NeedsBlockhashStore(t *testing.T) {
 			false,
 		)
 	})
-	t.Run("native payment", func(tt *testing.T) {
+	t.Run("native payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		testMultipleConsumersNeedBHS(
 			t,
 			ownerKey,
@@ -594,7 +598,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_BlockHeaderFeeder(t *testing.T) {
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
-	t.Run("link payment", func(tt *testing.T) {
+	t.Run("link payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		tt.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 		testBlockHeaderFeeder(
 			t,
@@ -611,7 +615,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_BlockHeaderFeeder(t *testing.T) {
 			false,
 		)
 	})
-	t.Run("native payment", func(tt *testing.T) {
+	t.Run("native payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		tt.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 		testBlockHeaderFeeder(
 			t,
@@ -634,7 +638,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_NeedsTopUp(t *testing.T) {
 	t.Parallel()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
-	t.Run("link payment", func(tt *testing.T) {
+	t.Run("link payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		tt.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 		testSingleConsumerNeedsTopUp(
 			t,
@@ -653,7 +657,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_NeedsTopUp(t *testing.T) {
 			false,
 		)
 	})
-	t.Run("native payment", func(tt *testing.T) {
+	t.Run("native payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		tt.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 		testSingleConsumerNeedsTopUp(
 			t,
@@ -675,6 +679,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_NeedsTopUp(t *testing.T) {
 }
 
 func TestVRFV2PlusIntegration_SingleConsumer_BigGasCallback_Sandwich(t *testing.T) {
+	t.Parallel()
 	t.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
@@ -682,6 +687,7 @@ func TestVRFV2PlusIntegration_SingleConsumer_BigGasCallback_Sandwich(t *testing.
 }
 
 func TestVRFV2PlusIntegration_SingleConsumer_MultipleGasLanes(t *testing.T) {
+	t.Parallel()
 	t.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
@@ -875,18 +881,18 @@ func TestVRFV2PlusIntegration_TestMaliciousConsumer(t *testing.T) {
 
 func TestVRFV2PlusIntegration_RequestCost(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, key, 1, false)
 
 	cfg := configtest.NewGeneralConfigSimulated(t, nil)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, cfg, uni.backend, key)
-	require.NoError(t, app.Start(testutils.Context(t)))
+	require.NoError(t, app.Start(t.Context()))
 
 	vrfkey, err := app.GetKeyStore().VRF().Create(ctx)
 	require.NoError(t, err)
 	registerProvingKeyHelper(t, uni.coordinatorV2UniverseCommon, uni.rootContract, vrfkey, &defaultMaxGasPrice)
-	t.Run("non-proxied consumer", func(tt *testing.T) {
+	t.Run("non-proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		carol := uni.vrfConsumers[0]
 		carolContract := uni.consumerContracts[0]
 		carolContractAddress := uni.consumerContractAddresses[0]
@@ -919,7 +925,7 @@ func TestVRFV2PlusIntegration_RequestCost(t *testing.T) {
 			"requestRandomWords tx gas cost more than expected")
 	})
 
-	t.Run("proxied consumer", func(tt *testing.T) {
+	t.Run("proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		consumerOwner := uni.neil
 		consumerContract := uni.consumerProxyContract
 		consumerContractAddress := uni.consumerProxyContractAddress
@@ -928,7 +934,7 @@ func TestVRFV2PlusIntegration_RequestCost(t *testing.T) {
 		tx, err := consumerContract.CreateSubscriptionAndFund(consumerOwner, assets.Ether(5).ToInt())
 		require.NoError(tt, err)
 		uni.backend.Commit()
-		r, err := uni.backend.Client().TransactionReceipt(testutils.Context(t), tx.Hash())
+		r, err := uni.backend.Client().TransactionReceipt(t.Context(), tx.Hash())
 		require.NoError(tt, err)
 		t.Log("gas used by proxied CreateSubscriptionAndFund:", r.GasUsed)
 
@@ -960,7 +966,7 @@ func TestVRFV2PlusIntegration_MaxConsumersCost(t *testing.T) {
 
 	cfg := configtest.NewGeneralConfigSimulated(t, nil)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, cfg, uni.backend, key)
-	require.NoError(t, app.Start(testutils.Context(t)))
+	require.NoError(t, app.Start(t.Context()))
 	_, err := carolContract.CreateSubscriptionAndFund(carol,
 		big.NewInt(1000000000000000000)) // 0.1 LINK
 	require.NoError(t, err)
@@ -1033,19 +1039,19 @@ func requestAndEstimateFulfillmentCost(
 
 func TestVRFV2PlusIntegration_FulfillmentCost(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, key, 1, false)
 
 	cfg := configtest.NewGeneralConfigSimulated(t, nil)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, cfg, uni.backend, key)
-	require.NoError(t, app.Start(testutils.Context(t)))
+	require.NoError(t, app.Start(t.Context()))
 
 	vrfkey, err := app.GetKeyStore().VRF().Create(ctx)
 	require.NoError(t, err)
 	registerProvingKeyHelper(t, uni.coordinatorV2UniverseCommon, uni.rootContract, vrfkey, &defaultMaxGasPrice)
 
-	t.Run("non-proxied consumer", func(tt *testing.T) {
+	t.Run("non-proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		carol := uni.vrfConsumers[0]
 		carolContract := uni.consumerContracts[0]
 		carolContractAddress := uni.consumerContractAddresses[0]
@@ -1062,7 +1068,7 @@ func TestVRFV2PlusIntegration_FulfillmentCost(t *testing.T) {
 		gasRequested := uint32(50_000)
 		nw := uint32(1)
 		requestedIncomingConfs := uint16(3)
-		t.Run("native payment", func(tt *testing.T) {
+		t.Run("native payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 			requestAndEstimateFulfillmentCost(
 				t,
 				subID,
@@ -1081,7 +1087,7 @@ func TestVRFV2PlusIntegration_FulfillmentCost(t *testing.T) {
 			)
 		})
 
-		t.Run("link payment", func(tt *testing.T) {
+		t.Run("link payment", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 			requestAndEstimateFulfillmentCost(
 				t,
 				subID,
@@ -1101,7 +1107,7 @@ func TestVRFV2PlusIntegration_FulfillmentCost(t *testing.T) {
 		})
 	})
 
-	t.Run("proxied consumer", func(tt *testing.T) {
+	t.Run("proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		consumerOwner := uni.neil
 		consumerContract := uni.consumerProxyContract
 		consumerContractAddress := uni.consumerProxyContractAddress
@@ -1145,7 +1151,7 @@ func setupSubscriptionAndFund(
 	require.NoError(t, err)
 	uni.backend.Commit()
 
-	receipt, err := uni.backend.Client().TransactionReceipt(testutils.Context(t), tx.Hash())
+	receipt, err := uni.backend.Client().TransactionReceipt(t.Context(), tx.Hash())
 	require.NoError(t, err)
 	require.Equal(t, uint64(1), receipt.Status)
 	var subID *big.Int
@@ -1182,7 +1188,7 @@ func setupSubscriptionAndFund(
 
 func TestVRFV2PlusIntegration_Migration(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2PlusUniverse(t, ownerKey, 1, false)
 	key1 := cltest.MustGenerateRandomKey(t)
@@ -1196,7 +1202,7 @@ func TestVRFV2PlusIntegration_Migration(t *testing.T) {
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(5_000_000))
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, config, uni.backend, ownerKey, key1)
 
@@ -1246,7 +1252,7 @@ func TestVRFV2PlusIntegration_Migration(t *testing.T) {
 		require.NoError(t, err)
 		t.Log("runs", len(runs))
 		return len(runs) == 1
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	mine(t, requestID, subID, uni.backend, db, vrfcommon.V2Plus, testutils.SimulatedChainID)
 	assertRandomWordsFulfilled(t, requestID, true, uni.rootContract, false)
@@ -1375,7 +1381,7 @@ func TestVRFV2PlusIntegration_CancelSubscription(t *testing.T) {
 
 	linkBalanceBeforeCancel, err := uni.linkContract.BalanceOf(nil, uni.neil.From)
 	require.NoError(t, err)
-	nativeBalanceBeforeCancel, err := uni.backend.Client().BalanceAt(testutils.Context(t), uni.neil.From, nil)
+	nativeBalanceBeforeCancel, err := uni.backend.Client().BalanceAt(t.Context(), uni.neil.From, nil)
 	require.NoError(t, err)
 
 	// non-owner cannot cancel subscription
diff --git a/core/services/vrf/v2/integration_v2_reverted_txns_test.go b/core/services/vrf/v2/integration_v2_reverted_txns_test.go
index dbfecf2a00c..777dcda72c5 100644
--- a/core/services/vrf/v2/integration_v2_reverted_txns_test.go
+++ b/core/services/vrf/v2/integration_v2_reverted_txns_test.go
@@ -283,9 +283,9 @@ func fulfillVRFReq(t *testing.T,
 	require.NoError(t, err)
 
 	ec := th.uni.backend
-	chainID, err := th.uni.backend.Client().ChainID(testutils.Context(t))
+	chainID, err := th.uni.backend.Client().ChainID(t.Context())
 	require.NoError(t, err)
-	chainService, err := th.app.GetRelayers().LegacyEVMChains().Get(chainID.String())
+	chainService, err := th.app.GetRelayers().LegacyEVMChains().Get(chainID.String()) //nolint:staticcheck // TODO: migrate to relayer interface
 	require.NoError(t, err)
 	chain, ok := chainService.(legacyevm.Chain)
 	require.True(t, ok)
@@ -302,7 +302,7 @@ func fulfillVRFReq(t *testing.T,
 			metadata.ForceFulfillmentAttempt = forceFulfilmentAttempt
 		}
 	}
-	etx, err := chain.TxManager().CreateTransaction(testutils.Context(t), txmgr.TxRequest{
+	etx, err := chain.TxManager().CreateTransaction(t.Context(), txmgr.TxRequest{
 		FromAddress:    th.key1.EIP55Address.Address(),
 		ToAddress:      th.uni.rootContractAddress,
 		EncodedPayload: b,
@@ -353,14 +353,14 @@ func fulfilBatchVRFReq(t *testing.T,
 	require.NoError(t, err)
 
 	ec := th.uni.backend
-	chainID, err := th.uni.backend.Client().ChainID(testutils.Context(t))
+	chainID, err := th.uni.backend.Client().ChainID(t.Context())
 	require.NoError(t, err)
-	chainService, err := th.app.GetRelayers().LegacyEVMChains().Get(chainID.String())
+	chainService, err := th.app.GetRelayers().LegacyEVMChains().Get(chainID.String()) //nolint:staticcheck // TODO: migrate to relayer interface
 	require.NoError(t, err)
 	chain, ok := chainService.(legacyevm.Chain)
 	require.True(t, ok)
 
-	etx, err := chain.TxManager().CreateTransaction(testutils.Context(t), txmgr.TxRequest{
+	etx, err := chain.TxManager().CreateTransaction(t.Context(), txmgr.TxRequest{
 		FromAddress:    th.key1.EIP55Address.Address(),
 		ToAddress:      th.uni.batchCoordinatorContractAddress,
 		EncodedPayload: b,
@@ -422,7 +422,7 @@ func createVRFJobsNew(
 	chainID *big.Int,
 	gasLanePrices ...*assets.Wei,
 ) (jobs []job.Job, vrfKeyIDs []string) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	require.Len(t, gasLanePrices, len(fromKeys), "must provide one gas lane price for each set of from addresses, got %d for %d sets", len(gasLanePrices), len(fromKeys))
 	// Create separate jobs for each gas lane and register their keys
 	for i, keys := range fromKeys {
@@ -620,7 +620,7 @@ func newRevertTxnTH(t *testing.T,
 	// Fund gas lanes.
 	sendEth(t, ownerKey, uni.backend, key1.Address, 10)
 	sendEth(t, ownerKey, uni.backend, key2.Address, 10)
-	require.NoError(t, app.Start(testutils.Context(t)))
+	require.NoError(t, app.Start(t.Context()))
 
 	// Create VRF job using key1 and key2 on the same gas lane.
 	jbs, vrfKeyIDs := createVRFJobsNew(
diff --git a/core/services/vrf/v2/integration_v2_test.go b/core/services/vrf/v2/integration_v2_test.go
index ade0f5c9448..174290baa62 100644
--- a/core/services/vrf/v2/integration_v2_test.go
+++ b/core/services/vrf/v2/integration_v2_test.go
@@ -205,7 +205,7 @@ func newVRFCoordinatorV2Universe(t *testing.T, key ethkey.KeyV2, numConsumers in
 		vrf_coordinator_v2.VRFCoordinatorV2ABI))
 	require.NoError(t, err)
 	backend := cltest.NewSimulatedBackend(t, genesisData, ethconfig.Defaults.Miner.GasCeil)
-	h, err := backend.Client().HeaderByNumber(testutils.Context(t), nil)
+	h, err := backend.Client().HeaderByNumber(t.Context(), nil)
 	require.NoError(t, err)
 	require.LessOrEqual(t, h.Time, uint64(math.MaxInt64))
 	blockTime := time.Unix(int64(h.Time), 0) //nolint:gosec // G115 false positive
@@ -469,7 +469,7 @@ func deployOldCoordinator(
 	common.Address,
 	*vrf_coordinator_v2.VRFCoordinatorV2,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	bytecode := hexutil.MustDecode("0x60e06040523480156200001157600080fd5b506040516200608c3803806200608c8339810160408190526200003491620001b1565b33806000816200008b5760405162461bcd60e51b815260206004820152601860248201527f43616e6e6f7420736574206f776e657220746f207a65726f000000000000000060448201526064015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0384811691909117909155811615620000be57620000be81620000e8565b5050506001600160601b0319606093841b811660805290831b811660a052911b1660c052620001fb565b6001600160a01b038116331415620001435760405162461bcd60e51b815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c66000000000000000000604482015260640162000082565b600180546001600160a01b0319166001600160a01b0383811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b80516001600160a01b0381168114620001ac57600080fd5b919050565b600080600060608486031215620001c757600080fd5b620001d28462000194565b9250620001e26020850162000194565b9150620001f26040850162000194565b90509250925092565b60805160601c60a05160601c60c05160601c615e2762000265600039600081816105260152613bd901526000818161061d015261402401526000818161036d01528181611599015281816125960152818161302c0152818161318201526138360152615e276000f3fe608060405234801561001057600080fd5b506004361061025b5760003560e01c80636f64f03f11610145578063ad178361116100bd578063d2f9f9a71161008c578063e72f6e3011610071578063e72f6e30146106fa578063e82ad7d41461070d578063f2fde38b1461073057600080fd5b8063d2f9f9a7146106d4578063d7ae1d30146106e757600080fd5b8063ad17836114610618578063af198b971461063f578063c3f909d41461066f578063caf70c4a146106c157600080fd5b80638da5cb5b11610114578063a21a23e4116100f9578063a21a23e4146105da578063a47c7696146105e2578063a4c0ed361461060557600080fd5b80638da5cb5b146105a95780639f87fad7146105c757600080fd5b80636f64f03f146105685780637341c10c1461057b57806379ba50971461058e578063823597401461059657600080fd5b8063356dac71116101d85780635fbbc0d2116101a757806366316d8d1161018c57806366316d8d1461050e578063689c45171461052157806369bcdb7d1461054857600080fd5b80635fbbc0d21461040057806364d51a2a1461050657600080fd5b8063356dac71146103b457806340d6bb82146103bc5780634cb48a54146103da5780635d3b1d30146103ed57600080fd5b806308821d581161022f57806315c48b841161021457806315c48b841461030e578063181f5a77146103295780631b6b6d231461036857600080fd5b806308821d58146102cf57806312b58349146102e257600080fd5b80620122911461026057806302bcc5b61461028057806304c357cb1461029557806306bfa637146102a8575b600080fd5b610268610743565b60405161027793929190615964565b60405180910390f35b61029361028e366004615792565b6107bf565b005b6102936102a33660046157ad565b61086b565b60055467ffffffffffffffff165b60405167ffffffffffffffff9091168152602001610277565b6102936102dd3660046154a3565b610a60565b6005546801000000000000000090046bffffffffffffffffffffffff165b604051908152602001610277565b61031660c881565b60405161ffff9091168152602001610277565b604080518082018252601681527f565246436f6f7264696e61746f72563220312e302e30000000000000000000006020820152905161027791906158f1565b61038f7f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610277565b600a54610300565b6103c56101f481565b60405163ffffffff9091168152602001610277565b6102936103e836600461563c565b610c3f565b6103006103fb366004615516565b611036565b600c546040805163ffffffff80841682526401000000008404811660208301526801000000000000000084048116928201929092526c010000000000000000000000008304821660608201527001000000000000000000000000000000008304909116608082015262ffffff740100000000000000000000000000000000000000008304811660a0830152770100000000000000000000000000000000000000000000008304811660c08301527a0100000000000000000000000000000000000000000000000000008304811660e08301527d01000000000000000000000000000000000000000000000000000000000090920490911661010082015261012001610277565b610316606481565b61029361051c36600461545b565b611444565b61038f7f000000000000000000000000000000000000000000000000000000000000000081565b610300610556366004615779565b60009081526009602052604090205490565b6102936105763660046153a0565b6116ad565b6102936105893660046157ad565b6117f7565b610293611a85565b6102936105a4366004615792565b611b82565b60005473ffffffffffffffffffffffffffffffffffffffff1661038f565b6102936105d53660046157ad565b611d7c565b6102b66121fd565b6105f56105f0366004615792565b6123ed565b6040516102779493929190615b02565b6102936106133660046153d4565b612537565b61038f7f000000000000000000000000000000000000000000000000000000000000000081565b61065261064d366004615574565b6127a8565b6040516bffffffffffffffffffffffff9091168152602001610277565b600b546040805161ffff8316815263ffffffff6201000084048116602083015267010000000000000084048116928201929092526b010000000000000000000000909204166060820152608001610277565b6103006106cf3660046154bf565b612c6d565b6103c56106e2366004615792565b612c9d565b6102936106f53660046157ad565b612e92565b610293610708366004615385565b612ff3565b61072061071b366004615792565b613257565b6040519015158152602001610277565b61029361073e366004615385565b6134ae565b600b546007805460408051602080840282018101909252828152600094859460609461ffff8316946201000090930463ffffffff169391928391908301828280156107ad57602002820191906000526020600020905b815481526020019060010190808311610799575b50505050509050925092509250909192565b6107c76134bf565b67ffffffffffffffff811660009081526003602052604090205473ffffffffffffffffffffffffffffffffffffffff1661082d576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff811660009081526003602052604090205461086890829073ffffffffffffffffffffffffffffffffffffffff16613542565b50565b67ffffffffffffffff8216600090815260036020526040902054829073ffffffffffffffffffffffffffffffffffffffff16806108d4576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff821614610940576040517fd8a3fb5200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff821660048201526024015b60405180910390fd5b600b546601000000000000900460ff1615610987576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff841660009081526003602052604090206001015473ffffffffffffffffffffffffffffffffffffffff848116911614610a5a5767ffffffffffffffff841660008181526003602090815260409182902060010180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff88169081179091558251338152918201527f69436ea6df009049404f564eff6622cd00522b0bd6a89efd9e52a355c4a879be91015b60405180910390a25b50505050565b610a686134bf565b604080518082018252600091610a97919084906002908390839080828437600092019190915250612c6d915050565b60008181526006602052604090205490915073ffffffffffffffffffffffffffffffffffffffff1680610af9576040517f77f5b84c00000000000000000000000000000000000000000000000000000000815260048101839052602401610937565b600082815260066020526040812080547fffffffffffffffffffffffff00000000000000000000000000000000000000001690555b600754811015610be9578260078281548110610b4c57610b4c615dbc565b90600052602060002001541415610bd7576007805460009190610b7190600190615c76565b81548110610b8157610b81615dbc565b906000526020600020015490508060078381548110610ba257610ba2615dbc565b6000918252602090912001556007805480610bbf57610bbf615d8d565b60019003818190600052602060002001600090559055505b80610be181615cba565b915050610b2e565b508073ffffffffffffffffffffffffffffffffffffffff167f72be339577868f868798bac2c93e52d6f034fef4689a9848996c14ebb7416c0d83604051610c3291815260200190565b60405180910390a2505050565b610c476134bf565b60c861ffff87161115610c9a576040517fa738697600000000000000000000000000000000000000000000000000000000815261ffff871660048201819052602482015260c86044820152606401610937565b60008213610cd7576040517f43d4cf6600000000000000000000000000000000000000000000000000000000815260048101839052602401610937565b6040805160a0808201835261ffff891680835263ffffffff89811660208086018290526000868801528a831660608088018290528b85166080988901819052600b80547fffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000001690971762010000909502949094177fffffffffffffffffffffffffffffffffff000000000000000000ffffffffffff166701000000000000009092027fffffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffff16919091176b010000000000000000000000909302929092179093558651600c80549489015189890151938a0151978a0151968a015160c08b015160e08c01516101008d01519588167fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000009099169890981764010000000093881693909302929092177fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff1668010000000000000000958716959095027fffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffffff16949094176c0100000000000000000000000098861698909802979097177fffffffffffffffffff00000000000000ffffffffffffffffffffffffffffffff1670010000000000000000000000000000000096909416959095027fffffffffffffffffff000000ffffffffffffffffffffffffffffffffffffffff16929092177401000000000000000000000000000000000000000062ffffff92831602177fffffff000000000000ffffffffffffffffffffffffffffffffffffffffffffff1677010000000000000000000000000000000000000000000000958216959095027fffffff000000ffffffffffffffffffffffffffffffffffffffffffffffffffff16949094177a01000000000000000000000000000000000000000000000000000092851692909202919091177cffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167d0100000000000000000000000000000000000000000000000000000000009390911692909202919091178155600a84905590517fc21e3bd2e0b339d2848f0dd956947a88966c242c0c0c582a33137a5c1ceb5cb2916110269189918991899189918991906159c3565b60405180910390a1505050505050565b600b546000906601000000000000900460ff1615611080576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff851660009081526003602052604090205473ffffffffffffffffffffffffffffffffffffffff166110e6576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b33600090815260026020908152604080832067ffffffffffffffff808a1685529252909120541680611156576040517ff0019fe600000000000000000000000000000000000000000000000000000000815267ffffffffffffffff87166004820152336024820152604401610937565b600b5461ffff9081169086161080611172575060c861ffff8616115b156111c257600b546040517fa738697600000000000000000000000000000000000000000000000000000000815261ffff8088166004830152909116602482015260c86044820152606401610937565b600b5463ffffffff620100009091048116908516111561122957600b546040517ff5d7e01e00000000000000000000000000000000000000000000000000000000815263ffffffff8087166004830152620100009092049091166024820152604401610937565b6101f463ffffffff8416111561127b576040517f47386bec00000000000000000000000000000000000000000000000000000000815263ffffffff841660048201526101f46024820152604401610937565b6000611288826001615bd2565b6040805160208082018c9052338284015267ffffffffffffffff808c16606084015284166080808401919091528351808403909101815260a08301845280519082012060c083018d905260e080840182905284518085039091018152610100909301909352815191012091925060009182916040805160208101849052439181019190915267ffffffffffffffff8c16606082015263ffffffff808b166080830152891660a08201523360c0820152919350915060e001604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0018152828252805160209182012060008681526009835283902055848352820183905261ffff8a169082015263ffffffff808916606083015287166080820152339067ffffffffffffffff8b16908c907f63373d1c4696214b898952999c9aaec57dac1ee2723cec59bea6888f489a97729060a00160405180910390a45033600090815260026020908152604080832067ffffffffffffffff808d16855292529091208054919093167fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000009091161790915591505095945050505050565b600b546601000000000000900460ff161561148b576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b336000908152600860205260409020546bffffffffffffffffffffffff808316911610156114e5576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b33600090815260086020526040812080548392906115129084906bffffffffffffffffffffffff16615c8d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555080600560088282829054906101000a90046bffffffffffffffffffffffff166115699190615c8d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663a9059cbb83836040518363ffffffff1660e01b815260040161162192919073ffffffffffffffffffffffffffffffffffffffff9290921682526bffffffffffffffffffffffff16602082015260400190565b602060405180830381600087803b15801561163b57600080fd5b505af115801561164f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061167391906154db565b6116a9576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5050565b6116b56134bf565b6040805180820182526000916116e4919084906002908390839080828437600092019190915250612c6d915050565b60008181526006602052604090205490915073ffffffffffffffffffffffffffffffffffffffff1615611746576040517f4a0b8fa700000000000000000000000000000000000000000000000000000000815260048101829052602401610937565b600081815260066020908152604080832080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff88169081179091556007805460018101825594527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688909301849055518381527fe729ae16526293f74ade739043022254f1489f616295a25bf72dfb4511ed73b89101610c32565b67ffffffffffffffff8216600090815260036020526040902054829073ffffffffffffffffffffffffffffffffffffffff1680611860576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff8216146118c7576040517fd8a3fb5200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82166004820152602401610937565b600b546601000000000000900460ff161561190e576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff841660009081526003602052604090206002015460641415611965576040517f05a48e0f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff8316600090815260026020908152604080832067ffffffffffffffff808916855292529091205416156119ac57610a5a565b73ffffffffffffffffffffffffffffffffffffffff8316600081815260026020818152604080842067ffffffffffffffff8a1680865290835281852080547fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000166001908117909155600384528286209094018054948501815585529382902090920180547fffffffffffffffffffffffff00000000000000000000000000000000000000001685179055905192835290917f43dc749a04ac8fb825cbd514f7c0e13f13bc6f2ee66043b76629d51776cff8e09101610a51565b60015473ffffffffffffffffffffffffffffffffffffffff163314611b06576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d7573742062652070726f706f736564206f776e6572000000000000000000006044820152606401610937565b60008054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560018054909116905560405173ffffffffffffffffffffffffffffffffffffffff90921692909183917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a350565b600b546601000000000000900460ff1615611bc9576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff811660009081526003602052604090205473ffffffffffffffffffffffffffffffffffffffff16611c2f576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff811660009081526003602052604090206001015473ffffffffffffffffffffffffffffffffffffffff163314611cd15767ffffffffffffffff8116600090815260036020526040908190206001015490517fd084e97500000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff9091166004820152602401610937565b67ffffffffffffffff81166000818152600360209081526040918290208054337fffffffffffffffffffffffff00000000000000000000000000000000000000008083168217845560019093018054909316909255835173ffffffffffffffffffffffffffffffffffffffff909116808252928101919091529092917f6f1dc65165ffffedfd8e507b4a0f1fcfdada045ed11f6c26ba27cedfe87802f0910160405180910390a25050565b67ffffffffffffffff8216600090815260036020526040902054829073ffffffffffffffffffffffffffffffffffffffff1680611de5576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff821614611e4c576040517fd8a3fb5200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82166004820152602401610937565b600b546601000000000000900460ff1615611e93576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff8316600090815260026020908152604080832067ffffffffffffffff808916855292529091205416611f2e576040517ff0019fe600000000000000000000000000000000000000000000000000000000815267ffffffffffffffff8516600482015273ffffffffffffffffffffffffffffffffffffffff84166024820152604401610937565b67ffffffffffffffff8416600090815260036020908152604080832060020180548251818502810185019093528083529192909190830182828015611fa957602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311611f7e575b50505050509050600060018251611fc09190615c76565b905060005b825181101561215f578573ffffffffffffffffffffffffffffffffffffffff16838281518110611ff757611ff7615dbc565b602002602001015173ffffffffffffffffffffffffffffffffffffffff16141561214d57600083838151811061202f5761202f615dbc565b6020026020010151905080600360008a67ffffffffffffffff1667ffffffffffffffff168152602001908152602001600020600201838154811061207557612075615dbc565b600091825260208083209190910180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff949094169390931790925567ffffffffffffffff8a1681526003909152604090206002018054806120ef576120ef615d8d565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff00000000000000000000000000000000000000001690550190555061215f565b8061215781615cba565b915050611fc5565b5073ffffffffffffffffffffffffffffffffffffffff8516600081815260026020908152604080832067ffffffffffffffff8b168085529083529281902080547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001690555192835290917f182bff9831466789164ca77075fffd84916d35a8180ba73c27e45634549b445b91015b60405180910390a2505050505050565b600b546000906601000000000000900460ff1615612247576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6005805467ffffffffffffffff1690600061226183615cf3565b82546101009290920a67ffffffffffffffff8181021990931691831602179091556005541690506000806040519080825280602002602001820160405280156122b4578160200160208202803683370190505b506040805180820182526000808252602080830182815267ffffffffffffffff888116808552600484528685209551865493516bffffffffffffffffffffffff9091167fffffffffffffffffffffffff0000000000000000000000000000000000000000948516176c010000000000000000000000009190931602919091179094558451606081018652338152808301848152818701888152958552600384529590932083518154831673ffffffffffffffffffffffffffffffffffffffff918216178255955160018201805490931696169590951790559151805194955090936123a592600285019201906150c5565b505060405133815267ffffffffffffffff841691507f464722b4166576d3dcbba877b999bc35cf911f4eaf434b7eba68fa113951d0bf9060200160405180910390a250905090565b67ffffffffffffffff81166000908152600360205260408120548190819060609073ffffffffffffffffffffffffffffffffffffffff1661245a576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff80861660009081526004602090815260408083205460038352928190208054600290910180548351818602810186019094528084526bffffffffffffffffffffffff8616966c010000000000000000000000009096049095169473ffffffffffffffffffffffffffffffffffffffff90921693909291839183018282801561252157602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116124f6575b5050505050905093509350935093509193509193565b600b546601000000000000900460ff161561257e576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016146125ed576040517f44b0e3c300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60208114612627576040517f8129bbcd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061263582840184615792565b67ffffffffffffffff811660009081526003602052604090205490915073ffffffffffffffffffffffffffffffffffffffff1661269e576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff8116600090815260046020526040812080546bffffffffffffffffffffffff16918691906126d58385615bfe565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555084600560088282829054906101000a90046bffffffffffffffffffffffff1661272c9190615bfe565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508167ffffffffffffffff167fd39ec07f4e209f627a4c427971473820dc129761ba28de8906bd56f57101d4f88287846127939190615bba565b604080519283526020830191909152016121ed565b600b546000906601000000000000900460ff16156127f2576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60005a9050600080600061280687876139b5565b9250925092506000866060015163ffffffff1667ffffffffffffffff81111561283157612831615deb565b60405190808252806020026020018201604052801561285a578160200160208202803683370190505b50905060005b876060015163ffffffff168110156128ce5760408051602081018590529081018290526060016040516020818303038152906040528051906020012060001c8282815181106128b1576128b1615dbc565b6020908102919091010152806128c681615cba565b915050612860565b506000838152600960205260408082208290555181907f1fe543e300000000000000000000000000000000000000000000000000000000906129169087908690602401615ab4565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529181526020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fffffffff0000000000000000000000000000000000000000000000000000000090941693909317909252600b80547fffffffffffffffffffffffffffffffffffffffffffffffffff00ffffffffffff166601000000000000179055908a015160808b01519192506000916129e49163ffffffff169084613d04565b600b80547fffffffffffffffffffffffffffffffffffffffffffffffffff00ffffffffffff1690556020808c01805167ffffffffffffffff9081166000908152600490935260408084205492518216845290922080549394506c01000000000000000000000000918290048316936001939192600c92612a68928692900416615bd2565b92506101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055506000612abf8a600b600001600b9054906101000a900463ffffffff1663ffffffff16612ab985612c9d565b3a613d52565b6020808e015167ffffffffffffffff166000908152600490915260409020549091506bffffffffffffffffffffffff80831691161015612b2b576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6020808d015167ffffffffffffffff1660009081526004909152604081208054839290612b679084906bffffffffffffffffffffffff16615c8d565b82546101009290920a6bffffffffffffffffffffffff81810219909316918316021790915560008b81526006602090815260408083205473ffffffffffffffffffffffffffffffffffffffff1683526008909152812080548594509092612bd091859116615bfe565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550877f7dffc5ae5ee4e2e4df1651cf6ad329a73cebdb728f37ea0187b9b17e036756e4888386604051612c53939291909283526bffffffffffffffffffffffff9190911660208301521515604082015260600190565b60405180910390a299505050505050505050505b92915050565b600081604051602001612c8091906158e3565b604051602081830303815290604052805190602001209050919050565b6040805161012081018252600c5463ffffffff80821683526401000000008204811660208401526801000000000000000082048116938301939093526c010000000000000000000000008104831660608301527001000000000000000000000000000000008104909216608082015262ffffff740100000000000000000000000000000000000000008304811660a08301819052770100000000000000000000000000000000000000000000008404821660c08401527a0100000000000000000000000000000000000000000000000000008404821660e08401527d0100000000000000000000000000000000000000000000000000000000009093041661010082015260009167ffffffffffffffff841611612dbb575192915050565b8267ffffffffffffffff168160a0015162ffffff16108015612df057508060c0015162ffffff168367ffffffffffffffff1611155b15612dff576020015192915050565b8267ffffffffffffffff168160c0015162ffffff16108015612e3457508060e0015162ffffff168367ffffffffffffffff1611155b15612e43576040015192915050565b8267ffffffffffffffff168160e0015162ffffff16108015612e79575080610100015162ffffff168367ffffffffffffffff1611155b15612e88576060015192915050565b6080015192915050565b67ffffffffffffffff8216600090815260036020526040902054829073ffffffffffffffffffffffffffffffffffffffff1680612efb576040517f1f6a65b600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff821614612f62576040517fd8a3fb5200000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82166004820152602401610937565b600b546601000000000000900460ff1615612fa9576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b612fb284613257565b15612fe9576040517fb42f66e800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610a5a8484613542565b612ffb6134bf565b6040517f70a082310000000000000000000000000000000000000000000000000000000081523060048201526000907f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16906370a082319060240160206040518083038186803b15801561308357600080fd5b505afa158015613097573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906130bb91906154fd565b6005549091506801000000000000000090046bffffffffffffffffffffffff168181111561311f576040517fa99da3020000000000000000000000000000000000000000000000000000000081526004810182905260248101839052604401610937565b818110156132525760006131338284615c76565b6040517fa9059cbb00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8681166004830152602482018390529192507f00000000000000000000000000000000000000000000000000000000000000009091169063a9059cbb90604401602060405180830381600087803b1580156131c857600080fd5b505af11580156131dc573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061320091906154db565b506040805173ffffffffffffffffffffffffffffffffffffffff86168152602081018390527f59bfc682b673f8cbf945f1e454df9334834abf7dfe7f92237ca29ecb9b436600910160405180910390a1505b505050565b67ffffffffffffffff811660009081526003602090815260408083208151606081018352815473ffffffffffffffffffffffffffffffffffffffff9081168252600183015416818501526002820180548451818702810187018652818152879693958601939092919083018282801561330657602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff1681526001909101906020018083116132db575b505050505081525050905060005b8160400151518110156134a45760005b60075481101561349157600061345a6007838154811061334657613346615dbc565b90600052602060002001548560400151858151811061336757613367615dbc565b602002602001015188600260008960400151898151811061338a5761338a615dbc565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040908101600090812067ffffffffffffffff808f168352935220541660408051602080820187905273ffffffffffffffffffffffffffffffffffffffff959095168183015267ffffffffffffffff9384166060820152919092166080808301919091528251808303909101815260a08201835280519084012060c082019490945260e080820185905282518083039091018152610100909101909152805191012091565b506000818152600960205260409020549091501561347e5750600195945050505050565b508061348981615cba565b915050613324565b508061349c81615cba565b915050613314565b5060009392505050565b6134b66134bf565b61086881613e5a565b60005473ffffffffffffffffffffffffffffffffffffffff163314613540576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4f6e6c792063616c6c61626c65206279206f776e6572000000000000000000006044820152606401610937565b565b600b546601000000000000900460ff1615613589576040517fed3ba6a600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b67ffffffffffffffff821660009081526003602090815260408083208151606081018352815473ffffffffffffffffffffffffffffffffffffffff90811682526001830154168185015260028201805484518187028101870186528181529295939486019383018282801561363457602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311613609575b5050509190925250505067ffffffffffffffff80851660009081526004602090815260408083208151808301909252546bffffffffffffffffffffffff81168083526c01000000000000000000000000909104909416918101919091529293505b83604001515181101561373b5760026000856040015183815181106136bc576136bc615dbc565b60209081029190910181015173ffffffffffffffffffffffffffffffffffffffff168252818101929092526040908101600090812067ffffffffffffffff8a168252909252902080547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001690558061373381615cba565b915050613695565b5067ffffffffffffffff8516600090815260036020526040812080547fffffffffffffffffffffffff00000000000000000000000000000000000000009081168255600182018054909116905590613796600283018261514f565b505067ffffffffffffffff8516600090815260046020526040902080547fffffffffffffffffffffffff0000000000000000000000000000000000000000169055600580548291906008906138069084906801000000000000000090046bffffffffffffffffffffffff16615c8d565b92506101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055507f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663a9059cbb85836bffffffffffffffffffffffff166040518363ffffffff1660e01b81526004016138be92919073ffffffffffffffffffffffffffffffffffffffff929092168252602082015260400190565b602060405180830381600087803b1580156138d857600080fd5b505af11580156138ec573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061391091906154db565b613946576040517ff4d678b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040805173ffffffffffffffffffffffffffffffffffffffff861681526bffffffffffffffffffffffff8316602082015267ffffffffffffffff8716917fe8ed5b475a5b5987aa9165e8731bb78043f39eee32ec5a1169a89e27fcd49815910160405180910390a25050505050565b60008060006139c78560000151612c6d565b60008181526006602052604090205490935073ffffffffffffffffffffffffffffffffffffffff1680613a29576040517f77f5b84c00000000000000000000000000000000000000000000000000000000815260048101859052602401610937565b6080860151604051613a48918691602001918252602082015260400190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291815281516020928301206000818152600990935291205490935080613ac5576040517f3688124a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b85516020808801516040808a015160608b015160808c01519251613b3e968b96909594910195865267ffffffffffffffff948516602087015292909316604085015263ffffffff908116606085015291909116608083015273ffffffffffffffffffffffffffffffffffffffff1660a082015260c00190565b604051602081830303815290604052805190602001208114613b8c576040517fd529142c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b855167ffffffffffffffff164080613cb05786516040517fe9413d3800000000000000000000000000000000000000000000000000000000815267ffffffffffffffff90911660048201527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063e9413d389060240160206040518083038186803b158015613c3057600080fd5b505afa158015613c44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613c6891906154fd565b905080613cb05786516040517f175dadad00000000000000000000000000000000000000000000000000000000815267ffffffffffffffff9091166004820152602401610937565b6000886080015182604051602001613cd2929190918252602082015260400190565b6040516020818303038152906040528051906020012060001c9050613cf78982613f50565b9450505050509250925092565b60005a611388811015613d1657600080fd5b611388810390508460408204820311613d2e57600080fd5b50823b613d3a57600080fd5b60008083516020850160008789f190505b9392505050565b600080613d5d613fd9565b905060008113613d9c576040517f43d4cf6600000000000000000000000000000000000000000000000000000000815260048101829052602401610937565b6000815a613daa8989615bba565b613db49190615c76565b613dc686670de0b6b3a7640000615c39565b613dd09190615c39565b613dda9190615c25565b90506000613df363ffffffff871664e8d4a51000615c39565b9050613e0b816b033b2e3c9fd0803ce8000000615c76565b821115613e44576040517fe80fa38100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b613e4e8183615bba565b98975050505050505050565b73ffffffffffffffffffffffffffffffffffffffff8116331415613eda576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f43616e6e6f74207472616e7366657220746f2073656c660000000000000000006044820152606401610937565b600180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83811691821790925560008054604051929316917fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae12789190a350565b6000613f848360000151846020015185604001518660600151868860a001518960c001518a60e001518b61010001516140ed565b60038360200151604051602001613f9c929190615aa0565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101209392505050565b600b54604080517ffeaf968c0000000000000000000000000000000000000000000000000000000081529051600092670100000000000000900463ffffffff169182151591849182917f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169163feaf968c9160048083019260a0929190829003018186803b15801561407f57600080fd5b505afa158015614093573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906140b791906157d7565b5094509092508491505080156140db57506140d28242615c76565b8463ffffffff16105b156140e55750600a545b949350505050565b6140f6896143c4565b61415c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f7075626c6963206b6579206973206e6f74206f6e2063757276650000000000006044820152606401610937565b614165886143c4565b6141cb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f67616d6d61206973206e6f74206f6e20637572766500000000000000000000006044820152606401610937565b6141d4836143c4565b61423a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f6347616d6d615769746e657373206973206e6f74206f6e2063757276650000006044820152606401610937565b614243826143c4565b6142a9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f73486173685769746e657373206973206e6f74206f6e206375727665000000006044820152606401610937565b6142b5878a888761451f565b61431b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f6164647228632a706b2b732a6729213d5f755769746e657373000000000000006044820152606401610937565b60006143278a876146c2565b9050600061433a898b878b868989614726565b9050600061434b838d8d8a866148ae565b9050808a146143b6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600d60248201527f696e76616c69642070726f6f66000000000000000000000000000000000000006044820152606401610937565b505050505050505050505050565b80516000907ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f11614451576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601260248201527f696e76616c696420782d6f7264696e61746500000000000000000000000000006044820152606401610937565b60208201517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f116144de576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601260248201527f696e76616c696420792d6f7264696e61746500000000000000000000000000006044820152606401610937565b60208201517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f9080096145188360005b602002015161490c565b1492915050565b600073ffffffffffffffffffffffffffffffffffffffff821661459e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600b60248201527f626164207769746e6573730000000000000000000000000000000000000000006044820152606401610937565b6020840151600090600116156145b557601c6145b8565b601b5b905060007ffffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641418587600060200201510986517ffffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141918203925060009190890987516040805160008082526020820180845287905260ff88169282019290925260608101929092526080820183905291925060019060a0016020604051602081039080840390855afa15801561466f573d6000803e3d6000fd5b50506040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0015173ffffffffffffffffffffffffffffffffffffffff9081169088161495505050505050949350505050565b6146ca61516d565b6146f7600184846040516020016146e3939291906158c2565b604051602081830303815290604052614964565b90505b614703816143c4565b612c6757805160408051602081019290925261471f91016146e3565b90506146fa565b61472e61516d565b825186517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f90819006910614156147c1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601e60248201527f706f696e747320696e2073756d206d7573742062652064697374696e637400006044820152606401610937565b6147cc8789886149cd565b614832576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4669727374206d756c20636865636b206661696c6564000000000000000000006044820152606401610937565b61483d8486856149cd565b6148a3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f5365636f6e64206d756c20636865636b206661696c65640000000000000000006044820152606401610937565b613e4e868484614b5a565b6000600286868685876040516020016148cc96959493929190615850565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101209695505050505050565b6000807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f80848509840990507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f600782089392505050565b61496c61516d565b61497582614c89565b815261498a61498582600061450e565b614cde565b6020820181905260029006600114156149c8576020810180517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f0390525b919050565b600082614a36576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600b60248201527f7a65726f207363616c61720000000000000000000000000000000000000000006044820152606401610937565b83516020850151600090614a4c90600290615d1b565b15614a5857601c614a5b565b601b5b905060007ffffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641418387096040805160008082526020820180845281905260ff86169282019290925260608101869052608081018390529192509060019060a0016020604051602081039080840390855afa158015614adb573d6000803e3d6000fd5b505050602060405103519050600086604051602001614afa919061583e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052805160209091012073ffffffffffffffffffffffffffffffffffffffff92831692169190911498975050505050505050565b614b6261516d565b835160208086015185519186015160009384938493614b8393909190614d18565b919450925090507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f858209600114614c17576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601960248201527f696e765a206d75737420626520696e7665727365206f66207a000000000000006044820152606401610937565b60405180604001604052807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f80614c5057614c50615d5e565b87860981526020017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f8785099052979650505050505050565b805160208201205b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f81106149c857604080516020808201939093528151808203840181529082019091528051910120614c91565b6000612c67826002614d117ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f6001615bba565b901c614eae565b60008080600180827ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f897ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f038808905060007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f8b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f038a0890506000614dc083838585614fa2565b9098509050614dd188828e88614ffa565b9098509050614de288828c87614ffa565b90985090506000614df58d878b85614ffa565b9098509050614e0688828686614fa2565b9098509050614e1788828e89614ffa565b9098509050818114614e9a577ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f818a0998507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f82890997507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f8183099650614e9e565b8196505b5050505050509450945094915050565b600080614eb961518b565b6020808252818101819052604082015260608101859052608081018490527ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f60a0820152614f056151a9565b60208160c08460057ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa925082614f98576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601260248201527f6269674d6f64457870206661696c7572652100000000000000000000000000006044820152606401610937565b5195945050505050565b6000807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f8487097ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f8487099097909650945050505050565b600080807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f878509905060007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f87877ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f030990507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f8183087ffffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f86890990999098509650505050505050565b82805482825590600052602060002090810192821561513f579160200282015b8281111561513f57825182547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff9091161782556020909201916001909101906150e5565b5061514b9291506151c7565b5090565b508054600082559060005260206000209081019061086891906151c7565b60405180604001604052806002906020820280368337509192915050565b6040518060c001604052806006906020820280368337509192915050565b60405180602001604052806001906020820280368337509192915050565b5b8082111561514b57600081556001016151c8565b803573ffffffffffffffffffffffffffffffffffffffff811681146149c857600080fd5b8060408101831015612c6757600080fd5b600082601f83011261522257600080fd5b6040516040810181811067ffffffffffffffff8211171561524557615245615deb565b806040525080838560408601111561525c57600080fd5b60005b600281101561527e57813583526020928301929091019060010161525f565b509195945050505050565b600060a0828403121561529b57600080fd5b60405160a0810181811067ffffffffffffffff821117156152be576152be615deb565b6040529050806152cd83615353565b81526152db60208401615353565b60208201526152ec6040840161533f565b60408201526152fd6060840161533f565b606082015261530e608084016151dc565b60808201525092915050565b803561ffff811681146149c857600080fd5b803562ffffff811681146149c857600080fd5b803563ffffffff811681146149c857600080fd5b803567ffffffffffffffff811681146149c857600080fd5b805169ffffffffffffffffffff811681146149c857600080fd5b60006020828403121561539757600080fd5b613d4b826151dc565b600080606083850312156153b357600080fd5b6153bc836151dc565b91506153cb8460208501615200565b90509250929050565b600080600080606085870312156153ea57600080fd5b6153f3856151dc565b935060208501359250604085013567ffffffffffffffff8082111561541757600080fd5b818701915087601f83011261542b57600080fd5b81358181111561543a57600080fd5b88602082850101111561544c57600080fd5b95989497505060200194505050565b6000806040838503121561546e57600080fd5b615477836151dc565b915060208301356bffffffffffffffffffffffff8116811461549857600080fd5b809150509250929050565b6000604082840312156154b557600080fd5b613d4b8383615200565b6000604082840312156154d157600080fd5b613d4b8383615211565b6000602082840312156154ed57600080fd5b81518015158114613d4b57600080fd5b60006020828403121561550f57600080fd5b5051919050565b600080600080600060a0868803121561552e57600080fd5b8535945061553e60208701615353565b935061554c6040870161531a565b925061555a6060870161533f565b91506155686080870161533f565b90509295509295909350565b60008082840361024081121561558957600080fd5b6101a08082121561559957600080fd5b6155a1615b90565b91506155ad8686615211565b82526155bc8660408701615211565b60208301526080850135604083015260a0850135606083015260c085013560808301526155eb60e086016151dc565b60a08301526101006155ff87828801615211565b60c0840152615612876101408801615211565b60e0840152610180860135818401525081935061563186828701615289565b925050509250929050565b6000806000806000808688036101c081121561565757600080fd5b6156608861531a565b965061566e6020890161533f565b955061567c6040890161533f565b945061568a6060890161533f565b935060808801359250610120807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60830112156156c557600080fd5b6156cd615b90565b91506156db60a08a0161533f565b82526156e960c08a0161533f565b60208301526156fa60e08a0161533f565b604083015261010061570d818b0161533f565b606084015261571d828b0161533f565b608084015261572f6101408b0161532c565b60a08401526157416101608b0161532c565b60c08401526157536101808b0161532c565b60e08401526157656101a08b0161532c565b818401525050809150509295509295509295565b60006020828403121561578b57600080fd5b5035919050565b6000602082840312156157a457600080fd5b613d4b82615353565b600080604083850312156157c057600080fd5b6157c983615353565b91506153cb602084016151dc565b600080600080600060a086880312156157ef57600080fd5b6157f88661536b565b94506020860151935060408601519250606086015191506155686080870161536b565b8060005b6002811015610a5a57815184526020938401939091019060010161581f565b615848818361581b565b604001919050565b868152615860602082018761581b565b61586d606082018661581b565b61587a60a082018561581b565b61588760e082018461581b565b60609190911b7fffffffffffffffffffffffffffffffffffffffff000000000000000000000000166101208201526101340195945050505050565b8381526158d2602082018461581b565b606081019190915260800192915050565b60408101612c67828461581b565b600060208083528351808285015260005b8181101561591e57858101830151858201604001528201615902565b81811115615930576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60006060820161ffff86168352602063ffffffff86168185015260606040850152818551808452608086019150828701935060005b818110156159b557845183529383019391830191600101615999565b509098975050505050505050565b60006101c08201905061ffff8816825263ffffffff808816602084015280871660408401528086166060840152846080840152835481811660a0850152615a1760c08501838360201c1663ffffffff169052565b615a2e60e08501838360401c1663ffffffff169052565b615a466101008501838360601c1663ffffffff169052565b615a5e6101208501838360801c1663ffffffff169052565b62ffffff60a082901c811661014086015260b882901c811661016086015260d082901c1661018085015260e81c6101a090930192909252979650505050505050565b82815260608101613d4b602083018461581b565b6000604082018483526020604081850152818551808452606086019150828701935060005b81811015615af557845183529383019391830191600101615ad9565b5090979650505050505050565b6000608082016bffffffffffffffffffffffff87168352602067ffffffffffffffff87168185015273ffffffffffffffffffffffffffffffffffffffff80871660408601526080606086015282865180855260a087019150838801945060005b81811015615b80578551841683529484019491840191600101615b62565b50909a9950505050505050505050565b604051610120810167ffffffffffffffff81118282101715615bb457615bb4615deb565b60405290565b60008219821115615bcd57615bcd615d2f565b500190565b600067ffffffffffffffff808316818516808303821115615bf557615bf5615d2f565b01949350505050565b60006bffffffffffffffffffffffff808316818516808303821115615bf557615bf5615d2f565b600082615c3457615c34615d5e565b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615615c7157615c71615d2f565b500290565b600082821015615c8857615c88615d2f565b500390565b60006bffffffffffffffffffffffff83811690831681811015615cb257615cb2615d2f565b039392505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415615cec57615cec615d2f565b5060010190565b600067ffffffffffffffff80831681811415615d1157615d11615d2f565b6001019392505050565b600082615d2a57615d2a615d5e565b500690565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fdfea164736f6c6343000806000a")
 	ctorArgs, err := evmutils.ABIEncode(`[{"type":"address"}, {"type":"address"}, {"type":"address"}]`, linkAddress, bhsAddress, linkEthFeed)
 	require.NoError(t, err)
@@ -496,7 +496,7 @@ func deployOldCoordinator(
 // Send eth from prefunded account.
 // Amount is number of ETH not wei.
 func sendEth(t *testing.T, key ethkey.KeyV2, b types.Backend, to common.Address, eth int) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	nonce, err := b.Client().PendingNonceAt(ctx, key.Address)
 	require.NoError(t, err)
 	tx := gethtypes.NewTx(&gethtypes.DynamicFeeTx{
@@ -567,7 +567,7 @@ func createVRFJobs(
 	batchEnabled bool,
 	gasLanePrices ...*assets.Wei,
 ) (jobs []job.Job) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	require.Len(t, gasLanePrices, len(fromKeys), "must provide one gas lane price for each set of from addresses")
 	// Create separate jobs for each gas lane and register their keys
 	for i, keys := range fromKeys {
@@ -667,7 +667,7 @@ func requestRandomnessForWrapper(
 			return false
 		}
 		return true
-	}, testutils.WaitTimeout(t), time.Second, "could not filter RandomWordsRequested events")
+	}, testutils.WaitTimeout(t), 100*time.Millisecond, "could not filter RandomWordsRequested events")
 
 	var events []v22.RandomWordsRequested
 	for iter.Next() {
@@ -733,7 +733,7 @@ func requestRandomnessAndAssertRandomWordsRequestedEvent(
 			return false
 		}
 		return true
-	}, testutils.WaitTimeout(t), time.Second, "could not filter RandomWordsRequested events")
+	}, testutils.WaitTimeout(t), 100*time.Millisecond, "could not filter RandomWordsRequested events")
 
 	var events []v22.RandomWordsRequested
 	for iter.Next() {
@@ -756,7 +756,7 @@ func requestRandomnessAndAssertRandomWordsRequestedEvent(
 }
 
 func commitRequestAndFilterIndexBlock(t *testing.T, backend types.Backend) *bind.FilterOpts {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	block, err := backend.Client().BlockByHash(ctx, backend.Commit())
 	require.NoError(t, err)
 	end := block.NumberU64()
@@ -767,7 +767,7 @@ func commitRequestAndFilterIndexBlock(t *testing.T, backend types.Backend) *bind
 }
 
 func indexedFilterOpts(t *testing.T, backend types.Backend) *bind.FilterOpts {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	header, err := backend.Client().HeaderByNumber(ctx, nil)
 	require.NoError(t, err)
 	if header.Number.Sign() == 0 {
@@ -859,7 +859,7 @@ func mine(t *testing.T, requestID, subID *big.Int, backend types.Backend, db *sq
 
 	return assert.Eventually(t, func() bool {
 		backend.Commit()
-		txes, err := txstore.FindTxesByMetaFieldAndStates(testutils.Context(t), metaField, subID.String(), []txmgrtypes.TxState{txmgrcommon.TxConfirmed, txmgrcommon.TxFinalized}, chainID)
+		txes, err := txstore.FindTxesByMetaFieldAndStates(t.Context(), metaField, subID.String(), []txmgrtypes.TxState{txmgrcommon.TxConfirmed, txmgrcommon.TxFinalized}, chainID)
 		require.NoError(t, err)
 		for _, tx := range txes {
 			if !checkForReceipt(t, db, tx.ID) {
@@ -872,7 +872,7 @@ func mine(t *testing.T, requestID, subID *big.Int, backend types.Backend, db *sq
 			}
 		}
 		return false
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 }
 
 func mineBatch(t *testing.T, requestIDs []*big.Int, subID *big.Int, backend types.Backend, db *sqlx.DB, vrfVersion vrfcommon.Version, chainID *big.Int) bool {
@@ -892,7 +892,7 @@ func mineBatch(t *testing.T, requestIDs []*big.Int, subID *big.Int, backend type
 	}
 	return assert.Eventually(t, func() bool {
 		backend.Commit()
-		txes, err := txstore.FindTxesByMetaFieldAndStates(testutils.Context(t), metaField, subID.String(), []txmgrtypes.TxState{txmgrcommon.TxConfirmed, txmgrcommon.TxFinalized}, chainID)
+		txes, err := txstore.FindTxesByMetaFieldAndStates(t.Context(), metaField, subID.String(), []txmgrtypes.TxState{txmgrcommon.TxConfirmed, txmgrcommon.TxFinalized}, chainID)
 		require.NoError(t, err)
 		for _, tx := range txes {
 			if !checkForReceipt(t, db, tx.ID) {
@@ -912,7 +912,7 @@ func mineBatch(t *testing.T, requestIDs []*big.Int, subID *big.Int, backend type
 		}
 		t.Log("requestIDMap:", requestIDMap)
 		return foundAll
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 }
 
 func mineForceFulfilled(t *testing.T, requestID *big.Int, subID uint64, forceFulfilledCount int64, uni coordinatorV2Universe, db *sqlx.DB) bool {
@@ -933,7 +933,7 @@ func mineForceFulfilled(t *testing.T, requestID *big.Int, subID uint64, forceFul
 			}
 		}
 		return len(txs) >= int(forceFulfilledCount)
-	}, testutils.WaitTimeout(t), time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 }
 
 func checkForReceipt(t *testing.T, db *sqlx.DB, txID int64) bool {
@@ -945,11 +945,11 @@ func checkForReceipt(t *testing.T, db *sqlx.DB, txID int64) bool {
 	JOIN evm.txes ON evm.txes.ID = evm.tx_attempts.eth_tx_id
 	WHERE evm.txes.ID = $1 AND evm.txes.state IN ('confirmed', 'finalized')`
 	if txID != -1 {
-		err := db.GetContext(testutils.Context(t), &count, sql, txID)
+		err := db.GetContext(t.Context(), &count, sql, txID)
 		require.NoError(t, err)
 	} else {
 		sql = strings.Replace(sql, "evm.txes.ID = $1", "evm.txes.meta->>'ForceFulfilled' IS NOT NULL", 1)
-		err := db.GetContext(testutils.Context(t), &count, sql, txID)
+		err := db.GetContext(t.Context(), &count, sql, txID)
 		require.NoError(t, err)
 	}
 	return count > 0
@@ -1097,7 +1097,7 @@ func testEoa(
 	vrfOwnerAddress *common.Address,
 	vrfVersion vrfcommon.Version,
 ) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	gasLimit := uint64(2_500_000)
 
 	finalityDepth := uint32(50)
@@ -1258,7 +1258,7 @@ func deployWrapper(t *testing.T, uni coordinatorV2UniverseCommon, wrapperOverhea
 
 func TestVRFV2Integration_SingleConsumer_Wrapper(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	wrapperOverhead := uint32(30_000)
 	coordinatorOverhead := uint32(90_000)
 
@@ -1326,7 +1326,7 @@ func TestVRFV2Integration_SingleConsumer_Wrapper(t *testing.T) {
 		require.NoError(t, err2)
 		t.Log("runs", len(runs))
 		return len(runs) == 1
-	}, testutils.WaitTimeout(t), time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 
 	// Mine the fulfillment that was queued.
 	mine(t, requestID, new(big.Int).SetUint64(wrapperSubID), uni.backend, db, vrfcommon.V2, testutils.SimulatedChainID)
@@ -1339,7 +1339,7 @@ func TestVRFV2Integration_SingleConsumer_Wrapper(t *testing.T) {
 
 func TestVRFV2Integration_Wrapper_High_Gas(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	wrapperOverhead := uint32(30_000)
 	coordinatorOverhead := uint32(90_000)
 
@@ -1355,7 +1355,7 @@ func TestVRFV2Integration_Wrapper_High_Gas(t *testing.T) {
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(3_500_000))
 		c.EVM[0].MinIncomingConfirmations = new(uint32(2))
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 	})
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, ownerKey, 1)
@@ -1409,7 +1409,7 @@ func TestVRFV2Integration_Wrapper_High_Gas(t *testing.T) {
 		require.NoError(t, err2)
 		t.Log("runs", len(runs))
 		return len(runs) == 1
-	}, testutils.WaitTimeout(t), time.Second).Should(gomega.BeTrue())
+	}, testutils.WaitTimeout(t), 100*time.Millisecond).Should(gomega.BeTrue())
 
 	// Mine the fulfillment that was queued.
 	mine(t, requestID, new(big.Int).SetUint64(wrapperSubID), uni.backend, db, vrfcommon.V2, testutils.SimulatedChainID)
@@ -1524,6 +1524,7 @@ func TestVRFV2Integration_SingleConsumer_NeedsTopUp(t *testing.T) {
 }
 
 func TestVRFV2Integration_SingleConsumer_BigGasCallback_Sandwich(t *testing.T) {
+	t.Parallel()
 	t.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, ownerKey, 1)
@@ -1531,6 +1532,7 @@ func TestVRFV2Integration_SingleConsumer_BigGasCallback_Sandwich(t *testing.T) {
 }
 
 func TestVRFV2Integration_SingleConsumer_MultipleGasLanes(t *testing.T) {
+	t.Parallel()
 	t.Skip("fails after geth upgrade https://github.com/smartcontractkit/chainlink/pull/11809")
 	ownerKey := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, ownerKey, 1)
@@ -1583,7 +1585,7 @@ func simulatedOverrides(t *testing.T, defaultGasPrice *assets.Wei, ks ...toml.Ke
 		c.EVM[0].GasEstimator.LimitDefault = new(uint64(3_500_000))
 
 		c.Feature.LogPoller = new(true)
-		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(1 * time.Second)
+		c.EVM[0].LogPollInterval = commonconfig.MustNewDuration(100 * time.Millisecond)
 
 		c.EVM[0].HeadTracker.MaxBufferSize = new(uint32(100))
 		c.EVM[0].HeadTracker.SamplingInterval = commonconfig.MustNewDuration(0) // Head sampling disabled
@@ -1664,7 +1666,7 @@ func TestExternalOwnerConsumerExample(t *testing.T) {
 	backend.Commit()
 	b, err := evmutils.ABIEncode(`[{"type":"uint64"}]`, uint64(1))
 	require.NoError(t, err)
-	_, err = linkContract.TransferAndCall(owner, coordinatorAddress, big.NewInt(0), b)
+	_, err = linkContract.TransferAndCall(owner, coordinatorAddress, assets.Ether(100).ToInt(), b)
 	require.NoError(t, err)
 	_, err = coordinator.AddConsumer(owner, 1, consumerAddress)
 	require.NoError(t, err)
@@ -1727,7 +1729,7 @@ func TestSimpleConsumerExample(t *testing.T) {
 
 func TestIntegrationVRFV2(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	// Reconfigure the sim chain with a default gas price of 1 gwei,
 	// max gas limit of 2M and a key specific max 10 gwei price.
 	// Keep the prices low so we can operate with small link balance subscriptions.
@@ -1753,7 +1755,7 @@ func TestIntegrationVRFV2(t *testing.T) {
 
 	require.NoError(t, app.Start(ctx))
 	var chainService commontypes.ChainService
-	chainService, err = app.GetRelayers().LegacyEVMChains().Get(testutils.SimulatedChainID.String())
+	chainService, err = app.GetRelayers().LegacyEVMChains().Get(testutils.SimulatedChainID.String()) //nolint:staticcheck // TODO: migrate to relayer interface
 	require.NoError(t, err)
 	chain, ok := chainService.(legacyevm.Chain)
 	require.True(t, ok)
@@ -1830,7 +1832,7 @@ func TestIntegrationVRFV2(t *testing.T) {
 		// keep blocks coming in for the lb to send the backfilled logs.
 		uni.backend.Commit()
 		return len(runs) == 1 && runs[0].State == pipeline.RunStatusCompleted
-	}, testutils.WaitTimeout(t), 1*time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 
 	// Wait for the request to be fulfilled on-chain.
 	var rf []v22.RandomWordsFulfilled
@@ -1923,7 +1925,7 @@ func TestIntegrationVRFV2(t *testing.T) {
 		require.NoError(t, err)
 		t.Log(counts, rf[0].RequestID().String())
 		return uint64(1) == counts[rf[0].RequestID().String()]
-	}, testutils.WaitTimeout(t), 1*time.Second)
+	}, testutils.WaitTimeout(t), 100*time.Millisecond)
 }
 
 func TestMaliciousConsumer(t *testing.T) {
@@ -1942,18 +1944,18 @@ func TestMaliciousConsumer(t *testing.T) {
 
 func TestRequestCost(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, key, 1)
 
 	cfg := configtest.NewGeneralConfigSimulated(t, nil)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, cfg, uni.backend, key)
-	require.NoError(t, app.Start(testutils.Context(t)))
+	require.NoError(t, app.Start(t.Context()))
 
 	vrfkey, err := app.GetKeyStore().VRF().Create(ctx)
 	require.NoError(t, err)
 	registerProvingKeyHelper(t, uni.coordinatorV2UniverseCommon, uni.rootContract, vrfkey, nil)
-	t.Run("non-proxied consumer", func(tt *testing.T) {
+	t.Run("non-proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		carol := uni.vrfConsumers[0]
 		carolContract := uni.consumerContracts[0]
 		carolContractAddress := uni.consumerContractAddresses[0]
@@ -1981,7 +1983,7 @@ func TestRequestCost(t *testing.T) {
 			"requestRandomness tx gas cost more than expected")
 	})
 
-	t.Run("proxied consumer", func(tt *testing.T) {
+	t.Run("proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		consumerOwner := uni.neil
 		consumerContract := uni.consumerProxyContract
 		consumerContractAddress := uni.consumerProxyContractAddress
@@ -1990,7 +1992,7 @@ func TestRequestCost(t *testing.T) {
 		tx, err := consumerContract.CreateSubscriptionAndFund(consumerOwner, assets.Ether(5).ToInt())
 		require.NoError(tt, err)
 		uni.backend.Commit()
-		r, err := uni.backend.Client().TransactionReceipt(testutils.Context(t), tx.Hash())
+		r, err := uni.backend.Client().TransactionReceipt(t.Context(), tx.Hash())
 		require.NoError(tt, err)
 		t.Log("gas used by proxied CreateSubscriptionAndFund:", r.GasUsed)
 
@@ -2023,7 +2025,7 @@ func TestMaxConsumersCost(t *testing.T) {
 
 	cfg := configtest.NewGeneralConfigSimulated(t, nil)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, cfg, uni.backend, key)
-	require.NoError(t, app.Start(testutils.Context(t)))
+	require.NoError(t, app.Start(t.Context()))
 	_, err := carolContract.CreateSubscriptionAndFund(carol,
 		big.NewInt(1000000000000000000)) // 0.1 LINK
 	require.NoError(t, err)
@@ -2051,13 +2053,13 @@ func TestMaxConsumersCost(t *testing.T) {
 
 func TestFulfillmentCost(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	key := cltest.MustGenerateRandomKey(t)
 	uni := newVRFCoordinatorV2Universe(t, key, 1)
 
 	cfg := configtest.NewGeneralConfigSimulated(t, nil)
 	app := cltest.NewApplicationWithConfigV2AndKeyOnSimulatedBlockchain(t, cfg, uni.backend, key)
-	require.NoError(t, app.Start(testutils.Context(t)))
+	require.NoError(t, app.Start(t.Context()))
 
 	vrfkey, err := app.GetKeyStore().VRF().Create(ctx)
 	require.NoError(t, err)
@@ -2067,7 +2069,7 @@ func TestFulfillmentCost(t *testing.T) {
 		nonProxiedConsumerGasEstimate uint64
 		proxiedConsumerGasEstimate    uint64
 	)
-	t.Run("non-proxied consumer", func(tt *testing.T) {
+	t.Run("non-proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		carol := uni.vrfConsumers[0]
 		carolContract := uni.consumerContracts[0]
 		carolContractAddress := uni.consumerContractAddresses[0]
@@ -2110,7 +2112,7 @@ func TestFulfillmentCost(t *testing.T) {
 		assert.Less(tt, nonProxiedConsumerGasEstimate, uint64(500_000))
 	})
 
-	t.Run("proxied consumer", func(tt *testing.T) {
+	t.Run("proxied consumer", func(tt *testing.T) { //nolint:paralleltest // shares universe setup
 		consumerOwner := uni.neil
 		consumerContract := uni.consumerProxyContract
 		consumerContractAddress := uni.consumerProxyContractAddress
@@ -2185,12 +2187,12 @@ func TestStartingCountsV1(t *testing.T) {
 	require.True(t, ok)
 	listenerV2 := v22.MakeTestListenerV2(chain)
 	var counts map[[32]byte]uint64
-	counts, err = vrfcommon.GetStartingResponseCountsV1(testutils.Context(t), chain)
+	counts, err = vrfcommon.GetStartingResponseCountsV1(t.Context(), chain)
 	require.NoError(t, err)
 	assert.Empty(t, counts)
 	err = ks.Unlock(ctx, testutils.Password)
 	require.NoError(t, err)
-	k, err := ks.Eth().Create(testutils.Context(t), testutils.SimulatedChainID)
+	k, err := ks.Eth().Create(t.Context(), testutils.SimulatedChainID)
 	require.NoError(t, err)
 	b := time.Now()
 	n1, n2, n3, n4 := types.Nonce(0), types.Nonce(1), types.Nonce(2), types.Nonce(3)
@@ -2283,16 +2285,17 @@ func TestStartingCountsV1(t *testing.T) {
 			ChainID:            chainID.ToInt(),
 		},
 	)
-	txList := append(confirmedTxes, unconfirmedTxes...)
-	for i := range txList {
-		err = txStore.InsertTx(ctx, &txList[i])
+	numConfirmed := len(confirmedTxes)
+	confirmedTxes = append(confirmedTxes, unconfirmedTxes...)
+	for i := range confirmedTxes {
+		err = txStore.InsertTx(ctx, &confirmedTxes[i])
 		require.NoError(t, err)
 	}
 
 	// add tx attempt for confirmed
 	broadcastBlock := int64(1)
-	txAttempts := make([]txmgr.TxAttempt, 0, len(confirmedTxes)+len(unconfirmedTxes))
-	for i := range confirmedTxes {
+	txAttempts := make([]txmgr.TxAttempt, 0, len(confirmedTxes))
+	for i := range numConfirmed {
 		txAttempts = append(txAttempts, txmgr.TxAttempt{
 			TxID:                    int64(i + 1),
 			TxFee:                   gas.EvmFee{GasPrice: assets.NewWeiI(100)},
@@ -2307,7 +2310,7 @@ func TestStartingCountsV1(t *testing.T) {
 	// add tx attempt for unconfirmed
 	for i := range unconfirmedTxes {
 		txAttempts = append(txAttempts, txmgr.TxAttempt{
-			TxID:                  int64(i + 1 + len(confirmedTxes)),
+			TxID:                  int64(i + 1 + numConfirmed),
 			TxFee:                 gas.EvmFee{GasPrice: assets.NewWeiI(100)},
 			SignedRawTx:           []byte(`blah`),
 			Hash:                  evmutils.NewHash(),
@@ -2339,14 +2342,14 @@ func TestStartingCountsV1(t *testing.T) {
 		require.NoError(t, err)
 	}
 
-	counts, err = vrfcommon.GetStartingResponseCountsV1(testutils.Context(t), chain)
+	counts, err = vrfcommon.GetStartingResponseCountsV1(t.Context(), chain)
 	require.NoError(t, err)
 	assert.Len(t, counts, 3)
 	assert.Equal(t, uint64(1), counts[evmutils.PadByteToHash(0x10)])
 	assert.Equal(t, uint64(2), counts[evmutils.PadByteToHash(0x11)])
 	assert.Equal(t, uint64(2), counts[evmutils.PadByteToHash(0x12)])
 
-	countsV2, err := listenerV2.GetStartingResponseCountsV2(testutils.Context(t))
+	countsV2, err := listenerV2.GetStartingResponseCountsV2(t.Context())
 	require.NoError(t, err)
 	t.Log(countsV2)
 	assert.Len(t, countsV2, 3)
@@ -2402,7 +2405,7 @@ func AssertLinkBalance(t *testing.T, linkContract *link_token_interface.LinkToke
 }
 
 func AssertNativeBalance(t *testing.T, backend types.Backend, address common.Address, balance *big.Int) {
-	b, err := backend.Client().BalanceAt(testutils.Context(t), address, nil)
+	b, err := backend.Client().BalanceAt(t.Context(), address, nil)
 	require.NoError(t, err)
 	assert.Equal(t, balance.String(), b.String(), "invalid balance for %v", address)
 }
@@ -2426,7 +2429,7 @@ func estimateGas(t *testing.T, backend types.Backend,
 	require.NoError(t, err, "failed to construct raw %s transaction with args %s",
 		method, args)
 	callMsg := ethereum.CallMsg{From: from, To: &to, Data: rawData}
-	estimate, err := backend.Client().EstimateGas(testutils.Context(t), callMsg)
+	estimate, err := backend.Client().EstimateGas(t.Context(), callMsg)
 	require.NoError(t, err, "failed to estimate gas from %s call with args %s",
 		method, args)
 	return estimate
diff --git a/core/services/vrf/v2/listener_v2_helpers_test.go b/core/services/vrf/v2/listener_v2_helpers_test.go
index 20c21cbdc48..c4540b052be 100644
--- a/core/services/vrf/v2/listener_v2_helpers_test.go
+++ b/core/services/vrf/v2/listener_v2_helpers_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestListener_EstimateFeeJuels(t *testing.T) {
+	t.Parallel()
 	callbackGasLimit := uint32(150_000)
 	maxGasPriceGwei := assets.GWei(30).ToInt()
 	weiPerUnitLink := big.NewInt(5898160000000000)
@@ -33,6 +34,7 @@ func TestListener_EstimateFeeJuels(t *testing.T) {
 }
 
 func Test_TxListDeduper(t *testing.T) {
+	t.Parallel()
 	tx1 := &txmgr.Tx{
 		ID:      1,
 		Value:   *big.NewInt(0),
diff --git a/core/services/vrf/v2/listener_v2_log_listener_test.go b/core/services/vrf/v2/listener_v2_log_listener_test.go
index 837618fbec1..14c49ece678 100644
--- a/core/services/vrf/v2/listener_v2_log_listener_test.go
+++ b/core/services/vrf/v2/listener_v2_log_listener_test.go
@@ -70,7 +70,7 @@ func setupVRFLogPollerListenerTH(t *testing.T) *vrfLogPollerListenerTH {
 		keepFinalizedBlocksDepth = 1000
 	)
 
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 
 	lggr := logger.Test(t)
 	chainID := testutils.NewRandomEVMChainID()
@@ -85,7 +85,7 @@ func setupVRFLogPollerListenerTH(t *testing.T) *vrfLogPollerListenerTH {
 	}, simulated.WithBlockGasLimit(10e6))
 	ec := backend.Client()
 
-	h, err := ec.HeaderByNumber(testutils.Context(t), nil)
+	h, err := ec.HeaderByNumber(t.Context(), nil)
 	require.NoError(t, err)
 	require.LessOrEqual(t, h.Time, uint64(math.MaxInt64))
 	blockTime := time.Unix(int64(h.Time), 0) //nolint:gosec // G115 false positive
@@ -225,10 +225,10 @@ func TestInitProcessedBlock_NoVRFReqs(t *testing.T) {
 	// The poller starts on a new chain at latest-finality (finalityDepth + 5 in this case),
 	// Replaying from block 4 should guarantee we have block 4 immediately.  (We will also get
 	// block 3 once the backup poller runs, since it always starts 100 blocks behind.)
-	require.NoError(t, th.LogPoller.Replay(testutils.Context(t), 4))
+	require.NoError(t, th.LogPoller.Replay(t.Context(), 4))
 
 	// Should return logs from block 5 to 7 (inclusive)
-	logs, err := th.LogPoller.Logs(testutils.Context(t), 4, 7, emitterABI.Events["Log1"].ID, th.EmitterAddress)
+	logs, err := th.LogPoller.Logs(t.Context(), 4, 7, emitterABI.Events["Log1"].ID, th.EmitterAddress)
 	require.NoError(t, err)
 	require.Len(t, logs, 3)
 
diff --git a/core/services/vrf/v2/listener_v2_test.go b/core/services/vrf/v2/listener_v2_test.go
index 103e72f8fc6..f2b6a90725e 100644
--- a/core/services/vrf/v2/listener_v2_test.go
+++ b/core/services/vrf/v2/listener_v2_test.go
@@ -102,7 +102,7 @@ func addEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, from common.Address, s
 		MinConfirmations:  clnull.Uint32{Uint32: 0},
 		PipelineTaskRunID: uuid.NullUUID{},
 	}
-	err = txStore.InsertTx(testutils.Context(t), tx)
+	err = txStore.InsertTx(t.Context(), tx)
 	require.NoError(t, err)
 }
 
@@ -133,7 +133,7 @@ func addConfirmedEthTx(t *testing.T, txStore txmgr.TestEvmTxStore, from common.A
 		BroadcastAt:        &now,
 		InitialBroadcastAt: &now,
 	}
-	err = txStore.InsertTx(testutils.Context(t), tx)
+	err = txStore.InsertTx(t.Context(), tx)
 	require.NoError(t, err)
 }
 
@@ -160,7 +160,7 @@ func addEthTxNativePayment(t *testing.T, txStore txmgr.TestEvmTxStore, from comm
 		MinConfirmations:  clnull.Uint32{Uint32: 0},
 		PipelineTaskRunID: uuid.NullUUID{},
 	}
-	err = txStore.InsertTx(testutils.Context(t), tx)
+	err = txStore.InsertTx(t.Context(), tx)
 	require.NoError(t, err)
 }
 
@@ -190,18 +190,18 @@ func addConfirmedEthTxNativePayment(t *testing.T, txStore txmgr.TestEvmTxStore,
 		BroadcastAt:        &now,
 		InitialBroadcastAt: &now,
 	}
-	err = txStore.InsertTx(testutils.Context(t), tx)
+	err = txStore.InsertTx(t.Context(), tx)
 	require.NoError(t, err)
 }
 
 func testMaybeSubtractReservedLink(t *testing.T, vrfVersion vrfcommon.Version) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	db := pgtest.NewSqlxDB(t)
 	lggr := logger.TestLogger(t)
 	ks := keystore.NewInMemory(db, commonkeystore.FastScryptParams, lggr.Infof)
 	require.NoError(t, ks.Unlock(ctx, "blah"))
 	chainID := testutils.SimulatedChainID
-	k, err := ks.Eth().Create(testutils.Context(t), chainID)
+	k, err := ks.Eth().Create(t.Context(), chainID)
 	require.NoError(t, err)
 
 	subID := new(big.Int).SetUint64(1)
@@ -249,7 +249,7 @@ func testMaybeSubtractReservedLink(t *testing.T, vrfVersion vrfcommon.Version) {
 	require.Equal(t, "80000", start.String())
 
 	// One key's data should not affect other keys' data in the case of different subscribers.
-	k2, err := ks.Eth().Create(testutils.Context(t), testutils.SimulatedChainID)
+	k2, err := ks.Eth().Create(t.Context(), testutils.SimulatedChainID)
 	require.NoError(t, err)
 
 	anotherSubID := new(big.Int).SetUint64(3)
@@ -277,13 +277,13 @@ func TestMaybeSubtractReservedLinkV2Plus(t *testing.T) {
 }
 
 func testMaybeSubtractReservedNative(t *testing.T, vrfVersion vrfcommon.Version) {
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	db := pgtest.NewSqlxDB(t)
 	lggr := logger.TestLogger(t)
 	ks := keystore.NewInMemory(db, commonkeystore.FastScryptParams, lggr.Infof)
 	require.NoError(t, ks.Unlock(ctx, "blah"))
 	chainID := testutils.SimulatedChainID
-	k, err := ks.Eth().Create(testutils.Context(t), chainID)
+	k, err := ks.Eth().Create(t.Context(), chainID)
 	require.NoError(t, err)
 
 	subID := new(big.Int).SetUint64(1)
@@ -332,7 +332,7 @@ func testMaybeSubtractReservedNative(t *testing.T, vrfVersion vrfcommon.Version)
 	require.Equal(t, "80000", start.String())
 
 	// One key's data should not affect other keys' data in the case of different subscribers.
-	k2, err := ks.Eth().Create(testutils.Context(t), testutils.SimulatedChainID)
+	k2, err := ks.Eth().Create(t.Context(), testutils.SimulatedChainID)
 	require.NoError(t, err)
 
 	anotherSubID := new(big.Int).SetUint64(3)
@@ -356,7 +356,7 @@ func TestMaybeSubtractReservedNativeV2Plus(t *testing.T) {
 
 func TestMaybeSubtractReservedNativeV2(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	db := pgtest.NewSqlxDB(t)
 	lggr := logger.TestLogger(t)
 	ks := keystore.NewInMemory(db, commonkeystore.FastScryptParams, lggr.Infof)
@@ -378,7 +378,7 @@ func TestMaybeSubtractReservedNativeV2(t *testing.T) {
 		chain:     chain,
 	}
 	// returns error because native payment is not supported for V2
-	start, err := listener.MaybeSubtractReservedEth(testutils.Context(t), big.NewInt(100_000), chainID, subID, vrfcommon.V2)
+	start, err := listener.MaybeSubtractReservedEth(t.Context(), big.NewInt(100_000), chainID, subID, vrfcommon.V2)
 	require.NoError(t, err)
 	assert.Equal(t, big.NewInt(0), start)
 }
diff --git a/core/services/vrf/vrftesthelpers/helpers.go b/core/services/vrf/vrftesthelpers/helpers.go
index c785a98de83..328c3c09954 100644
--- a/core/services/vrf/vrftesthelpers/helpers.go
+++ b/core/services/vrf/vrftesthelpers/helpers.go
@@ -47,7 +47,7 @@ func CreateAndStartBHSJob(
 		BlockhashStoreAddress:          bhsAddress,
 		TrustedBlockhashStoreAddress:   trustedBlockhashStoreAddress,
 		TrustedBlockhashStoreBatchSize: trustedBlockhashStoreBatchSize,
-		PollPeriod:                     time.Second,
+		PollPeriod:                     100 * time.Millisecond,
 		RunTimeout:                     10 * time.Second,
 		EVMChainID:                     1337,
 		FromAddresses:                  fromAddresses,
@@ -86,7 +86,7 @@ func CreateAndStartBlockHeaderFeederJob(
 		LookbackBlocks:             1000,
 		BlockhashStoreAddress:      bhsAddress,
 		BatchBlockhashStoreAddress: batchBHSAddress,
-		PollPeriod:                 15 * time.Second,
+		PollPeriod:                 100 * time.Millisecond,
 		RunTimeout:                 15 * time.Second,
 		EVMChainID:                 1337,
 		FromAddresses:              fromAddresses,
diff --git a/core/services/workflows/syncer/engine_registry_test.go b/core/services/workflows/syncer/engine_registry_test.go
index cc9f828284f..5dc920f3516 100644
--- a/core/services/workflows/syncer/engine_registry_test.go
+++ b/core/services/workflows/syncer/engine_registry_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func TestEngineRegistry(t *testing.T) {
+	t.Parallel()
 	var srv services.Service = &fakeService{}
 
 	owner := []byte{1, 2, 3, 4, 5}
@@ -71,6 +72,7 @@ func TestEngineRegistry(t *testing.T) {
 }
 
 func TestEngineRegistry_keyFor(t *testing.T) {
+	t.Parallel()
 	owner := []byte("owner")
 	k := EngineRegistryKey{Owner: owner, Name: "name"}
 	assert.Equal(t, k.keyFor(), fmt.Sprintf("%x-name", owner))
diff --git a/core/services/workflows/syncer/fetcher_test.go b/core/services/workflows/syncer/fetcher_test.go
index bc98e8f9e3d..aef60888ecd 100644
--- a/core/services/workflows/syncer/fetcher_test.go
+++ b/core/services/workflows/syncer/fetcher_test.go
@@ -61,7 +61,7 @@ func TestNewFetcherService(t *testing.T) {
 		donID = "don-id"
 	)
 
-	t.Run("OK-valid_request", func(t *testing.T) {
+	t.Run("OK-valid_request", func(t *testing.T) { //nolint:paralleltest // shares connector mock
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 		connector.EXPECT().GatewayIDs(matches.AnyContext).Return([]string{"gateway1", "gateway2"}, nil)
 
@@ -91,7 +91,7 @@ func TestNewFetcherService(t *testing.T) {
 		require.Equal(t, expectedPayload, payload)
 	})
 
-	t.Run("fails with invalid payload response", func(t *testing.T) {
+	t.Run("fails with invalid payload response", func(t *testing.T) { //nolint:paralleltest // shares connector mock
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 
 		fetcher := NewFetcherService(lggr, wrapper, gateway.WithFixedStart())
@@ -118,7 +118,7 @@ func TestNewFetcherService(t *testing.T) {
 		require.Error(t, err)
 	})
 
-	t.Run("fails due to invalid gateway response", func(t *testing.T) {
+	t.Run("fails due to invalid gateway response", func(t *testing.T) { //nolint:paralleltest // shares connector mock
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 
 		fetcher := NewFetcherService(lggr, wrapper, gateway.WithFixedStart())
@@ -156,7 +156,7 @@ func TestNewFetcherService(t *testing.T) {
 		require.ErrorContains(t, err, "context deadline exceeded")
 	})
 
-	t.Run("NOK-response_payload_too_large", func(t *testing.T) {
+	t.Run("NOK-response_payload_too_large", func(t *testing.T) { //nolint:paralleltest // shares connector mock
 		headers := map[string]string{"Content-Type": "application/json"}
 		responsePayload, err := json.Marshal(ghcapabilities.Response{
 			StatusCode:   400,
@@ -204,7 +204,7 @@ func TestNewFetcherService(t *testing.T) {
 		require.Error(t, err, "execution error from gateway: http: request body too large")
 	})
 
-	t.Run("NOK-bad_request", func(t *testing.T) {
+	t.Run("NOK-bad_request", func(t *testing.T) { //nolint:paralleltest // shares connector mock
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 		connector.EXPECT().GatewayIDs(matches.AnyContext).Return([]string{"gateway1", "gateway2"}, nil)
 
@@ -235,7 +235,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	// Connector handler never makes a connection to a gateway and the context expires.
-	t.Run("NOK-request_context_deadline_exceeded", func(t *testing.T) {
+	t.Run("NOK-request_context_deadline_exceeded", func(t *testing.T) { //nolint:paralleltest // shares connector mock
 		connector := gcmocks.NewGatewayConnector(t)
 		wrapper := newConnectorWrapper(connector)
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
@@ -263,7 +263,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	// Connector handler cycles to next available gateway after first connection fails.
-	t.Run("OK-connector_handler_awaits_working_gateway", func(t *testing.T) {
+	t.Run("OK-connector_handler_awaits_working_gateway", func(t *testing.T) { //nolint:paralleltest // shares connector mock
 		connector := gcmocks.NewGatewayConnector(t)
 		wrapper := newConnectorWrapper(connector)
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
@@ -299,11 +299,13 @@ func TestNewFetcherService(t *testing.T) {
 }
 
 func TestNewFetcherFunc(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 	testContent := []byte("test content")
 
 	t.Run("error cases", func(t *testing.T) {
+		t.Parallel()
 		tests := []struct {
 			name    string
 			baseURL string
@@ -333,6 +335,7 @@ func TestNewFetcherFunc(t *testing.T) {
 
 		for _, tc := range tests {
 			t.Run(tc.name, func(t *testing.T) {
+				t.Parallel()
 				_, err := NewFetcherFunc(tc.baseURL, lggr)
 				require.Error(t, err)
 				assert.Contains(t, err.Error(), tc.errMsg)
@@ -341,6 +344,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("file fetcher", func(t *testing.T) {
+		t.Parallel()
 		// Create temp dir for test files
 		tempDir := t.TempDir()
 		testFilePath := filepath.Join(tempDir, "test.txt")
@@ -391,6 +395,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("file fetcher resolves HTTP URL to basename", func(t *testing.T) {
+		t.Parallel()
 		tempDir := t.TempDir()
 		err := os.WriteFile(filepath.Join(tempDir, "binary.wasm"), testContent, 0600)
 		require.NoError(t, err)
@@ -412,6 +417,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("file fetcher rejects HTTP URL with empty path", func(t *testing.T) {
+		t.Parallel()
 		tempDir := t.TempDir()
 		fetcher, err := NewFetcherFunc("file://"+tempDir, lggr)
 		require.NoError(t, err)
@@ -424,6 +430,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("http fetcher", func(t *testing.T) {
+		t.Parallel()
 		// Create test HTTP server
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			if r.URL.Path == "/workflows/test.json" {
@@ -457,6 +464,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("context cancellation", func(t *testing.T) {
+		t.Parallel()
 		tempDir := t.TempDir()
 		baseURL := "file://" + tempDir
 
@@ -476,6 +484,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("timeout handling", func(t *testing.T) {
+		t.Parallel()
 		// Create a slow HTTP server
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			time.Sleep(200 * time.Millisecond) // Delay response
@@ -504,6 +513,8 @@ func TestNewFetcherFunc(t *testing.T) {
 
 // gatewayResponse creates an unsigned gateway response with a response body.
 func gatewayResponse(t *testing.T, msgID string, donID string, statusCode int) *api.Message {
+	t.Helper()
+
 	headers := map[string]string{"Content-Type": "application/json"}
 	body := []byte("response body")
 	responsePayload, err := json.Marshal(ghcapabilities.Response{
@@ -525,6 +536,8 @@ func gatewayResponse(t *testing.T, msgID string, donID string, statusCode int) *
 // inconsistentPayload creates an unsigned gateway response with an inconsistent payload.  The
 // ExecutionError is true, but there is no ErrorMessage, so it is invalid.
 func inconsistentPayload(t *testing.T, msgID string, donID string) *api.Message {
+	t.Helper()
+
 	responsePayload, err := json.Marshal(ghcapabilities.Response{
 		ExecutionError: true,
 	})
@@ -542,6 +555,8 @@ func inconsistentPayload(t *testing.T, msgID string, donID string) *api.Message
 // signGatewayResponse signs the gateway response with a private key and arbitrarily sets the receiver
 // to the signer's address.  A signature and receiver are required for a valid gateway response.
 func signGatewayResponse(t *testing.T, msg *api.Message) *jsonrpc.Request[json.RawMessage] {
+	t.Helper()
+
 	nodeKeys := common.NewTestNodes(t, 1)
 	s := &signer{pk: nodeKeys[0].PrivateKey}
 	msgToSign := api.GetRawMessageBody(&msg.Body)
diff --git a/core/services/workflows/syncer/handler_test.go b/core/services/workflows/syncer/handler_test.go
index 5f9c25f6284..cb1b13ade88 100644
--- a/core/services/workflows/syncer/handler_test.go
+++ b/core/services/workflows/syncer/handler_test.go
@@ -118,16 +118,16 @@ func newMockDecrypter() *mockDecrypter {
 	}
 }
 
-func Test_Handler(t *testing.T) {
+func Test_Handler(t *testing.T) { //nolint:paralleltest // subtests share wfStore and registry
 	lggr := logger.TestLogger(t)
 	emitter := custmsg.NewLabeler()
 	wfStore := store.NewInMemoryStore(lggr, clockwork.NewFakeClock())
 	registry := capabilities.NewRegistry(lggr)
 	registry.SetLocalRegistry(&capabilities.TestMetadataRegistry{})
 	workflowEncryptionKey := workflowkey.MustNewXXXTestingOnly(big.NewInt(1))
-	t.Run("success", func(t *testing.T) {
+	t.Run("success", func(t *testing.T) { //nolint:paralleltest // shares wfStore and registry
 		mockORM := mocks.NewORM(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		limiters, err := v2.NewLimiters(limits.Factory{}, nil)
 		require.NoError(t, err)
 		featureFlags, err := v2.NewFeatureFlags(limits.Factory{}, nil)
@@ -168,9 +168,9 @@ func Test_Handler(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("fails with unsupported event type", func(t *testing.T) {
+	t.Run("fails with unsupported event type", func(t *testing.T) { //nolint:paralleltest // shares wfStore and registry
 		mockORM := mocks.NewORM(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		limiters, err := v2.NewLimiters(limits.Factory{}, nil)
 		require.NoError(t, err)
 		featureFlags, err := v2.NewFeatureFlags(limits.Factory{}, nil)
@@ -197,9 +197,9 @@ func Test_Handler(t *testing.T) {
 		require.Contains(t, err.Error(), "event type unsupported")
 	})
 
-	t.Run("fails to get secrets url", func(t *testing.T) {
+	t.Run("fails to get secrets url", func(t *testing.T) { //nolint:paralleltest // shares wfStore and registry
 		mockORM := mocks.NewORM(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		limiters, err := v2.NewLimiters(limits.Factory{}, nil)
 		require.NoError(t, err)
 		featureFlags, err := v2.NewFeatureFlags(limits.Factory{}, nil)
@@ -234,9 +234,9 @@ func Test_Handler(t *testing.T) {
 		require.ErrorContains(t, err, assert.AnError.Error())
 	})
 
-	t.Run("fails to fetch contents", func(t *testing.T) {
+	t.Run("fails to fetch contents", func(t *testing.T) { //nolint:paralleltest // shares wfStore and registry
 		mockORM := mocks.NewORM(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		limiters, err := v2.NewLimiters(limits.Factory{}, nil)
 		require.NoError(t, err)
 		featureFlags, err := v2.NewFeatureFlags(limits.Factory{}, nil)
@@ -274,9 +274,9 @@ func Test_Handler(t *testing.T) {
 		require.ErrorIs(t, err, assert.AnError)
 	})
 
-	t.Run("fails to update secrets", func(t *testing.T) {
+	t.Run("fails to update secrets", func(t *testing.T) { //nolint:paralleltest // shares wfStore and registry
 		mockORM := mocks.NewORM(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		limiters, err := v2.NewLimiters(limits.Factory{}, nil)
 		require.NoError(t, err)
 		featureFlags, err := v2.NewFeatureFlags(limits.Factory{}, nil)
@@ -767,8 +767,9 @@ type testCase struct {
 func testRunningWorkflow(t *testing.T, tc testCase, workflowEncryptionKey workflowkey.Key) {
 	t.Helper()
 	t.Run(tc.Name, func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx     = testutils.Context(t)
+			ctx     = t.Context()
 			lggr    = logger.TestLogger(t)
 			db      = pgtest.NewSqlxDB(t)
 			orm     = artifacts.NewWorkflowRegistryDS(db, lggr)
@@ -883,8 +884,9 @@ func Test_workflowDeletedHandler(t *testing.T) {
 	t.Parallel()
 	workflowEncryptionKey := workflowkey.MustNewXXXTestingOnly(big.NewInt(1))
 	t.Run("success deleting existing engine and spec", func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx          = testutils.Context(t)
+			ctx          = t.Context()
 			lggr         = logger.TestLogger(t)
 			db           = pgtest.NewSqlxDB(t)
 			orm          = artifacts.NewWorkflowRegistryDS(db, lggr)
@@ -973,8 +975,9 @@ func Test_workflowDeletedHandler(t *testing.T) {
 		assert.False(t, ok)
 	})
 	t.Run("success deleting non-existing workflow spec", func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx          = testutils.Context(t)
+			ctx          = t.Context()
 			lggr         = logger.TestLogger(t)
 			db           = pgtest.NewSqlxDB(t)
 			orm          = artifacts.NewWorkflowRegistryDS(db, lggr)
@@ -1032,8 +1035,9 @@ func Test_workflowDeletedHandler(t *testing.T) {
 		require.Error(t, err)
 	})
 	t.Run("removes from DB before engine registry", func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx          = testutils.Context(t)
+			ctx          = t.Context()
 			lggr         = logger.TestLogger(t)
 			db           = pgtest.NewSqlxDB(t)
 			orm          = artifacts.NewWorkflowRegistryDS(db, lggr)
@@ -1129,8 +1133,9 @@ func Test_workflowDeletedHandler(t *testing.T) {
 func Test_workflowPausedActivatedUpdatedHandler(t *testing.T) {
 	t.Parallel()
 	t.Run("success pausing activating and updating existing engine and spec", func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx          = testutils.Context(t)
+			ctx          = t.Context()
 			lggr         = logger.TestLogger(t)
 			db           = pgtest.NewSqlxDB(t)
 			orm          = artifacts.NewWorkflowRegistryDS(db, lggr)
@@ -1269,7 +1274,7 @@ func Test_workflowPausedActivatedUpdatedHandler(t *testing.T) {
 
 func TestEngineFactoryFn_SuccessfulCreation(t *testing.T) {
 	t.Parallel()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 	lggr := logger.TestLogger(t)
 	config := []byte(`{"key": "value"}`)
 
@@ -1321,7 +1326,7 @@ func TestEngineFactoryFn_SuccessfulCreation(t *testing.T) {
 	wfOwnerBytes := testutils.NewAddress().Bytes()
 	wfOwner := hex.EncodeToString(wfOwnerBytes)
 
-	t.Run("DAG workflow", func(t *testing.T) {
+	t.Run("DAG workflow", func(t *testing.T) { //nolint:paralleltest // shares eventHandler setup
 		binary := wasmtest.CreateTestBinary(t, binaryCmd, true)
 		workflowID, err := pkgworkflows.GenerateWorkflowID(wfOwnerBytes, testutils.RandomizeName(t.Name()), binary, config, secretsURL)
 		require.NoError(t, err)
@@ -1330,7 +1335,7 @@ func TestEngineFactoryFn_SuccessfulCreation(t *testing.T) {
 		require.NotNil(t, engine)
 	})
 
-	t.Run("NoDAG workflow", func(t *testing.T) {
+	t.Run("NoDAG workflow", func(t *testing.T) { //nolint:paralleltest // shares eventHandler setup
 		binary := wasmtest.CreateTestBinary(t, noDagBinaryCmd, true)
 		workflowID, err := pkgworkflows.GenerateWorkflowID(wfOwnerBytes, testutils.RandomizeName(t.Name()), binary, config, secretsURL)
 		require.NoError(t, err)
diff --git a/core/services/workflows/syncer/v2/contract_workflow_source_test.go b/core/services/workflows/syncer/v2/contract_workflow_source_test.go
index 5a64f7cff6d..f0d1ebbde5d 100644
--- a/core/services/workflows/syncer/v2/contract_workflow_source_test.go
+++ b/core/services/workflows/syncer/v2/contract_workflow_source_test.go
@@ -97,6 +97,7 @@ func createTestWorkflowMetadata(name string, family string) workflow_registry_wr
 }
 
 func TestContractWorkflowSource_ListWorkflowMetadata_Success(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -134,6 +135,7 @@ func TestContractWorkflowSource_ListWorkflowMetadata_Success(t *testing.T) {
 }
 
 func TestContractWorkflowSource_ListWorkflowMetadata_MultipleDONFamilies(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -169,6 +171,7 @@ func TestContractWorkflowSource_ListWorkflowMetadata_MultipleDONFamilies(t *test
 }
 
 func TestContractWorkflowSource_ListWorkflowMetadata_NotInitialized(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -196,6 +199,7 @@ func TestContractWorkflowSource_ListWorkflowMetadata_NotInitialized(t *testing.T
 }
 
 func TestContractWorkflowSource_ListWorkflowMetadata_ContractReaderError(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -226,6 +230,7 @@ func TestContractWorkflowSource_ListWorkflowMetadata_ContractReaderError(t *test
 }
 
 func TestContractWorkflowSource_ListWorkflowMetadata_EmptyResult(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -256,6 +261,7 @@ func TestContractWorkflowSource_ListWorkflowMetadata_EmptyResult(t *testing.T) {
 }
 
 func TestContractWorkflowSource_Ready_NotInitialized(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	source := NewContractWorkflowSource(
@@ -273,6 +279,7 @@ func TestContractWorkflowSource_Ready_NotInitialized(t *testing.T) {
 }
 
 func TestContractWorkflowSource_Ready_Initialized(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	mockReader := &mockWorkflowContractReader{}
@@ -292,6 +299,7 @@ func TestContractWorkflowSource_Ready_Initialized(t *testing.T) {
 }
 
 func TestContractWorkflowSource_tryInitialize_Success(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -318,6 +326,7 @@ func TestContractWorkflowSource_tryInitialize_Success(t *testing.T) {
 }
 
 func TestContractWorkflowSource_tryInitialize_AlreadyInitialized(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -346,6 +355,7 @@ func TestContractWorkflowSource_tryInitialize_AlreadyInitialized(t *testing.T) {
 }
 
 func TestContractWorkflowSource_tryInitialize_FactoryError(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -364,6 +374,7 @@ func TestContractWorkflowSource_tryInitialize_FactoryError(t *testing.T) {
 }
 
 func TestContractWorkflowSource_Name(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	source := NewContractWorkflowSource(
diff --git a/core/services/workflows/syncer/v2/engine_registry_test.go b/core/services/workflows/syncer/v2/engine_registry_test.go
index 0243a583ca0..09ca7e02850 100644
--- a/core/services/workflows/syncer/v2/engine_registry_test.go
+++ b/core/services/workflows/syncer/v2/engine_registry_test.go
@@ -11,6 +11,7 @@ import (
 )
 
 func TestEngineRegistry(t *testing.T) {
+	t.Parallel()
 	workflowID1 := types.WorkflowID([32]byte{0, 1, 2, 3, 4})
 	workflowID2 := types.WorkflowID([32]byte{0, 1, 2, 3, 4, 5})
 
@@ -64,6 +65,7 @@ func TestEngineRegistry(t *testing.T) {
 }
 
 func TestEngineRegistry_SourceTracking(t *testing.T) {
+	t.Parallel()
 	er := NewEngineRegistry()
 
 	wfID1 := types.WorkflowID([32]byte{1})
@@ -88,6 +90,7 @@ func TestEngineRegistry_SourceTracking(t *testing.T) {
 }
 
 func TestEngineRegistry_SourceInMetadata(t *testing.T) {
+	t.Parallel()
 	er := NewEngineRegistry()
 	wfID := types.WorkflowID([32]byte{1})
 
@@ -99,6 +102,7 @@ func TestEngineRegistry_SourceInMetadata(t *testing.T) {
 }
 
 func TestEngineRegistry_GetAllIncludesSource(t *testing.T) {
+	t.Parallel()
 	er := NewEngineRegistry()
 
 	wfID1 := types.WorkflowID([32]byte{1})
@@ -120,6 +124,7 @@ func TestEngineRegistry_GetAllIncludesSource(t *testing.T) {
 }
 
 func TestEngineRegistry_PopReturnsSource(t *testing.T) {
+	t.Parallel()
 	er := NewEngineRegistry()
 	wfID := types.WorkflowID([32]byte{1})
 
@@ -131,6 +136,7 @@ func TestEngineRegistry_PopReturnsSource(t *testing.T) {
 }
 
 func TestEngineRegistry_PopAllReturnsSource(t *testing.T) {
+	t.Parallel()
 	er := NewEngineRegistry()
 
 	wfID1 := types.WorkflowID([32]byte{1})
diff --git a/core/services/workflows/syncer/v2/evictable_module.go b/core/services/workflows/syncer/v2/evictable_module.go
index 1ca9790f247..ee95c88b985 100644
--- a/core/services/workflows/syncer/v2/evictable_module.go
+++ b/core/services/workflows/syncer/v2/evictable_module.go
@@ -472,11 +472,9 @@ func WithCacheMetrics(cm *CacheMetrics) func(*ModuleLRU) {
 }
 
 func (lru *ModuleLRU) Start() {
-	lru.wg.Add(1)
-	go func() {
-		defer lru.wg.Done()
+	lru.wg.Go(func() {
 		lru.reapLoop()
-	}()
+	})
 }
 
 func (lru *ModuleLRU) Close() {
@@ -581,7 +579,7 @@ func (lru *ModuleLRU) enforceCapLocked() int {
 	})
 
 	evicted := 0
-	for i := 0; i < excess; i++ {
+	for i := range excess {
 		if m, ok := lru.modules[loaded[i].id]; ok {
 			m.Evict()
 			evicted++
diff --git a/core/services/workflows/syncer/v2/evictable_module_bench_test.go b/core/services/workflows/syncer/v2/evictable_module_bench_test.go
index 3f40e4a7d12..3d902c47ccb 100644
--- a/core/services/workflows/syncer/v2/evictable_module_bench_test.go
+++ b/core/services/workflows/syncer/v2/evictable_module_bench_test.go
@@ -33,7 +33,7 @@ func BenchmarkModuleLRU_Contains(b *testing.B) {
 	clock := clockwork.NewFakeClock()
 	lru := NewModuleLRU(clock, WithIdleTimeout(time.Hour))
 	const n = 256
-	for i := 0; i < n; i++ {
+	for i := range n {
 		wfID := fmt.Sprintf("wf-%d", i)
 		lru.Register(wfID, benchLoadedModule(wfID))
 	}
@@ -54,10 +54,7 @@ func BenchmarkModuleLRU_reap_cap(b *testing.B) {
 			clock := clockwork.NewFakeClock()
 			reap := make(chan time.Time, 1)
 			done := make(chan struct{}, 1)
-			capLimit := n / 2
-			if capLimit < 1 {
-				capLimit = 1
-			}
+			capLimit := max(n/2, 1)
 			lru := NewModuleLRU(clock,
 				WithMaxLoadedModules(capLimit),
 				WithIdleTimeout(time.Hour),
@@ -67,7 +64,7 @@ func BenchmarkModuleLRU_reap_cap(b *testing.B) {
 			lru.Start()
 			defer lru.Close()
 
-			for j := 0; j < n; j++ {
+			for j := range n {
 				wfID := fmt.Sprintf("wf-%d", j)
 				em := benchLoadedModule(wfID)
 				em.lastUsed.Store(clock.Now().Add(-time.Duration(j) * time.Second).UnixNano())
diff --git a/core/services/workflows/syncer/v2/evictable_module_test.go b/core/services/workflows/syncer/v2/evictable_module_test.go
index a150b84f131..e4d7e789d5a 100644
--- a/core/services/workflows/syncer/v2/evictable_module_test.go
+++ b/core/services/workflows/syncer/v2/evictable_module_test.go
@@ -72,7 +72,7 @@ func newTestEvictableModule(t *testing.T, inner host.ModuleV2, factory ModuleFac
 	return em, store
 }
 
-func TestEvictable_Execute_ContextCanceled(t *testing.T) {
+func TestEvictable_Execute_ContextCanceled(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Start()
 	inner.EXPECT().Close()
@@ -88,7 +88,7 @@ func TestEvictable_Execute_ContextCanceled(t *testing.T) {
 	require.ErrorIs(t, err, context.Canceled)
 }
 
-func TestEvictable_Execute_TryAcquireExhausted(t *testing.T) {
+func TestEvictable_Execute_TryAcquireExhausted(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	prevTryAcquireAttempts := tryAcquireMaxAttempts
 	tryAcquireMaxAttempts = 3
 	t.Cleanup(func() { tryAcquireMaxAttempts = prevTryAcquireAttempts })
@@ -129,7 +129,7 @@ func TestEvictable_Execute_TryAcquireExhausted(t *testing.T) {
 	em.Close()
 }
 
-func TestEvictable_Execute_PinRetriesExhausted(t *testing.T) {
+func TestEvictable_Execute_PinRetriesExhausted(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	prevAttempts := executePinMaxAttempts
 	executePinMaxAttempts = 3
 	t.Cleanup(func() { executePinMaxAttempts = prevAttempts })
@@ -167,7 +167,7 @@ func TestEvictable_Execute_PinRetriesExhausted(t *testing.T) {
 	assert.Equal(t, int32(1), pinExhaustedRecorded.Load())
 }
 
-func TestEvictable_DelegatesToInner(t *testing.T) {
+func TestEvictable_DelegatesToInner(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Start()
 	inner.EXPECT().Execute(mock.Anything, mock.Anything, mock.Anything).Return(&sdkpb.ExecutionResult{}, nil)
@@ -183,7 +183,7 @@ func TestEvictable_DelegatesToInner(t *testing.T) {
 	assert.False(t, em.IsLegacyDAG())
 }
 
-func TestEvictable_LastUsedUpdated(t *testing.T) {
+func TestEvictable_LastUsedUpdated(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Execute(mock.Anything, mock.Anything, mock.Anything).Return(&sdkpb.ExecutionResult{}, nil).Times(2)
 	inner.EXPECT().Close()
@@ -205,7 +205,7 @@ func TestEvictable_LastUsedUpdated(t *testing.T) {
 	assert.Greater(t, em.LastUsed(), after1)
 }
 
-func TestEvictable_EvictFreesModule(t *testing.T) {
+func TestEvictable_EvictFreesModule(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	// Close comes from forceEvictForTest below (simulating GC cleanup);
 	// the production Evict call does not close.
@@ -222,7 +222,7 @@ func TestEvictable_EvictFreesModule(t *testing.T) {
 	em.forceEvictForTest()
 }
 
-func TestEvictable_ReloadFromDisk(t *testing.T) {
+func TestEvictable_ReloadFromDisk(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -251,7 +251,7 @@ func TestEvictable_ReloadFromDisk(t *testing.T) {
 	assert.Equal(t, []byte("fake-binary"), reloadedBinary)
 }
 
-func TestEvictable_ReloadFromDisk_RejectsEngineVersionMismatch(t *testing.T) {
+func TestEvictable_ReloadFromDisk_RejectsEngineVersionMismatch(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -281,7 +281,7 @@ func TestEvictable_ReloadFromDisk_RejectsEngineVersionMismatch(t *testing.T) {
 	assert.False(t, ok, "stale cached binary must be deleted after mismatch")
 }
 
-func TestEvictable_ReloadFromDisk_AcceptsMatchingEngineVersion(t *testing.T) {
+func TestEvictable_ReloadFromDisk_AcceptsMatchingEngineVersion(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -307,7 +307,7 @@ func TestEvictable_ReloadFromDisk_AcceptsMatchingEngineVersion(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestEvictable_ReloadCallsStart(t *testing.T) {
+func TestEvictable_ReloadCallsStart(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Start()
 	inner.EXPECT().Close()
@@ -330,7 +330,7 @@ func TestEvictable_ReloadCallsStart(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestEvictable_ClosePreventsReload(t *testing.T) {
+func TestEvictable_ClosePreventsReload(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -344,7 +344,7 @@ func TestEvictable_ClosePreventsReload(t *testing.T) {
 }
 
 // Ensure that calling evict once ends all concurrent execution attempts
-func TestEvictable_ConcurrentExecuteDuringEvict(t *testing.T) {
+func TestEvictable_ConcurrentExecuteDuringEvict(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 	inner.EXPECT().Execute(mock.Anything, mock.Anything, mock.Anything).
@@ -365,19 +365,15 @@ func TestEvictable_ConcurrentExecuteDuringEvict(t *testing.T) {
 
 	var wg sync.WaitGroup
 	execErrs := make(chan error, 5)
-	for i := 0; i < 5; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+	for range 5 {
+		wg.Go(func() {
 			_, err := em.Execute(context.Background(), &sdkpb.ExecuteRequest{}, nil)
 			execErrs <- err
-		}()
+		})
 	}
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		em.Evict()
-	}()
+	})
 	wg.Wait()
 	close(execErrs)
 	for err := range execErrs {
@@ -385,7 +381,7 @@ func TestEvictable_ConcurrentExecuteDuringEvict(t *testing.T) {
 	}
 }
 
-func TestEvictable_EvictDoesNotWaitForExecution(t *testing.T) {
+func TestEvictable_EvictDoesNotWaitForExecution(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	var executing atomic.Bool
 	var closeCalled atomic.Bool
 	executeStarted := make(chan struct{})
@@ -446,7 +442,7 @@ func TestEvictable_EvictDoesNotWaitForExecution(t *testing.T) {
 	assert.True(t, closeCalled.Load(), "close still releases module ownership")
 }
 
-func TestEvictable_NewExecuteUsesExistingModuleWhenEvictSkipped(t *testing.T) {
+func TestEvictable_NewExecuteUsesExistingModuleWhenEvictSkipped(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	firstExecuteStarted := make(chan struct{})
 	releaseFirstExecute := make(chan struct{})
 	firstExecuteDone := make(chan error, 1)
@@ -518,7 +514,7 @@ func TestEvictable_NewExecuteUsesExistingModuleWhenEvictSkipped(t *testing.T) {
 	assert.True(t, closeCalled.Load(), "Close should eventually release module ownership")
 }
 
-func TestLRU_FrequentReapSkipsPinnedModuleAndEvictsAfterDrain(t *testing.T) {
+func TestLRU_FrequentReapSkipsPinnedModuleAndEvictsAfterDrain(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 64)
 	onReaped := make(chan struct{}, 64)
@@ -560,22 +556,20 @@ func TestLRU_FrequentReapSkipsPinnedModuleAndEvictsAfterDrain(t *testing.T) {
 
 	var wg sync.WaitGroup
 	execErrs := make(chan error, concurrentExecs)
-	for i := 0; i < concurrentExecs; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+	for range concurrentExecs {
+		wg.Go(func() {
 			_, err := em.Execute(context.Background(), &sdkpb.ExecuteRequest{}, nil)
 			execErrs <- err
-		}()
+		})
 	}
 
-	for i := 0; i < concurrentExecs; i++ {
+	for range concurrentExecs {
 		<-execStarted
 	}
 	require.Equal(t, int32(concurrentExecs), activeExecs.Load(), "all executes must overlap")
 
 	// Keep forcing eviction while work is pinned; all these attempts should be skipped.
-	for i := 0; i < 25; i++ {
+	for range 25 {
 		em.lastUsed.Store(clock.Now().Add(-time.Hour).UnixNano())
 		clock.Advance(time.Second)
 		reapTicker <- clock.Now()
@@ -611,7 +605,7 @@ func TestLRU_FrequentReapSkipsPinnedModuleAndEvictsAfterDrain(t *testing.T) {
 	assert.Equal(t, int32(0), factoryCalls.Load(), "eviction itself should not reload a module")
 }
 
-func TestEvictable_MultipleEvictReloadCycles(t *testing.T) {
+func TestEvictable_MultipleEvictReloadCycles(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	var createCount atomic.Int32
 
 	inner := modulemocks.NewModuleV2(t)
@@ -633,7 +627,7 @@ func TestEvictable_MultipleEvictReloadCycles(t *testing.T) {
 	// Each iteration force-evicts (including L2) so the factory is guaranteed
 	// to run. Without the force, weak resurrection would skip the factory after
 	// the first cycle.
-	for i := 0; i < 3; i++ {
+	for range 3 {
 		em.forceEvictForTest()
 		assert.False(t, em.IsLoaded())
 
@@ -647,7 +641,7 @@ func TestEvictable_MultipleEvictReloadCycles(t *testing.T) {
 	em.Close()
 }
 
-func TestEvictable_ReloadFailure(t *testing.T) {
+func TestEvictable_ReloadFailure(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -706,8 +700,7 @@ func triggerLRUReap(t *testing.T, clock *clockwork.FakeClock, reap chan time.Tim
 	<-done
 }
 
-func TestLRU_AtCapacity_noEvictionUntilOver(t *testing.T) {
-	t.Parallel()
+func TestLRU_AtCapacity_noEvictionUntilOver(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock, lru, reap, done := newTestLRU(t, 2)
 
 	store, err := artifacts.NewFileModuleStore(t.TempDir(), false)
@@ -735,8 +728,7 @@ func TestLRU_AtCapacity_noEvictionUntilOver(t *testing.T) {
 	assert.True(t, m3.IsLoaded())
 }
 
-func TestLRU_RecencyBump_changesEvictionVictim(t *testing.T) {
-	t.Parallel()
+func TestLRU_RecencyBump_changesEvictionVictim(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock, lru, reap, done := newTestLRU(t, 2)
 
 	store, err := artifacts.NewFileModuleStore(t.TempDir(), false)
@@ -763,7 +755,7 @@ func TestLRU_RecencyBump_changesEvictionVictim(t *testing.T) {
 	assert.True(t, mC.IsLoaded())
 }
 
-func TestLRU_EvictsIdleModule(t *testing.T) {
+func TestLRU_EvictsIdleModule(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 1)
 	onReaped := make(chan struct{}, 1)
@@ -788,7 +780,7 @@ func TestLRU_EvictsIdleModule(t *testing.T) {
 	assert.False(t, em.IsLoaded())
 }
 
-func TestLRU_ActiveModuleNotEvicted(t *testing.T) {
+func TestLRU_ActiveModuleNotEvicted(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 1)
 	onReaped := make(chan struct{}, 1)
@@ -815,7 +807,7 @@ func TestLRU_ActiveModuleNotEvicted(t *testing.T) {
 	assert.True(t, em.IsLoaded(), "active module should not be evicted")
 }
 
-func TestLRU_MaxLoadedCap(t *testing.T) {
+func TestLRU_MaxLoadedCap(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 1)
 	onReaped := make(chan struct{}, 1)
@@ -852,7 +844,7 @@ func TestLRU_MaxLoadedCap(t *testing.T) {
 	assert.True(t, m3.IsLoaded())
 }
 
-func TestLRU_DeregisterStopsTracking(t *testing.T) {
+func TestLRU_DeregisterStopsTracking(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 1)
 	onReaped := make(chan struct{}, 1)
@@ -876,7 +868,7 @@ func TestLRU_DeregisterStopsTracking(t *testing.T) {
 	assert.True(t, em.IsLoaded(), "deregistered module should not be evicted by LRU")
 }
 
-func TestLRU_ConcurrentRegisterDeregister(t *testing.T) {
+func TestLRU_ConcurrentRegisterDeregister(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	lru := NewModuleLRU(clock)
 
@@ -888,7 +880,7 @@ func TestLRU_ConcurrentRegisterDeregister(t *testing.T) {
 		em   *EvictableModule
 	}
 	entries := make([]entry, 20)
-	for i := 0; i < 20; i++ {
+	for i := range 20 {
 		wfID := string(rune('A' + i))
 		entries[i] = entry{wfID: wfID, em: newLRUModule(t, store, wfID)}
 	}
@@ -909,7 +901,7 @@ func TestLRU_ConcurrentRegisterDeregister(t *testing.T) {
 	assert.Empty(t, lru.modules)
 }
 
-func TestLRU_StartStop(t *testing.T) {
+func TestLRU_StartStop(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 1)
 	onReaped := make(chan struct{}, 1)
@@ -929,7 +921,7 @@ func TestLRU_StartStop(t *testing.T) {
 	assert.True(t, em.IsLoaded())
 }
 
-func TestLRU_EmptyScan(t *testing.T) {
+func TestLRU_EmptyScan(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 1)
 	onReaped := make(chan struct{}, 1)
@@ -942,7 +934,7 @@ func TestLRU_EmptyScan(t *testing.T) {
 	<-onReaped
 }
 
-func TestLRU_EvictionOrder(t *testing.T) {
+func TestLRU_EvictionOrder(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reapTicker := make(chan time.Time, 1)
 	onReaped := make(chan struct{}, 1)
@@ -951,7 +943,7 @@ func TestLRU_EvictionOrder(t *testing.T) {
 	require.NoError(t, err)
 
 	modules := make([]*EvictableModule, 5)
-	for i := 0; i < 5; i++ {
+	for i := range 5 {
 		wfID := string(rune('A' + i))
 		modules[i] = newLRUModule(t, store, wfID)
 		modules[i].lastUsed.Store(clock.Now().Add(time.Duration(i) * time.Minute).UnixNano())
@@ -981,15 +973,14 @@ func TestLRU_EvictionOrder(t *testing.T) {
 	}
 }
 
-func TestLRU_MaxLoaded_zero_disablesCapEnforcement(t *testing.T) {
-	t.Parallel()
+func TestLRU_MaxLoaded_zero_disablesCapEnforcement(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock, lru, reap, done := newTestLRU(t, 0)
 
 	store, err := artifacts.NewFileModuleStore(t.TempDir(), false)
 	require.NoError(t, err)
 
 	modules := make([]*EvictableModule, 3)
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		wfID := string(rune('A' + i))
 		modules[i] = newLRUModule(t, store, wfID)
 		modules[i].lastUsed.Store(clock.Now().Add(-time.Duration(i+1) * time.Minute).UnixNano())
@@ -1002,8 +993,7 @@ func TestLRU_MaxLoaded_zero_disablesCapEnforcement(t *testing.T) {
 	}
 }
 
-func TestLRU_Register_duplicateWorkflowID_replaces(t *testing.T) {
-	t.Parallel()
+func TestLRU_Register_duplicateWorkflowID_replaces(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	_, lru, _, _ := newTestLRU(t, 10)
 
 	store, err := artifacts.NewFileModuleStore(t.TempDir(), false)
@@ -1021,8 +1011,7 @@ func TestLRU_Register_duplicateWorkflowID_replaces(t *testing.T) {
 	assert.True(t, lru.Contains("wf-1"))
 }
 
-func TestLRU_ConcurrentReapAndRegister(t *testing.T) {
-	t.Parallel()
+func TestLRU_ConcurrentReapAndRegister(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	clock := clockwork.NewFakeClock()
 	reap := make(chan time.Time, 64)
 	done := make(chan struct{}, 64)
@@ -1044,7 +1033,7 @@ func TestLRU_ConcurrentReapAndRegister(t *testing.T) {
 		em   *EvictableModule
 	}
 	entries := make([]entry, workers)
-	for i := 0; i < workers; i++ {
+	for i := range workers {
 		wfID := string(rune('A' + i))
 		entries[i] = entry{wfID: wfID, em: newLRUModule(t, store, wfID)}
 	}
@@ -1071,8 +1060,7 @@ func TestLRU_ConcurrentReapAndRegister(t *testing.T) {
 	assert.Positive(t, n)
 }
 
-func TestEvictable_Execute_L1_hit(t *testing.T) {
-	t.Parallel()
+func TestEvictable_Execute_L1_hit(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Start()
 	inner.EXPECT().Execute(mock.Anything, mock.Anything, mock.Anything).Return(&sdkpb.ExecutionResult{}, nil)
@@ -1093,8 +1081,7 @@ func TestEvictable_Execute_L1_hit(t *testing.T) {
 	assert.Equal(t, int32(0), cs.getModuleCalls.Load(), "L1 hit must not read from disk")
 }
 
-func TestEvictable_Evict_then_reloadWithoutDisk(t *testing.T) {
-	t.Parallel()
+func TestEvictable_Evict_then_reloadWithoutDisk(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Execute(mock.Anything, mock.Anything, mock.Anything).Return(&sdkpb.ExecutionResult{}, nil).Once()
 	inner.EXPECT().Close()
@@ -1113,6 +1100,9 @@ func TestEvictable_Evict_then_reloadWithoutDisk(t *testing.T) {
 	em.started.Store(true)
 	t.Cleanup(em.Close)
 
+	// Pin the module on the stack so GC cannot reclaim it after eviction.
+	// This deterministically tests weak reference resurrection.
+	strongRef := em.current.Load()
 	em.Evict()
 	assert.False(t, em.IsLoaded())
 
@@ -1120,10 +1110,12 @@ func TestEvictable_Evict_then_reloadWithoutDisk(t *testing.T) {
 	require.NoError(t, err)
 	assert.True(t, em.IsLoaded())
 	assert.Equal(t, int32(0), cs.getModuleCalls.Load(), "weak L2 reload must not touch disk")
+
+	// Force the compiler to keep strongRef alive until this exact point.
+	runtime.KeepAlive(strongRef)
 }
 
-func TestEvictable_emptyWorkflowID_diskMiss(t *testing.T) {
-	t.Parallel()
+func TestEvictable_emptyWorkflowID_diskMiss(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	store, err := artifacts.NewFileModuleStore(t.TempDir(), false)
 	require.NoError(t, err)
 
@@ -1141,7 +1133,7 @@ func TestEvictable_emptyWorkflowID_diskMiss(t *testing.T) {
 // TestEvictable_WeakRefHitAfterEvict verifies that Evict drops only the strong
 // reference and a subsequent Execute resurrects the still-live compiled module
 // via the weak L2, skipping both disk I/O and the factory.
-func TestEvictable_WeakRefHitAfterEvict(t *testing.T) {
+func TestEvictable_WeakRefHitAfterEvict(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Execute(mock.Anything, mock.Anything, mock.Anything).Return(&sdkpb.ExecutionResult{}, nil)
 	inner.EXPECT().Close()
@@ -1160,18 +1152,24 @@ func TestEvictable_WeakRefHitAfterEvict(t *testing.T) {
 	em.started.Store(true)
 	t.Cleanup(em.Close)
 
+	// Pin the module on the stack so GC cannot reclaim it after eviction.
+	// This deterministically tests weak reference resurrection.
+	strongRef := em.current.Load()
 	em.Evict()
 
 	_, err = em.Execute(context.Background(), &sdkpb.ExecuteRequest{}, nil)
 	require.NoError(t, err)
 
 	assert.Equal(t, int32(0), cs.getModuleCalls.Load(), "disk should not be accessed when weak module is alive")
+
+	// Force the compiler to keep strongRef alive until this exact point.
+	runtime.KeepAlive(strongRef)
 }
 
 // TestEvictable_WeakRefMissFallsToDisk verifies that when the weak L2 is
 // unreachable (GC has reclaimed the holder, simulated via forceEvictForTest),
 // ensureLoaded falls through to disk and invokes the factory.
-func TestEvictable_WeakRefMissFallsToDisk(t *testing.T) {
+func TestEvictable_WeakRefMissFallsToDisk(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -1206,7 +1204,7 @@ func TestEvictable_WeakRefMissFallsToDisk(t *testing.T) {
 
 // TestEvictable_WeakRefPopulatedAfterReload verifies that a disk reload
 // populates weakInner, so a second evict+execute cycle hits the weak L2.
-func TestEvictable_WeakRefPopulatedAfterReload(t *testing.T) {
+func TestEvictable_WeakRefPopulatedAfterReload(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -1256,7 +1254,7 @@ func TestEvictable_WeakRefPopulatedAfterReload(t *testing.T) {
 // TestEvictable_WeakRefClearedOnForceEvict proves that forceEvictForTest (the
 // GC-pressure simulation) genuinely clears the weak pointer — a sanity check
 // for the other weak-ref tests.
-func TestEvictable_WeakRefClearedOnForceEvict(t *testing.T) {
+func TestEvictable_WeakRefClearedOnForceEvict(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -1276,7 +1274,7 @@ func TestEvictable_WeakRefClearedOnForceEvict(t *testing.T) {
 // GC-eligible and runtime.AddCleanup must eventually invoke mod.Close. This
 // is the only path that reclaims wasm runtime resources in production
 // (forceEvictForTest exists solely as a deterministic test hook).
-func TestEvictable_GCFiresCloseAfterEvict(t *testing.T) {
+func TestEvictable_GCFiresCloseAfterEvict(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	fake := &fakeModule{}
 
 	em, _ := newTestEvictableModule(t, fake, nil)
@@ -1303,7 +1301,7 @@ func TestEvictable_GCFiresCloseAfterEvict(t *testing.T) {
 
 // --- Metrics integration tests ---
 
-func TestEvictable_ReloadSourceMetric(t *testing.T) {
+func TestEvictable_ReloadSourceMetric(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	cm, err := NewCacheMetrics()
 	require.NoError(t, err)
 
@@ -1333,7 +1331,7 @@ func TestEvictable_ReloadSourceMetric(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestLRU_EvictionMetric(t *testing.T) {
+func TestLRU_EvictionMetric(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	cm, err := NewCacheMetrics()
 	require.NoError(t, err)
 
@@ -1366,7 +1364,7 @@ func TestLRU_EvictionMetric(t *testing.T) {
 	assert.False(t, em.IsLoaded())
 }
 
-func TestEvictable_BinarySizeTracked(t *testing.T) {
+func TestEvictable_BinarySizeTracked(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	inner := modulemocks.NewModuleV2(t)
 	inner.EXPECT().Close()
 
@@ -1398,7 +1396,7 @@ func TestEvictable_BinarySizeTracked(t *testing.T) {
 	t.Cleanup(em.Close)
 }
 
-func TestLRU_MemorySavedMetric(t *testing.T) {
+func TestLRU_MemorySavedMetric(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	prevHook := reapMemorySavedHook
 	var observed []int64
 	reapMemorySavedHook = func(b int64) { observed = append(observed, b) }
@@ -1444,7 +1442,7 @@ func TestLRU_MemorySavedMetric(t *testing.T) {
 	require.Equal(t, []int64{3072}, observed)
 }
 
-func TestLRU_ReapMemorySavedBytesNotCumulative(t *testing.T) {
+func TestLRU_ReapMemorySavedBytesNotCumulative(t *testing.T) { //nolint:paralleltest // package-level hooks and eviction config
 	prevHook := reapMemorySavedHook
 	var observed []int64
 	reapMemorySavedHook = func(b int64) { observed = append(observed, b) }
diff --git a/core/services/workflows/syncer/v2/fetcher_test.go b/core/services/workflows/syncer/v2/fetcher_test.go
index f4937db5735..0a91472bdd7 100644
--- a/core/services/workflows/syncer/v2/fetcher_test.go
+++ b/core/services/workflows/syncer/v2/fetcher_test.go
@@ -65,6 +65,7 @@ func TestNewFetcherService(t *testing.T) {
 	)
 
 	t.Run("OK-valid_request", func(t *testing.T) {
+		t.Parallel()
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 		connector.EXPECT().GatewayIDs(matches.AnyContext).Return([]string{"gateway1", "gateway2"}, nil)
 
@@ -95,6 +96,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	t.Run("OK-retrieve-url", func(t *testing.T) {
+		t.Parallel()
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 
 		fetcher := NewFetcherService(lggr, wrapper, storageService, gateway.WithFixedStart())
@@ -118,6 +120,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	t.Run("NOK-retrieve-url-empty-req", func(t *testing.T) {
+		t.Parallel()
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 
 		fetcher := NewFetcherService(lggr, wrapper, storageService, gateway.WithFixedStart())
@@ -129,6 +132,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	t.Run("fails with invalid payload response", func(t *testing.T) {
+		t.Parallel()
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 
 		fetcher := NewFetcherService(lggr, wrapper, storageService, gateway.WithFixedStart())
@@ -156,6 +160,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	t.Run("fails due to invalid gateway response", func(t *testing.T) {
+		t.Parallel()
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 
 		fetcher := NewFetcherService(lggr, wrapper, storageService, gateway.WithFixedStart())
@@ -194,6 +199,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	t.Run("NOK-response_payload_too_large", func(t *testing.T) {
+		t.Parallel()
 		headers := map[string]string{"Content-Type": "application/json"}
 		responsePayload, err := json.Marshal(ghcapabilities.Response{
 			StatusCode:   400,
@@ -242,6 +248,7 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	t.Run("NOK-bad_request", func(t *testing.T) {
+		t.Parallel()
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
 		connector.EXPECT().GatewayIDs(matches.AnyContext).Return([]string{"gateway1", "gateway2"}, nil)
 
@@ -273,6 +280,7 @@ func TestNewFetcherService(t *testing.T) {
 
 	// Connector handler never makes a connection to a gateway and the context expires.
 	t.Run("NOK-request_context_deadline_exceeded", func(t *testing.T) {
+		t.Parallel()
 		connector := gcmocks.NewGatewayConnector(t)
 		connWrapper := newConnectorWrapper(connector)
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
@@ -301,6 +309,7 @@ func TestNewFetcherService(t *testing.T) {
 
 	// Connector handler cycles to next available gateway after first connection fails.
 	t.Run("OK-connector_handler_awaits_working_gateway", func(t *testing.T) {
+		t.Parallel()
 		connector := gcmocks.NewGatewayConnector(t)
 		connWrapper := newConnectorWrapper(connector)
 		connector.EXPECT().AddHandler(matches.AnyContext, []string{ghcapabilities.MethodWorkflowSyncer}, mock.Anything).Return(nil)
@@ -335,12 +344,14 @@ func TestNewFetcherService(t *testing.T) {
 	})
 
 	t.Run("NOK-no-gateway-connector", func(t *testing.T) {
+		t.Parallel()
 		fetcher := NewFetcherService(lggr, nil, storageService, gateway.WithFixedStart())
 		require.ErrorIs(t, fetcher.Start(ctx), ErrNoGatewayConnector)
 		defer fetcher.Close()
 	})
 
 	t.Run("NOK-no-storage-client", func(t *testing.T) {
+		t.Parallel()
 		fetcher := NewFetcherService(lggr, wrapper, nil, gateway.WithFixedStart())
 		require.ErrorIs(t, fetcher.Start(ctx), ErrNoStorageClient)
 		defer fetcher.Close()
@@ -348,11 +359,13 @@ func TestNewFetcherService(t *testing.T) {
 }
 
 func TestNewFetcherFunc(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 	testContent := []byte("test content")
 
 	t.Run("error cases", func(t *testing.T) {
+		t.Parallel()
 		tests := []struct {
 			name    string
 			baseURL string
@@ -382,6 +395,7 @@ func TestNewFetcherFunc(t *testing.T) {
 
 		for _, tc := range tests {
 			t.Run(tc.name, func(t *testing.T) {
+				t.Parallel()
 				_, err := NewFetcherFunc(tc.baseURL, lggr)
 				require.Error(t, err)
 				assert.Contains(t, err.Error(), tc.errMsg)
@@ -390,6 +404,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("file fetcher", func(t *testing.T) {
+		t.Parallel()
 		// Create temp dir for test files
 		tempDir := t.TempDir()
 		testFilePath := filepath.Join(tempDir, "test.txt")
@@ -440,6 +455,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("file fetcher resolves HTTP URL to basename", func(t *testing.T) {
+		t.Parallel()
 		tempDir := t.TempDir()
 		err := os.WriteFile(filepath.Join(tempDir, "binary.wasm"), testContent, 0600)
 		require.NoError(t, err)
@@ -461,6 +477,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("file fetcher rejects HTTP URL with empty path", func(t *testing.T) {
+		t.Parallel()
 		tempDir := t.TempDir()
 		fetcher, err := NewFetcherFunc("file://"+tempDir, lggr)
 		require.NoError(t, err)
@@ -473,6 +490,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("http fetcher", func(t *testing.T) {
+		t.Parallel()
 		// Create test HTTP server
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			if r.URL.Path == "/workflows/test.json" {
@@ -506,6 +524,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("context cancellation", func(t *testing.T) {
+		t.Parallel()
 		tempDir := t.TempDir()
 		baseURL := "file://" + tempDir
 
@@ -525,6 +544,7 @@ func TestNewFetcherFunc(t *testing.T) {
 	})
 
 	t.Run("timeout handling", func(t *testing.T) {
+		t.Parallel()
 		// Create a slow HTTP server
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			time.Sleep(200 * time.Millisecond) // Delay response
diff --git a/core/services/workflows/syncer/v2/file_workflow_source_test.go b/core/services/workflows/syncer/v2/file_workflow_source_test.go
index 0dd76dc972b..33fdaef3b9a 100644
--- a/core/services/workflows/syncer/v2/file_workflow_source_test.go
+++ b/core/services/workflows/syncer/v2/file_workflow_source_test.go
@@ -15,6 +15,7 @@ import (
 )
 
 func TestFileWorkflowSource_FileNotExists(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	_, err := NewFileWorkflowSourceWithPath(lggr, "test-file-source", "/nonexistent/path/workflows.json")
 	require.Error(t, err)
@@ -22,6 +23,7 @@ func TestFileWorkflowSource_FileNotExists(t *testing.T) {
 }
 
 func TestFileWorkflowSource_EmptyName(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	tmpDir := t.TempDir()
@@ -35,6 +37,7 @@ func TestFileWorkflowSource_EmptyName(t *testing.T) {
 }
 
 func TestFileWorkflowSource_ListWorkflowMetadata_EmptyFile(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	// Create a temp file
@@ -59,6 +62,7 @@ func TestFileWorkflowSource_ListWorkflowMetadata_EmptyFile(t *testing.T) {
 }
 
 func TestFileWorkflowSource_ListWorkflowMetadata_ValidFile(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	// Create workflow ID (32 bytes)
@@ -135,6 +139,7 @@ func TestFileWorkflowSource_ListWorkflowMetadata_ValidFile(t *testing.T) {
 }
 
 func TestFileWorkflowSource_ListWorkflowMetadata_MultipleDONFamilies(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	// Create workflow ID (32 bytes)
@@ -196,6 +201,7 @@ func TestFileWorkflowSource_ListWorkflowMetadata_MultipleDONFamilies(t *testing.
 }
 
 func TestFileWorkflowSource_ListWorkflowMetadata_PausedWorkflow(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	workflowID := make([]byte, 32)
@@ -242,6 +248,7 @@ func TestFileWorkflowSource_ListWorkflowMetadata_PausedWorkflow(t *testing.T) {
 }
 
 func TestFileWorkflowSource_Name(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	tmpDir := t.TempDir()
@@ -255,6 +262,7 @@ func TestFileWorkflowSource_Name(t *testing.T) {
 }
 
 func TestFileWorkflowSource_Ready(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	tmpDir := t.TempDir()
@@ -273,6 +281,7 @@ func TestFileWorkflowSource_Ready(t *testing.T) {
 }
 
 func TestFileWorkflowSource_InvalidJSON(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	tmpDir := t.TempDir()
@@ -294,6 +303,7 @@ func TestFileWorkflowSource_InvalidJSON(t *testing.T) {
 }
 
 func TestFileWorkflowSource_InvalidWorkflowID(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	owner := make([]byte, 20)
diff --git a/core/services/workflows/syncer/v2/grpc_workflow_source_test.go b/core/services/workflows/syncer/v2/grpc_workflow_source_test.go
index 70cf092d32e..6df506d2f4f 100644
--- a/core/services/workflows/syncer/v2/grpc_workflow_source_test.go
+++ b/core/services/workflows/syncer/v2/grpc_workflow_source_test.go
@@ -111,6 +111,7 @@ func createTestProtoWorkflow(name string, family string) *pb.WorkflowMetadata {
 }
 
 func TestGRPCWorkflowSource_NewGRPCWorkflowSource_EmptyURL(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	_, err := NewGRPCWorkflowSource(lggr, GRPCWorkflowSourceConfig{
@@ -123,6 +124,7 @@ func TestGRPCWorkflowSource_NewGRPCWorkflowSource_EmptyURL(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_NewGRPCWorkflowSource_EmptyName(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	_, err := NewGRPCWorkflowSource(lggr, GRPCWorkflowSourceConfig{
@@ -135,6 +137,7 @@ func TestGRPCWorkflowSource_NewGRPCWorkflowSource_EmptyName(t *testing.T) {
 }
 
 func TestGRPCWorkflowSourceWithClient_EmptyName(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	_, err := NewGRPCWorkflowSourceWithClient(lggr, &mockGRPCClient{}, GRPCWorkflowSourceConfig{
@@ -146,6 +149,7 @@ func TestGRPCWorkflowSourceWithClient_EmptyName(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_ListWorkflowMetadata_Success(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -178,6 +182,7 @@ func TestGRPCWorkflowSource_ListWorkflowMetadata_Success(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_ListWorkflowMetadata_Pagination(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -210,6 +215,7 @@ func TestGRPCWorkflowSource_ListWorkflowMetadata_Pagination(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_ListWorkflowMetadata_InvalidWorkflow(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -245,6 +251,7 @@ func TestGRPCWorkflowSource_ListWorkflowMetadata_InvalidWorkflow(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Retry_Unavailable(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -282,6 +289,7 @@ func TestGRPCWorkflowSource_Retry_Unavailable(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Retry_ResourceExhausted(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -314,6 +322,7 @@ func TestGRPCWorkflowSource_Retry_ResourceExhausted(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Retry_MaxExceeded(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -341,6 +350,7 @@ func TestGRPCWorkflowSource_Retry_MaxExceeded(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Retry_NonRetryable(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -366,6 +376,7 @@ func TestGRPCWorkflowSource_Retry_NonRetryable(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Backoff_Jitter(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	source, err := NewGRPCWorkflowSourceWithClient(lggr, &mockGRPCClient{}, GRPCWorkflowSourceConfig{
@@ -395,6 +406,7 @@ func TestGRPCWorkflowSource_Backoff_Jitter(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_ContextCancellation(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx, cancel := context.WithCancel(t.Context())
 
@@ -427,6 +439,7 @@ func TestGRPCWorkflowSource_ContextCancellation(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_ConfigDefaults(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	// Name is required, but other config options have defaults
@@ -444,6 +457,7 @@ func TestGRPCWorkflowSource_ConfigDefaults(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Ready(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	source, err := NewGRPCWorkflowSourceWithClient(lggr, &mockGRPCClient{}, GRPCWorkflowSourceConfig{
@@ -461,6 +475,7 @@ func TestGRPCWorkflowSource_Ready(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_ListWorkflowMetadata_NotReady(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	ctx := t.Context()
 
@@ -484,6 +499,7 @@ func TestGRPCWorkflowSource_ListWorkflowMetadata_NotReady(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Close(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	mockClient := &mockGRPCClient{}
@@ -507,6 +523,7 @@ func TestGRPCWorkflowSource_Close(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Name(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	source, err := NewGRPCWorkflowSourceWithClient(lggr, &mockGRPCClient{}, GRPCWorkflowSourceConfig{
@@ -518,6 +535,7 @@ func TestGRPCWorkflowSource_Name(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_Name_Required(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	// Empty name should return an error
@@ -527,6 +545,7 @@ func TestGRPCWorkflowSource_Name_Required(t *testing.T) {
 }
 
 func TestGRPCWorkflowSource_syntheticHead(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 
 	source, err := NewGRPCWorkflowSourceWithClient(lggr, &mockGRPCClient{}, GRPCWorkflowSourceConfig{
diff --git a/core/services/workflows/syncer/v2/handler_test.go b/core/services/workflows/syncer/v2/handler_test.go
index 566d5db2f42..5301811127b 100644
--- a/core/services/workflows/syncer/v2/handler_test.go
+++ b/core/services/workflows/syncer/v2/handler_test.go
@@ -167,7 +167,9 @@ func mockEngineFactory(ctx context.Context, wfid string, owner string, name type
 }
 
 func Test_Handler(t *testing.T) {
+	t.Parallel()
 	t.Run("fails with unsupported event type", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
 		lf := limits.Factory{Logger: lggr}
 		emitter := custmsg.NewLabeler()
@@ -177,7 +179,7 @@ func Test_Handler(t *testing.T) {
 		workflowEncryptionKey := workflowkey.MustNewXXXTestingOnly(big.NewInt(1))
 
 		mockORM := mocks.NewORM(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		limiters, err := v2.NewLimiters(lf, nil)
 		require.NoError(t, err)
 		rl, err := ratelimiter.NewRateLimiter(rlConfig)
@@ -672,6 +674,7 @@ func Test_workflowRegisteredHandler(t *testing.T) {
 }
 
 func Test_workflowRegisteredHandler_confidentialRouting(t *testing.T) {
+	t.Parallel()
 	payload, err := anypb.New(&basictrigger.Outputs{CoolOutput: "foo"})
 	require.NoError(t, err)
 
@@ -684,6 +687,7 @@ func Test_workflowRegisteredHandler_confidentialRouting(t *testing.T) {
 	}
 
 	t.Run("confidential workflow module is hooked correctly", func(t *testing.T) {
+		t.Parallel()
 		var (
 			ctx                   = t.Context()
 			lggr                  = logger.TestLogger(t)
@@ -792,6 +796,7 @@ func Test_workflowRegisteredHandler_confidentialRouting(t *testing.T) {
 	})
 
 	t.Run("non-confidential workflow module is hooked correctly", func(t *testing.T) {
+		t.Parallel()
 		var (
 			ctx     = t.Context()
 			lggr    = logger.TestLogger(t)
@@ -892,8 +897,9 @@ type testCase struct {
 func testRunningWorkflow(t *testing.T, tc testCase) {
 	t.Helper()
 	t.Run(tc.Name, func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx     = testutils.Context(t)
+			ctx     = t.Context()
 			lggr    = logger.TestLogger(t)
 			lf      = limits.Factory{Logger: lggr}
 			db      = pgtest.NewSqlxDB(t)
@@ -948,11 +954,14 @@ func testRunningWorkflow(t *testing.T, tc testCase) {
 }
 
 func Test_customerFacingError(t *testing.T) {
+	t.Parallel()
 	t.Run("nil error returns nil", func(t *testing.T) {
+		t.Parallel()
 		assert.NoError(t, customerFacingError(nil))
 	})
 
 	t.Run("ArtifactFetchError returns deterministic customer message", func(t *testing.T) {
+		t.Parallel()
 		fetchErr := &types.ArtifactFetchError{
 			ArtifactType: "binary",
 			URL:          "https://storage.example.com/binary.wasm?Expires=123&Signature=nodeSpecificSig",
@@ -964,6 +973,7 @@ func Test_customerFacingError(t *testing.T) {
 	})
 
 	t.Run("wrapped ArtifactFetchError is still detected", func(t *testing.T) {
+		t.Parallel()
 		fetchErr := &types.ArtifactFetchError{
 			ArtifactType: "config",
 			URL:          "https://storage.example.com/config.yaml?Expires=456&Signature=abc",
@@ -976,6 +986,7 @@ func Test_customerFacingError(t *testing.T) {
 	})
 
 	t.Run("non-ArtifactFetchError passes through unchanged", func(t *testing.T) {
+		t.Parallel()
 		original := errors.New("some other error")
 		assert.Equal(t, original, customerFacingError(original))
 	})
@@ -1019,8 +1030,9 @@ func newMockArtifactStore(as *artifacts.Store, deleteWorkflowArtifactsErr error)
 func Test_workflowDeletedHandler(t *testing.T) {
 	t.Parallel()
 	t.Run("success deleting existing engine and spec", func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx     = testutils.Context(t)
+			ctx     = t.Context()
 			lggr    = logger.TestLogger(t)
 			lf      = limits.Factory{Logger: lggr}
 			db      = pgtest.NewSqlxDB(t)
@@ -1120,8 +1132,9 @@ func Test_workflowDeletedHandler(t *testing.T) {
 	})
 
 	t.Run("success deleting non-existing workflow spec", func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx     = testutils.Context(t)
+			ctx     = t.Context()
 			lggr    = logger.TestLogger(t)
 			lf      = limits.Factory{Logger: lggr}
 			db      = pgtest.NewSqlxDB(t)
@@ -1170,8 +1183,9 @@ func Test_workflowDeletedHandler(t *testing.T) {
 	})
 
 	t.Run("removes from DB before engine registry", func(t *testing.T) {
+		t.Parallel()
 		var (
-			ctx     = testutils.Context(t)
+			ctx     = t.Context()
 			lggr    = logger.TestLogger(t)
 			lf      = limits.Factory{Logger: lggr}
 			db      = pgtest.NewSqlxDB(t)
@@ -1401,10 +1415,10 @@ func (m *mockLinkingService) GetOrganizationFromWorkflowOwner(ctx context.Contex
 	}, nil
 }
 
-func Test_Handler_OrganizationID(t *testing.T) {
+func Test_Handler_OrganizationID(t *testing.T) { //nolint:paralleltest // beholdertest.NewObserver uses t.Setenv
 	observer := beholdertest.NewObserver(t)
 	emitter := custmsg.NewLabeler()
-	ctx := testutils.Context(t)
+	ctx := t.Context()
 
 	// Set up mock gRPC server for linking service
 	mockLinking := &mockLinkingService{orgID: "test-org"}
diff --git a/core/services/workflows/syncer/v2/workflow_syncer_v2_test.go b/core/services/workflows/syncer/v2/workflow_syncer_v2_test.go
index b61846e8c1a..94b4cf62c99 100644
--- a/core/services/workflows/syncer/v2/workflow_syncer_v2_test.go
+++ b/core/services/workflows/syncer/v2/workflow_syncer_v2_test.go
@@ -32,7 +32,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 	pkgworkflows "github.com/smartcontractkit/chainlink-common/pkg/workflows"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/workflow/generated/workflow_registry_wrapper_v2"
-	coretestutils "github.com/smartcontractkit/chainlink-evm/pkg/testutils"
 	storage_service "github.com/smartcontractkit/chainlink-protos/storage-service/go"
 	corecaps "github.com/smartcontractkit/chainlink/v2/core/capabilities"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/vault/vaulttypes"
@@ -242,7 +241,7 @@ func Test_RegistrySyncer_SkipsEventsNotBelongingToDONV2(t *testing.T) {
 func Test_RegistrySyncer_WorkflowRegistered_InitiallyPausedV2(t *testing.T) {
 	t.Parallel()
 	var (
-		ctx       = coretestutils.Context(t)
+		ctx       = t.Context()
 		lggr      = logger.TestLogger(t)
 		emitter   = custmsg.NewLabeler()
 		backendTH = testutils.NewEVMBackendTH(t)
@@ -346,7 +345,7 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyPausedV2(t *testing.T) {
 func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivatedV2(t *testing.T) {
 	t.Parallel()
 	var (
-		ctx       = coretestutils.Context(t)
+		ctx       = t.Context()
 		lggr      = logger.TestLogger(t)
 		emitter   = custmsg.NewLabeler()
 		backendTH = testutils.NewEVMBackendTH(t)
@@ -454,6 +453,7 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivatedV2(t *testing.T) {
 func Test_StratReconciliation_InitialStateSyncV2(t *testing.T) {
 	t.Parallel()
 	t.Run("with heavy load", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
 		backendTH := testutils.NewEVMBackendTH(t)
 		donID := uint32(1)
diff --git a/core/services/workflows/syncer/workflow_registry_test.go b/core/services/workflows/syncer/workflow_registry_test.go
index 34589e57d69..efff2062f27 100644
--- a/core/services/workflows/syncer/workflow_registry_test.go
+++ b/core/services/workflows/syncer/workflow_registry_test.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities"
-	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
@@ -30,9 +29,11 @@ func (m *mockService) Ready() error { return nil }
 func (m *mockService) Name() string { return "svc" }
 
 func Test_generateReconciliationEvents(t *testing.T) {
+	t.Parallel()
 	t.Run("WorkflowRegisteredEvent", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// No engines are in the workflow registry
@@ -94,8 +95,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("WorkflowUpdatedEvent", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
@@ -161,8 +163,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("WorkflowDeletedEvent", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
@@ -208,8 +211,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("No change", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// No engines are in the workflow registry
@@ -280,8 +284,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("A paused workflow doesn't start a new workflow", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// No engines are in the workflow registry
@@ -330,8 +335,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("A paused workflow deletes a running workflow", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
@@ -392,8 +398,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("pending delete events are handled when workflow metadata no longer exists", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
@@ -449,8 +456,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("pending create events are handled when workflow metadata no longer exists", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		er := NewEngineRegistry()
@@ -511,8 +519,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("delete events are handled before any other events", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
@@ -568,8 +577,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("reconciles with a pending event if it has the same signature", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
@@ -653,8 +663,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("removes pending event if different signature", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
@@ -734,8 +745,9 @@ func Test_generateReconciliationEvents(t *testing.T) {
 	})
 
 	t.Run("removes pending event if the workflow ID changed", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
-		ctx := testutils.Context(t)
+		ctx := t.Context()
 		donID := uint32(1)
 		workflowDonNotifier := capabilities.NewDonNotifier()
 		// Engine already in the workflow registry
diff --git a/core/services/workflows/syncer/workflow_syncer_test.go b/core/services/workflows/syncer/workflow_syncer_test.go
index 2e6ef295a73..3b39747beae 100644
--- a/core/services/workflows/syncer/workflow_syncer_test.go
+++ b/core/services/workflows/syncer/workflow_syncer_test.go
@@ -36,7 +36,6 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/workflows/dontime"
 	"github.com/smartcontractkit/chainlink-common/pkg/workflows/secrets"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/workflow/generated/workflow_registry_wrapper_v1"
-	coretestutils "github.com/smartcontractkit/chainlink-evm/pkg/testutils"
 	corecaps "github.com/smartcontractkit/chainlink/v2/core/capabilities"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -248,6 +247,7 @@ func Test_EventHandlerStateSync(t *testing.T) {
 }
 
 func Test_InitialStateSync(t *testing.T) {
+	t.Parallel()
 	lggr := logger.TestLogger(t)
 	backendTH := testutils.NewEVMBackendTH(t)
 	donID := uint32(1)
@@ -313,6 +313,7 @@ func Test_InitialStateSync(t *testing.T) {
 }
 
 func Test_SecretsWorker(t *testing.T) {
+	t.Parallel()
 	tests.SkipFlakey(t, "https://smartcontract-it.atlassian.net/browse/DX-732")
 	tc := []struct {
 		ss SyncStrategy
@@ -323,8 +324,9 @@ func Test_SecretsWorker(t *testing.T) {
 
 	for _, tt := range tc {
 		t.Run(string(tt.ss), func(t *testing.T) {
+			t.Parallel()
 			var (
-				ctx       = coretestutils.Context(t)
+				ctx       = t.Context()
 				lggr      = logger.TestLogger(t)
 				emitter   = custmsg.NewLabeler()
 				backendTH = testutils.NewEVMBackendTH(t)
@@ -459,6 +461,7 @@ func Test_SecretsWorker(t *testing.T) {
 }
 
 func Test_RegistrySyncer_SkipsEventsNotBelongingToDON(t *testing.T) {
+	t.Parallel()
 	var (
 		lggr      = logger.TestLogger(t)
 		backendTH = testutils.NewEVMBackendTH(t)
@@ -541,8 +544,9 @@ func Test_RegistrySyncer_SkipsEventsNotBelongingToDON(t *testing.T) {
 }
 
 func Test_RegistrySyncer_WorkflowRegistered_InitiallyPaused(t *testing.T) {
+	t.Parallel()
 	var (
-		ctx       = coretestutils.Context(t)
+		ctx       = t.Context()
 		lggr      = logger.TestLogger(t)
 		emitter   = custmsg.NewLabeler()
 		backendTH = testutils.NewEVMBackendTH(t)
@@ -641,8 +645,9 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyPaused(t *testing.T) {
 }
 
 func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivated(t *testing.T) {
+	t.Parallel()
 	var (
-		ctx       = coretestutils.Context(t)
+		ctx       = t.Context()
 		lggr      = logger.TestLogger(t)
 		emitter   = custmsg.NewLabeler()
 		backendTH = testutils.NewEVMBackendTH(t)
@@ -741,8 +746,10 @@ func Test_RegistrySyncer_WorkflowRegistered_InitiallyActivated(t *testing.T) {
 }
 
 func Test_StratReconciliation_InitialStateSync(t *testing.T) {
+	t.Parallel()
 	quarantine.Flaky(t, "DX-2063")
 	t.Run("with heavy load", func(t *testing.T) {
+		t.Parallel()
 		lggr := logger.TestLogger(t)
 		backendTH := testutils.NewEVMBackendTH(t)
 		donID := uint32(1)
@@ -876,7 +883,7 @@ func Test_StratReconciliation_RetriesWithBackoff(t *testing.T) {
 	// Wait for the handler to be called 3 times: 2 failures with backoff + 1 success
 	require.Eventually(t, func() bool {
 		return retryCount.Load() >= 3
-	}, 30*time.Second, 1*time.Second)
+	}, tests.WaitTimeout(t), 1*time.Second)
 
 	// All 3 calls (2 failures + 1 success) should have appended events
 	events := testEventHandler.GetEvents()
diff --git a/core/services/workflows/v2/engine_test.go b/core/services/workflows/v2/engine_test.go
index c97bd48cc88..293c7c0f855 100644
--- a/core/services/workflows/v2/engine_test.go
+++ b/core/services/workflows/v2/engine_test.go
@@ -1679,11 +1679,12 @@ func TestEngine_WASMBinary_With_Config(t *testing.T) { //nolint:paralleltest //
 		require.NoError(t, err)
 
 		require.Equal(t, execID, <-executionFinishedCh)
-		require.NoError(t, engine.Close())
 
 		requireUserLogs(t, beholderObserver, []string{
 			"onTrigger called",
 		})
+
+		require.NoError(t, engine.Close())
 	})
 }
 
diff --git a/tools/test/AGENTS.md b/tools/test/AGENTS.md
index abb60b8f38a..c2b5627024d 100644
--- a/tools/test/AGENTS.md
+++ b/tools/test/AGENTS.md
@@ -28,4 +28,6 @@ Opinionated flow to re-run tests and identify flakes, races, timeouts, and test
 Run these commands to validate any changes you make:
 ```sh
 golangci-lint run ./... --fix
-go test ./...
\ No newline at end of file
+go test ./...
+```
+</commands>
\ No newline at end of file
diff --git a/tools/test/go.mod b/tools/test/go.mod
index a9ab219d5b6..29b446c5c0e 100644
--- a/tools/test/go.mod
+++ b/tools/test/go.mod
@@ -6,7 +6,7 @@ require (
 	charm.land/lipgloss/v2 v2.0.4
 	github.com/charmbracelet/x/term v0.2.2
 	github.com/jackc/pgx/v5 v5.10.0
-	github.com/smartcontractkit/testrig v0.0.8
+	github.com/smartcontractkit/testrig v0.0.10
 	github.com/spf13/pflag v1.0.10
 	github.com/stretchr/testify v1.11.1
 	github.com/testcontainers/testcontainers-go v0.42.0
diff --git a/tools/test/go.sum b/tools/test/go.sum
index ed3704ac78c..5e790f59a87 100644
--- a/tools/test/go.sum
+++ b/tools/test/go.sum
@@ -152,6 +152,8 @@ github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w
 github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
 github.com/smartcontractkit/testrig v0.0.8 h1:VDdjDV7gOiAncV74qdgSHW8q5kL9CRtGYqqkHg+TnHc=
 github.com/smartcontractkit/testrig v0.0.8/go.mod h1:8m40ksjyRdc2PUI0qhYKpJGdz5ficIsVbeVnlqCAa2Y=
+github.com/smartcontractkit/testrig v0.0.10 h1:I44LpFSXXOnQoBkVU+sy0wTPI6DWvNdrG9qSzrTgvE8=
+github.com/smartcontractkit/testrig v0.0.10/go.mod h1:8m40ksjyRdc2PUI0qhYKpJGdz5ficIsVbeVnlqCAa2Y=
 github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
 github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
 github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=