diff --git a/e2e/docker/BUILD.bazel b/e2e/docker/BUILD.bazel
index 0d6bf3709134d4e7eddd680ad42ef3c33962291d..603581deec810ea4af206fefbdb6c36441c5a01c 100644
--- a/e2e/docker/BUILD.bazel
+++ b/e2e/docker/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@rules_diff//diff/file/test:defs.bzl", "diff_file_test")
 load("@rules_labgrid//labgrid/config/toolchain:defs.bzl", "labgrid_config_toolchain")
-load("@rules_labgrid//labgrid/run:defs.bzl", "labgrid_run")
+load("@rules_labgrid//labgrid/genrule:defs.bzl", "labgrid_genrule")
 load("@rules_labgrid//labgrid/state:defs.bzl", "labgrid_state")
 load("@rules_python//python:defs.bzl", "py_binary")
 
@@ -43,12 +43,13 @@ py_binary(
     deps = ["@pip//docker"],
 )
 
-labgrid_run(
+labgrid_genrule(
     name = "os-release",
     srcs = ["@ape//ape:cat"],
     outs = ["stdout.log"],
-    cmd = "$(location @ape//ape:cat) /etc/os-release > $@",
+    cmd = "$(location @rules_labgrid//labgrid/run) $(location @ape//ape:cat) /etc/os-release > $@",
     platform = ":platform",
+    tools = ["@rules_labgrid//labgrid/run"],
 )
 
 diff_file_test(
diff --git a/e2e/localhost/BUILD.bazel b/e2e/localhost/BUILD.bazel
index 6d451f3ad979eacbbd4f9c9eebd8491f88ac3e07..51fad29e7812b22c90c1169483b4482f3c1d87a6 100644
--- a/e2e/localhost/BUILD.bazel
+++ b/e2e/localhost/BUILD.bazel
@@ -1,16 +1,16 @@
 load("@rules_diff//diff/file/test:defs.bzl", "diff_file_test")
 load("@rules_labgrid//labgrid/genrule:defs.bzl", "labgrid_genrule")
-load("@rules_labgrid//labgrid/run:defs.bzl", "labgrid_run")
 load("@rules_labgrid//labgrid/run/binary:defs.bzl", "labgrid_run_binary")
 load("@rules_labgrid//labgrid/test:defs.bzl", "labgrid_test")
 load("@rules_python//python:defs.bzl", "py_binary")
 
-labgrid_run(
+labgrid_genrule(
     name = "hello",
     srcs = ["@ape//ape:echo"],
     outs = ["run.actual"],
-    cmd = "$(location @ape//ape:echo) world > $@",
+    cmd = "$(location @rules_labgrid//labgrid/run) $(location @ape//ape:echo) world > $@",
     platform = "@rules_labgrid//labgrid/platform:localhost",
+    tools = ["@rules_labgrid//labgrid/run"],
 )
 
 py_binary(
@@ -19,12 +19,13 @@ py_binary(
     main = "echo.py",
 )
 
-labgrid_run(
+labgrid_genrule(
     name = "hello-with-runfiles",
     srcs = [":echo-with-runfiles"],
     outs = ["run-with-runfiles.actual"],
-    cmd = "$(locations :echo-with-runfiles) world > $@",
+    cmd = "$(location @rules_labgrid//labgrid/run) $(locations :echo-with-runfiles) world > $@",
     platform = "@rules_labgrid//labgrid/platform:localhost",
+    tools = ["@rules_labgrid//labgrid/run"],
 )
 
 labgrid_genrule(
diff --git a/e2e/qemu/BUILD.bazel b/e2e/qemu/BUILD.bazel
index e763df2bb15db7a16358112a0fc3632fc758dc45..5f5dc15cb5252494feacbe80ba36375e7fcdc374 100644
--- a/e2e/qemu/BUILD.bazel
+++ b/e2e/qemu/BUILD.bazel
@@ -1,17 +1,18 @@
 load("@rules_diff//diff/file/test:defs.bzl", "diff_file_test")
-load("@rules_labgrid//labgrid/run:defs.bzl", "labgrid_run")
+load("@rules_labgrid//labgrid/genrule:defs.bzl", "labgrid_genrule")
 load("@rules_labgrid//labgrid/test:defs.bzl", "labgrid_test")
 load("@rules_python//python:defs.bzl", "py_binary")
 
 CPUS = ("amd64",)
 
 [
-    labgrid_run(
+    labgrid_genrule(
         name = "os-release-{}".format(cpu),
         srcs = ["@ape//ape:cat"],
         outs = ["stdout-{}.log".format(cpu)],
-        cmd = "$(location @ape//ape:cat) /etc/os-release > $@",
+        cmd = "$(location @rules_labgrid//labgrid/run) $(location @ape//ape:cat) /etc/os-release > $@",
         platform = "@rules_labgrid//labgrid/platform:qemu-{}-linux".format(cpu),
+        tools = ["@rules_labgrid//labgrid/run"],
     )
     for cpu in CPUS
 ]
diff --git a/labgrid/run/BUILD.bazel b/labgrid/run/BUILD.bazel
index 66aacf50c1ba340ceaf213ec0755cee7b1aa7b52..2380e847db8fc0db7b39aa7e2816be6778a52a9f 100644
--- a/labgrid/run/BUILD.bazel
+++ b/labgrid/run/BUILD.bazel
@@ -41,17 +41,3 @@ py_binary(
         "@rules_python//python/runfiles",
     ],
 )
-
-bzl_library(
-    name = "defs",
-    srcs = ["defs.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [":macro"],
-)
-
-bzl_library(
-    name = "macro",
-    srcs = ["macro.bzl"],
-    visibility = ["//visibility:public"],
-    deps = ["//labgrid/genrule:defs"],
-)
diff --git a/labgrid/run/defs.bzl b/labgrid/run/defs.bzl
deleted file mode 100644
index 011620d53848192245cd4b86f9afa4650a809c99..0000000000000000000000000000000000000000
--- a/labgrid/run/defs.bzl
+++ /dev/null
@@ -1,5 +0,0 @@
-load(":macro.bzl", _run = "labgrid_run")
-
-visibility("public")
-
-labgrid_run = _run
diff --git a/labgrid/run/macro.bzl b/labgrid/run/macro.bzl
deleted file mode 100644
index be08399b88a0f485b04d70f6710b1ca3b95b35f5..0000000000000000000000000000000000000000
--- a/labgrid/run/macro.bzl
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//labgrid/genrule:defs.bzl", "labgrid_genrule")
-
-visibility("//...")
-
-def labgrid_run(name, srcs, outs, cmd, platform = None, **kwargs):
-    run = Label("//labgrid/run")
-    labgrid_genrule(
-        name = name,
-        srcs = srcs,
-        outs = outs,
-        cmd = "$(location {}) {}".format(run, cmd),
-        platform = platform,
-        tools = [run],
-        **kwargs
-    )