diff --git a/Test/baseResults/hlsl.constantbuffer.frag.out b/Test/baseResults/hlsl.constantbuffer.frag.out
index 4185ea95..052d84e4 100644
--- a/Test/baseResults/hlsl.constantbuffer.frag.out
+++ b/Test/baseResults/hlsl.constantbuffer.frag.out
@@ -132,7 +132,9 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
 error: SPIRV-Tools Validation Errors
-error: Only a single level of array is allowed for descriptor set variables
+error: Uniform OpVariable <id> '18[cb3] 'has illegal type.
+From Vulkan spec, section 14.5.2:
+Variables identified with the Uniform storage class are used to access transparent buffer backed resources. Such variables must be typed as OpTypeStruct, or an array of this type
   %cb3_0 = OpVariable %_ptr_Uniform__arr__arr_cb3_uint_4_uint_2 Uniform
 
 // Module Version 10000
diff --git a/Test/baseResults/hlsl.structarray.flatten.frag.out b/Test/baseResults/hlsl.structarray.flatten.frag.out
index 0756a528..fc66a7ce 100644
--- a/Test/baseResults/hlsl.structarray.flatten.frag.out
+++ b/Test/baseResults/hlsl.structarray.flatten.frag.out
@@ -156,7 +156,8 @@ gl_FragCoord origin is upper left
 0:?     'ps_output.color' (layout( location=0) out 4-component vector of float)
 
 error: SPIRV-Tools Validation Errors
-error: From Vulkan spec, section 14.5.2:
+error: UniformConstant OpVariable <id> '65[g_texdata.nonopaque_thing] 'has illegal type.
+From Vulkan spec, section 14.5.2:
 Variables identified with the UniformConstant storage class are used only as handles to refer to opaque resources. Such variables must be typed as OpTypeImage, OpTypeSampler, OpTypeSampledImage, OpTypeAccelerationStructureNV, or an array of one of these types.
   %g_texdata_nonopaque_thing = OpVariable %_ptr_UniformConstant_int UniformConstant
 
diff --git a/Test/baseResults/spv.AofA.frag.out b/Test/baseResults/spv.AofA.frag.out
index 798f083a..e8572ba9 100644
--- a/Test/baseResults/spv.AofA.frag.out
+++ b/Test/baseResults/spv.AofA.frag.out
@@ -2,7 +2,9 @@ spv.AofA.frag
 WARNING: 0:6: '[][]' : Generating SPIR-V array-of-arrays, but Vulkan only supports single array level for this resource 
 
 error: SPIRV-Tools Validation Errors
-error: Only a single level of array is allowed for descriptor set variables
+error: Uniform OpVariable <id> '98[nameAofA] 'has illegal type.
+From Vulkan spec, section 14.5.2:
+Variables identified with the Uniform storage class are used to access transparent buffer backed resources. Such variables must be typed as OpTypeStruct, or an array of this type
   %nameAofA = OpVariable %_ptr_Uniform__arr__arr_uAofA_uint_5_uint_3 Uniform
 
 // Module Version 10000
diff --git a/Test/baseResults/spv.functionNestedOpaque.vert.out b/Test/baseResults/spv.functionNestedOpaque.vert.out
index 31938f80..ff94077f 100644
--- a/Test/baseResults/spv.functionNestedOpaque.vert.out
+++ b/Test/baseResults/spv.functionNestedOpaque.vert.out
@@ -1,6 +1,7 @@
 spv.functionNestedOpaque.vert
 error: SPIRV-Tools Validation Errors
-error: From Vulkan spec, section 14.5.2:
+error: UniformConstant OpVariable <id> '36[si] 'has illegal type.
+From Vulkan spec, section 14.5.2:
 Variables identified with the UniformConstant storage class are used only as handles to refer to opaque resources. Such variables must be typed as OpTypeImage, OpTypeSampler, OpTypeSampledImage, OpTypeAccelerationStructureNV, or an array of one of these types.
   %si = OpVariable %_ptr_UniformConstant_S UniformConstant
 
diff --git a/known_good.json b/known_good.json
index 0bfa88a7..c9a308a2 100755
--- a/known_good.json
+++ b/known_good.json
@@ -5,7 +5,7 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "a29a9947ac96d811b310f481b24e293f67fedf32"
+      "commit" : "ab76e332de7a8480c5753b1c63cc6052949df9fc"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",