diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm32 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm32
index 36be62fd..8492474c 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm32
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm32
@@ -7,7 +7,6 @@
                OpCapability Linkage
                OpCapability Kernel
                OpCapability Int8
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical32 OpenCL
                OpEntryPoint Kernel %11 "spec_const_kernel"
@@ -21,7 +20,6 @@
                OpName %if_end "if.end"
                OpDecorate %test_value FuncParamAttr Zext
                OpDecorate %test_value LinkageAttributes "test_value" Export
-               OpDecorate %add NoSignedWrap
                OpDecorate %false SpecId 101
       %uchar = OpTypeInt 8 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm64 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm64
index c9f53443..c76bccc8 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm64
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_false_simple.spvasm64
@@ -7,7 +7,6 @@
                OpCapability Linkage
                OpCapability Kernel
                OpCapability Int8
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical64 OpenCL
                OpEntryPoint Kernel %11 "spec_const_kernel"
@@ -21,7 +20,6 @@
                OpName %if_end "if.end"
                OpDecorate %test_value FuncParamAttr Zext
                OpDecorate %test_value LinkageAttributes "test_value" Export
-               OpDecorate %add NoSignedWrap
                OpDecorate %false SpecId 101
       %uchar = OpTypeInt 8 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm32 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm32
index 5e182e1a..834b85df 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm32
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm32
@@ -7,7 +7,6 @@
                OpCapability Linkage
                OpCapability Kernel
                OpCapability Int8
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical32 OpenCL
                OpEntryPoint Kernel %11 "spec_const_kernel"
@@ -21,7 +20,6 @@
                OpName %if_end "if.end"
                OpDecorate %test_value FuncParamAttr Zext
                OpDecorate %test_value LinkageAttributes "test_value" Export
-               OpDecorate %add NoSignedWrap
                OpDecorate %true SpecId 101
       %uchar = OpTypeInt 8 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm64 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm64
index 720121f6..83ce4d62 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm64
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_true_simple.spvasm64
@@ -7,7 +7,6 @@
                OpCapability Linkage
                OpCapability Kernel
                OpCapability Int8
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical64 OpenCL
                OpEntryPoint Kernel %11 "spec_const_kernel"
@@ -21,7 +20,6 @@
                OpName %if_end "if.end"
                OpDecorate %test_value FuncParamAttr Zext
                OpDecorate %test_value LinkageAttributes "test_value" Export
-               OpDecorate %add NoSignedWrap
                OpDecorate %true SpecId 101
       %uchar = OpTypeInt 8 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm32 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm32
index af778e37..0e832b42 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm32
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm32
@@ -6,7 +6,6 @@
                OpCapability Addresses
                OpCapability Kernel
                OpCapability Int8
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical32 OpenCL
                OpEntryPoint Kernel %9 "spec_const_kernel"
@@ -18,7 +17,6 @@
                OpName %add "add"
                OpDecorate %spec_const_kernel_spec_constant_value Constant
                OpDecorate %spec_const_kernel_spec_constant_value Alignment 1
-               OpDecorate %add NoSignedWrap
                OpDecorate %uchar_0 SpecId 101
       %uchar = OpTypeInt 8 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm64 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm64
index a05d7b7a..89150fc6 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm64
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_uchar_simple.spvasm64
@@ -6,7 +6,6 @@
                OpCapability Addresses
                OpCapability Kernel
                OpCapability Int8
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical64 OpenCL
                OpEntryPoint Kernel %9 "spec_const_kernel"
@@ -18,7 +17,6 @@
                OpName %add "add"
                OpDecorate %spec_const_kernel_spec_constant_value Constant
                OpDecorate %spec_const_kernel_spec_constant_value Alignment 1
-               OpDecorate %add NoSignedWrap
                OpDecorate %uchar_0 SpecId 101
       %uchar = OpTypeInt 8 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm32 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm32
index 75d2e24f..d5012070 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm32
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm32
@@ -6,7 +6,6 @@
                OpCapability Addresses
                OpCapability Kernel
                OpCapability Int16
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical32 OpenCL
                OpEntryPoint Kernel %9 "spec_const_kernel"
@@ -17,7 +16,6 @@
                OpName %entry "entry"
                OpDecorate %spec_const_kernel_spec_constant_value Constant
                OpDecorate %spec_const_kernel_spec_constant_value Alignment 2
-               OpDecorate %add NoSignedWrap
                OpDecorate %ushort_0 SpecId 101
      %ushort = OpTypeInt 16 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm64 b/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm64
index 4f3582eb..27f5fb8f 100644
--- a/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm64
+++ b/test_conformance/spirv_new/spirv_asm/op_spec_constant_ushort_simple.spvasm64
@@ -6,7 +6,6 @@
                OpCapability Addresses
                OpCapability Kernel
                OpCapability Int16
-               OpExtension "SPV_KHR_no_integer_wrap_decoration"
           %1 = OpExtInstImport "OpenCL.std"
                OpMemoryModel Physical64 OpenCL
                OpEntryPoint Kernel %9 "spec_const_kernel"
@@ -17,7 +16,6 @@
                OpName %entry "entry"
                OpDecorate %spec_const_kernel_spec_constant_value Constant
                OpDecorate %spec_const_kernel_spec_constant_value Alignment 2
-               OpDecorate %add NoSignedWrap
                OpDecorate %ushort_0 SpecId 101
      %ushort = OpTypeInt 16 0
        %uint = OpTypeInt 32 0
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv32 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv32
index 045abe52..adc01353 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv32 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv32 differ
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv64 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv64
index 701527d8..2046ab64 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv64 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_false_simple.spv64 differ
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv32 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv32
index f60e2835..fa0deb0d 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv32 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv32 differ
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv64 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv64
index 4d96c8e8..84f6149f 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv64 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_true_simple.spv64 differ
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv32 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv32
index 94ce6666..ac0536a7 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv32 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv32 differ
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv64 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv64
index 6dc98167..5f2e95dd 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv64 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_uchar_simple.spv64 differ
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv32 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv32
index c81e309a..84926b4c 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv32 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv32 differ
diff --git a/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv64 b/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv64
index 8f707428..00d01a7f 100644
Binary files a/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv64 and b/test_conformance/spirv_new/spirv_bin/op_spec_constant_ushort_simple.spv64 differ
diff --git a/test_conformance/spirv_new/test_op_spec_constant.cpp b/test_conformance/spirv_new/test_op_spec_constant.cpp
index a6feddfd..a280a4f7 100644
--- a/test_conformance/spirv_new/test_op_spec_constant.cpp
+++ b/test_conformance/spirv_new/test_op_spec_constant.cpp
@@ -20,8 +20,7 @@ Agreement as executed between Khronos and the recipient.
 template <typename T>
 int run_case(cl_device_id deviceID, cl_context context, cl_command_queue queue,
              const char *name, T init_buffer, T spec_constant_value,
-             T final_value, bool use_spec_constant,
-             bool (*notEqual)(const T &, const T &) = isNotEqual<T>)
+             T final_value, bool use_spec_constant)
 {
     clProgramWrapper prog;
     cl_int err = CL_SUCCESS;
@@ -54,7 +53,6 @@ int run_case(cl_device_id deviceID, cl_context context, cl_command_queue queue,
     err = clEnqueueNDRangeKernel(queue, kernel, 1, NULL, &work_size, NULL, 0,
                                  NULL, NULL);
     SPIRV_CHECK_ERROR(err, "Failed to enqueue kernel");
-    clFinish(queue);
 
     T device_results = 0;
     err = clEnqueueReadBuffer(queue, output_buffer, CL_TRUE, 0, bytes,