diff --git a/test/mx_mfma_op/mx_mfma_op.cpp b/test/mx_mfma_op/mx_mfma_op.cpp
index a0ec7483f5..30c57632ac 100644
--- a/test/mx_mfma_op/mx_mfma_op.cpp
+++ b/test/mx_mfma_op/mx_mfma_op.cpp
@@ -20,9 +20,9 @@ using ck::type_convert;
 template <typename AType, typename BType, typename CType, ck::MFMA_F8F6F4 mfma>
 bool run_mfma_test(ck::index_t init)
 {
-    using ALayout = ck::tensor_layout::gemm::ColumnMajor;
+    using ALayout = ck::tensor_layout::gemm::RowMajor;
     using BLayout = ck::tensor_layout::gemm::ColumnMajor;
-    using CLayout = ck::tensor_layout::gemm::ColumnMajor;
+    using CLayout = ck::tensor_layout::gemm::RowMajor;
 
     using AccType    = float; // only MFMA_F32 instructions supported
     using CPUAccType = AccType;
@@ -52,19 +52,19 @@ bool run_mfma_test(ck::index_t init)
     return pass;
 }
 
-// TEST(MFMA, FP8MFMA16x16x128)
-// {
-//     auto AB_init = 7;
-//     auto pass    = run_mfma_test<f8_t, f8_t, half_t, ck::MFMA_F8F6F4::F32_16x16x128>(AB_init);
-//     EXPECT_TRUE(pass);
-// }
+TEST(MFMA, FP8MFMA16x16x128)
+{
+    auto AB_init = 7;
+    auto pass    = run_mfma_test<f8_t, f8_t, half_t, ck::MFMA_F8F6F4::F32_16x16x128>(AB_init);
+    EXPECT_TRUE(pass);
+}
 
-// TEST(MFMA, FP8MFMA32x32x64)
-// {
-//     auto AB_init = 7;
-//     auto pass    = run_mfma_test<f8_t, f8_t, float, ck::MFMA_F8F6F4::F32_32x32x64>(AB_init);
-//     EXPECT_TRUE(pass);
-// }
+TEST(MFMA, FP8MFMA32x32x64)
+{
+    auto AB_init = 7;
+    auto pass    = run_mfma_test<f8_t, f8_t, float, ck::MFMA_F8F6F4::F32_32x32x64>(AB_init);
+    EXPECT_TRUE(pass);
+}
 
 TEST(MFMA, FP4MFMA16x16x128)
 {
@@ -73,12 +73,12 @@ TEST(MFMA, FP4MFMA16x16x128)
     EXPECT_TRUE(pass);
 }
 
-// TEST(MFMA, FP4MFMA32x32x64)
-// {
-//     auto AB_init = 4;
-//     auto pass = run_mfma_test<f4x2_pk_t, f4x2_pk_t, half_t,
-//     ck::MFMA_F8F6F4::F32_32x32x64>(AB_init); EXPECT_TRUE(pass);
-// }
+TEST(MFMA, FP4MFMA32x32x64)
+{
+    auto AB_init = 4;
+    auto pass = run_mfma_test<f4x2_pk_t, f4x2_pk_t, half_t, ck::MFMA_F8F6F4::F32_32x32x64>(AB_init);
+    EXPECT_TRUE(pass);
+}
 
 /**
  * @brief Run the test for the given MX MFMA instruction
@@ -125,34 +125,32 @@ bool run_mxmfma_test(ck::index_t init)
     return pass;
 }
 
-// TEST(MXMFMA, MXFP8MFMA16x16x128)
-// {
-//     auto AB_init = 7;
-//     auto pass = run_mxmfma_test<f8_t, f8_t, float,
-//     ck::MFMA_F8F6F4::SCALE_F32_16x16x128>(AB_init); EXPECT_TRUE(pass);
-// }
+TEST(MXMFMA, MXFP8MFMA16x16x128)
+{
+    auto AB_init = 7;
+    auto pass = run_mxmfma_test<f8_t, f8_t, float, ck::MFMA_F8F6F4::SCALE_F32_16x16x128>(AB_init);
+    EXPECT_TRUE(pass);
+}
 
-// TEST(MXMFMA, MXFP8MFMA32x32x64)
-// {
-//     auto AB_init = 7;
-//     auto pass = run_mxmfma_test<f8_t, f8_t, half_t,
-//     ck::MFMA_F8F6F4::SCALE_F32_32x32x64>(AB_init); EXPECT_TRUE(pass);
-// }
+TEST(MXMFMA, MXFP8MFMA32x32x64)
+{
+    auto AB_init = 7;
+    auto pass = run_mxmfma_test<f8_t, f8_t, half_t, ck::MFMA_F8F6F4::SCALE_F32_32x32x64>(AB_init);
+    EXPECT_TRUE(pass);
+}
 
-// TEST(MXMFMA, MXFP4MFMA16x16x128)
-// {
-//     auto AB_init = 4;
-//     auto pass =
-//         run_mxmfma_test<f4x2_pk_t, f4x2_pk_t, float,
-//         ck::MFMA_F8F6F4::SCALE_F32_16x16x128>(AB_init);
-//     EXPECT_TRUE(pass);
-// }
+TEST(MXMFMA, MXFP4MFMA16x16x128)
+{
+    auto AB_init = 4;
+    auto pass =
+        run_mxmfma_test<f4x2_pk_t, f4x2_pk_t, float, ck::MFMA_F8F6F4::SCALE_F32_16x16x128>(AB_init);
+    EXPECT_TRUE(pass);
+}
 
-// TEST(MXMFMA, MXFP4MFMA32x32x64)
-// {
-//     auto AB_init = 4;
-//     auto pass =
-//         run_mxmfma_test<f4x2_pk_t, f4x2_pk_t, half_t,
-//         ck::MFMA_F8F6F4::SCALE_F32_32x32x64>(AB_init);
-//     EXPECT_TRUE(pass);
-// }
+TEST(MXMFMA, MXFP4MFMA32x32x64)
+{
+    auto AB_init = 4;
+    auto pass =
+        run_mxmfma_test<f4x2_pk_t, f4x2_pk_t, half_t, ck::MFMA_F8F6F4::SCALE_F32_32x32x64>(AB_init);
+    EXPECT_TRUE(pass);
+}