diff --git a/src/intel/ci/deqp-iris-amly-egl.toml b/src/intel/ci/deqp-iris-amly-egl.toml
new file mode 100644
index 00000000000..b6d8ca18944
--- /dev/null
+++ b/src/intel/ci/deqp-iris-amly-egl.toml
@@ -0,0 +1,21 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"
diff --git a/src/intel/ci/deqp-iris-apl-egl.toml b/src/intel/ci/deqp-iris-apl-egl.toml
new file mode 100644
index 00000000000..b6d8ca18944
--- /dev/null
+++ b/src/intel/ci/deqp-iris-apl-egl.toml
@@ -0,0 +1,21 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"
diff --git a/src/intel/ci/deqp-iris-apl-glk.toml b/src/intel/ci/deqp-iris-apl-glk.toml
new file mode 100644
index 00000000000..b6d8ca18944
--- /dev/null
+++ b/src/intel/ci/deqp-iris-apl-glk.toml
@@ -0,0 +1,21 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"
diff --git a/src/intel/ci/deqp-iris-glk-egl.toml b/src/intel/ci/deqp-iris-glk-egl.toml
new file mode 100644
index 00000000000..b6d8ca18944
--- /dev/null
+++ b/src/intel/ci/deqp-iris-glk-egl.toml
@@ -0,0 +1,21 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl-wayland"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["/install/iris-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
+prefix = "wayland-"
diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml
index 6904a7d32f2..befddcba006 100644
--- a/src/intel/ci/gitlab-ci.yml
+++ b/src/intel/ci/gitlab-ci.yml
@@ -134,7 +134,8 @@ iris-apl-egl:
   variables:
     PIGLIT_NO_WINDOW: 0
     HWCI_START_XORG: 1
-    DEQP_VER: egl
+    HWCI_START_WESTON: 1
+    DEQP_SUITE: iris-apl-egl
 
 iris-glk-deqp:
   extends:
@@ -149,7 +150,8 @@ iris-glk-egl:
   variables:
     PIGLIT_NO_WINDOW: 0
     HWCI_START_XORG: 1
-    DEQP_VER: egl
+    HWCI_START_WESTON: 1
+    DEQP_SUITE: iris-glk-egl
 
 iris-amly-deqp:
   extends:
@@ -192,7 +194,8 @@ iris-amly-egl:
   variables:
     PIGLIT_NO_WINDOW: 0
     HWCI_START_XORG: 1
-    DEQP_VER: egl
+    HWCI_START_WESTON: 1
+    DEQP_SUITE: iris-amly-egl
 
 iris-kbl-piglit:
   extends:
diff --git a/src/intel/ci/iris-amly-fails.txt b/src/intel/ci/iris-amly-fails.txt
index b2c73fd17b3..3fd02a29d97 100644
--- a/src/intel/ci/iris-amly-fails.txt
+++ b/src/intel/ci/iris-amly-fails.txt
@@ -14,3 +14,21 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail
 dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail
 
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12,Crash
+
+# EGL_BAD_DISPLAY is generated if display is not an EGL display connection
+# eglCreatePixmapSurface(0, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# eglCreatePixmapSurface(0xffffffffffffffff, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# EGL_BAD_CONFIG or EGL_BAD_PARAMETER is generated if config is not an EGL frame buffer configuration or if the PixmapSurface call is not supported
+# eglCreatePixmapSurface(0x5599c86d4b90, 0xffffffffffffffff, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP
+wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail
+
+# [...]
+# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3
+# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3
+# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3
+# [...]
+wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail
diff --git a/src/intel/ci/iris-apl-fails.txt b/src/intel/ci/iris-apl-fails.txt
index 03d12bcd5de..222368a4c2a 100644
--- a/src/intel/ci/iris-apl-fails.txt
+++ b/src/intel/ci/iris-apl-fails.txt
@@ -1 +1,18 @@
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12,Crash
+
+# EGL_BAD_DISPLAY is generated if display is not an EGL display connection
+# eglCreatePixmapSurface(0, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# eglCreatePixmapSurface(0xffffffffffffffff, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# EGL_BAD_CONFIG or EGL_BAD_PARAMETER is generated if config is not an EGL frame buffer configuration or if the PixmapSurface call is not supported
+# eglCreatePixmapSurface(0xaaab01f31100, 0xffffffffffffffff, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP
+wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail
+# Excerpt:
+# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3
+# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3
+# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3
+# Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3
+wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail
diff --git a/src/intel/ci/iris-glk-fails.txt b/src/intel/ci/iris-glk-fails.txt
index f98f3fbcd4d..aa8d0d02f4f 100644
--- a/src/intel/ci/iris-glk-fails.txt
+++ b/src/intel/ci/iris-glk-fails.txt
@@ -4,3 +4,20 @@ KHR-GL46.texture_buffer.texture_buffer_atomic_functions,Fail
 KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions,Fail
 
 dEQP-EGL.functional.sharing.gles2.multithread.random.images.copyteximage2d.12,Crash
+
+# EGL_BAD_DISPLAY is generated if display is not an EGL display connection
+# eglCreatePixmapSurface(0, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# eglCreatePixmapSurface(0xffffffffffffffff, 0x0000000000000000, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# EGL_BAD_CONFIG or EGL_BAD_PARAMETER is generated if config is not an EGL frame buffer configuration or if the PixmapSurface call is not supported
+# eglCreatePixmapSurface(0xaaab01f31100, 0xffffffffffffffff, 0x0000000000000000, { EGL_NONE });
+# // 0x0000000000000000 returned
+# // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP
+wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail
+# Excerpt:
+# Image comparison failed: reference = -0.000488281, expected = 0:0:0:0, result = 0:0:0:3
+# Image comparison failed: reference = 0, expected = 0:0:0:0, result = 0:0:0:3
+# Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3
+# Image comparison failed: reference = 0.000976562, expected = 1:1:0:0, result = 1:1:0:3
+wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail