diff --git a/tests/unittests/testllvmbuildconfig.py b/tests/unittests/testllvmbuildconfig.py
index 509e8a4..efc7bfa 100644
--- a/tests/unittests/testllvmbuildconfig.py
+++ b/tests/unittests/testllvmbuildconfig.py
@@ -25,10 +25,11 @@
 
     def test_configure_generator(self):
         """Test that we can use a custom generator for our CMake command."""
-        buildConfig = LLVMBuildConfig(self.sourceConfig, self.buildPath)
-
         consumer = MagicMock()
-        buildConfig.cmake(consumer, [], "Unix Makefiles")
+        buildConfig = LLVMBuildConfig(self.sourceConfig, self.buildPath,
+                                      consumer)
+
+        buildConfig.cmake([], "Unix Makefiles")
         command, directory = consumer.consume.call_args[0]
 
         self.assertEqual(directory, self.buildPath)
@@ -41,12 +42,13 @@
 
     def test_configure_definitions(self):
         """Test that we can define custom CMake variables."""
-        buildConfig = LLVMBuildConfig(self.sourceConfig, self.buildPath)
+        consumer = MagicMock()
+        buildConfig = LLVMBuildConfig(self.sourceConfig, self.buildPath,
+                                      consumer)
         flags = ["-DCMAKE_BUILD_TYPE=Release",
                  "-DCMAKE_CXX_FLAGS=\"-Oz -g\""]
 
-        consumer = MagicMock()
-        buildConfig.cmake(consumer, flags, "Ninja")
+        buildConfig.cmake(flags, "Ninja")
         command, directory = consumer.consume.call_args[0]
 
         self.assertEqual(directory, self.buildPath)
@@ -74,10 +76,11 @@
 
         self.sourceConfig.for_each_subproj.side_effect = for_each_subproj
 
-        buildConfig = LLVMBuildConfig(self.sourceConfig, self.buildPath)
-
         consumer = MagicMock()
-        buildConfig.cmake(consumer, [], "Ninja")
+        buildConfig = LLVMBuildConfig(self.sourceConfig, self.buildPath,
+                                      consumer)
+
+        buildConfig.cmake([], "Ninja")
         command, directory = consumer.consume.call_args[0]
 
         self.assertEqual(directory, self.buildPath)