diff --git a/go.mod b/go.mod
index 8c76a28..1fbd739 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/ipld/ipld/specs v0.0.0-20230907004443-0e4ff95ff474
 	github.com/ipni/go-libipni v0.5.0
 	github.com/ipni/index-provider v0.14.1
-	github.com/ipni/storetheindex v0.7.9-0.20230912093039-8042ebe82b42
+	github.com/ipni/storetheindex v0.7.9-0.20230914224616-e6658bcf60c5
 	github.com/libp2p/go-libp2p v0.31.0
 	github.com/multiformats/go-multiaddr v0.11.0
 	github.com/multiformats/go-multihash v0.2.3
diff --git a/go.sum b/go.sum
index 599db7c..c7f391c 100644
--- a/go.sum
+++ b/go.sum
@@ -295,8 +295,8 @@ github.com/ipni/go-libipni v0.5.0 h1:UTVq4U9cReNz/rbeVeUvl+JTLexdfb7yjmBgouSteJ8
 github.com/ipni/go-libipni v0.5.0/go.mod h1:UnrhEqjVI2Z2HXlaieOBONJmtW557nZkYpB4IIsMD+s=
 github.com/ipni/index-provider v0.14.1 h1:ADD/bdn/E7QUWeZEhjs2DJ/kfAzBozXMeGjR4SEV3sE=
 github.com/ipni/index-provider v0.14.1/go.mod h1:Ax0/G8jSQaCYqukXb6KzX41MsDZxrCnShWWcjU3XoaE=
-github.com/ipni/storetheindex v0.7.9-0.20230912093039-8042ebe82b42 h1:rJsakaXDEn0xvXPZSzVBHUW7vCjgT2oCfEf1+8fxpT8=
-github.com/ipni/storetheindex v0.7.9-0.20230912093039-8042ebe82b42/go.mod h1:C7798VST3lqwZnCl8lGCjol5GUU9yFD9RJgOZ17LZRE=
+github.com/ipni/storetheindex v0.7.9-0.20230914224616-e6658bcf60c5 h1:WXgzhHhDatR+TtTOYUKrqiJpxYGCQE3NkHix/cyuch8=
+github.com/ipni/storetheindex v0.7.9-0.20230914224616-e6658bcf60c5/go.mod h1:C7798VST3lqwZnCl8lGCjol5GUU9yFD9RJgOZ17LZRE=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
diff --git a/internal/integration/e2e_test.go b/internal/integration/e2e_test.go
index b49f13d..613bb28 100644
--- a/internal/integration/e2e_test.go
+++ b/internal/integration/e2e_test.go
@@ -51,10 +51,7 @@ func TestIpniAndFetchIntegration(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 			defer cancel()
 
-			indexerReady := test.NewIndexerReadyWatcher()
-			frisbiiReady := test.NewStdoutWatcher("frisbii", "Announce() complete")
-
-			tr := test.NewTestIndexerRunner(t, ctx, t.TempDir(), indexerReady, frisbiiReady)
+			tr := test.NewTestIpniRunner(t, ctx, t.TempDir())
 
 			t.Log("Running in test directory:", tr.Dir)
 
@@ -70,7 +67,7 @@ func TestIpniAndFetchIntegration(t *testing.T) {
 
 			// install the indexer to announce to
 			indexer := filepath.Join(tr.Dir, "storetheindex")
-			tr.Run("go", "install", "github.com/ipni/storetheindex@e56485343dd8e235581191b4668b5bfc0cea0781") // TODO: use @latest when we have a release
+			tr.Run("go", "install", "github.com/ipni/storetheindex@HEAD") // TODO: use @latest when we have a release
 			// install the ipni cli to inspect the indexer
 			ipni := filepath.Join(tr.Dir, "ipni")
 			tr.Run("go", "install", "github.com/ipni/ipni-cli/cmd/ipni@latest")
@@ -83,7 +80,8 @@ func TestIpniAndFetchIntegration(t *testing.T) {
 
 			// initialise and start the indexer and adjust the config
 			tr.Run(indexer, "init", "--store", "pebble", "--pubsub-topic", "/indexer/ingest/mainnet", "--no-bootstrap")
-			cmdIndexer := tr.Start(indexer, "daemon")
+			indexerReady := test.NewStdoutWatcher(test.IndexerReadyMatch)
+			cmdIndexer := tr.Start(test.NewExecution(indexer, "daemon").WithWatcher(indexerReady))
 			select {
 			case <-indexerReady.Signal:
 			case <-ctx.Done():
@@ -122,7 +120,8 @@ func TestIpniAndFetchIntegration(t *testing.T) {
 			args = append(args, testCase.frisbiiFlags...)
 
 			// start frisbii
-			cmdFrisbii := tr.Start(frisbii, args...)
+			frisbiiReady := test.NewStdoutWatcher("Announce() complete")
+			cmdFrisbii := tr.Start(test.NewExecution(frisbii, args...).WithWatcher(frisbiiReady))
 
 			select {
 			case <-frisbiiReady.Signal: