diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt
index dd78084f..6bc5b199 100644
--- a/osquery/tables/CMakeLists.txt
+++ b/osquery/tables/CMakeLists.txt
@@ -34,7 +34,6 @@ if(APPLE)
   ADD_OSQUERY_LINK_ADDITIONAL("libxar.dylib")
   ADD_OSQUERY_LINK_ADDITIONAL("libcups")
   ADD_OSQUERY_LINK_ADDITIONAL("libiconv")
-  ADD_OSQUERY_LINK_ADDITIONAL("libbsm")
 endif()

 # FreeBSD specific and applicable tables.
victor@kl ~/g/s/g/f/osquery> git diff osquery/CMakeLists.txt
diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
index 1c8201ee..94882799 100644
--- a/osquery/CMakeLists.txt
+++ b/osquery/CMakeLists.txt
@@ -142,6 +142,10 @@ else()
   ADD_OSQUERY_LINK_CORE("thrift")
 endif()

+ADD_OSQUERY_LINK_ADDITIONAL("libiconv")
+ADD_OSQUERY_LINK_ADDITIONAL("-framework CoreGraphics")
+ADD_OSQUERY_LINK_ADDITIONAL("libbsm")
+
 if(APPLE OR LINUX)
   ADD_OSQUERY_LINK_CORE("libdl")
   ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite")
@@ -437,18 +441,18 @@ if(NOT SKIP_TESTS)

   if(NOT OSQUERY_BUILD_SDK_ONLY)
     # osquery core (additional) set of unit tests built outside of SDK.
-    add_executable(osquery_additional_tests tests/test_additional_util.cpp main/tests.cpp ${OSQUERY_ADDITIONAL_TESTS})
-    ADD_DEFAULT_LINKS(osquery_additional_tests TRUE)
-    target_link_libraries(osquery_additional_tests gtest gmock libosquery_testing)
-    SET_OSQUERY_COMPILE(osquery_additional_tests "${GTEST_FLAGS}")
-    add_test(osquery_additional_tests osquery_additional_tests ${TEST_ARGS})
+    #add_executable(osquery_additional_tests tests/test_additional_util.cpp main/tests.cpp ${OSQUERY_ADDITIONAL_TESTS})
+    #ADD_DEFAULT_LINKS(osquery_additional_tests TRUE)
+    #target_link_libraries(osquery_additional_tests gtest gmock libosquery_testing)
+    #SET_OSQUERY_COMPILE(osquery_additional_tests "${GTEST_FLAGS}")
+    #add_test(osquery_additional_tests osquery_additional_tests ${TEST_ARGS})

     # osquery tables set of unit tests (extracted for organization).
-    add_executable(osquery_tables_tests tests/test_additional_util.cpp main/tests.cpp ${OSQUERY_TABLES_TESTS})
-    ADD_DEFAULT_LINKS(osquery_tables_tests TRUE)
-    target_link_libraries(osquery_tables_tests gtest gmock libosquery_testing)
-    SET_OSQUERY_COMPILE(osquery_tables_tests "${GTEST_FLAGS}")
-    add_test(osquery_tables_tests osquery_tables_tests ${TEST_ARGS})
+    #add_executable(osquery_tables_tests tests/test_additional_util.cpp main/tests.cpp ${OSQUERY_TABLES_TESTS})
+    #ADD_DEFAULT_LINKS(osquery_tables_tests TRUE)
+    #target_link_libraries(osquery_tables_tests gtest gmock libosquery_testing)
+    #SET_OSQUERY_COMPILE(osquery_tables_tests "${GTEST_FLAGS}")
+    #add_test(osquery_tables_tests osquery_tables_tests ${TEST_ARGS})
   endif()