diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 4def31c85b..5de2f6fdf8 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -38,7 +38,10 @@ if (BUILD_TOOLS)
     # Allow different tools for stable builds
     if (STABLE_BUILD)
     else()
-        list(APPEND ALL_TOOLS nitpick)
+        # Don't include nitpick in OSX client-only DMGs.
+        if (NOT APPLE OR NOT CLIENT_ONLY)
+            list(APPEND ALL_TOOLS nitpick)
+        endif()
     endif()
 
     foreach(TOOL ${ALL_TOOLS})