diff --git a/reactos/tools/rbuild/tests/cdfiletest.cpp b/reactos/tools/rbuild/tests/cdfiletest.cpp
index d41c8dc8363..764f4fcc5be 100644
--- a/reactos/tools/rbuild/tests/cdfiletest.cpp
+++ b/reactos/tools/rbuild/tests/cdfiletest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void CDFileTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/cdfile.xml" );
-	Project project( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL ( 3, project.cdfiles.size () );
 
 	CDFile& cdfile1 = *project.cdfiles[0];
diff --git a/reactos/tools/rbuild/tests/compilationunittest.cpp b/reactos/tools/rbuild/tests/compilationunittest.cpp
index e96f61fb35e..519ab076f68 100644
--- a/reactos/tools/rbuild/tests/compilationunittest.cpp
+++ b/reactos/tools/rbuild/tests/compilationunittest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void CompilationUnitTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/compilationunit.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL ( 1, project.modules.size () );
 
 	Module& module1 = *project.modules[0];
diff --git a/reactos/tools/rbuild/tests/data/compilationunit.xml b/reactos/tools/rbuild/tests/data/compilationunit.xml
index 92719cdf164..d238c389a95 100644
--- a/reactos/tools/rbuild/tests/data/compilationunit.xml
+++ b/reactos/tools/rbuild/tests/data/compilationunit.xml
@@ -2,7 +2,7 @@
 <project name="Project" makefile="Makefile">
 	<directory name="dir1">
 		<module name="module1" type="buildtool">
-			<compilationunit>
+			<compilationunit name="module1_unit.c">
 				<file>file1.c</file>
 				<file>file2.c</file>
 			</compilationunit>
diff --git a/reactos/tools/rbuild/tests/definetest.cpp b/reactos/tools/rbuild/tests/definetest.cpp
index 7dd8383f428..ca3976513f4 100644
--- a/reactos/tools/rbuild/tests/definetest.cpp
+++ b/reactos/tools/rbuild/tests/definetest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void DefineTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/define.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.non_if_data.defines.size());
 	Define& define1 = *project.non_if_data.defines[0];
 	ARE_EQUAL("define1", define1.name);
diff --git a/reactos/tools/rbuild/tests/iftest.cpp b/reactos/tools/rbuild/tests/iftest.cpp
index 3419e81de1a..b71cd748303 100644
--- a/reactos/tools/rbuild/tests/iftest.cpp
+++ b/reactos/tools/rbuild/tests/iftest.cpp
@@ -60,7 +60,8 @@ void
 IfTest::Run ()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/if.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 
 	TestProjectIf ( project );
 	TestModuleIf ( project );
diff --git a/reactos/tools/rbuild/tests/includetest.cpp b/reactos/tools/rbuild/tests/includetest.cpp
index 5677a99b116..a9753c9f782 100644
--- a/reactos/tools/rbuild/tests/includetest.cpp
+++ b/reactos/tools/rbuild/tests/includetest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void IncludeTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/include.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.non_if_data.includes.size());
 	Include& include1 = *project.non_if_data.includes[0];
 	ARE_EQUAL("include1", include1.directory);
diff --git a/reactos/tools/rbuild/tests/invoketest.cpp b/reactos/tools/rbuild/tests/invoketest.cpp
index 39651fad789..5732525ae43 100644
--- a/reactos/tools/rbuild/tests/invoketest.cpp
+++ b/reactos/tools/rbuild/tests/invoketest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void InvokeTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/invoke.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.modules.size());
 
 	Module& module1 = *project.modules[0];
diff --git a/reactos/tools/rbuild/tests/linkerflagtest.cpp b/reactos/tools/rbuild/tests/linkerflagtest.cpp
index 15a4ef10e40..1045e79cbd9 100644
--- a/reactos/tools/rbuild/tests/linkerflagtest.cpp
+++ b/reactos/tools/rbuild/tests/linkerflagtest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void LinkerFlagTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/linkerflag.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.linkerFlags.size());
 	LinkerFlag& linkerFlag1 = *project.linkerFlags[0];
 	ARE_EQUAL("-lgcc1", linkerFlag1.flag);
diff --git a/reactos/tools/rbuild/tests/moduletest.cpp b/reactos/tools/rbuild/tests/moduletest.cpp
index 4def3ff2cdc..596739059cf 100644
--- a/reactos/tools/rbuild/tests/moduletest.cpp
+++ b/reactos/tools/rbuild/tests/moduletest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void ModuleTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/module.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(2, project.modules.size());
 
 	Module& module1 = *project.modules[0];
diff --git a/reactos/tools/rbuild/tests/projecttest.cpp b/reactos/tools/rbuild/tests/projecttest.cpp
index 0b49bd75451..17050a4d109 100644
--- a/reactos/tools/rbuild/tests/projecttest.cpp
+++ b/reactos/tools/rbuild/tests/projecttest.cpp
@@ -22,6 +22,7 @@ using std::string;
 void ProjectTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/project.xml" );
-	Project project( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(2, project.modules.size());
 }
diff --git a/reactos/tools/rbuild/tests/sourcefiletest.cpp b/reactos/tools/rbuild/tests/sourcefiletest.cpp
index a7c3eabde72..bfe693b5cf0 100644
--- a/reactos/tools/rbuild/tests/sourcefiletest.cpp
+++ b/reactos/tools/rbuild/tests/sourcefiletest.cpp
@@ -51,7 +51,9 @@ SourceFileTest::IsParentOf ( const SourceFile* parent,
 void
 SourceFileTest::IncludeTest ()
 {
-	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml" );
+	const string projectFilename = RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml";
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	AutomaticDependency automaticDependency ( project );
 	automaticDependency.ParseFiles ();
 	ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () );
@@ -64,7 +66,9 @@ SourceFileTest::IncludeTest ()
 void
 SourceFileTest::FullParseTest ()
 {
-	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml" );
+	const string projectFilename = RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml";
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	AutomaticDependency automaticDependency ( project );
 	automaticDependency.ParseFiles ();
 	ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () );
diff --git a/reactos/tools/rbuild/tests/symboltest.cpp b/reactos/tools/rbuild/tests/symboltest.cpp
index 07209f94704..ff8a0375b28 100644
--- a/reactos/tools/rbuild/tests/symboltest.cpp
+++ b/reactos/tools/rbuild/tests/symboltest.cpp
@@ -22,7 +22,8 @@ using std::string;
 void SymbolTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/symbol.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	
 	ARE_EQUAL ( 1, project.modules.size () );
 	Module& module1 = *project.modules[0];