diff --git a/tests/common/type_coverage.h b/tests/common/type_coverage.h
index 8cf7d2fd8..987513a9d 100644
--- a/tests/common/type_coverage.h
+++ b/tests/common/type_coverage.h
@@ -57,7 +57,7 @@ struct type_name_string<sycl::vec<T, nElements>> {
   }
 };
 
-// FIXME: re-enable when marrray is implemented in hipsycl
+// FIXME: re-enable when marray is implemented in hipsycl
 #if !SYCL_CTS_COMPILING_WITH_HIPSYCL
 /**
  * @brief Specialization of type name retrieve for sycl::marray class
@@ -457,7 +457,7 @@ void for_all_types_and_vectors(const named_type_pack<types...> &typeList,
   assert((typeNameIndex == sizeof...(types)) && "Pack expansion failed");
 }
 
-// FIXME: re-enable when marrray is implemented in hipsycl
+// FIXME: re-enable when marray is implemented in hipsycl
 #if !SYCL_CTS_COMPILING_WITH_HIPSYCL
 /**
  * @brief Run action for type, vectors and marrays of this type
@@ -542,7 +542,7 @@ void for_type_vectors_marray_reduced(argsT&&... args) {
 }
 #endif  // !SYCL_CTS_COMPILING_WITH_HIPSYCL
 
-// FIXME: re-enable when marrray is implemented in hipsycl
+// FIXME: re-enable when marray is implemented in hipsycl
 #if !SYCL_CTS_COMPILING_WITH_HIPSYCL
 /**
  * @brief Run action for each of types, vectors and marrays of types given by
@@ -573,7 +573,7 @@ void for_all_types_vectors_marray(const named_type_pack<types...> &typeList,
 }
 #endif  // !SYCL_CTS_COMPILING_WITH_HIPSYCL
 
-// FIXME: re-enable when marrray is implemented in hipsycl
+// FIXME: re-enable when marray is implemented in hipsycl
 #if !SYCL_CTS_COMPILING_WITH_HIPSYCL
 /**
  * @brief Run action for type and marrays of this type
@@ -594,7 +594,28 @@ void for_type_and_marrays(argsT &&...args) {
 }
 #endif  // !SYCL_CTS_COMPILING_WITH_HIPSYCL
 
-// FIXME: re-enable when marrray is implemented in hipsycl
+// FIXME: re-enable when marray is implemented in hipsycl
+#if !SYCL_CTS_COMPILING_WITH_HIPSYCL
+/**
+ * @brief Run action for marrays of type T
+ * @tparam action Functor template for action to run
+ * @tparam T Type to instantiate functor template with
+ * @tparam actionArgsT Parameter pack to use for functor template instantiation
+ * @tparam argsT Deduced parameter pack for arguments to forward into the call
+ * @param args Arguments to forward into the call
+ */
+template <template <typename, typename...> class action, typename T,
+          typename... actionArgsT, typename... argsT>
+void for_marrays_of_type(argsT &&...args) {
+  for_all_types<action, actionArgsT...>(
+      type_pack<typename sycl::template marray<T, 2>,
+                typename sycl::template marray<T, 5>,
+                typename sycl::template marray<T, 10>>{},
+      std::forward<argsT>(args)...);
+}
+#endif  // !SYCL_CTS_COMPILING_WITH_HIPSYCL
+
+// FIXME: re-enable when marray is implemented in hipsycl
 #if !SYCL_CTS_COMPILING_WITH_HIPSYCL
 /**
  * @brief Run action for each of types and marrays of types given by
@@ -621,4 +642,32 @@ void for_all_types_and_marrays(const named_type_pack<types...> &typeList,
    ...);
 }
 #endif  // !SYCL_CTS_COMPILING_WITH_HIPSYCL
+
+// FIXME: re-enable when marray is implemented in hipsycl
+#if !SYCL_CTS_COMPILING_WITH_HIPSYCL
+/**
+ * @brief Run action for marrays of each type of types given by
+ *        named_type_pack instance
+ * @tparam action Functor template for action to run
+ * @tparam actionArgsT Parameter pack to use for functor template instantiation
+ * @tparam types Deduced from type_pack parameter pack for list of types to use
+ * @tparam argsT Deduced parameter pack for arguments to forward into the call
+ * @param typeList Named type pack instance with underlying type names stored
+ * @param args Arguments to forward into the call
+ */
+template <template <typename, typename...> class action,
+          typename... actionArgsT, typename... types, typename... argsT>
+void for_marrays_of_all_types(const named_type_pack<types...> &typeList,
+                              argsT &&...args) {
+  // run action for each type from types... parameter pack
+  // Using fold expression to iterate over all types within type pack
+
+  size_t typeNameIndex = 0;
+
+  ((for_marrays_of_type<action, types, actionArgsT...>(
+        std::forward<argsT>(args)..., typeList.names[typeNameIndex]),
+    ++typeNameIndex),
+   ...);
+}
+#endif  // !SYCL_CTS_COMPILING_WITH_HIPSYCL
 #endif  // __SYCLCTS_TESTS_COMMON_TYPE_COVERAGE_H
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_all.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_all.cpp
index 0ffbf9548..9d823461e 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_all.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_all.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask all()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_all
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_all_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -45,32 +59,22 @@ using verification_func_for_true_predicate =
                    true_predicate, const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check all() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    log.note("Check all() for mask with even predicate");
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
-
-    log.note("Check all() for mask with true predicate");
-    check_diff_sub_group_sizes<verification_func_for_true_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
 };
 
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+TEST_CASE("Check all() for mask with true predicate",
+          "[oneapi_sub_group_mask]") {
+#ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
+  check_diff_sub_group_sizes<verification_func_for_true_predicate>();
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+};
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_all_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_any.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_any.cpp
index 79ca2bd7a..d0ed7a18e 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_any.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_any.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask any()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_any
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_any_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -45,33 +59,22 @@ using verification_func_for_false_predicate =
                    false_predicate, const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check any() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    log.note("Check any() for mask with even predicate");
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
-
-    log.note("Check any() for mask with false predicate");
-    check_diff_sub_group_sizes<verification_func_for_false_predicate>(log);
-
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+TEST_CASE("Check any() for mask with false predicate",
+          "[oneapi_sub_group_mask]") {
+#ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
+  check_diff_sub_group_sizes<verification_func_for_false_predicate>();
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_any_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_common.h b/tests/extension/oneapi_sub_group_mask/sub_group_mask_common.h
index b84038848..36f39c15c 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_common.h
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_common.h
@@ -9,13 +9,37 @@
 #ifndef __SYCLCTS_TESTS_SUB_GROUP_MASK_COMMON_H
 #define __SYCLCTS_TESTS_SUB_GROUP_MASK_COMMON_H
 
+#include <array>
+
 #include "../../common/common.h"
 #include "../../common/type_coverage.h"
 
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 namespace {
 
+// Error types for sub_group_mask ctors
+struct ctor_error {
+  static constexpr size_t ctor_wrong =
+      0;  // wrong sub_group_mask instance created
+  static constexpr size_t copy_ctor_wrong =
+      1;  // wrong sub_group_mask instance created with copy ctor
+  static constexpr size_t assign_wrong =
+      2;  // wrong result of sub_group_mask::operator=
+  static constexpr size_t assign_type_wrong =
+      3;  // wrong type of sub_group_mask::operator=
+
+  static constexpr size_t error_types_count = 4;
+
+  inline static const std::array<std::string, error_types_count> error_strings{
+      std::string{"Error with constructed instance of sub_group_mask"},
+      std::string{
+          "Error with instance of sub_group_mask constructed with copy ctor"},
+      std::string{"Error with result of sub_group_mask::operator="},
+      std::string{"Error type of sub_group_mask::operator="}};
+};
+
 #if SYCL_CTS_ENABLE_FULL_CONFORMANCE
+
 static const auto types =
     named_type_pack<char, signed char, unsigned char, short, unsigned short,
                     int, unsigned int, long, unsigned long, long long,
@@ -74,6 +98,12 @@ inline auto get_result_array() {
   return resultArr;
 }
 
+inline auto get_ctors_result_array() {
+  std::array<bool, globalSize * ctor_error::error_types_count> resultArr;
+  resultArr.fill(true);
+  return resultArr;
+}
+
 inline bool if_check(const sycl::sub_group &sub_group) {
 #if SYCL_CTS_ENABLE_FULL_CONFORMANCE
   return true;
@@ -84,7 +114,7 @@ inline bool if_check(const sycl::sub_group &sub_group) {
 template <size_t SGSize, typename funT, typename funTypeT, typename predT,
           typename maskT, typename T = void>
 struct check_mask_api {
-  void operator()(sycl_cts::util::logger &log) {
+  void operator()() {
     sycl::range<1> globalRange(globalSize);
     sycl::range<1> localRange(localSize);
     sycl::nd_range<1> dataRange(globalRange, localRange);
@@ -116,16 +146,67 @@ struct check_mask_api {
             });
       });
     }
-    for (size_t i = 0; i < globalSize; i++)
-      if (!resultArr[i])
-        FAIL(log, "Check result failed on element " + std::to_string(i) +
-                      " with sub group size: " + std::to_string(SGSize));
-    if (!resultTypeArr[0]) FAIL(log, "Check type failed");
+    for (size_t i = 0; i < globalSize; i++) {
+      {
+        INFO("Check result failed on element " + std::to_string(i) +
+             " with sub group size: " + std::to_string(SGSize));
+        CHECK(true == resultArr[i]);
+      }
+    }
+    {
+      INFO("Check type failed");
+      CHECK(true == resultTypeArr[0]);
+    }
+  }
+};
+
+using res_array = sycl::marray<bool, ctor_error::error_types_count>;
+
+template <size_t SGSize, typename funT>
+struct check_mask_ctors {
+  void operator()() {
+    sycl::range<1> globalRange(globalSize);
+    sycl::range<1> localRange(localSize);
+    sycl::nd_range<1> dataRange(globalRange, localRange);
+
+    auto resultArr = get_ctors_result_array();
+
+    auto testQueue = sycl_cts::util::get_cts_object::queue();
+    {
+      auto buffer = sycl::buffer(resultArr.data(), globalRange);
+
+      testQueue.submit([&](sycl::handler &h) {
+        auto resultPtr =
+            buffer.template get_access<sycl::access_mode::read_write>(h);
+
+        h.parallel_for(
+            dataRange,
+            [=](sycl::nd_item<1> item) [[sycl::reqd_sub_group_size(SGSize)]] {
+              auto sub_group = item.get_sub_group();
+              if (if_check(sub_group)) {
+                res_array result = funT()(item);
+                for (size_t i = 0; i < ctor_error::error_types_count; ++i) {
+                  resultPtr[item.get_global_id(0) + i] = result[i];
+                }
+              }
+            });
+      });
+    }
+    for (size_t i = 0; i < globalSize; i++) {
+      for (size_t j = 0; j < ctor_error::error_types_count; ++j) {
+        {
+          INFO(ctor_error::error_strings[j] + " on element " +
+               std::to_string(i) +
+               " with sub group size: " + std::to_string(SGSize));
+          CHECK(resultArr[i * ctor_error::error_types_count + j]);
+        }
+      }
+    }
   }
 };
 
 template <template <size_t> class verification_func>
-void check_diff_sub_group_sizes(sycl_cts::util::logger &log) {
+void check_diff_sub_group_sizes() {
   sycl::device device{sycl_cts::util::get_cts_object::device()};
   const auto available_sg_sizes =
       device.get_info<sycl::info::device::sub_group_sizes>();
@@ -135,7 +216,7 @@ void check_diff_sub_group_sizes(sycl_cts::util::logger &log) {
 
   constexpr size_t eight_sg_size = 8;
   if (std::find(sb_begin, sb_end, eight_sg_size) != sb_end) {
-    verification_func<eight_sg_size>{}(log);
+    verification_func<eight_sg_size>{}();
   } else {
     WARN(
         "Test for 8 sub group size was skipped due to 8 is unsupported sub "
@@ -143,7 +224,7 @@ void check_diff_sub_group_sizes(sycl_cts::util::logger &log) {
   }
   constexpr size_t sixteen_sg_size = 16;
   if (std::find(sb_begin, sb_end, sixteen_sg_size) != sb_end) {
-    verification_func<sixteen_sg_size>{}(log);
+    verification_func<sixteen_sg_size>{}();
   } else {
     WARN(
         "Test for 16 sub group size was skipped due to 16 is unsupported sub "
@@ -151,7 +232,7 @@ void check_diff_sub_group_sizes(sycl_cts::util::logger &log) {
   }
   constexpr size_t thirty_two_sg_size = 32;
   if (std::find(sb_begin, sb_end, thirty_two_sg_size) != sb_end) {
-    verification_func<thirty_two_sg_size>{}(log);
+    verification_func<thirty_two_sg_size>{}();
   } else {
     WARN(
         "Test for 32 sub group size was skipped due to 32 is unsupported sub "
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_constructors.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_constructors.cpp
new file mode 100644
index 000000000..8bcdafe18
--- /dev/null
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_constructors.cpp
@@ -0,0 +1,192 @@
+/*******************************************************************************
+//
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+//  Provides tests to check sub_group_mask constructors()
+//
+*******************************************************************************/
+
+#include "catch2/catch_test_macros.hpp"
+
+#include "sub_group_mask_common.h"
+
+namespace sub_group_mask_constructors_test {
+
+using namespace sycl_cts;
+
+#if SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+template <typename T, size_t dim>
+void copy_ulong_long2marray(sycl::marray<T, dim>& marray,
+                            unsigned long long value) {
+  size_t elem_size = sizeof(T);
+  size_t num_bytes =
+      elem_size * dim > sizeof(value) ? sizeof(value) : elem_size * dim;
+  size_t shift = 0;
+  size_t i = 0;
+  while (shift + elem_size <= num_bytes && i < dim) {
+    memcpy(&(marray[i]), &value + shift, elem_size);
+    ++i;
+    shift += elem_size;
+  }
+}
+
+template <typename T, size_t dim>
+void copy_marray2ulong_long(unsigned long long& value,
+                            const sycl::marray<T, dim>& marray) {
+  size_t elem_size = sizeof(T);
+  size_t num_bytes =
+      elem_size * dim > sizeof(value) ? sizeof(value) : elem_size * dim;
+  size_t shift = 0;
+  size_t i = 0;
+  while (shift + elem_size <= num_bytes && i < dim) {
+    memcpy(&value + shift, &(marray[i]), elem_size);
+    ++i;
+    shift += elem_size;
+  }
+}
+
+bool compare_mask_and_init_value(sycl::ext::oneapi::sub_group_mask& mask,
+                                 unsigned long long init_value) {
+  for (size_t i = 0; i < mask.size(); ++i) {
+    if (mask[sycl::id<1>(i)] != (((init_value >> i) & 1))) {
+      return false;
+    }
+  }
+  return true;
+}
+
+template <typename T, size_t dim>
+bool compare_mask_and_init_value(sycl::ext::oneapi::sub_group_mask& mask,
+                                 const sycl::marray<T, dim>& val) {
+  unsigned long long result = 0;
+  size_t num_bytes = (sizeof(val) >= mask.size()) ? mask.size() : sizeof(val);
+  copy_marray2ulong_long(result, val);
+  return compare_mask_and_init_value(mask, result);
+}
+
+unsigned long long init_even_bits() {
+  unsigned long long value = 0;
+  for (size_t i = 0; i < CHAR_BIT * sizeof(value); i += 2) {
+    value |= 1UL << i;
+  }
+  return value;
+}
+
+template <typename T>
+res_array check_mask_constructors(sycl::ext::oneapi::sub_group_mask& mask,
+                                  T& value) {
+  res_array result;
+  result[ctor_error::ctor_wrong] = compare_mask_and_init_value(mask, value);
+  sycl::ext::oneapi::sub_group_mask copy(mask);
+  result[ctor_error::copy_ctor_wrong] =
+      compare_mask_and_init_value(copy, value);
+  auto assign = (copy = mask);
+  result[ctor_error::assign_type_wrong] =
+      std::is_same_v<decltype(assign), decltype(copy)>;
+  result[ctor_error::assign_wrong] = compare_mask_and_init_value(assign, value);
+  return result;
+}
+
+struct check_result_default_ctor {
+  res_array operator()(sycl::nd_item<1>& nd_item) {
+    sycl::ext::oneapi::sub_group_mask mask;
+    unsigned long long value = 0;
+    return check_mask_constructors(mask, value);
+  }
+};
+
+struct check_result_ctor_ulong_long {
+  res_array operator()(sycl::nd_item<1>& item) {
+    // Check for value = item.get_local_linear_id()
+    unsigned long long val = item.get_local_linear_id();
+    sycl::ext::oneapi::sub_group_mask mask(val);
+    res_array result = check_mask_constructors(mask, val);
+    // Check for value = 0b1010...
+    val = init_even_bits();
+    sycl::ext::oneapi::sub_group_mask mask_even(val);
+    result |= check_mask_constructors(mask_even, val);
+    return result;
+  }
+};
+
+template <typename T>
+struct check_result_ctor_marray {
+  res_array operator()(sycl::nd_item<1>& item) {
+    // Check for value = item.get_local_linear_id()
+    unsigned long long value = item.get_local_linear_id();
+    T val{};
+    copy_ulong_long2marray(val, value);
+    sycl::ext::oneapi::sub_group_mask mask(val);
+    res_array result = check_mask_constructors(mask, val);
+    // Check for value = 0b1010...
+    value = init_even_bits();
+    val = T{};
+    copy_ulong_long2marray(val, value);
+    sycl::ext::oneapi::sub_group_mask mask_even(val);
+    result |= check_mask_constructors(mask_even, val);
+    return result;
+  }
+};
+
+template <size_t SGSize>
+using verification_func_for_def_ctor =
+    check_mask_ctors<SGSize, check_result_default_ctor>;
+
+template <size_t SGSize>
+using verification_func_for_ulong_long_ctor =
+    check_mask_ctors<SGSize, check_result_ctor_ulong_long>;
+
+template <typename T>
+struct check_for_type {
+  template <size_t SGSize>
+  using verification_func_for_marray_ctor =
+      check_mask_ctors<SGSize, check_result_ctor_marray<T>>;
+
+  void operator()(const std::string& typeName) {
+    check_diff_sub_group_sizes<verification_func_for_marray_ctor>();
+  }
+};
+
+#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+
+TEST_CASE("Check sub_group_mask empty constructor", "[oneapi_sub_group_mask]") {
+#if SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+  check_diff_sub_group_sizes<verification_func_for_def_ctor>();
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined or revision less than 2");
+#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+};
+
+TEST_CASE("Check sub_group_mask(unsigned long long) constructor",
+          "[oneapi_sub_group_mask]") {
+#if SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+  check_diff_sub_group_sizes<verification_func_for_ulong_long_ctor>();
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined or revision less than 2");
+#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+};
+
+TEST_CASE("Check sub_group_mask(marray<T,dim>) constructor",
+          "[oneapi_sub_group_mask]") {
+#if SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+  for_marrays_of_all_types<check_for_type>(types);
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined or revision less than 2");
+#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK >= 2
+};
+
+}  // namespace sub_group_mask_constructors_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_count.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_count.cpp
index a08ee9ecc..489229662 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_count.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_count.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask count()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_count
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_count_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -35,28 +49,13 @@ using verification_func_for_first_half_predicate =
                    const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check count() for mask with first half predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_first_half_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_first_half_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_count_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_extract_bits.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_extract_bits.cpp
index adbb8c191..6f581265e 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_extract_bits.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_extract_bits.cpp
@@ -2,15 +2,29 @@
 //
 //  SYCL 2020 Conformance Test Suite
 //
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
 //  Provides tests to check sub_group_mask extract_bits()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_extract_bits
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_extract_bits_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -66,35 +80,21 @@ struct check_for_type {
                      check_type_extract_bits<T>, even_predicate,
                      const sycl::ext::oneapi::sub_group_mask>;
 
-  void operator()(util::logger &log, const std::string &typeName) {
-    log.note("testing: " + type_name_string<T>::get(typeName));
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  void operator()(const std::string &typeName) {
+    SECTION("testing: " + type_name_string<T>::get(typeName)) {
+      check_diff_sub_group_sizes<verification_func_for_even_predicate>();
+    }
   }
 };
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check extract_bits() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    for_all_types_and_marrays<check_for_type>(types, log);
+  for_all_types_and_marrays<check_for_type>(types);
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_extract_bits_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_high.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_high.cpp
index 4ae3cd019..b7fa96665 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_high.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_high.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask find_high()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_find_high
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_find_high_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -51,32 +65,22 @@ using verification_func_for_false_predicate =
 
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check find_high() for mask with first half predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    log.note("Check find_high() for mask with first half predicate");
-    check_diff_sub_group_sizes<verification_func_for_first_half_predicate>(log);
-
-    log.note("Check find_high() for mask with false predicate");
-    check_diff_sub_group_sizes<verification_func_for_false_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_first_half_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+TEST_CASE("Check find_high() for mask with false predicate",
+          "[oneapi_sub_group_mask]") {
+#ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
+  check_diff_sub_group_sizes<verification_func_for_false_predicate>();
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_find_high_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_low.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_low.cpp
index 45cfc0c95..495190bc0 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_low.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_find_low.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask find_low()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_find_low
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_find_low_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -50,33 +64,22 @@ using verification_func_for_false_predicate =
                    const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check find_low() for mask with second half predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    log.note("Check find_low() for mask with second half predicate");
-    check_diff_sub_group_sizes<verification_func_for_second_half_predicate>(
-        log);
-
-    log.note("Check find_low() for mask with false predicate");
-    check_diff_sub_group_sizes<verification_func_for_false_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_second_half_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+TEST_CASE("Check find_low() for mask with false predicate",
+          "[oneapi_sub_group_mask]") {
+#ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
+  check_diff_sub_group_sizes<verification_func_for_false_predicate>();
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_find_low_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_api.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_api.cpp
index f85b53b20..282e481cf 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_api.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_api.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask flip()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_flip_api
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_flip_api_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -44,28 +58,13 @@ using verification_func_for_even_predicate =
                    sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check flip() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_flip_api_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_id.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_id.cpp
index c533ac7cc..b40c69b7f 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_id.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_flip_id.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask flip_id()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_flip_id
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_flip_id_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -39,29 +53,13 @@ using verification_func_for_even_predicate =
                    even_predicate, sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check flip_id() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
-
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_flip_id_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_insert_bits.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_insert_bits.cpp
index 6f8c3c87d..484b39678 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_insert_bits.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_insert_bits.cpp
@@ -2,15 +2,29 @@
 //
 //  SYCL 2020 Conformance Test Suite
 //
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
 //  Provides tests to check sub_group_mask insert_bits()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_insert_bits
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_insert_bits_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -67,35 +81,21 @@ struct check_for_type {
                      check_type_insert_bits<T>, mod3_predicate,
                      sycl::ext::oneapi::sub_group_mask>;
 
-  void operator()(util::logger &log, const std::string &typeName) {
-    log.note("testing: " + type_name_string<T>::get(typeName));
-    check_diff_sub_group_sizes<verification_func_for_mod3_predicate>(log);
+  void operator()(const std::string &typeName) {
+    SECTION("testing: " + type_name_string<T>::get(typeName)) {
+      check_diff_sub_group_sizes<verification_func_for_mod3_predicate>();
+    }
   }
 };
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check insert_bits() for mask with mod3 predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    for_all_types_and_marrays<check_for_type>(types, log);
+  for_all_types_and_marrays<check_for_type>(types);
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_insert_bits_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_none.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_none.cpp
index 9c536ddde..73d0f59fa 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_none.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_none.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask none()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_none
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_none_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -45,32 +59,22 @@ using verification_func_for_false_predicate =
                    false_predicate, const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check none() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    log.note("Check none() for mask with even predicate");
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
-
-    log.note("Check none() for mask with false predicate");
-    check_diff_sub_group_sizes<verification_func_for_false_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+TEST_CASE("Check none() for mask with false predicate",
+          "[oneapi_sub_group_mask]") {
+#ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
+  check_diff_sub_group_sizes<verification_func_for_false_predicate>();
+#else
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_none_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reference.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reference.cpp
index c2e20f0d5..c6b3fe2b2 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reference.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reference.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask operator[] const and reference
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_reference
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_reference_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -71,28 +85,13 @@ using verification_func_for_even_predicate =
                    even_predicate, sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check operator[] and reference for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-     check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_reference_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_api.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_api.cpp
index 3191ccdb4..2bbdc781a 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_api.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_api.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask reset()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_reset_api
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_reset_api_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -37,28 +51,13 @@ using verification_func_for_even_predicate =
                    sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check reset() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_reset_api_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_high.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_high.cpp
index 0cd31b91e..8501decd9 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_high.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_high.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask reset_high()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_reset_high
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_reset_high_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -39,28 +53,13 @@ using verification_func_for_even_predicate =
                    first_half_predicate, sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check reset_high() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_reset_high_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_id.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_id.cpp
index cdef7ca09..0f3699acc 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_id.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_id.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask reset(id)
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_reset_id
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_reset_id_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -48,28 +62,13 @@ using verification_func_for_even_predicate =
                    even_predicate, sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check reset_id() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_reset_id_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_low.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_low.cpp
index 0a33e5305..9cfc17dfd 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_low.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_reset_low.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask reset_low()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_reset_low
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_reset_low_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -39,28 +53,13 @@ using verification_func_for_even_predicate =
                    second_half_predicate, sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check reset_low() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_reset_low_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_api.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_api.cpp
index 57c9b1236..f3d47f5ba 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_api.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_api.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask set()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_set_api
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_set_api_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -44,28 +58,13 @@ using verification_func_for_even_predicate =
                    sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check set() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_set_api_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_id.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_id.cpp
index afc2ca28d..6b62120d4 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_id.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_set_id.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask set(id)
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_set_id
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_set_id_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -54,28 +68,13 @@ using verification_func_for_even_predicate =
                    even_predicate, sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check set(id) for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_set_id_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_size.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_size.cpp
index a94e63a73..dfc3ca206 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_size.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_size.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask size()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_size
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_size_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -34,28 +48,13 @@ using verification_func_for_true_predicate =
                    const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check size() for mask with true predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_true_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_true_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_size_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_subscript.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_subscript.cpp
index d7beead94..53ea7510b 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_subscript.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_subscript.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask operator[]
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_subscript
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_subsscript_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -37,28 +51,13 @@ using verification_func_for_even_predicate =
                    even_predicate, const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check subscript[] for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_subsscript_test
diff --git a/tests/extension/oneapi_sub_group_mask/sub_group_mask_test.cpp b/tests/extension/oneapi_sub_group_mask/sub_group_mask_test.cpp
index 25039e4b5..b0a9ef6ae 100644
--- a/tests/extension/oneapi_sub_group_mask/sub_group_mask_test.cpp
+++ b/tests/extension/oneapi_sub_group_mask/sub_group_mask_test.cpp
@@ -1,16 +1,30 @@
 /*******************************************************************************
 //
-//  SYCL 2020 Extension Conformance Test
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2023 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //
 //  Provides tests to check sub_group_mask test()
 //
 *******************************************************************************/
 
-#include "sub_group_mask_common.h"
+#include "catch2/catch_test_macros.hpp"
 
-#define TEST_NAME sub_group_mask_test
+#include "sub_group_mask_common.h"
 
-namespace TEST_NAMESPACE {
+namespace sub_group_mask_test_test {
 
 using namespace sycl_cts;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
@@ -37,28 +51,13 @@ using verification_func_for_even_predicate =
                    const sycl::ext::oneapi::sub_group_mask>;
 #endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 
-/** test sycl::oneapi::sub_group_mask interface
- */
-class TEST_NAME : public util::test_base {
- public:
-  /** return information about this test
-   */
-  void get_info(test_base::info &out) const override {
-    set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE);
-  }
-
-  /** execute the test
-   */
-  void run(util::logger &log) override {
+TEST_CASE("Check test() for mask with even predicate",
+          "[oneapi_sub_group_mask]") {
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-    check_diff_sub_group_sizes<verification_func_for_even_predicate>(log);
+  check_diff_sub_group_sizes<verification_func_for_even_predicate>();
 #else
-    SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
-#endif  // SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-  }
-};
-
-// register this test with the test_collection.
-util::test_proxy<TEST_NAME> proxy;
+  SKIP("SYCL_EXT_ONEAPI_SUB_GROUP_MASK is not defined");
+#endif
+}
 
-} /* namespace TEST_NAMESPACE */
+}  // namespace sub_group_mask_test_test