diff --git a/include/oneapi/dpl/pstl/hetero/dpcpp/sycl_iterator.h b/include/oneapi/dpl/pstl/hetero/dpcpp/sycl_iterator.h
index a38d6520b4f..b238133ace0 100644
--- a/include/oneapi/dpl/pstl/hetero/dpcpp/sycl_iterator.h
+++ b/include/oneapi/dpl/pstl/hetero/dpcpp/sycl_iterator.h
@@ -17,6 +17,7 @@
 #define _ONEDPL_SYCL_ITERATOR_H
 
 #include <iterator>
+#include <type_traits>
 #include "../../onedpl_config.h"
 #include "sycl_defs.h"
 
@@ -149,14 +150,14 @@ struct _ModeConverter<access_mode::write>
     static constexpr access_mode __value = access_mode::discard_write;
 };
 
-template <typename Iter, typename ValueType = typename std::iterator_traits<Iter>::value_type>
+template <typename Iter, typename ValueType = std::decay_t<typename std::iterator_traits<Iter>::value_type>>
 using __default_alloc_vec_iter = typename std::vector<ValueType>::iterator;
 
-template <typename Iter, typename ValueType = typename std::iterator_traits<Iter>::value_type>
+template <typename Iter, typename ValueType = std::decay_t<typename std::iterator_traits<Iter>::value_type>>
 using __usm_shared_alloc_vec_iter =
     typename std::vector<ValueType, typename sycl::usm_allocator<ValueType, sycl::usm::alloc::shared>>::iterator;
 
-template <typename Iter, typename ValueType = typename std::iterator_traits<Iter>::value_type>
+template <typename Iter, typename ValueType = std::decay_t<typename std::iterator_traits<Iter>::value_type>>
 using __usm_host_alloc_vec_iter =
     typename std::vector<ValueType, typename sycl::usm_allocator<ValueType, sycl::usm::alloc::host>>::iterator;
 
@@ -164,48 +165,17 @@ using __usm_host_alloc_vec_iter =
 // std::vector<value_type, Alloc>::iterator can be distinguished between three different allocators, the
 // default, usm_shared, and usm_host. If all are distinct, it is very unlikely any non-usm based allocator
 // could be confused with a usm allocator.
-template <typename Iter, typename Void = void>
-struct __vector_iter_distinguishes_by_allocator : std::false_type
-{
-};
-template <typename Iter>
-struct __vector_iter_distinguishes_by_allocator<
-    Iter, std::enable_if_t<!std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>> &&
-                           !std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_host_alloc_vec_iter<Iter>> &&
-                           !std::is_same_v<__usm_host_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>>>>
-    : std::true_type
-{
-};
-
-template <typename Iter, typename Void = void>
-struct __is_known_usm_vector_iter_impl : std::false_type
-{
-};
-
 template <typename Iter>
-struct __is_known_usm_vector_iter_impl<
-    Iter, std::enable_if_t<std::conjunction<
-              std::disjunction<std::is_same<Iter, oneapi::dpl::__internal::__usm_shared_alloc_vec_iter<Iter>>,
-                               std::is_same<Iter, oneapi::dpl::__internal::__usm_host_alloc_vec_iter<Iter>>>,
-              oneapi::dpl::__internal::__vector_iter_distinguishes_by_allocator<Iter>>::value>> : std::true_type
-{
-};
-
-template <typename Iter, typename Void = void>
-struct __is_known_usm_vector_iter : std::false_type
-{
-};
+constexpr bool __vector_iter_distinguishes_by_allocator_v =
+    !std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>> &&
+    !std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_host_alloc_vec_iter<Iter>> &&
+    !std::is_same_v<__usm_host_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>>;
 
-//We must avoid instantiating vector of const, reference, or function elements to avoid ill-formed vector instantiation
 template <typename Iter>
-struct __is_known_usm_vector_iter<
-    Iter, std::enable_if_t<std::conjunction<
-              std::negation<std::disjunction<std::is_const<typename std::iterator_traits<Iter>::value_type>,
-                                             std::is_reference<typename std::iterator_traits<Iter>::value_type>,
-                                             std::is_function<typename std::iterator_traits<Iter>::value_type>>>,
-              oneapi::dpl::__internal::__is_known_usm_vector_iter_impl<Iter>>::value>> : std::true_type
-{
-};
+constexpr bool __is_known_usm_vector_iter_v =
+    oneapi::dpl::__internal::__vector_iter_distinguishes_by_allocator_v<Iter> &&
+    (std::is_same_v<Iter, oneapi::dpl::__internal::__usm_shared_alloc_vec_iter<Iter>> ||
+     std::is_same_v<Iter, oneapi::dpl::__internal::__usm_host_alloc_vec_iter<Iter>>);
 
 } // namespace __internal
 
diff --git a/include/oneapi/dpl/pstl/hetero/dpcpp/utils_ranges_sycl.h b/include/oneapi/dpl/pstl/hetero/dpcpp/utils_ranges_sycl.h
index 4e2f8626950..09f17157c20 100644
--- a/include/oneapi/dpl/pstl/hetero/dpcpp/utils_ranges_sycl.h
+++ b/include/oneapi/dpl/pstl/hetero/dpcpp/utils_ranges_sycl.h
@@ -209,7 +209,7 @@ struct is_passed_directly<Iter, ::std::enable_if_t<Iter::is_passed_directly::val
 
 //support std::vector::iterator with usm host / shared allocator as passed directly
 template <typename Iter>
-struct is_passed_directly<Iter, std::enable_if_t<oneapi::dpl::__internal::__is_known_usm_vector_iter<Iter>::value>>
+struct is_passed_directly<Iter, std::enable_if_t<oneapi::dpl::__internal::__is_known_usm_vector_iter_v<Iter>>>
     : std::true_type
 {
 };
@@ -236,7 +236,9 @@ struct is_passed_directly<oneapi::dpl::transform_iterator<Iter, Unary>> : is_pas
 
 template <typename SourceIterator, typename IndexIterator>
 struct is_passed_directly<oneapi::dpl::permutation_iterator<SourceIterator, IndexIterator>>
-    : ::std::conjunction<is_passed_directly<SourceIterator>, is_passed_directly<IndexIterator>>
+    : ::std::conjunction<
+          is_passed_directly<SourceIterator>,
+          is_passed_directly<typename oneapi::dpl::permutation_iterator<SourceIterator, IndexIterator>::IndexMap>>
 {
 };
 
diff --git a/test/parallel_api/iterator/input_data_sweep_usm_allocator.pass.cpp b/test/parallel_api/iterator/input_data_sweep_usm_allocator.pass.cpp
index 90b635a4e86..ceb0d2036c9 100644
--- a/test/parallel_api/iterator/input_data_sweep_usm_allocator.pass.cpp
+++ b/test/parallel_api/iterator/input_data_sweep_usm_allocator.pass.cpp
@@ -47,7 +47,7 @@ test_usm_shared_alloc(Policy&& policy, T trash, size_t n, const std::string& typ
             __recurse, 0, /*__read =*/true, /*__reset_read=*/true, /*__write=*/true,
             /*__check_write=*/true, /*__usable_as_perm_map=*/true,
             /*__usable_as_perm_src=*/
-            TestUtils::__vector_impl_distinguishes_usm_allocator_from_default<decltype(shared_data_vec.begin())>::value,
+            TestUtils::__vector_impl_distinguishes_usm_allocator_from_default_v<decltype(shared_data_vec.begin())>,
             /*__is_reversible=*/true>(policy, shared_data_vec.begin(), shared_data_vec.end(), counting,
                                       copy_out.get_data(), shared_data_vec.begin(), copy_out.get_data(), counting,
                                       trash, std::string("usm_shared_alloc_vector<") + type_text + std::string(">"));
@@ -77,7 +77,7 @@ test_usm_host_alloc(Policy&& policy, T trash, size_t n, const std::string& type_
         wrap_recurse<
             __recurse, 0, /*__read =*/true, /*__reset_read=*/true, /*__write=*/true,
             /*__check_write=*/true, /*__usable_as_perm_map=*/true, /*__usable_as_perm_src=*/
-            TestUtils::__vector_impl_distinguishes_usm_allocator_from_default<decltype(host_data_vec.begin())>::value,
+            TestUtils::__vector_impl_distinguishes_usm_allocator_from_default_v<decltype(host_data_vec.begin())>,
             /*__is_reversible=*/true>(policy, host_data_vec.begin(), host_data_vec.end(), counting, copy_out.get_data(),
                                       host_data_vec.begin(), copy_out.get_data(), counting, trash,
                                       std::string("usm_host_alloc_vector<") + type_text + std::string(">"));
diff --git a/test/support/utils.h b/test/support/utils.h
index d314346875b..ccbd4d4ba68 100644
--- a/test/support/utils.h
+++ b/test/support/utils.h
@@ -854,14 +854,14 @@ struct _ZipIteratorAdapter
 };
 
 #if TEST_DPCPP_BACKEND_PRESENT
-template <typename Iter, typename ValueType = typename std::iterator_traits<Iter>::value_type>
+template <typename Iter, typename ValueType = std::decay_t<typename std::iterator_traits<Iter>::value_type>>
 using __default_alloc_vec_iter = typename std::vector<ValueType>::iterator;
 
-template <typename Iter, typename ValueType = typename std::iterator_traits<Iter>::value_type>
+template <typename Iter, typename ValueType = std::decay_t<typename std::iterator_traits<Iter>::value_type>>
 using __usm_shared_alloc_vec_iter =
     typename std::vector<ValueType, typename sycl::usm_allocator<ValueType, sycl::usm::alloc::shared>>::iterator;
 
-template <typename Iter, typename ValueType = typename std::iterator_traits<Iter>::value_type>
+template <typename Iter, typename ValueType = std::decay_t<typename std::iterator_traits<Iter>::value_type>>
 using __usm_host_alloc_vec_iter =
     typename std::vector<ValueType, typename sycl::usm_allocator<ValueType, sycl::usm::alloc::host>>::iterator;
 
@@ -869,19 +869,12 @@ using __usm_host_alloc_vec_iter =
 // std::vector<value_type, Alloc>::iterator can be distinguished between three different allocators, the
 // default, usm_shared, and usm_host. If all are distinct, it is very unlikely any non-usm based allocator
 // could be confused with a usm allocator.
-template <typename Iter, typename Void = void>
-struct __vector_impl_distinguishes_usm_allocator_from_default : std::false_type
-{
-};
-
 template <typename Iter>
-struct __vector_impl_distinguishes_usm_allocator_from_default<
-    Iter, std::enable_if_t<!std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>> &&
-                           !std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_host_alloc_vec_iter<Iter>> &&
-                           !std::is_same_v<__usm_host_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>>>>
-    : std::true_type
-{
-};
+constexpr bool __vector_impl_distinguishes_usm_allocator_from_default_v =
+    !std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>> &&
+    !std::is_same_v<__default_alloc_vec_iter<Iter>, __usm_host_alloc_vec_iter<Iter>> &&
+    !std::is_same_v<__usm_host_alloc_vec_iter<Iter>, __usm_shared_alloc_vec_iter<Iter>>;
+
 #endif //TEST_DPCPP_BACKEND_PRESENT
 
 ////////////////////////////////////////////////////////////////////////////////