diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 78426f2..6a1fe13 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -136,9 +136,9 @@
   add_compiler_flag_if_supported("-Wuninitialized")
   add_compiler_flag_if_supported("-Wunused")
   add_compiler_flag_if_supported("-Wvla")
-  # TODO(jzern): this could be added as a cxx flags for test/*.cc only,
-  # avoiding third_party.
-  add_c_flag_if_supported("-Wshorten-64-to-32")
+  if (NOT CONFIG_HIGHBITDEPTH)
+    add_c_flag_if_supported("-Wshorten-64-to-32")
+  endif ()
 
   # Add -Wshadow only for C files to avoid massive gtest warning spam.
   add_c_flag_if_supported("-Wshadow")
diff --git a/configure b/configure
index 5e105b9..c741f7b 100755
--- a/configure
+++ b/configure
@@ -722,9 +722,11 @@
         fi
         # gtest makes heavy use of undefined pre-processor symbols
         check_cflags "-Wundef" && add_cflags_only "-Wundef"
-        # Avoid this warning for third_party C++ sources. Some reorganization
-        # would be needed to apply this only to test/*.cc.
-        check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32
+        if ! enabled highbitdepth; then
+          # Avoid this warning for third_party C++ sources. Some reorganization
+          # would be needed to apply this only to test/*.cc.
+          check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32
+        fi
     fi
 
     if enabled icc; then