diff --git a/stl/inc/ranges b/stl/inc/ranges
index 2f8b62dd7f..7a939994e6 100644
--- a/stl/inc/ranges
+++ b/stl/inc/ranges
@@ -42,10 +42,10 @@ namespace ranges {
 
 #if _HAS_CXX23
     _EXPORT_STD template <range _Rng>
-    using const_iterator_t = const_iterator<iterator_t<_Rng>>;
+    using const_iterator_t = decltype(_RANGES cbegin(_STD declval<_Rng&>()));
 
     _EXPORT_STD template <range _Rng>
-    using const_sentinel_t = const_sentinel<sentinel_t<_Rng>>;
+    using const_sentinel_t = decltype(_RANGES cend(_STD declval<_Rng&>()));
 
     _EXPORT_STD template <range _Rng>
     using range_const_reference_t = iter_const_reference_t<iterator_t<_Rng>>;
diff --git a/tests/std/tests/P2278R4_ranges_const_range_machinery/test.cpp b/tests/std/tests/P2278R4_ranges_const_range_machinery/test.cpp
index e504f96def..02ce17af43 100644
--- a/tests/std/tests/P2278R4_ranges_const_range_machinery/test.cpp
+++ b/tests/std/tests/P2278R4_ranges_const_range_machinery/test.cpp
@@ -36,8 +36,8 @@ namespace test_array {
     static_assert(CanRangeConstIterator<Arr>);
     static_assert(CanRangeConstSentinel<Arr>);
     static_assert(CanRangeConstReference<Arr>);
-    static_assert(same_as<ranges::const_iterator_t<Arr>, const_iterator<int*>>);
-    static_assert(same_as<ranges::const_sentinel_t<Arr>, const_iterator<int*>>);
+    static_assert(same_as<ranges::const_iterator_t<Arr>, const int*>);
+    static_assert(same_as<ranges::const_sentinel_t<Arr>, const int*>);
     static_assert(same_as<ranges::range_const_reference_t<Arr>, const int&>);
     static_assert(!ranges::constant_range<Arr>);
 
@@ -56,8 +56,8 @@ namespace test_random_access_range {
     static_assert(CanRangeConstIterator<Rng>);
     static_assert(CanRangeConstSentinel<Rng>);
     static_assert(CanRangeConstReference<Rng>);
-    static_assert(same_as<ranges::const_iterator_t<Rng>, const_iterator<Rng::iterator>>);
-    static_assert(same_as<ranges::const_sentinel_t<Rng>, const_iterator<Rng::iterator>>);
+    static_assert(same_as<ranges::const_iterator_t<Rng>, Rng::const_iterator>);
+    static_assert(same_as<ranges::const_sentinel_t<Rng>, Rng::const_iterator>);
     static_assert(same_as<ranges::range_const_reference_t<Rng>, const int&>);
     static_assert(!ranges::constant_range<Rng>);
 
@@ -76,8 +76,8 @@ namespace test_bidirectional_range {
     static_assert(CanRangeConstIterator<Rng>);
     static_assert(CanRangeConstSentinel<Rng>);
     static_assert(CanRangeConstReference<Rng>);
-    static_assert(same_as<ranges::const_iterator_t<Rng>, const_iterator<Rng::iterator>>);
-    static_assert(same_as<ranges::const_sentinel_t<Rng>, const_iterator<Rng::iterator>>);
+    static_assert(same_as<ranges::const_iterator_t<Rng>, Rng::const_iterator>);
+    static_assert(same_as<ranges::const_sentinel_t<Rng>, Rng::const_iterator>);
     static_assert(same_as<ranges::range_const_reference_t<Rng>, const int&>);
     static_assert(!ranges::constant_range<Rng>);
 
@@ -96,8 +96,8 @@ namespace test_forward_range {
     static_assert(CanRangeConstIterator<Rng>);
     static_assert(CanRangeConstSentinel<Rng>);
     static_assert(CanRangeConstReference<Rng>);
-    static_assert(same_as<ranges::const_iterator_t<Rng>, const_iterator<Rng::iterator>>);
-    static_assert(same_as<ranges::const_sentinel_t<Rng>, const_iterator<Rng::iterator>>);
+    static_assert(same_as<ranges::const_iterator_t<Rng>, Rng::const_iterator>);
+    static_assert(same_as<ranges::const_sentinel_t<Rng>, Rng::const_iterator>);
     static_assert(same_as<ranges::range_const_reference_t<Rng>, const int&>);
     static_assert(!ranges::constant_range<Rng>);
 
@@ -147,8 +147,8 @@ namespace test_vector_bool {
     static_assert(CanRangeConstIterator<Vb>);
     static_assert(CanRangeConstSentinel<Vb>);
     static_assert(CanRangeConstReference<Vb>);
-    static_assert(same_as<ranges::const_iterator_t<Vb>, const_iterator<Vb::iterator>>);
-    static_assert(same_as<ranges::const_sentinel_t<Vb>, const_iterator<Vb::iterator>>);
+    static_assert(same_as<ranges::const_iterator_t<Vb>, Vb::const_iterator>);
+    static_assert(same_as<ranges::const_sentinel_t<Vb>, Vb::const_iterator>);
     static_assert(same_as<ranges::range_const_reference_t<Vb>, bool>);
     static_assert(!ranges::constant_range<Vb>);