diff --git a/Foundation/testsuite/TestApp_vs120.vcxproj b/Foundation/testsuite/TestApp_vs120.vcxproj
index 4b2284f97..5bcd9c7a1 100644
--- a/Foundation/testsuite/TestApp_vs120.vcxproj
+++ b/Foundation/testsuite/TestApp_vs120.vcxproj
@@ -143,10 +143,10 @@
       <AdditionalOptions>/FS</AdditionalOptions>
     </ClCompile>
     <Link>
-      <OutputFile>bin\TestAppd.exe</OutputFile>
+      <OutputFile>%(OutputFile)</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\TestAppd.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>bin\$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -174,7 +174,7 @@
       <AdditionalOptions>/FS</AdditionalOptions>
     </ClCompile>
     <Link>
-      <OutputFile>bin\TestApp.exe</OutputFile>
+      <OutputFile>%(OutputFile)</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <ProgramDatabaseFile>
@@ -208,7 +208,7 @@
       <AdditionalOptions>/FS</AdditionalOptions>
     </ClCompile>
     <Link>
-      <OutputFile>bin\static_md\TestApp.exe</OutputFile>
+      <OutputFile>%(OutputFile)</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <ProgramDatabaseFile>
@@ -238,7 +238,7 @@
       <AdditionalOptions>/FS</AdditionalOptions>
     </ClCompile>
     <Link>
-      <OutputFile>bin\static_md\TestAppd.exe</OutputFile>
+      <OutputFile>%(OutputFile)</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_md\TestAppd.pdb</ProgramDatabaseFile>
@@ -265,10 +265,10 @@
       <AdditionalOptions>/FS</AdditionalOptions>
     </ClCompile>
     <Link>
-      <OutputFile>bin\static_mt\TestAppd.exe</OutputFile>
+      <OutputFile>%(OutputFile)</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_mt\TestAppd.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>bin\static_mt\$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -296,7 +296,7 @@
       <AdditionalOptions>/FS</AdditionalOptions>
     </ClCompile>
     <Link>
-      <OutputFile>bin\static_mt\TestApp.exe</OutputFile>
+      <OutputFile>%(OutputFile)</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <ProgramDatabaseFile>
diff --git a/Foundation/testsuite/TestLibrary_vs120.vcxproj b/Foundation/testsuite/TestLibrary_vs120.vcxproj
index 5cd3a7f75..917b5d08b 100644
--- a/Foundation/testsuite/TestLibrary_vs120.vcxproj
+++ b/Foundation/testsuite/TestLibrary_vs120.vcxproj
@@ -70,10 +70,10 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\TestLibraryd.dll</OutputFile>
+      <OutputFile>%(OutputFile)</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\TestLibraryd.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>bin\$(TargetName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <ImportLibrary>
       </ImportLibrary>