diff --git a/tests/regres/testlists/vk-master-INTERNAL_ERROR.txt b/tests/regres/testlists/vk-master-INTERNAL_ERROR.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/regres/testlists/vk-master-INTERNAL_ERROR.txt
diff --git a/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt b/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt
index 3ca9319..0aad18d 100644
--- a/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt
+++ b/tests/regres/testlists/vk-master-NOT_SUPPORTED.txt
Binary files differ
diff --git a/tests/regres/testlists/vk-master-PASS.txt b/tests/regres/testlists/vk-master-PASS.txt
index cbdebe8..420b2dc 100644
--- a/tests/regres/testlists/vk-master-PASS.txt
+++ b/tests/regres/testlists/vk-master-PASS.txt
@@ -195536,8 +195536,52 @@
 dEQP-VK.ubo.single_struct_array.single_buffer.std430_instance_array_fragment_comp_access
 dEQP-VK.ubo.single_struct_array.single_buffer.std430_instance_array_vertex
 dEQP-VK.ubo.single_struct_array.single_buffer.std430_instance_array_vertex_comp_access
+dEQP-VK.wsi.xcb.surface.create
+dEQP-VK.wsi.xcb.surface.create_custom_allocator
+dEQP-VK.wsi.xcb.surface.create_simulate_oom
 dEQP-VK.wsi.xcb.surface.destroy_null_handle
+dEQP-VK.wsi.xcb.surface.initial_size
+dEQP-VK.wsi.xcb.surface.query_capabilities
 dEQP-VK.wsi.xcb.surface.query_devgroup_present_capabilities
+dEQP-VK.wsi.xcb.surface.query_devgroup_present_modes
+dEQP-VK.wsi.xcb.surface.query_formats
+dEQP-VK.wsi.xcb.surface.query_present_modes
+dEQP-VK.wsi.xcb.surface.query_presentation_support
+dEQP-VK.wsi.xcb.surface.query_support
+dEQP-VK.wsi.xcb.surface.resize
+dEQP-VK.wsi.xcb.swapchain.acquire.too_many
+dEQP-VK.wsi.xcb.swapchain.acquire.too_many_timeout
+dEQP-VK.wsi.xcb.swapchain.create.clipped
+dEQP-VK.wsi.xcb.swapchain.create.composite_alpha
+dEQP-VK.wsi.xcb.swapchain.create.image_array_layers
+dEQP-VK.wsi.xcb.swapchain.create.image_extent
+dEQP-VK.wsi.xcb.swapchain.create.image_format
+dEQP-VK.wsi.xcb.swapchain.create.image_swapchain_create_info
+dEQP-VK.wsi.xcb.swapchain.create.image_usage
+dEQP-VK.wsi.xcb.swapchain.create.min_image_count
+dEQP-VK.wsi.xcb.swapchain.create.pre_transform
+dEQP-VK.wsi.xcb.swapchain.create.present_mode
+dEQP-VK.wsi.xcb.swapchain.destroy.null_handle
+dEQP-VK.wsi.xcb.swapchain.get_images.count
+dEQP-VK.wsi.xcb.swapchain.get_images.incomplete
+dEQP-VK.wsi.xcb.swapchain.render.10swapchains
+dEQP-VK.wsi.xcb.swapchain.render.10swapchains2
+dEQP-VK.wsi.xcb.swapchain.render.2swapchains
+dEQP-VK.wsi.xcb.swapchain.render.2swapchains2
+dEQP-VK.wsi.xcb.swapchain.render.basic
+dEQP-VK.wsi.xcb.swapchain.render.basic2
+dEQP-VK.wsi.xcb.swapchain.render.device_group
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.clipped
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.composite_alpha
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_array_layers
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_extent
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_format
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_sharing_mode
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_swapchain_create_info
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_usage
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.min_image_count
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.pre_transform
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.present_mode
 dEQP-VK.wsi.xlib.surface.create
 dEQP-VK.wsi.xlib.surface.create_custom_allocator
 dEQP-VK.wsi.xlib.surface.create_simulate_oom
diff --git a/tests/regres/testlists/vk-wsi-INTERNAL_ERROR.txt b/tests/regres/testlists/vk-wsi-INTERNAL_ERROR.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/regres/testlists/vk-wsi-INTERNAL_ERROR.txt
diff --git a/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt b/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt
index d20a3dd..d2645bd 100644
--- a/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt
+++ b/tests/regres/testlists/vk-wsi-NOT_SUPPORTED.txt
@@ -4985,48 +4985,11 @@
 dEQP-VK.wsi.xcb.shared_presentable_image.scale_none.rotate_90.post_multiplied.demand
 dEQP-VK.wsi.xcb.shared_presentable_image.scale_none.rotate_90.pre_multiplied.continuous
 dEQP-VK.wsi.xcb.shared_presentable_image.scale_none.rotate_90.pre_multiplied.demand
-dEQP-VK.wsi.xcb.surface.create
-dEQP-VK.wsi.xcb.surface.create_custom_allocator
-dEQP-VK.wsi.xcb.surface.create_simulate_oom
-dEQP-VK.wsi.xcb.surface.initial_size
-dEQP-VK.wsi.xcb.surface.query_capabilities
 dEQP-VK.wsi.xcb.surface.query_capabilities2
-dEQP-VK.wsi.xcb.surface.query_devgroup_present_modes
-dEQP-VK.wsi.xcb.surface.query_formats
 dEQP-VK.wsi.xcb.surface.query_formats2
-dEQP-VK.wsi.xcb.surface.query_present_modes
 dEQP-VK.wsi.xcb.surface.query_protected_capabilities
-dEQP-VK.wsi.xcb.surface.query_support
-dEQP-VK.wsi.xcb.surface.resize
-dEQP-VK.wsi.xcb.swapchain.create.clipped
-dEQP-VK.wsi.xcb.swapchain.create.composite_alpha
-dEQP-VK.wsi.xcb.swapchain.create.image_array_layers
-dEQP-VK.wsi.xcb.swapchain.create.image_extent
-dEQP-VK.wsi.xcb.swapchain.create.image_format
 dEQP-VK.wsi.xcb.swapchain.create.image_sharing_mode
-dEQP-VK.wsi.xcb.swapchain.create.image_swapchain_create_info
-dEQP-VK.wsi.xcb.swapchain.create.image_usage
-dEQP-VK.wsi.xcb.swapchain.create.min_image_count
-dEQP-VK.wsi.xcb.swapchain.create.pre_transform
-dEQP-VK.wsi.xcb.swapchain.create.present_mode
-dEQP-VK.wsi.xcb.swapchain.destroy.null_handle
-dEQP-VK.wsi.xcb.swapchain.get_images.count
-dEQP-VK.wsi.xcb.swapchain.get_images.incomplete
-dEQP-VK.wsi.xcb.swapchain.render.basic
-dEQP-VK.wsi.xcb.swapchain.render.basic2
-dEQP-VK.wsi.xcb.swapchain.render.device_group
 dEQP-VK.wsi.xcb.swapchain.render.device_group2
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.clipped
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.composite_alpha
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_array_layers
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_extent
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_format
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_sharing_mode
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_swapchain_create_info
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_usage
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.min_image_count
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.pre_transform
-dEQP-VK.wsi.xcb.swapchain.simulate_oom.present_mode
 dEQP-VK.wsi.xlib.colorspace.basic
 dEQP-VK.wsi.xlib.colorspace.extensions
 dEQP-VK.wsi.xlib.colorspace.hdr
diff --git a/tests/regres/testlists/vk-wsi-PASS.txt b/tests/regres/testlists/vk-wsi-PASS.txt
index 5a32874..0d79dc2 100644
--- a/tests/regres/testlists/vk-wsi-PASS.txt
+++ b/tests/regres/testlists/vk-wsi-PASS.txt
@@ -1,5 +1,42 @@
+dEQP-VK.wsi.xcb.surface.create
+dEQP-VK.wsi.xcb.surface.create_custom_allocator
+dEQP-VK.wsi.xcb.surface.create_simulate_oom
 dEQP-VK.wsi.xcb.surface.destroy_null_handle
+dEQP-VK.wsi.xcb.surface.initial_size
+dEQP-VK.wsi.xcb.surface.query_capabilities
 dEQP-VK.wsi.xcb.surface.query_devgroup_present_capabilities
+dEQP-VK.wsi.xcb.surface.query_devgroup_present_modes
+dEQP-VK.wsi.xcb.surface.query_formats
+dEQP-VK.wsi.xcb.surface.query_present_modes
+dEQP-VK.wsi.xcb.surface.query_support
+dEQP-VK.wsi.xcb.surface.resize
+dEQP-VK.wsi.xcb.swapchain.create.clipped
+dEQP-VK.wsi.xcb.swapchain.create.composite_alpha
+dEQP-VK.wsi.xcb.swapchain.create.image_array_layers
+dEQP-VK.wsi.xcb.swapchain.create.image_extent
+dEQP-VK.wsi.xcb.swapchain.create.image_format
+dEQP-VK.wsi.xcb.swapchain.create.image_swapchain_create_info
+dEQP-VK.wsi.xcb.swapchain.create.image_usage
+dEQP-VK.wsi.xcb.swapchain.create.min_image_count
+dEQP-VK.wsi.xcb.swapchain.create.pre_transform
+dEQP-VK.wsi.xcb.swapchain.create.present_mode
+dEQP-VK.wsi.xcb.swapchain.destroy.null_handle
+dEQP-VK.wsi.xcb.swapchain.get_images.count
+dEQP-VK.wsi.xcb.swapchain.get_images.incomplete
+dEQP-VK.wsi.xcb.swapchain.render.basic
+dEQP-VK.wsi.xcb.swapchain.render.basic2
+dEQP-VK.wsi.xcb.swapchain.render.device_group
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.clipped
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.composite_alpha
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_array_layers
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_extent
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_format
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_sharing_mode
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_swapchain_create_info
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.image_usage
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.min_image_count
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.pre_transform
+dEQP-VK.wsi.xcb.swapchain.simulate_oom.present_mode
 dEQP-VK.wsi.xlib.surface.create
 dEQP-VK.wsi.xlib.surface.create_custom_allocator
 dEQP-VK.wsi.xlib.surface.create_simulate_oom