diff --git a/sycl/test-e2e/ESIMD/accessor_global.cpp b/sycl/test-e2e/ESIMD/accessor_global.cpp
index a5ebcf560bf40..454b294409c2e 100644
--- a/sycl/test-e2e/ESIMD/accessor_global.cpp
+++ b/sycl/test-e2e/ESIMD/accessor_global.cpp
@@ -52,7 +52,7 @@ bool test(queue Q, uint32_t LocalRange, uint32_t GlobalRange) {
                T *Ptr = TmpAcc.template get_multi_ptr<access::decorated::yes>()
                             .get();
                simd<T, VL> Values = block_load<T, VL>(Ptr + (GID + LID) * VL);
-               Values.template copy_to(Out + (GID + LID) * VL);
+               Values.template copy_to<sizeof(T)>(Out + (GID + LID) * VL);
              }
            } // end for (int LID = 0; LID < LocalRange; LID++)
          } // end if (LID == 0)
diff --git a/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp b/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp
index 6f3fc4d1f7f87..3415d39bedfaf 100644
--- a/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp
+++ b/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp
@@ -66,7 +66,7 @@ ESIMD_NOINLINE bool test(queue Q, int PrivateArrayLen) {
            for (int I = 0; I < ArrayLen; I++) {
              simd<int, 1> IV(static_cast<int>(Id) * PrivateArrayLen + I);
              simd<T, 1> TV = IV;
-             TV.template copy_to(PrivateArray + I);
+             TV.template copy_to<sizeof(T)>(PrivateArray + I);
            }
 
            simd<T, PrivateArrayLenConst> BigVec(PrivateArray);
diff --git a/sycl/test-e2e/ESIMD/regression/big_const_initializer.cpp b/sycl/test-e2e/ESIMD/regression/big_const_initializer.cpp
index 7f1d6a0003c73..52d29b404fc04 100644
--- a/sycl/test-e2e/ESIMD/regression/big_const_initializer.cpp
+++ b/sycl/test-e2e/ESIMD/regression/big_const_initializer.cpp
@@ -59,7 +59,7 @@ int main(int argc, char **argv) {
     std::cout << "*** EXCEPTION caught: " << e.what() << "\n";
     return 1;
   }
-  auto acc = r.template get_host_access(sycl::read_only);
+  auto acc = r.get_host_access(sycl::read_only);
   for (int i = 0; i < N_PRINT; i++) {
     std::cout << acc[i] << " ";
   }
diff --git a/sycl/test-e2e/ESIMD/regression/iselect.cpp b/sycl/test-e2e/ESIMD/regression/iselect.cpp
index 7b01436508be6..34a7e7b8f8c1e 100644
--- a/sycl/test-e2e/ESIMD/regression/iselect.cpp
+++ b/sycl/test-e2e/ESIMD/regression/iselect.cpp
@@ -59,7 +59,7 @@ int test(sycl::queue queue) {
 
             esimd::simd<int, 8> data = input_load_vec.iselect(offset);
             data += 3;
-            input_load_vec.template iupdate(offset, data,
+            input_load_vec.iupdate(offset, data,
                                             esimd::simd_mask<8>(1));
             input_load_vec.copy_to(out_ptr);
           });
diff --git a/sycl/test-e2e/ESIMD/unified_memory_api/Inputs/copyto_copyfrom.hpp b/sycl/test-e2e/ESIMD/unified_memory_api/Inputs/copyto_copyfrom.hpp
index 3b1d80d201d39..5721f35d421c9 100644
--- a/sycl/test-e2e/ESIMD/unified_memory_api/Inputs/copyto_copyfrom.hpp
+++ b/sycl/test-e2e/ESIMD/unified_memory_api/Inputs/copyto_copyfrom.hpp
@@ -205,7 +205,7 @@ bool testLocalAccSLM(queue Q, uint32_t Groups, PropertiesT Properties) {
              Vals = gather<T, N>(LocalAcc, ByteOffsets, PropertiesT{});
          } else {
            if (GlobalID % GroupSize)
-             Vals.template copy_from(LocalAcc, LocalElemOffset);
+             Vals.template copy_from<decltype(LocalAcc), ChunkSize>(LocalAcc, LocalElemOffset);
            else
              Vals = gather<T, N>(LocalAcc, ByteOffsets);
          }
diff --git a/sycl/test-e2e/GroupAlgorithm/SYCL2020/group_sort/group_and_joint_sort.cpp b/sycl/test-e2e/GroupAlgorithm/SYCL2020/group_sort/group_and_joint_sort.cpp
index 4abea0c6a7268..c6d8774683402 100644
--- a/sycl/test-e2e/GroupAlgorithm/SYCL2020/group_sort/group_and_joint_sort.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/SYCL2020/group_sort/group_and_joint_sort.cpp
@@ -291,7 +291,7 @@ void RunSortOVerGroup(sycl::queue &Q, const std::vector<T> &DataToSort,
 #endif
 
 #if VERSION == 1
-    LocalMemorySizeRadix = RadixSorterT::template memory_required(
+    LocalMemorySizeRadix = RadixSorterT::memory_required(
         sycl::memory_scope::sub_group, sycl::range<1>{ReqSubGroupSize});
 #else
     LocalMemorySizeRadix = RadixSorterT::memory_required(
@@ -310,7 +310,7 @@ void RunSortOVerGroup(sycl::queue &Q, const std::vector<T> &DataToSort,
 #endif
 
 #if VERSION == 1
-    LocalMemorySizeRadix = RadixSorterT::template memory_required(
+    LocalMemorySizeRadix = RadixSorterT::memory_required(
         sycl::memory_scope::work_group, sycl::range<1>{NumOfElements});
 #else
     LocalMemorySizeRadix = RadixSorterT::memory_required(