3 files changed, 20 insertions, 31 deletions
diff --git a/test/benchmarks/database/BUILD b/test/benchmarks/database/BUILD
index bfa7f71b6..0b1743603 100644
--- a/test/benchmarks/database/BUILD
+++ b/test/benchmarks/database/BUILD
@@ -7,11 +7,10 @@ go_library(
     name = "database",
     testonly = 1,
     srcs = ["database.go"],
-    deps = ["//test/benchmarks/harness"],
 )
 
 benchmark_test(
-    name = "database_test",
+    name = "redis_test",
     size = "enormous",
     srcs = ["redis_test.go"],
     library = ":database",
diff --git a/test/benchmarks/database/database.go b/test/benchmarks/database/database.go
index 9eeb59f9a..c15ca661c 100644
--- a/test/benchmarks/database/database.go
+++ b/test/benchmarks/database/database.go
@@ -14,18 +14,3 @@
 
 // Package database holds benchmarks around database applications.
 package database
-
-import (
-	"os"
-	"testing"
-
-	"gvisor.dev/gvisor/test/benchmarks/harness"
-)
-
-var h harness.Harness
-
-// TestMain is the main method for package database.
-func TestMain(m *testing.M) {
-	h.Init()
-	os.Exit(m.Run())
-}
diff --git a/test/benchmarks/database/redis_test.go b/test/benchmarks/database/redis_test.go
index 02e67154e..f8075a04b 100644
--- a/test/benchmarks/database/redis_test.go
+++ b/test/benchmarks/database/redis_test.go
@@ -16,6 +16,7 @@ package database
 
 import (
 	"context"
+	"os"
 	"testing"
 	"time"
 
@@ -24,6 +25,8 @@ import (
 	"gvisor.dev/gvisor/test/benchmarks/tools"
 )
 
+var h harness.Harness
+
 // All possible operations from redis. Note: "ping" will
 // run both PING_INLINE and PING_BUILD.
 var operations []string = []string{
@@ -111,21 +114,23 @@ func BenchmarkRedis(b *testing.B) {
 			// Reset profiles and timer to begin the measurement.
 			server.RestartProfiles()
 			b.ResetTimer()
-			for i := 0; i < b.N; i++ {
-				client := clientMachine.GetNativeContainer(ctx, b)
-				defer client.CleanUp(ctx)
-				out, err := client.Run(ctx, dockerutil.RunOpts{
-					Image: "benchmarks/redis",
-				}, redis.MakeCmd(ip, serverPort)...)
-				if err != nil {
-					b.Fatalf("redis-benchmark failed with: %v", err)
-				}
-
-				// Stop time while we parse results.
-				b.StopTimer()
-				redis.Report(b, out)
-				b.StartTimer()
+			client := clientMachine.GetNativeContainer(ctx, b)
+			defer client.CleanUp(ctx)
+			out, err := client.Run(ctx, dockerutil.RunOpts{
+				Image: "benchmarks/redis",
+			}, redis.MakeCmd(ip, serverPort, b.N /*requests*/)...)
+			if err != nil {
+				b.Fatalf("redis-benchmark failed with: %v", err)
 			}
+
+			// Stop time while we parse results.
+			b.StopTimer()
+			redis.Report(b, out)
 		})
 	}
 }
+
+func TestMain(m *testing.M) {
+	h.Init()
+	os.Exit(m.Run())
+}