diff --git a/av1/common/av1_rtcd_defs.pl b/av1/common/av1_rtcd_defs.pl
index dbd8271..f4cdfa5 100644
--- a/av1/common/av1_rtcd_defs.pl
+++ b/av1/common/av1_rtcd_defs.pl
@@ -111,7 +111,8 @@
 
 #inv txfm
 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): Disable NEON version due to test vector mismatch.
+specialize qw/av1_inv_txfm_add ssse3 avx2/; # neon/;
 
 add_proto qw/void av1_highbd_inv_txfm_add/, "const tran_low_t *dqcoeff, uint8_t *dst, int stride, const TxfmParam *txfm_param";
 # TODO(http://crbug.com/aomedia/2350): avx2 is disabled due to test vector
diff --git a/test/av1_inv_txfm2d_test.cc b/test/av1_inv_txfm2d_test.cc
index 46cf068..75040c2 100644
--- a/test/av1_inv_txfm2d_test.cc
+++ b/test/av1_inv_txfm2d_test.cc
@@ -405,15 +405,17 @@
                         ::testing::Values(av1_lowbd_inv_txfm2d_add_avx2));
 #endif  // HAVE_AVX2
 
-#if HAVE_NEON
-
-extern "C" void av1_lowbd_inv_txfm2d_add_neon(const int32_t *input,
-                                              uint8_t *output, int stride,
-                                              TX_TYPE tx_type, TX_SIZE tx_size,
-                                              int eob);
-
-INSTANTIATE_TEST_CASE_P(NEON, AV1LbdInvTxfm2d,
-                        ::testing::Values(av1_lowbd_inv_txfm2d_add_neon));
-#endif  // HAVE_NEON
+// TODO(yunqing): Re-enable this unit test for NEON version after the functions
+// are fixed.
+// #if HAVE_NEON
+// extern "C" void av1_lowbd_inv_txfm2d_add_neon(const int32_t *input,
+//                                               uint8_t *output, int stride,
+//                                               TX_TYPE tx_type,
+//                                               TX_SIZE tx_size,
+//                                               int eob);
+//
+// INSTANTIATE_TEST_CASE_P(NEON, AV1LbdInvTxfm2d,
+//                         ::testing::Values(av1_lowbd_inv_txfm2d_add_neon));
+// #endif  // HAVE_NEON
 
 }  // namespace