diff --git a/plist-cil.test/ChangeLog b/plist-cil.test/ChangeLog
index 9382c65..7ec6e32 100644
--- a/plist-cil.test/ChangeLog
+++ b/plist-cil.test/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-19  Natalia Portillo  <claunia@claunia.com>
+
+	* plist-cil.test.csproj:
+	  Organize test-files in a folder
+
 2015-02-19  Natalia Portillo  <claunia@claunia.com>
 
 	* packages.config:
diff --git a/plist-cil.test/plist-cil.test.csproj b/plist-cil.test/plist-cil.test.csproj
index 3ab5916..7f919cf 100644
--- a/plist-cil.test/plist-cil.test.csproj
+++ b/plist-cil.test/plist-cil.test.csproj
@@ -40,72 +40,72 @@
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="..\test-files\test1-ascii-gnustep.plist">
-      <Link>test1-ascii-gnustep.plist</Link>
+      <Link>test-files\test1-ascii-gnustep.plist</Link>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\test-files\test1-ascii.plist">
-      <Link>test1-ascii.plist</Link>
+      <Link>test-files\test1-ascii.plist</Link>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\test-files\test1.plist">
-      <Link>test1.plist</Link>
+      <Link>test-files\test1.plist</Link>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\test-files\testNegative-bin.plist">
-      <Link>testNegative-bin.plist</Link>
+      <Link>test-files\testNegative-bin.plist</Link>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\test-files\testNegative-xml.plist">
-      <Link>testNegative-xml.plist</Link>
+      <Link>test-files\testNegative-xml.plist</Link>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\test-files\issue4.plist">
-      <Link>issue4.plist</Link>
+      <Link>test-files\issue4.plist</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\issue16.plist">
-      <Link>issue16.plist</Link>
+      <Link>test-files\issue16.plist</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\issue21.plist">
-      <Link>issue21.plist</Link>
+      <Link>test-files\issue21.plist</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\issue22-emoji-xml.plist">
-      <Link>issue22-emoji-xml.plist</Link>
+      <Link>test-files\issue22-emoji-xml.plist</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\issue22-emoji.plist">
-      <Link>issue22-emoji.plist</Link>
+      <Link>test-files\issue22-emoji.plist</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\issue30.plist">
-      <Link>issue30.plist</Link>
+      <Link>test-files\issue30.plist</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\issue33.pbxproj">
-      <Link>issue33.pbxproj</Link>
+      <Link>test-files\issue33.pbxproj</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\issue49.plist">
-      <Link>issue49.plist</Link>
+      <Link>test-files\issue49.plist</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
     </None>
     <None Include="..\test-files\test-ascii.plist">
-      <Link>test-ascii.plist</Link>
+      <Link>test-files\test-ascii.plist</Link>
       <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -116,4 +116,7 @@
       <Name>plist-cil</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="test-files\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file