diff --git a/test/encoder/EncUT_DecodeMbAux.cpp b/test/encoder/EncUT_DecodeMbAux.cpp
index 559d4583..8c507958 100644
--- a/test/encoder/EncUT_DecodeMbAux.cpp
+++ b/test/encoder/EncUT_DecodeMbAux.cpp
@@ -355,7 +355,8 @@ TEST (DecodeMbAuxTest, WelsIDctFourT4Rec_sse2) {
   TestIDctFourT4Rec<int16_t> (WelsIDctFourT4Rec_sse2);
 }
 TEST (DecodeMbAuxTest, WelsIDctFourT4Rec_avx2) {
-  TestIDctFourT4Rec<int16_t> (WelsIDctFourT4Rec_avx2);
+  if (WelsCPUFeatureDetect (0) & WELS_CPU_AVX2)
+    TestIDctFourT4Rec<int16_t> (WelsIDctFourT4Rec_avx2);
 }
 TEST (DecodeMbAuxTest, WelsIDctRecI16x16Dc_sse2) {
   int32_t iCpuCores = 0;
diff --git a/test/encoder/EncUT_EncoderMbAux.cpp b/test/encoder/EncUT_EncoderMbAux.cpp
index 5eb7278e..464dc66a 100644
--- a/test/encoder/EncUT_EncoderMbAux.cpp
+++ b/test/encoder/EncUT_EncoderMbAux.cpp
@@ -1,4 +1,5 @@
 #include <gtest/gtest.h>
+#include "cpu.h"
 #include "ls_defines.h"
 #include "encode_mb_aux.h"
 #include "wels_common_basis.h"
@@ -199,7 +200,8 @@ TEST (EncodeMbAuxTest, WelsDctFourT4_sse2) {
 }
 
 TEST (EncodeMbAuxTest, WelsDctFourT4_avx2) {
-  TestDctFourT4 (WelsDctFourT4_avx2);
+  if (WelsCPUFeatureDetect (0) & WELS_CPU_AVX2)
+    TestDctFourT4 (WelsDctFourT4_avx2);
 }
 
 TEST (EncodeMbAuxTest, WelsCalculateSingleCtr4x4_sse2) {