diff --git a/lnt/tests/test_suite.py b/lnt/tests/test_suite.py
index 97619742..95be4cdf 100644
--- a/lnt/tests/test_suite.py
+++ b/lnt/tests/test_suite.py
@@ -448,6 +448,11 @@ def _configure(self, path, extra_cmake_defs=[], execute=True):
             defs['CMAKE_CXX_COMPILER'] = self.opts.cxx
         if self.opts.make:
             defs['CMAKE_MAKE_PROGRAM'] = self.opts.make
+        if self.opts.make and (self.opts.make.endswith('ninja') or
+                              self.opts.make.endswith('ninja.exe')):
+            cmake_flags = ['-G', 'Ninja']
+        else:
+            cmake_flags = []
 
         cmake_build_types = ('DEBUG', 'MINSIZEREL', 'RELEASE',
                              'RELWITHDEBINFO')
@@ -520,7 +525,6 @@ def _configure(self, path, extra_cmake_defs=[], execute=True):
             self.remote_run = True
 
         # Prepare cmake cache if requested:
-        cmake_flags = []
         for cache in self.opts.cmake_cache:
             if cache == "":
                 continue