Revert "Automatically set Ninja generator for --use-make=ninja"
diff --git a/lnt/tests/test_suite.py b/lnt/tests/test_suite.py
index 95be4cd..9761974 100644
--- a/lnt/tests/test_suite.py
+++ b/lnt/tests/test_suite.py
@@ -448,11 +448,6 @@
             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')
@@ -525,6 +520,7 @@
             self.remote_run = True
 
         # Prepare cmake cache if requested:
+        cmake_flags = []
         for cache in self.opts.cmake_cache:
             if cache == "":
                 continue