diff --git a/model_files/CMSSMCKM/FlexibleSUSY.m.in b/model_files/CMSSMCKM/FlexibleSUSY.m.in
index 9af816cc3..4cdeb5d83 100644
--- a/model_files/CMSSMCKM/FlexibleSUSY.m.in
+++ b/model_files/CMSSMCKM/FlexibleSUSY.m.in
@@ -47,9 +47,9 @@ LowScale = SM[MZ];
 LowScaleFirstGuess = SM[MZ];
 
 LowScaleInput = {
-   {Yu, Sqrt[2] Re[MatMul[ZUR, topDRbar, CKM, ZUL]] / vu},
-   {Yd, Sqrt[2] Re[MatMul[ZDR, bottomDRbar, ZDL]] / vd},
-   {Ye, Sqrt[2] Re[MatMul[ZER, electronDRbar, ZEL]] / vd},
+   {Yu, Sqrt[2] Re[MatMul[Tp[CKM], topDRbar]] / vu},
+   {Yd, Sqrt[2] Re[MatMul[bottomDRbar]] / vd},
+   {Ye, Sqrt[2] Re[MatMul[electronDRbar]] / vd},
    {vd, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
    {vu, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
diff --git a/test/test_CMSSMCKM_low_scale_constraint.cpp b/test/test_CMSSMCKM_low_scale_constraint.cpp
index 6edc13495..f4e0e8c33 100644
--- a/test/test_CMSSMCKM_low_scale_constraint.cpp
+++ b/test/test_CMSSMCKM_low_scale_constraint.cpp
@@ -231,10 +231,10 @@ BOOST_AUTO_TEST_CASE( test_low_energy_constraint_with_flavour_mixing )
    // set non-diagonal CKM matrix
    CKM_parameters ckm_parameters;
    ckm_parameters.reset_to_observation();
-   ckm_parameters.theta_12 = 0.;
-   ckm_parameters.theta_13 = 0.;
-   ckm_parameters.theta_23 = 0.;
-   ckm_parameters.delta = 0.;
+   // ckm_parameters.theta_12 = 0.;
+   // ckm_parameters.theta_13 = 0.;
+   // ckm_parameters.theta_23 = 0.;
+   // ckm_parameters.delta = 0.;
    oneset.setCKM(ckm_parameters);
 
    s.setData(oneset);
@@ -306,7 +306,7 @@ BOOST_AUTO_TEST_CASE( test_low_energy_constraint_with_flavour_mixing )
          if (i == k)
             continue;
          BOOST_MESSAGE("testing yukawa elements " << i << ", " << k);
-         BOOST_CHECK_CLOSE_FRACTION(m.get_Yu()(i-1,k-1), s.displayYukawaMatrix(YU)(i,k), 0.00001);
+         BOOST_CHECK_CLOSE_FRACTION(m.get_Yu()(i-1,k-1), s.displayYukawaMatrix(YU)(i,k), 0.01);
          BOOST_CHECK_CLOSE_FRACTION(m.get_Yd()(i-1,k-1), s.displayYukawaMatrix(YD)(i,k), 0.00001);
          BOOST_CHECK_CLOSE_FRACTION(m.get_Ye()(i-1,k-1), s.displayYukawaMatrix(YE)(i,k), 0.00001);
       }