Index: zorg/buildbot/builders/ClangBuilder.py
===================================================================
--- zorg/buildbot/builders/ClangBuilder.py
+++ zorg/buildbot/builders/ClangBuilder.py
@@ -489,7 +489,7 @@
         # but the CMakeList.txt and Makefiles are in %(builddir)s/test/test-suite.
         test_suite_work_dir = 'test/sandbox'
         if cmake_test_suite:
-            cmake_test_suite_cmd = ['cmake', '-G', 'Unix', 'Makefiles',
+            cmake_test_suite_cmd = ['cmake', '-G', '"Unix', 'Makefiles"',
                                     '--cc', cc,
                                     '--cxx', cxx]
             test_suite_cmd = ['make', '-k']