diff --git a/CMakeLists.txt b/CMakeLists.txt
index c75579c..4d29e0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -627,11 +627,6 @@
     # requires CONFIG_ADAPT_SCAN
     #"${AOM_ROOT}/test/scan_test.cc"
     "${AOM_ROOT}/test/simd_cmp_impl.h"
-    # requires the obvious assembly flavor.
-    #"${AOM_ROOT}/test/simd_cmp_neon.cc"
-    #"${AOM_ROOT}/test/simd_cmp_sse2.cc"
-    #"${AOM_ROOT}/test/simd_cmp_sse4.cc"
-    #"${AOM_ROOT}/test/simd_cmp_ssse3.cc"
     "${AOM_ROOT}/test/subtract_test.cc"
     "${AOM_ROOT}/test/sum_squares_test.cc"
     "${AOM_ROOT}/test/superframe_test.cc"
@@ -649,6 +644,11 @@
     "${AOM_ROOT}/test/y4m_video_source.h"
     "${AOM_ROOT}/test/yuv_video_source.h")
 
+set(AOM_UNIT_TEST_INTRIN_NEON "${AOM_ROOT}/test/simd_cmp_neon.cc")
+set(AOM_UNIT_TEST_INTRIN_SSE2 "${AOM_ROOT}/test/simd_cmp_sse2.cc")
+set(AOM_UNIT_TEST_INTRIN_SSSE3 "${AOM_ROOT}/test/simd_cmp_ssse3.cc")
+set(AOM_UNIT_TEST_INTRIN_SSE4_1 "${AOM_ROOT}/test/simd_cmp_sse4.cc")
+
 set(AOM_GTEST_SOURCES
     "${AOM_ROOT}/third_party/googletest/src/src/gtest-all.cc"
     "${AOM_ROOT}/third_party/googletest/src/include/gtest/gtest.h")
@@ -899,6 +899,18 @@
     target_sources(test_libaom PUBLIC ${AOM_UNIT_TEST_WEBM_SOURCES}
                    $<TARGET_OBJECTS:webm>)
   endif ()
+  if (HAVE_SSE2)
+    add_intrinsics_source_to_target("-msse2" "test_libaom"
+                                    "AOM_UNIT_TEST_INTRIN_SSE2")
+  endif ()
+  if (HAVE_SSSE3)
+    add_intrinsics_source_to_target("-mssse3" "test_libaom"
+                                    "AOM_UNIT_TEST_INTRIN_SSSE3")
+  endif ()
+  if (HAVE_SSE4_1)
+    add_intrinsics_source_to_target("-msse4.1" "test_libaom"
+                                    "AOM_UNIT_TEST_INTRIN_SSE4_1")
+  endif ()
 endif ()
 
 if (XCODE)
diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
index ff33948..f0ac87a 100644
--- a/build/cmake/aom_optimization.cmake
+++ b/build/cmake/aom_optimization.cmake
@@ -32,6 +32,18 @@
   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE)
 endfunction ()
 
+# Adds sources in list named by $sources to $target and adds $flag to the
+# compile flags for each source file.
+function (add_intrinsics_source_to_target flag target sources)
+  if (MSVC)
+    message(FATAL_ERROR "MSVC instrinics support not implemented.")
+  endif ()
+  target_sources(${target} PUBLIC ${${sources}})
+  foreach (source ${${sources}})
+    set_property(SOURCE ${source} APPEND PROPERTY COMPILE_FLAGS ${flag})
+  endforeach ()
+endfunction ()
+
 # Adds build commands for ASM files in $sources and uses $asm_build_name to
 # build an output directory path. Adds ASM objects to libaom directly. $sources
 # must be the name of a variable containing a list of sources.