diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..23dd6fe34
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.dll
+*.exe
+*.depend
+*.o
+*.a
+*.res
+*.layout
diff --git a/test/Test.cbp b/test/Test.cbp
index ef48ffe96..a15ea9d08 100644
--- a/test/Test.cbp
+++ b/test/Test.cbp
@@ -7,11 +7,13 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/Debug/Test" prefix_auto="1" extension_auto="1" />
+				<Option output="../Test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
+					<Add option="-march=athlon-xp" />
+					<Add option="-Wextra" />
 					<Add option="-g" />
 				</Compiler>
 			</Target>
@@ -19,8 +21,29 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
+			<Add option="-Wpointer-arith" />
+			<Add option="-Wno-switch" />
+			<Add option="-Wno-sign-compare" />
+			<Add option="-Wno-unused-parameter" />
+			<Add option="-Wno-overloaded-virtual" />
+			<Add option="-Wno-unused-local-typedefs" />
+			<Add directory="$(#boost.include)" />
 		</Compiler>
-		<Unit filename="main.cpp" />
+		<Linker>
+			<Add option="-lVCMI_lib" />
+			<Add option="-lboost_system$(#boost.libsuffix)" />
+			<Add option="-lboost_test_exec_monitor$(#boost.libsuffix)" />
+			<Add option="-lboost_unit_test_framework$(#boost.libsuffix)" />
+			<Add directory="$(#boost.lib32)" />
+			<Add directory="../" />
+		</Linker>
+		<Unit filename="CMapEditManagerTest.cpp" />
+		<Unit filename="CVcmiTestConfig.cpp" />
+		<Unit filename="CVcmiTestConfig.h" />
+		<Unit filename="StdInc.cpp">
+			<Option weight="0" />
+		</Unit>
+		<Unit filename="StdInc.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/vcmi.workspace b/vcmi.workspace
index 866596963..8d0da349d 100644
--- a/vcmi.workspace
+++ b/vcmi.workspace
@@ -26,5 +26,6 @@
 		<Project filename="AI/BattleAI/BattleAI.cbp">
 			<Depends filename="lib/VCMI_lib.cbp" />
 		</Project>
+		<Project filename="test/Test.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>