diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index 4fd24be5d1..f2ee1d8aee 100644
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -677,6 +677,11 @@ if(MSVC)
   target_compile_options(arangod PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
 
+if (DARWIN)
+  target_compile_options(arangoserver PRIVATE -Werror)
+  target_compile_options(arangod PRIVATE -Werror)
+endif()
+
 ################################################################################
 ## arango-dfdb
 ################################################################################
diff --git a/arangosh/CMakeLists.txt b/arangosh/CMakeLists.txt
index e552ddd1c9..78f4978eae 100644
--- a/arangosh/CMakeLists.txt
+++ b/arangosh/CMakeLists.txt
@@ -56,6 +56,10 @@ if(MSVC)
   target_compile_options(arangobench PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
 
+if (DARWIN)
+  target_compile_options(arangobench PRIVATE -Werror)
+endif()
+
 ################################################################################
 ## arangodump
 ################################################################################
@@ -108,7 +112,11 @@ if (USE_JEMALLOC)
 endif ()
 
 if(MSVC)
-  target_compile_options(arangobench PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
+  target_compile_options(arangodump PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
+endif()
+
+if (DARWIN)
+  target_compile_options(arangodump PRIVATE -Werror)
 endif()
 
 ################################################################################
@@ -164,6 +172,10 @@ if(MSVC)
   target_compile_options(arangoexport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
 
+if (DARWIN)
+  target_compile_options(arangoexport PRIVATE -Werror)
+endif()
+
 ################################################################################
 ## arangoimport
 ################################################################################
@@ -228,6 +240,11 @@ install_command_alias(arangoimport
 if(MSVC)
   target_compile_options(arangoimport PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
+
+if (DARWIN)
+  target_compile_options(arangoimport PRIVATE -Werror)
+endif()
+
 ################################################################################
 ## arangorestore
 ################################################################################
@@ -282,6 +299,11 @@ endif ()
 if(MSVC)
   target_compile_options(arangorestore PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
+
+if (DARWIN)
+  target_compile_options(arangorestore PRIVATE -Werror)
+endif()
+
 ################################################################################
 ## arangosh
 ################################################################################
@@ -343,6 +365,11 @@ endif ()
 if(MSVC)
   target_compile_options(arangosh PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
+
+if (DARWIN)
+  target_compile_options(arangosh PRIVATE -Werror)
+endif()
+
 ################################################################################
 ## arangovpack
 ################################################################################
@@ -394,6 +421,11 @@ endif ()
 if(MSVC)
   target_compile_options(arangovpack PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
+
+if (DARWIN)
+  target_compile_options(arangovpack PRIVATE -Werror)
+endif()
+
 ################################################################################
 ## foxx-manager
 ################################################################################
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 4a57e50c9c..8be9ce4abf 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -336,3 +336,9 @@ if(MSVC)
   target_compile_options(${LIB_ARANGO_GEO} PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
   target_compile_options(${LIB_ARANGO} PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
+
+if (DARWIN)
+  target_compile_options(${LIB_ARANGO_V8} PRIVATE -Werror)
+  target_compile_options(${LIB_ARANGO_GEO} PRIVATE -Werror)
+  target_compile_options(${LIB_ARANGO} PRIVATE -Werror)
+endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 17c9cbee64..7183ab866c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -230,6 +230,11 @@ if(MSVC)
   target_compile_options(arangodbtests PRIVATE /WX /D_WINSOCK_DEPRECATED_NO_WARNINGS)
 endif()
 
+if (DARWIN)
+  # Missing Braces is broken in older CLangs - disable them here.
+  target_compile_options(arangodbtests PRIVATE -Werror -Wno-missing-braces)
+endif()
+
 # add these includes as system includes because otherwise
 # the compiler will emit warnings for fakeit.hpp
 target_include_directories(arangodbtests SYSTEM PRIVATE
diff --git a/tests/IResearch/AgencyCommManagerMock.h b/tests/IResearch/AgencyCommManagerMock.h
index 67422c5c04..898fb0b8b9 100644
--- a/tests/IResearch/AgencyCommManagerMock.h
+++ b/tests/IResearch/AgencyCommManagerMock.h
@@ -25,6 +25,10 @@
 #define ARANGODB_IRESEARCH__IRESEARCH_AGENCY_COMM_MANAGER_MOCK_H 1
 
 #include <map>
+#ifdef feof_unlocked
+#undef feof_unlocked
+#endif
+
 #include "utils/file_utils.hpp"
 #include "Agency/AgencyComm.h"
 
diff --git a/tests/IResearch/IResearchQueryTokens-test.cpp b/tests/IResearch/IResearchQueryTokens-test.cpp
index dc622ceadb..a3e02f94ed 100644
--- a/tests/IResearch/IResearchQueryTokens-test.cpp
+++ b/tests/IResearch/IResearchQueryTokens-test.cpp
@@ -142,8 +142,6 @@ REGISTER_ANALYZER_JSON(TestDelimAnalyzer, TestDelimAnalyzer::make);
 // --SECTION--                                                 setup / tear-down
 // -----------------------------------------------------------------------------
 
-extern const char* ARGV0;  // defined in main.cpp
-
 class IResearchQueryTokensTest : public ::testing::Test {
  protected:
   StorageEngineMock engine;
diff --git a/tests/IResearch/IResearchViewMeta-test.cpp b/tests/IResearch/IResearchViewMeta-test.cpp
index 2030b2af0d..0c55625a02 100644
--- a/tests/IResearch/IResearchViewMeta-test.cpp
+++ b/tests/IResearch/IResearchViewMeta-test.cpp
@@ -743,7 +743,6 @@ TEST_F(IResearchViewMetaTest, test_writeMaskAll) {
   arangodb::iresearch::IResearchViewMeta::Mask mask(true);
   arangodb::iresearch::IResearchViewMetaState::Mask maskState(true);
   arangodb::velocypack::Builder builder;
-  arangodb::velocypack::Slice tmpSlice;
 
   builder.openObject();
   EXPECT_TRUE((true == meta.json(builder, nullptr, &mask)));