diff --git a/.devcontainer/gz-smoke/devcontainer.json b/.devcontainer/gz-smoke/devcontainer.json
new file mode 100644
index 0000000..4389beb
--- /dev/null
+++ b/.devcontainer/gz-smoke/devcontainer.json
@@ -0,0 +1,29 @@
+{
+  "name": "gz-smoke",
+  "image": "althack/gz:jetty-base",
+  "remoteUser": "ros",
+  "updateRemoteUserUID": true,
+  "containerEnv": {
+    "GZ_VERSION": "jetty"
+  },
+  "runArgs": [
+    "--network=host",
+    "--ipc=host",
+    "--cap-add=SYS_PTRACE",
+    "--security-opt=seccomp:unconfined",
+    "--security-opt=apparmor:unconfined"
+  ],
+  "features": {
+    "../local-features/linux-x11-forwarding": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-vscode.cpptools",
+        "ms-python.python",
+        "twxs.cmake",
+        "redhat.vscode-yaml"
+      ]
+    }
+  }
+}
diff --git a/.devcontainer/linux-x11-forwarding-smoke/devcontainer.json b/.devcontainer/linux-x11-forwarding-smoke/devcontainer.json
new file mode 100644
index 0000000..9498c44
--- /dev/null
+++ b/.devcontainer/linux-x11-forwarding-smoke/devcontainer.json
@@ -0,0 +1,10 @@
+{
+  "name": "linux-x11-forwarding-smoke",
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "features": {
+    "../local-features/linux-x11-forwarding": {
+      "x11Display": "${localEnv:DISPLAY}"
+    }
+  },
+  "postCreateCommand": "sudo apt-get update && sudo apt-get install -y x11-apps"
+}
diff --git a/.devcontainer/local-features/.gitignore b/.devcontainer/local-features/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/.devcontainer/local-features/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/.devcontainer/prepare-local-features.sh b/.devcontainer/prepare-local-features.sh
new file mode 100755
index 0000000..e1ed0c0
--- /dev/null
+++ b/.devcontainer/prepare-local-features.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+local_features_dir="${repo_root}/.devcontainer/local-features"
+
+mkdir -p "${local_features_dir}"
+rm -rf "${local_features_dir}/linux-x11-forwarding" "${local_features_dir}/x11" "${local_features_dir}/wayland"
+cp -R "${repo_root}/features/src/linux-x11-forwarding" "${local_features_dir}/linux-x11-forwarding"
+
+echo "Prepared local smoke-test features in ${local_features_dir}"
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index a975c73..6af8a8d 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -23,6 +23,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: Install devcontainer CLI
+        run: npm install -g @devcontainers/cli
+
       - name: Validate feature metadata
         run: bash features/test/test_all.sh
 
diff --git a/README.md b/README.md
index 10323b2..057ad3e 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,22 @@ Devcontainer templates repository focused on robotics and simulation.
 
 - `templates/src/gz`
 
-## Included features
+## Included feature
 
-- `features/src/x11`
-- `features/src/wayland`
+- `features/src/linux-x11-forwarding` (local Linux hosts only)
+
+## Sample configs
+
+- `.devcontainer/gz-smoke/devcontainer.json`
+- `.devcontainer/linux-x11-forwarding-smoke/devcontainer.json`
+
+Before using the samples locally, run
+`bash .devcontainer/prepare-local-features.sh` so `devcontainer up` can resolve
+the unpublished Feature.
+
+On classic Xorg hosts where the authority cookie lives outside
+`XDG_RUNTIME_DIR`, add a bind mount to `/tmp/devcontainer-xauthority-host`.
+XWayland setups are auto-detected from the mounted runtime directory.
 
 ## Workflows
 
diff --git a/features/src/linux-x11-forwarding/NOTES.md b/features/src/linux-x11-forwarding/NOTES.md
new file mode 100644
index 0000000..60bb038
--- /dev/null
+++ b/features/src/linux-x11-forwarding/NOTES.md
@@ -0,0 +1,31 @@
+## Linux host requirements
+
+This Feature supports containers running locally on a Linux desktop with Xorg or
+Wayland/XWayland. It does not configure a host X server and does not support
+Docker Desktop on macOS or Windows, remote Docker daemons, or Codespaces.
+
+The container is granted access to the host X server. Only use it with
+development containers you trust.
+
+## Xauthority
+
+For modern Wayland/XWayland desktops, the feature auto-discovers the mounted `.mutter-Xwaylandauth.*` file from `XDG_RUNTIME_DIR`.
+
+For classic Xorg setups where the authority file lives outside `XDG_RUNTIME_DIR` (often `~/.Xauthority`), add an explicit mount in the consuming `devcontainer.json`:
+
+```json
+"mounts": [
+  "source=${localEnv:XAUTHORITY},target=/tmp/devcontainer-xauthority-host,type=bind,readonly"
+]
+```
+
+The feature always exposes the stable in-container path `/tmp/devcontainer-xauthority` through `XAUTHORITY`.
+
+Qt applications are forced onto the X11 backend with `QT_QPA_PLATFORM=xcb` so they do not try to boot the Wayland plugin in X11-only containers.
+
+If the container does not already define `XDG_RUNTIME_DIR`, the Feature creates
+a private per-user directory at `/tmp/devcontainer-runtime-<uid>`. The mounted
+host runtime directory remains separate and is used only for host sockets and
+XWayland authentication.
+
+Use the `x11Display` option to set the in-container `DISPLAY` value.
diff --git a/features/src/linux-x11-forwarding/README.md b/features/src/linux-x11-forwarding/README.md
new file mode 100644
index 0000000..f169dcb
--- /dev/null
+++ b/features/src/linux-x11-forwarding/README.md
@@ -0,0 +1,56 @@
+
+# Linux X11 Forwarding (linux-x11-forwarding)
+
+Forward a local Linux host's X11 display into a development container.
+
+## Example Usage
+
+```json
+"features": {
+    "ghcr.io/althack/devcontainers/linux-x11-forwarding:0": {}
+}
+```
+
+## Options
+
+| Options Id | Description | Type | Default Value |
+|-----|-----|-----|-----|
+| x11Display | Set DISPLAY for X11 clients launched from the container. | string | :0 |
+| softwareGL | Set LIBGL_ALWAYS_SOFTWARE for GPU compatibility. | string | 1 |
+
+## Linux host requirements
+
+This Feature supports containers running locally on a Linux desktop with Xorg or
+Wayland/XWayland. It does not configure a host X server and does not support
+Docker Desktop on macOS or Windows, remote Docker daemons, or Codespaces.
+
+The container is granted access to the host X server. Only use it with
+development containers you trust.
+
+## Xauthority
+
+For modern Wayland/XWayland desktops, the feature auto-discovers the mounted `.mutter-Xwaylandauth.*` file from `XDG_RUNTIME_DIR`.
+
+For classic Xorg setups where the authority file lives outside `XDG_RUNTIME_DIR` (often `~/.Xauthority`), add an explicit mount in the consuming `devcontainer.json`:
+
+```json
+"mounts": [
+  "source=${localEnv:XAUTHORITY},target=/tmp/devcontainer-xauthority-host,type=bind,readonly"
+]
+```
+
+The feature always exposes the stable in-container path `/tmp/devcontainer-xauthority` through `XAUTHORITY`.
+
+Qt applications are forced onto the X11 backend with `QT_QPA_PLATFORM=xcb` so they do not try to boot the Wayland plugin in X11-only containers.
+
+If the container does not already define `XDG_RUNTIME_DIR`, the Feature creates
+a private per-user directory at `/tmp/devcontainer-runtime-<uid>`. The mounted
+host runtime directory remains separate and is used only for host sockets and
+XWayland authentication.
+
+Use the `x11Display` option to set the in-container `DISPLAY` value.
+
+
+---
+
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/althack/devcontainers/blob/main/features/src/linux-x11-forwarding/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/features/src/linux-x11-forwarding/devcontainer-feature.json b/features/src/linux-x11-forwarding/devcontainer-feature.json
new file mode 100644
index 0000000..3375ae5
--- /dev/null
+++ b/features/src/linux-x11-forwarding/devcontainer-feature.json
@@ -0,0 +1,35 @@
+{
+  "id": "linux-x11-forwarding",
+  "version": "0.1.0",
+  "name": "Linux X11 Forwarding",
+  "description": "Forward a local Linux host's X11 display into a development container.",
+  "documentationURL": "https://github.com/althack/devcontainers/tree/main/features/src/linux-x11-forwarding",
+  "licenseURL": "https://github.com/althack/devcontainers/blob/main/LICENSE",
+  "options": {
+    "x11Display": {
+      "type": "string",
+      "default": ":0",
+      "description": "Set DISPLAY for X11 clients launched from the container."
+    },
+    "softwareGL": {
+      "type": "string",
+      "default": "1",
+      "proposals": [
+        "0",
+        "1"
+      ],
+      "description": "Set LIBGL_ALWAYS_SOFTWARE for GPU compatibility."
+    }
+  },
+  "containerEnv": {
+    "XAUTHORITY": "/tmp/devcontainer-xauthority",
+    "PULSE_SERVER": "unix:/tmp/devcontainer-host-runtime/pulse-native"
+  },
+  "mounts": [
+    "source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind",
+    "source=${localEnv:XDG_RUNTIME_DIR},target=/tmp/devcontainer-host-runtime,type=bind"
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
+}
diff --git a/features/src/linux-x11-forwarding/install.sh b/features/src/linux-x11-forwarding/install.sh
new file mode 100755
index 0000000..318df6f
--- /dev/null
+++ b/features/src/linux-x11-forwarding/install.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+x11_display="${X11DISPLAY:-:0}"
+software_gl="${SOFTWAREGL:-1}"
+
+cat >/etc/profile.d/devcontainer-x11-gui.sh <<EOF
+host_runtime_dir="/tmp/devcontainer-host-runtime"
+mounted_xauthority="/tmp/devcontainer-xauthority-host"
+xauthority_target="/tmp/devcontainer-xauthority"
+
+if [ -z "\${XDG_RUNTIME_DIR:-}" ]; then
+    container_runtime_dir="/tmp/devcontainer-runtime-\$(id -u)"
+    mkdir -p "\${container_runtime_dir}"
+    chmod 0700 "\${container_runtime_dir}"
+    export XDG_RUNTIME_DIR="\${container_runtime_dir}"
+fi
+
+if [ -e "\${mounted_xauthority}" ]; then
+    ln -snf "\${mounted_xauthority}" "\${xauthority_target}"
+else
+    set -- "\${host_runtime_dir}"/.mutter-Xwaylandauth.*
+    if [ -e "\$1" ]; then
+        ln -snf "\$1" "\${xauthority_target}"
+    else
+        rm -f "\${xauthority_target}"
+    fi
+fi
+
+export DISPLAY="${x11_display}"
+export LIBGL_ALWAYS_SOFTWARE="${software_gl}"
+export QT_QPA_PLATFORM="xcb"
+export XAUTHORITY="\${xauthority_target}"
+EOF
+
+chmod 0644 /etc/profile.d/devcontainer-x11-gui.sh
+
+echo "X11 feature metadata configured."
diff --git a/features/src/wayland/README.md b/features/src/wayland/README.md
deleted file mode 100644
index 30c1a2b..0000000
--- a/features/src/wayland/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# Wayland GUI Forwarding (wayland)
-
-Configure container environment and mounts for host Wayland display forwarding.
-
-## Example Usage
-
-```json
-"features": {
-    "ghcr.io/althack/devcontainers/wayland:0": {}
-}
-```
-
-## Options
-
-| Options Id | Description | Type | Default Value |
-|-----|-----|-----|-----|
-| softwareGL | Set LIBGL_ALWAYS_SOFTWARE for GPU compatibility. | string | 1 |
-
-
-
----
-
-_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/althack/devcontainers/blob/main/features/src/wayland/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/features/src/wayland/devcontainer-feature.json b/features/src/wayland/devcontainer-feature.json
deleted file mode 100644
index c718490..0000000
--- a/features/src/wayland/devcontainer-feature.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "id": "wayland",
-  "version": "0.1.0",
-  "name": "Wayland GUI Forwarding",
-  "description": "Configure container environment and mounts for host Wayland display forwarding.",
-  "documentationURL": "https://github.com/athackst/devcontainer-templates/tree/main/features/src/wayland",
-  "licenseURL": "https://github.com/athackst/devcontainer-templates/blob/main/LICENSE",
-  "options": {
-    "softwareGL": {
-      "type": "string",
-      "default": "1",
-      "proposals": [
-        "0",
-        "1"
-      ],
-      "description": "Set LIBGL_ALWAYS_SOFTWARE for GPU compatibility."
-    }
-  },
-  "containerEnv": {
-    "WAYLAND_DISPLAY": "${localEnv:WAYLAND_DISPLAY}",
-    "XDG_RUNTIME_DIR": "${localEnv:XDG_RUNTIME_DIR}",
-    "PULSE_SERVER": "${localEnv:PULSE_SERVER}",
-    "LIBGL_ALWAYS_SOFTWARE": "${feature:softwareGL}"
-  },
-  "mounts": [
-    "source=${localEnv:XDG_RUNTIME_DIR},target=${localEnv:XDG_RUNTIME_DIR},type=bind"
-  ],
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
-}
diff --git a/features/src/wayland/install.sh b/features/src/wayland/install.sh
deleted file mode 100755
index 51daee1..0000000
--- a/features/src/wayland/install.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Runtime forwarding is configured through feature metadata (containerEnv/mounts).
-# Keep install lightweight and deterministic.
-echo "Wayland feature metadata configured."
diff --git a/features/src/x11/README.md b/features/src/x11/README.md
deleted file mode 100644
index 313e323..0000000
--- a/features/src/x11/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# X11 GUI Forwarding (x11)
-
-Configure container environment and mounts for host X11 display forwarding.
-
-## Example Usage
-
-```json
-"features": {
-    "ghcr.io/althack/devcontainers/x11:0": {}
-}
-```
-
-## Options
-
-| Options Id | Description | Type | Default Value |
-|-----|-----|-----|-----|
-| softwareGL | Set LIBGL_ALWAYS_SOFTWARE for GPU compatibility. | string | 1 |
-
-
-
----
-
-_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/althack/devcontainers/blob/main/features/src/x11/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/features/src/x11/devcontainer-feature.json b/features/src/x11/devcontainer-feature.json
deleted file mode 100644
index 297db48..0000000
--- a/features/src/x11/devcontainer-feature.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "id": "x11",
-  "version": "0.1.0",
-  "name": "X11 GUI Forwarding",
-  "description": "Configure container environment and mounts for host X11 display forwarding.",
-  "documentationURL": "https://github.com/athackst/devcontainer-templates/tree/main/features/src/x11",
-  "licenseURL": "https://github.com/athackst/devcontainer-templates/blob/main/LICENSE",
-  "options": {
-    "softwareGL": {
-      "type": "string",
-      "default": "1",
-      "proposals": [
-        "0",
-        "1"
-      ],
-      "description": "Set LIBGL_ALWAYS_SOFTWARE for GPU compatibility."
-    }
-  },
-  "containerEnv": {
-    "DISPLAY": "${localEnv:DISPLAY}",
-    "XAUTHORITY": "${localEnv:XAUTHORITY}",
-    "PULSE_SERVER": "${localEnv:PULSE_SERVER}",
-    "LIBGL_ALWAYS_SOFTWARE": "${feature:softwareGL}"
-  },
-  "mounts": [
-    "source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind"
-  ],
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
-}
diff --git a/features/src/x11/install.sh b/features/src/x11/install.sh
deleted file mode 100755
index 8eed45b..0000000
--- a/features/src/x11/install.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Runtime forwarding is configured through feature metadata (containerEnv/mounts).
-# Keep install lightweight and deterministic.
-echo "X11 feature metadata configured."
diff --git a/features/test/linux-x11-forwarding/host_forwarding_env.sh b/features/test/linux-x11-forwarding/host_forwarding_env.sh
new file mode 100755
index 0000000..f2ea4a8
--- /dev/null
+++ b/features/test/linux-x11-forwarding/host_forwarding_env.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -e
+
+source dev-container-features-test-lib
+
+check "DISPLAY can be overridden from feature option" bash -lc '[ "${DISPLAY:-}" = ":99" ]'
+check "XAUTHORITY stays on fixed path" bash -c '[ "${XAUTHORITY:-}" = "/tmp/devcontainer-xauthority" ]'
+check "PULSE_SERVER stays on mounted runtime path" bash -c '[ "${PULSE_SERVER:-}" = "unix:/tmp/devcontainer-host-runtime/pulse-native" ]'
+check "software rendering defaults through shell init" bash -lc '[ "${LIBGL_ALWAYS_SOFTWARE:-}" = "1" ]'
+check "Qt uses the X11 backend by default" bash -lc '[ "${QT_QPA_PLATFORM:-}" = "xcb" ]'
+check "x11 socket directory is mounted" mountpoint -q /tmp/.X11-unix
+check "runtime directory is mounted" mountpoint -q /tmp/devcontainer-host-runtime
+check "xauthority file resolves after shell init" bash -lc '[ -e /tmp/devcontainer-xauthority ]'
+check "xauthority prefers explicit host file mount" bash -lc '[ "$(readlink /tmp/devcontainer-xauthority)" = "/tmp/devcontainer-xauthority-host" ]'
+check "pulse socket file is reachable through runtime mount" bash -c '[ -e /tmp/devcontainer-host-runtime/pulse-native ]'
+
+reportResults
diff --git a/features/test/linux-x11-forwarding/scenarios.json b/features/test/linux-x11-forwarding/scenarios.json
new file mode 100644
index 0000000..d2a5084
--- /dev/null
+++ b/features/test/linux-x11-forwarding/scenarios.json
@@ -0,0 +1,21 @@
+{
+  "host_forwarding_env": {
+    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+    "mounts": [
+      "source=${localEnv:XAUTHORITY},target=/tmp/devcontainer-xauthority-host,type=bind,readonly"
+    ],
+    "features": {
+      "linux-x11-forwarding": {
+        "x11Display": "${localEnv:DISPLAY}"
+      }
+    }
+  },
+  "software_gl_disabled": {
+    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+    "features": {
+      "linux-x11-forwarding": {
+        "softwareGL": "0"
+      }
+    }
+  }
+}
diff --git a/features/test/linux-x11-forwarding/software_gl_disabled.sh b/features/test/linux-x11-forwarding/software_gl_disabled.sh
new file mode 100755
index 0000000..581ae03
--- /dev/null
+++ b/features/test/linux-x11-forwarding/software_gl_disabled.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+source dev-container-features-test-lib
+
+check "software rendering can be disabled through shell init" bash -lc '[ "${LIBGL_ALWAYS_SOFTWARE:-}" = "0" ]'
+check "Qt uses the X11 backend by default" bash -lc '[ "${QT_QPA_PLATFORM:-}" = "xcb" ]'
+check "x11 socket directory is mounted" mountpoint -q /tmp/.X11-unix
+check "runtime directory is mounted" mountpoint -q /tmp/devcontainer-host-runtime
+check "xauthority file resolves after shell init" bash -lc '[ -e /tmp/devcontainer-xauthority ]'
+check "pulse socket file is reachable through runtime mount" bash -c '[ -e /tmp/devcontainer-host-runtime/pulse-native ]'
+
+reportResults
diff --git a/features/test/linux-x11-forwarding/test.sh b/features/test/linux-x11-forwarding/test.sh
new file mode 100755
index 0000000..f2bcd46
--- /dev/null
+++ b/features/test/linux-x11-forwarding/test.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+source dev-container-features-test-lib
+
+check "DISPLAY defaults to :0" bash -lc '[ "${DISPLAY:-}" = ":0" ]'
+check "XAUTHORITY is set to fixed path" bash -c '[ "${XAUTHORITY:-}" = "/tmp/devcontainer-xauthority" ]'
+check "PULSE_SERVER is set to mounted runtime path" bash -c '[ "${PULSE_SERVER:-}" = "unix:/tmp/devcontainer-host-runtime/pulse-native" ]'
+check "software rendering defaults through shell init" bash -lc '[ "${LIBGL_ALWAYS_SOFTWARE:-}" = "1" ]'
+check "Qt uses the X11 backend by default" bash -lc '[ "${QT_QPA_PLATFORM:-}" = "xcb" ]'
+check "XDG runtime directory is private and writable" bash -lc '[ "${XDG_RUNTIME_DIR:-}" = "/tmp/devcontainer-runtime-$(id -u)" ] && [ -d "${XDG_RUNTIME_DIR}" ] && [ -w "${XDG_RUNTIME_DIR}" ] && [ "$(stat -c %a "${XDG_RUNTIME_DIR}")" = "700" ]'
+check "x11 socket directory exists" bash -c '[ -d /tmp/.X11-unix ]'
+check "x11 socket directory is mounted" mountpoint -q /tmp/.X11-unix
+check "runtime directory is mounted" mountpoint -q /tmp/devcontainer-host-runtime
+check "xauthority file resolves after shell init" bash -lc '[ -e /tmp/devcontainer-xauthority ]'
+check "xauthority falls back to XWayland runtime auth" bash -lc '[ "$(readlink /tmp/devcontainer-xauthority)" = "/tmp/devcontainer-host-runtime/.mutter-Xwaylandauth.test" ]'
+check "pulse socket file is reachable through runtime mount" bash -c '[ -e /tmp/devcontainer-host-runtime/pulse-native ]'
+
+reportResults
diff --git a/features/test/test_all.sh b/features/test/test_all.sh
index d1ea3c3..45f3eeb 100755
--- a/features/test/test_all.sh
+++ b/features/test/test_all.sh
@@ -1,8 +1,48 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+features_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+base_image="${DEVCONTAINER_BASE_IMAGE:-mcr.microsoft.com/devcontainers/base:ubuntu}"
 
-for test_script in "${repo_root}"/features/test/*/test.sh; do
-  bash "${test_script}"
+if ! command -v devcontainer >/dev/null 2>&1; then
+    echo "devcontainer CLI is required. Install it with 'npm install -g @devcontainers/cli'." >&2
+    exit 1
+fi
+
+cleanup_paths=()
+
+cleanup() {
+    for path in "${cleanup_paths[@]}"; do
+        if [[ -d "${path}" ]]; then
+            rm -rf "${path}"
+        elif [[ -f "${path}" ]]; then
+            rm -f "${path}"
+        fi
+    done
+}
+
+trap cleanup EXIT
+
+mkdir -p /tmp/.X11-unix
+
+export DISPLAY="${FEATURE_TEST_DISPLAY:-:99}"
+export XDG_RUNTIME_DIR="${FEATURE_TEST_XDG_RUNTIME_DIR:-/tmp/devcontainers-x11-runtime}"
+export XAUTHORITY="${FEATURE_TEST_XAUTHORITY:-/tmp/devcontainers-xauthority.test}"
+export PULSE_SERVER="${FEATURE_TEST_PULSE_SERVER:-unix:${XDG_RUNTIME_DIR}/pulse-native}"
+xwayland_xauthority="${FEATURE_TEST_XWAYLAND_XAUTHORITY:-${XDG_RUNTIME_DIR}/.mutter-Xwaylandauth.test}"
+
+cleanup_paths+=("${XAUTHORITY}" "${XDG_RUNTIME_DIR}")
+
+mkdir -p "$(dirname "${XAUTHORITY}")"
+mkdir -p "${XDG_RUNTIME_DIR}"
+chmod 700 "${XDG_RUNTIME_DIR}"
+touch "${XAUTHORITY}"
+touch "${xwayland_xauthority}"
+touch "${XDG_RUNTIME_DIR}/pulse-native"
+
+for feature in linux-x11-forwarding; do
+    devcontainer features test \
+        --base-image "${base_image}" \
+        --features "${feature}" \
+        --project-folder "${features_root}"
 done
diff --git a/features/test/wayland/test.sh b/features/test/wayland/test.sh
deleted file mode 100755
index 058c89f..0000000
--- a/features/test/wayland/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
-feature_dir="${repo_root}/features/src/wayland"
-feature_metadata="${feature_dir}/devcontainer-feature.json"
-feature_install="${feature_dir}/install.sh"
-feature_readme="${feature_dir}/README.md"
-
-test -f "${feature_metadata}"
-test -f "${feature_install}"
-test -f "${feature_readme}"
-
-jq -e '.id == "wayland"' "${feature_metadata}" >/dev/null
-jq -e '.name == "Wayland GUI Forwarding"' "${feature_metadata}" >/dev/null
-jq -e '.options.softwareGL.default == "1"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.WAYLAND_DISPLAY == "${localEnv:WAYLAND_DISPLAY}"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.XDG_RUNTIME_DIR == "${localEnv:XDG_RUNTIME_DIR}"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.PULSE_SERVER == "${localEnv:PULSE_SERVER}"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.LIBGL_ALWAYS_SOFTWARE == "${feature:softwareGL}"' "${feature_metadata}" >/dev/null
-jq -e '.mounts | index("source=${localEnv:XDG_RUNTIME_DIR},target=${localEnv:XDG_RUNTIME_DIR},type=bind") != null' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.DISPLAY == null' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.XAUTHORITY == null' "${feature_metadata}" >/dev/null
-
-grep -q 'Wayland feature metadata configured.' "${feature_install}"
diff --git a/features/test/x11/test.sh b/features/test/x11/test.sh
deleted file mode 100755
index b5d09b1..0000000
--- a/features/test/x11/test.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
-feature_dir="${repo_root}/features/src/x11"
-feature_metadata="${feature_dir}/devcontainer-feature.json"
-feature_install="${feature_dir}/install.sh"
-feature_readme="${feature_dir}/README.md"
-
-test -f "${feature_metadata}"
-test -f "${feature_install}"
-test -f "${feature_readme}"
-
-jq -e '.id == "x11"' "${feature_metadata}" >/dev/null
-jq -e '.name == "X11 GUI Forwarding"' "${feature_metadata}" >/dev/null
-jq -e '.options.softwareGL.default == "1"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.DISPLAY == "${localEnv:DISPLAY}"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.XAUTHORITY == "${localEnv:XAUTHORITY}"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.PULSE_SERVER == "${localEnv:PULSE_SERVER}"' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.LIBGL_ALWAYS_SOFTWARE == "${feature:softwareGL}"' "${feature_metadata}" >/dev/null
-jq -e '.mounts | index("source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind") != null' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.WAYLAND_DISPLAY == null' "${feature_metadata}" >/dev/null
-jq -e '.containerEnv.XDG_RUNTIME_DIR == null' "${feature_metadata}" >/dev/null
-
-grep -q 'X11 feature metadata configured.' "${feature_install}"