diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index ee4325c..53bb4fb 100644
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -133,8 +133,11 @@
 add_proto qw/void av1_inv_txfm_add/, "const tran_low_t *dqcoeff, uint8_t *dst, int stride, const TxfmParam *txfm_param";
 specialize qw/av1_inv_txfm_add ssse3 avx2 neon/;
 
+# TODO(yunqing): disabled sse4_1 and avx2 optimizations that caused test vector mismatch,
+# including av1_highbd_inv_txfm_add_wxh_sse4_1 and av1_highbd_inv_txfm2d_add_universe_sse4_1/avx2.
 add_proto qw/void av1_highbd_inv_txfm_add/, "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param";
-specialize qw/av1_highbd_inv_txfm_add sse4_1 avx2/;
+#specialize qw/av1_highbd_inv_txfm_add sse4_1 avx2/;
+
 add_proto qw/void av1_highbd_inv_txfm_add_4x4/,  "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param";
 specialize qw/av1_highbd_inv_txfm_add_4x4 sse4_1/;
 add_proto qw/void av1_highbd_inv_txfm_add_8x8/,  "const tran_low_t *input, uint8_t *dest, int stride, const TxfmParam *txfm_param";
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 7f077b6..28501a3 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -303,13 +303,15 @@
   }
 }
 
-#if HAVE_SSE4_1
-INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdInvTxfm2d,
-                        ::testing::Values(av1_highbd_inv_txfm_add_sse4_1));
-#endif
+// TODO(yunqing): disabled sse4_1 and avx2 optimizations that caused test vector
+// mismatch. Will be enabled after the bug fix.
+// #if HAVE_SSE4_1
+// INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdInvTxfm2d,
+//                        ::testing::Values(av1_highbd_inv_txfm_add_sse4_1));
+// #endif
 
-#if HAVE_AVX2
-INSTANTIATE_TEST_CASE_P(AVX2, AV1HighbdInvTxfm2d,
-                        ::testing::Values(av1_highbd_inv_txfm_add_avx2));
-#endif
+// #if HAVE_AVX2
+// INSTANTIATE_TEST_CASE_P(AVX2, AV1HighbdInvTxfm2d,
+//                        ::testing::Values(av1_highbd_inv_txfm_add_avx2));
+// #endif
 }  // namespace