diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
index d5c6f1f35c3..74067e6d005 100755
--- a/.github/scripts/tests_run.sh
+++ b/.github/scripts/tests_run.sh
@@ -69,6 +69,10 @@ function run_test() {
             if [[ -f "$sketchdir/scenario.yaml" ]]; then
                 extra_args+=" --wokwi-scenario $sketchdir/scenario.yaml"
             fi
+            if [[ -f "$sketchdir/diagram.$target.json" ]]; then
+                extra_args+=" --wokwi-diagram $sketchdir/diagram.$target.json"
+            fi
+
         elif [ $platform == "qemu" ]; then
             PATH=$HOME/qemu/bin:$PATH
             extra_args="--embedded-services qemu --qemu-image-path $build_dir/$sketchname.ino.merged.bin"
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 7acb197d6ad..87bb08a67b2 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,7 +1,7 @@
 cryptography==42.0.7
 --only-binary cryptography
 pytest-cov==5.0.0
-pytest-embedded-serial-esp==1.10.2
-pytest-embedded-arduino==1.10.2
-pytest-embedded-wokwi==1.10.2
-pytest-embedded-qemu==1.10.2
+pytest-embedded-serial-esp==1.11.0
+pytest-embedded-arduino==1.11.0
+pytest-embedded-wokwi==1.11.0
+pytest-embedded-qemu==1.11.0
diff --git a/tests/validation/gpio/esp32.diagram.json b/tests/validation/gpio/diagram.esp32.json
similarity index 100%
rename from tests/validation/gpio/esp32.diagram.json
rename to tests/validation/gpio/diagram.esp32.json
diff --git a/tests/validation/gpio/esp32c3.diagram.json b/tests/validation/gpio/diagram.esp32c3.json
similarity index 100%
rename from tests/validation/gpio/esp32c3.diagram.json
rename to tests/validation/gpio/diagram.esp32c3.json
diff --git a/tests/validation/gpio/esp32c6.diagram.json b/tests/validation/gpio/diagram.esp32c6.json
similarity index 100%
rename from tests/validation/gpio/esp32c6.diagram.json
rename to tests/validation/gpio/diagram.esp32c6.json
diff --git a/tests/validation/gpio/esp32h2.diagram.json b/tests/validation/gpio/diagram.esp32h2.json
similarity index 100%
rename from tests/validation/gpio/esp32h2.diagram.json
rename to tests/validation/gpio/diagram.esp32h2.json
diff --git a/tests/validation/gpio/esp32s2.diagram.json b/tests/validation/gpio/diagram.esp32s2.json
similarity index 100%
rename from tests/validation/gpio/esp32s2.diagram.json
rename to tests/validation/gpio/diagram.esp32s2.json
diff --git a/tests/validation/gpio/esp32s3.diagram.json b/tests/validation/gpio/diagram.esp32s3.json
similarity index 100%
rename from tests/validation/gpio/esp32s3.diagram.json
rename to tests/validation/gpio/diagram.esp32s3.json