diff --git a/src/test/ValentinaTest/tst_vabstractpiece.cpp b/src/test/ValentinaTest/tst_vabstractpiece.cpp
index c3e8bb6f7..d13ed83e6 100644
--- a/src/test/ValentinaTest/tst_vabstractpiece.cpp
+++ b/src/test/ValentinaTest/tst_vabstractpiece.cpp
@@ -82,8 +82,8 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data()
                                       << 11.338582677165354 // seam allowance width (0.3 cm)
                                       << OutputPointsIssue548Case1();
 
-#ifndef Q_OS_WIN // Disabled due to "undefined behavior" problem
-#ifndef Q_CC_CLANG
+    // Disabled due to "undefined behavior" problem
+#if !defined(Q_OS_WIN) && !defined(Q_CC_CLANG) && !defined(Q_PROCESSOR_X86_64)
     QTest::newRow("Issue 548. Case2") << InputPointsIssue548Case2()
                                       << 37.795275590551185 // seam allowance width (1.0 cm)
                                       << OutputPointsIssue548Case2();
@@ -91,7 +91,6 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data()
     QTest::newRow("Issue 548. Case3") << InputPointsIssue548Case3()
                                       << 75.59055118110237 // seam allowance width (2.0 cm)
                                       << OutputPointsIssue548Case3();
-#endif
 #endif
 
     QTest::newRow("Issue 646.") << InputPointsIssue646()
@@ -2478,10 +2477,9 @@ void TST_VAbstractPiece::BrokenDetailEquidistant_data() const
     ekvOrig.append(QPointF(796.554931640625, 2597.28125));
     ekvOrig.append(QPointF(787.1898456692913, 1663.5186141732283));
 
-#ifndef Q_OS_WIN // Disabled due to "undefined behavior" problem
-#ifndef Q_CC_CLANG
+    // Disabled due to "undefined behavior" problem
+#if !defined(Q_OS_WIN) && !defined(Q_CC_CLANG) && !defined(Q_PROCESSOR_X86_64)
     QTest::newRow("GAVAUDAN Laure.") << points << 37.795275590551185 << ekvOrig;
-#endif
 #endif
 
     points.clear();