3 files changed, 15 insertions, 7 deletions
diff --git a/test/benchmarks/base/startup_test.go b/test/benchmarks/base/startup_test.go
index 05a43ad17..197241622 100644
--- a/test/benchmarks/base/startup_test.go
+++ b/test/benchmarks/base/startup_test.go
@@ -34,15 +34,19 @@ func BenchmarkStartupEmpty(b *testing.B) {
 	defer machine.CleanUp()
 
 	ctx := context.Background()
+	b.StopTimer()
+	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		harness.DebugLog(b, "Running container: %d", i)
 		container := machine.GetContainer(ctx, b)
-		defer container.CleanUp(ctx)
-		if _, err := container.Run(ctx, dockerutil.RunOpts{
+		b.StartTimer()
+		if err := container.Spawn(ctx, dockerutil.RunOpts{
 			Image: "benchmarks/alpine",
-		}, "true"); err != nil {
-			b.Fatalf("failed to run container: %v", err)
+		}, "sleep", "100"); err != nil {
+			b.Fatalf("failed to start container: %v", err)
 		}
+		b.StopTimer()
+		container.CleanUp(ctx)
 		harness.DebugLog(b, "Ran container: %d", i)
 	}
 }
diff --git a/test/benchmarks/tcp/tcp_proxy.go b/test/benchmarks/tcp/tcp_proxy.go
index be74e4d4a..bc0d8fd38 100644
--- a/test/benchmarks/tcp/tcp_proxy.go
+++ b/test/benchmarks/tcp/tcp_proxy.go
@@ -208,8 +208,12 @@ func newNetstackImpl(mode string) (impl, error) {
 	if err := s.CreateNIC(nicID, fifo.New(ep, runtime.GOMAXPROCS(0), 1000)); err != nil {
 		return nil, fmt.Errorf("error creating NIC %q: %v", *iface, err)
 	}
-	if err := s.AddAddress(nicID, ipv4.ProtocolNumber, parsedAddr); err != nil {
-		return nil, fmt.Errorf("error adding IP address to %q: %v", *iface, err)
+	protocolAddr := tcpip.ProtocolAddress{
+		Protocol:          ipv4.ProtocolNumber,
+		AddressWithPrefix: parsedAddr.WithPrefix(),
+	}
+	if err := s.AddProtocolAddress(nicID, protocolAddr, stack.AddressProperties{}); err != nil {
+		return nil, fmt.Errorf("error adding IP address %+v to %q: %w", protocolAddr, *iface, err)
 	}
 
 	subnet, err := tcpip.NewSubnet(parsedDest, parsedMask)
diff --git a/test/benchmarks/tools/fio_test.go b/test/benchmarks/tools/fio_test.go
index a98277150..3b1f852ce 100644
--- a/test/benchmarks/tools/fio_test.go
+++ b/test/benchmarks/tools/fio_test.go
@@ -86,7 +86,7 @@ func TestFio(t *testing.T) {
 	fio := Fio{}
 	// WriteBandwidth.
 	got, err := fio.parseBandwidth(sampleData, false)
-	var want float64 = 1753471.0 * 1024
+	want := 1753471.0 * 1024
 	if err != nil {
 		t.Fatalf("parse failed with err: %v", err)
 	} else if got != want {