diff --git a/bazel/labgrid/executor/BUILD.bazel b/bazel/labgrid/executor/BUILD.bazel
new file mode 100644
index 0000000000000000000000000000000000000000..5034f9800a10d052219c7b6e84067f40ab71f542
--- /dev/null
+++ b/bazel/labgrid/executor/BUILD.bazel
@@ -0,0 +1,7 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
+py_library(
+    name = "executor",
+    srcs = ["manager.py"],
+    visibility = ["//visibility:public"],
+)
diff --git a/labgrid/executor/manager.py b/bazel/labgrid/executor/manager.py
similarity index 100%
rename from labgrid/executor/manager.py
rename to bazel/labgrid/executor/manager.py
diff --git a/e2e/docker/BUILD.bazel b/e2e/docker/BUILD.bazel
index cc34f9a0b8aa5d21f9c005a71d20e94d4d3c880a..b729b8f40f632dc2071040afd33a3cc29542c272 100644
--- a/e2e/docker/BUILD.bazel
+++ b/e2e/docker/BUILD.bazel
@@ -32,7 +32,7 @@ py_library(
     name = "manager",
     srcs = ["manager.py"],
     data = ["local-ubuntu.16.04-gnu.yaml"],
-    deps = ["@rules_labgrid//labgrid/executor:manager"],
+    deps = ["@rules_labgrid//bazel/labgrid/executor"],
 )
 
 # Create the LabGrid executor binary using our manager
diff --git a/e2e/docker/manager.py b/e2e/docker/manager.py
index cca44f05f35c9ace1eaa2ca58ba93bdb4fb053e0..192ab9dfb35c6d6d12e1966f37180feffd4cb358 100644
--- a/e2e/docker/manager.py
+++ b/e2e/docker/manager.py
@@ -5,7 +5,7 @@ from typing import Iterator
 
 from python.runfiles import Runfiles
 
-from labgrid.executor.manager import Data, Manager
+from bazel.labgrid.executor.manager import Data, Manager
 
 
 @contextmanager
diff --git a/labgrid/executor/BUILD.bazel b/labgrid/executor/BUILD.bazel
index b052be318f0380c83f34a2b81310570c51f2e729..ba75acaf3443f657898abce18dca34762777658c 100644
--- a/labgrid/executor/BUILD.bazel
+++ b/labgrid/executor/BUILD.bazel
@@ -3,20 +3,25 @@ load("@toolchain_utils//toolchain/symlink/target:defs.bzl", "toolchain_symlink_t
 
 exports_files(
     ["executor.py"],
+)
+
+alias(
+    name = "main",
+    actual = "executor.py",
     visibility = ["//visibility:public"],
 )
 
-py_library(
-    name = "manager",
-    srcs = ["manager.py"],
+filegroup(
+    name = "srcs",
+    srcs = ["executor.py"],
     visibility = ["//visibility:public"],
 )
 
 py_binary(
     name = "executor",
-    srcs = ["executor.py"],
+    srcs = [":srcs"],
     visibility = ["//visibility:public"],
-    deps = [":manager"],
+    deps = ["//bazel/labgrid/executor"],
 )
 
 py_library(
@@ -24,7 +29,7 @@ py_library(
     srcs = ["host.py"],
     data = ["hello-world.txt"],
     deps = [
-        ":manager",
+        "//bazel/labgrid/executor",
         "@rules_python//python/runfiles",
     ],
 )
@@ -32,21 +37,21 @@ py_library(
 py_test(
     name = "argument",
     size = "small",
-    srcs = ["executor.py"],
+    srcs = [":srcs"],
     args = [
         "--manager",
         "labgrid.executor.host:manager",
         "echo",
         "$${DATA}",
     ],
-    main = "executor.py",
+    main = ":main",
     deps = ["host"],
 )
 
 py_test(
     name = "envvar",
     size = "small",
-    srcs = ["executor.py"],
+    srcs = [":srcs"],
     args = [
         "echo",
         "$${DATA}",
@@ -54,6 +59,6 @@ py_test(
     env = {
         "LABGRID_EXECUTOR_MANAGER": "labgrid.executor.host:manager",
     },
-    main = "executor.py",
+    main = ":main",
     deps = ["host"],
 )
diff --git a/labgrid/executor/executor.py b/labgrid/executor/executor.py
index c205278aa5c0ad7880f4e2a22548080e6625e3a6..570ad65bf797ccefbed215f7cbb32688f9aadb79 100644
--- a/labgrid/executor/executor.py
+++ b/labgrid/executor/executor.py
@@ -13,7 +13,7 @@ from shutil import which
 from subprocess import CalledProcessError, run
 from sys import argv, stderr
 
-from labgrid.executor.manager import Manager
+from bazel.labgrid.executor.manager import Manager
 
 
 def load(value: str) -> Manager:
diff --git a/labgrid/executor/host.py b/labgrid/executor/host.py
index 1e412cb7e5921997d240402086bc769bf2f3e96c..d638d9e4d987a90c0cdc1d00ae766e56618ee35b 100644
--- a/labgrid/executor/host.py
+++ b/labgrid/executor/host.py
@@ -5,7 +5,7 @@ from typing import Iterator
 
 from python.runfiles import Runfiles
 
-from labgrid.executor.manager import Data, Manager
+from bazel.labgrid.executor.manager import Data, Manager
 
 
 @contextmanager
diff --git a/labgrid/executor/macro.bzl b/labgrid/executor/macro.bzl
index f868e57a2da4ca3cf3b18adbf88dc0cd40080562..da9217e8506bf47288e60abe92b459afd29de26f 100644
--- a/labgrid/executor/macro.bzl
+++ b/labgrid/executor/macro.bzl
@@ -23,8 +23,8 @@ def labgrid_executor(
     labels = [native.package_relative_label(d) for d in deps]
     py_binary(
         name = name,
-        srcs = [Label(":executor.py")],
-        main = "executor.py",
+        srcs = [Label(":srcs")],
+        main = Label(":main"),
         deps = labels + [Label("@rules_python//python/runfiles")],
         env = env | {
             "LABGRID_EXECUTOR_MANAGER": _manager(labels, manager),