diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0c7d51f92e4719e88d3a8d7cae6866040f53398..f70dca77f1f13007eb2ad5dd47331e4d084cc329 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.0.1"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.1.0"
     inputs:
+      extends:
+        - .base
       needs:
         - oci
         - format-check
@@ -17,12 +19,28 @@ include:
 default:
   tags:
     - arm64
+    - linux
+    - dind
+
+.base:
+  extends: .job
+  tags:
+    - arm64
+    - linux
+    - metal
+  variables:
+    TARGET: "//..."
+  rules:
+    - if: $ROOT == "e2e" && $CI_MERGE_REQUEST_IID
+      variables:
+        TARGET: "//:ci"
+    - !reference [.bazelisk, rules]
+  script:
+    - cd "${ROOT}"; bazelisk test --config="${CONFIG}" ${TARGET}
 
 oci:
   stage: .pre
   image: docker:27.3.0
-  tags:
-    - dind
   services:
     - docker:27.3.0-dind
   variables:
@@ -35,14 +53,12 @@ oci:
     - docker info
     - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
     - docker buildx build --tag="$CI_REGISTRY_IMAGE:$CI_COMMIT_SHA" --push --cache-from "type=registry,ref=$CI_REGISTRY_IMAGE:$CI_COMMIT_BEFORE_SHA" --build-arg BUILDKIT_INLINE_CACHE=1 .
-  rules: !reference [.bazelisk, rules]
+  rules: !reference [.base, rules]
 
 format-check:
   stage: .pre
   image: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
-  tags:
-    - dind
-  extends: .job
+  extends: .base
   needs:
     - oci
   script:
@@ -51,9 +67,7 @@ format-check:
 
 pages:
   stage: deploy
-  tags:
-    - dind
-  extends: .job
+  extends: .base
   needs:
     - oci
   script:
diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel
new file mode 100644
index 0000000000000000000000000000000000000000..d3242e79b4ebb53ce70435b05e6333d8f2296ed0
--- /dev/null
+++ b/e2e/BUILD.bazel
@@ -0,0 +1,4 @@
+test_suite(
+    name = "ci",
+    tests = ["//localhost"],
+)
diff --git a/e2e/localhost/BUILD.bazel b/e2e/localhost/BUILD.bazel
index 51fad29e7812b22c90c1169483b4482f3c1d87a6..05b48f0a36cbfce3c3b3e219dc0a6ef89980c2ea 100644
--- a/e2e/localhost/BUILD.bazel
+++ b/e2e/localhost/BUILD.bazel
@@ -129,3 +129,7 @@ labgrid_test(
     src = ":inner",
     platform = "@rules_labgrid//labgrid/platform:localhost",
 )
+
+test_suite(
+    name = "localhost",
+)