diff --git a/tests/std/tests/P0009R18_mdspan_layout_right/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_right/test.cpp
index 00feac5437..67530019c1 100644
--- a/tests/std/tests/P0009R18_mdspan_layout_right/test.cpp
+++ b/tests/std/tests/P0009R18_mdspan_layout_right/test.cpp
@@ -59,7 +59,7 @@ constexpr void check_members(const extents<IndexType, Extents...>& ext, index_se
         static_assert(is_nothrow_constructible_v<Mapping2, Mapping>);
         // Other tests are defined in 'check_construction_from_other_right_mapping' function
     }
-#endif
+#endif // __clang__
 
     { // Check construction from layout_left::mapping
         using LeftMapping = layout_left::mapping<Ext>;
diff --git a/tests/std/tests/P0009R18_mdspan_layout_stride/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_stride/test.cpp
index 74744d7b7e..435d637177 100644
--- a/tests/std/tests/P0009R18_mdspan_layout_stride/test.cpp
+++ b/tests/std/tests/P0009R18_mdspan_layout_stride/test.cpp
@@ -215,7 +215,7 @@ constexpr void check_construction_from_other_mappings() {
 }
 
 constexpr void check_required_span_size() {
-    { // Check [mdspan.layout.stride.expo]/1.1: Ext::rank() == 0
+    { // Check N4950 [mdspan.layout.stride.expo]/1.1: Ext::rank() == 0
         using M1 = layout_stride::mapping<extents<int>>;
         static_assert(M1{}.required_span_size() == 1);
 
@@ -223,7 +223,7 @@ constexpr void check_required_span_size() {
         assert(m2.required_span_size() == 1);
     }
 
-    { // Check [mdspan.layout.stride.expo]/1.2: size of the multidimensional index space e is 0
+    { // Check N4950 [mdspan.layout.stride.expo]/1.2: size of the multidimensional index space e is 0
         using M1 = layout_stride::mapping<extents<int, 3, 3, 0, 3>>;
         static_assert(M1{}.required_span_size() == 0);
 
@@ -231,7 +231,7 @@ constexpr void check_required_span_size() {
         assert(m2.required_span_size() == 0);
     }
 
-    { // Check [mdspan.layout.stride.expo]/1.3: final case
+    { // Check N4950 [mdspan.layout.stride.expo]/1.3: final case
         using M1 = layout_stride::mapping<extents<int, 3, 4, 3>>;
         static_assert(M1{}.required_span_size() == 36);
 
@@ -345,7 +345,7 @@ constexpr void check_comparisons() {
         static_assert(!equality_comparable_with<StaticStrideMapping, layout_stride::mapping<dextents<int, 3>>>);
         static_assert(!equality_comparable_with<DynamicStrideMapping, layout_right::mapping<extents<int, 2>>>);
         static_assert(!equality_comparable_with<StaticStrideMapping, layout_left::mapping<dextents<int, 1>>>);
-        // TRANSITION, Check other constraints: [mdspan.layout.stride.obs]/6.1, 6.3
+        // TRANSITION, Check other constraints: N4950 [mdspan.layout.stride.obs]/6.1, 6.3
     }
 
     { // Check correctness: layout_stride::mapping with layout_stride::mapping
diff --git a/tests/std/tests/P0009R18_mdspan_layout_stride_death/test.cpp b/tests/std/tests/P0009R18_mdspan_layout_stride_death/test.cpp
index 2532506730..2ad0eda002 100644
--- a/tests/std/tests/P0009R18_mdspan_layout_stride_death/test.cpp
+++ b/tests/std/tests/P0009R18_mdspan_layout_stride_death/test.cpp
@@ -28,7 +28,7 @@ void test_construction_from_strided_layout_mapping() {
 }
 
 void test_call_operator() {
-    layout_stride::mapping<extents<unsigned, 5, 3, 4>> m;
+    layout_stride::mapping<extents<unsigned int, 5, 3, 4>> m;
     // Value of extents_type::index-cast(i) must be a multidimensional index in extents_
     (void) m(4, 3, 3);
 }