8 files changed, 45 insertions, 25 deletions
diff --git a/test/benchmarks/BUILD b/test/benchmarks/BUILD
new file mode 100644
index 000000000..faf310676
--- /dev/null
+++ b/test/benchmarks/BUILD
@@ -0,0 +1,11 @@
+load("//tools:defs.bzl", "bzl_library")
+
+package(licenses = ["notice"])
+
+bzl_library(
+    name = "defs_bzl",
+    srcs = ["defs.bzl"],
+    visibility = [
+        "//:sandbox",
+    ],
+)
diff --git a/test/benchmarks/base/BUILD b/test/benchmarks/base/BUILD
index b4b55317b..697ab5837 100644
--- a/test/benchmarks/base/BUILD
+++ b/test/benchmarks/base/BUILD
@@ -1,4 +1,5 @@
-load("//tools:defs.bzl", "go_library", "go_test")
+load("//tools:defs.bzl", "go_library")
+load("//test/benchmarks:defs.bzl", "benchmark_test")
 
 package(licenses = ["notice"])
 
@@ -14,7 +15,7 @@ go_library(
     ],
 )
 
-go_test(
+benchmark_test(
     name = "startup_test",
     size = "enormous",
     srcs = ["startup_test.go"],
@@ -26,7 +27,7 @@ go_test(
     ],
 )
 
-go_test(
+benchmark_test(
     name = "size_test",
     size = "enormous",
     srcs = ["size_test.go"],
@@ -39,7 +40,7 @@ go_test(
     ],
 )
 
-go_test(
+benchmark_test(
     name = "sysbench_test",
     size = "enormous",
     srcs = ["sysbench_test.go"],
diff --git a/test/benchmarks/database/BUILD b/test/benchmarks/database/BUILD
index 93b380e8a..bfa7f71b6 100644
--- a/test/benchmarks/database/BUILD
+++ b/test/benchmarks/database/BUILD
@@ -1,4 +1,5 @@
-load("//tools:defs.bzl", "go_library", "go_test")
+load("//tools:defs.bzl", "go_library")
+load("//test/benchmarks:defs.bzl", "benchmark_test")
 
 package(licenses = ["notice"])
 
@@ -9,16 +10,11 @@ go_library(
     deps = ["//test/benchmarks/harness"],
 )
 
-go_test(
+benchmark_test(
     name = "database_test",
     size = "enormous",
     srcs = ["redis_test.go"],
     library = ":database",
-    tags = [
-        # Requires docker and runsc to be configured before test runs.
-        "manual",
-        "local",
-    ],
     visibility = ["//:sandbox"],
     deps = [
         "//pkg/test/dockerutil",
diff --git a/test/benchmarks/defs.bzl b/test/benchmarks/defs.bzl
new file mode 100644
index 000000000..ef44b46e3
--- /dev/null
+++ b/test/benchmarks/defs.bzl
@@ -0,0 +1,14 @@
+"""Defines a rule for benchmark test targets."""
+
+load("//tools:defs.bzl", "go_test")
+
+def benchmark_test(name, tags = [], **kwargs):
+    go_test(
+        name,
+        tags = [
+            # Requires docker and runsc to be configured before the test runs.
+            "local",
+            "manual",
+        ],
+        **kwargs
+    )
diff --git a/test/benchmarks/fs/BUILD b/test/benchmarks/fs/BUILD
index 021fae38d..b4f967441 100644
--- a/test/benchmarks/fs/BUILD
+++ b/test/benchmarks/fs/BUILD
@@ -1,8 +1,8 @@
-load("//tools:defs.bzl", "go_test")
+load("//test/benchmarks:defs.bzl", "benchmark_test")
 
 package(licenses = ["notice"])
 
-go_test(
+benchmark_test(
     name = "bazel_test",
     size = "enormous",
     srcs = ["bazel_test.go"],
@@ -14,7 +14,7 @@ go_test(
     ],
 )
 
-go_test(
+benchmark_test(
     name = "fio_test",
     size = "enormous",
     srcs = ["fio_test.go"],
diff --git a/test/benchmarks/media/BUILD b/test/benchmarks/media/BUILD
index bb242d385..46e8dc8b5 100644
--- a/test/benchmarks/media/BUILD
+++ b/test/benchmarks/media/BUILD
@@ -1,4 +1,5 @@
-load("//tools:defs.bzl", "go_library", "go_test")
+load("//tools:defs.bzl", "go_library")
+load("//test/benchmarks:defs.bzl", "benchmark_test")
 
 package(licenses = ["notice"])
 
@@ -9,7 +10,7 @@ go_library(
     deps = ["//test/benchmarks/harness"],
 )
 
-go_test(
+benchmark_test(
     name = "media_test",
     size = "large",
     srcs = ["ffmpeg_test.go"],
diff --git a/test/benchmarks/ml/BUILD b/test/benchmarks/ml/BUILD
index 970f52706..02ff6966f 100644
--- a/test/benchmarks/ml/BUILD
+++ b/test/benchmarks/ml/BUILD
@@ -1,4 +1,5 @@
-load("//tools:defs.bzl", "go_library", "go_test")
+load("//tools:defs.bzl", "go_library")
+load("//test/benchmarks:defs.bzl", "benchmark_test")
 
 package(licenses = ["notice"])
 
@@ -9,7 +10,7 @@ go_library(
     deps = ["//test/benchmarks/harness"],
 )
 
-go_test(
+benchmark_test(
     name = "ml_test",
     size = "large",
     srcs = ["tensorflow_test.go"],
diff --git a/test/benchmarks/network/BUILD b/test/benchmarks/network/BUILD
index 472b5c387..c75d1ce11 100644
--- a/test/benchmarks/network/BUILD
+++ b/test/benchmarks/network/BUILD
@@ -1,4 +1,5 @@
-load("//tools:defs.bzl", "go_library", "go_test")
+load("//tools:defs.bzl", "go_library")
+load("//test/benchmarks:defs.bzl", "benchmark_test")
 
 package(licenses = ["notice"])
 
@@ -16,7 +17,7 @@ go_library(
     ],
 )
 
-go_test(
+benchmark_test(
     name = "network_test",
     size = "large",
     srcs = [
@@ -27,11 +28,6 @@ go_test(
         "ruby_test.go",
     ],
     library = ":network",
-    tags = [
-        # Requires docker and runsc to be configured before test runs.
-        "manual",
-        "local",
-    ],
     visibility = ["//:sandbox"],
     deps = [
         "//pkg/test/dockerutil",