diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp
index 39f38df192..d80c96ae1e 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp
index cfe71a18bb..cc5ff54340 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp
index 2fee0d351c..f49104e10e 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp
index b33e13e475..fbf8e02d52 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp
index 02f4fecb28..756b3a464b 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp
index 73c7c2f83b..e68556c046 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp
index c098139a48..2d1d9474e4 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp
index 67c4e63c35..482849ad18 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp
index 6ed389d0fd..6e73989cb4 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp
index 164025654c..66f8a1db9c 100644
--- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp
+++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
 #include <cstdint>
diff --git a/SYCL/ESIMD/fp_call_from_func.cpp b/SYCL/ESIMD/fp_call_from_func.cpp
index 692861ead6..ea34d5a34c 100644
--- a/SYCL/ESIMD/fp_call_from_func.cpp
+++ b/SYCL/ESIMD/fp_call_from_func.cpp
@@ -8,7 +8,7 @@
 // REQUIRES: gpu
 // Issue #162 Test timeouts on Windows
 // UNSUPPORTED: windows
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // UNSUPPORTED: cuda
 //
diff --git a/SYCL/ESIMD/fp_call_recursive.cpp b/SYCL/ESIMD/fp_call_recursive.cpp
index 3d4cc36f56..7fe38532e4 100644
--- a/SYCL/ESIMD/fp_call_recursive.cpp
+++ b/SYCL/ESIMD/fp_call_recursive.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: cuda
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
 // The test checks that ESIMD kernels support use of function pointers
diff --git a/SYCL/ESIMD/fp_in_phi.cpp b/SYCL/ESIMD/fp_in_phi.cpp
index 513f825319..0f86ed6c73 100644
--- a/SYCL/ESIMD/fp_in_phi.cpp
+++ b/SYCL/ESIMD/fp_in_phi.cpp
@@ -10,7 +10,7 @@
 // based spirv translator. This test should start working on Windows when the
 // llvm version is switched to 9.
 // UNSUPPORTED: windows
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // UNSUPPORTED: cuda
 //
diff --git a/SYCL/ESIMD/fp_in_select.cpp b/SYCL/ESIMD/fp_in_select.cpp
index 1182e8dc96..f0e169d113 100644
--- a/SYCL/ESIMD/fp_in_select.cpp
+++ b/SYCL/ESIMD/fp_in_select.cpp
@@ -10,7 +10,7 @@
 // based spirv translator. This test should start working on Windows when the
 // llvm version is switched to 9.
 // UNSUPPORTED: windows
-// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out
+// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // UNSUPPORTED: cuda
 // The test fails on JITing due to use of too many registers
diff --git a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp b/SYCL/FunctionPointers/fp-as-kernel-arg.cpp
index 875878781f..dd74040dd3 100644
--- a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp
+++ b/SYCL/FunctionPointers/fp-as-kernel-arg.cpp
@@ -1,7 +1,7 @@
 // UNSUPPORTED: cuda
 // CUDA does not support the function pointer as kernel argument extension.
 
-// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_optionc++14 -fsycl %s -o %t.out
+// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp b/SYCL/FunctionPointers/pass-fp-through-buffer.cpp
index 058036e335..e8c845a49c 100644
--- a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp
+++ b/SYCL/FunctionPointers/pass-fp-through-buffer.cpp
@@ -1,7 +1,7 @@
 // UNSUPPORTED: cuda
 // CUDA does not support the function pointer as kernel argument extension.
 
-// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_optionc++14 -fsycl %s -o %t.out
+// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/Sampler/normalized-clamp-nearest.cpp b/SYCL/Sampler/normalized-clamp-nearest.cpp
index f343f1089d..5afccd5772 100644
--- a/SYCL/Sampler/normalized-clamp-nearest.cpp
+++ b/SYCL/Sampler/normalized-clamp-nearest.cpp
@@ -4,6 +4,9 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
 // XFAIL: level_zero
 
+// TODO: enable this test after flaky bug is gone on Windows
+// UNSUPPORTED: windows
+
 // LevelZero has a bug wherein it always returns the first pixel value.
 // Will re-enable once fixed.