diff --git a/msvc/gtest-md.vcproj b/msvc/gtest-md.vcproj
index abc3c39b9..c78a4a4d9 100755
--- a/msvc/gtest-md.vcproj
+++ b/msvc/gtest-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest.vcproj b/msvc/gtest.vcproj
index b3720b302..bd2ed81e4 100644
--- a/msvc/gtest.vcproj
+++ b/msvc/gtest.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest_main-md.vcproj b/msvc/gtest_main-md.vcproj
index 5c7c93358..321667f1b 100755
--- a/msvc/gtest_main-md.vcproj
+++ b/msvc/gtest_main-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest_main.vcproj b/msvc/gtest_main.vcproj
index 93e532dd1..13cc1d4f9 100644
--- a/msvc/gtest_main.vcproj
+++ b/msvc/gtest_main.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="">
@@ -54,8 +54,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
diff --git a/msvc/gtest_prod_test-md.vcproj b/msvc/gtest_prod_test-md.vcproj
index bb912f4c9..05b05d9ed 100755
--- a/msvc/gtest_prod_test-md.vcproj
+++ b/msvc/gtest_prod_test-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
diff --git a/msvc/gtest_prod_test.vcproj b/msvc/gtest_prod_test.vcproj
index 336e8dbf8..6d7a2f021 100644
--- a/msvc/gtest_prod_test.vcproj
+++ b/msvc/gtest_prod_test.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
diff --git a/msvc/gtest_unittest-md.vcproj b/msvc/gtest_unittest-md.vcproj
index 6da35d184..38a5e5663 100755
--- a/msvc/gtest_unittest-md.vcproj
+++ b/msvc/gtest_unittest-md.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
diff --git a/msvc/gtest_unittest.vcproj b/msvc/gtest_unittest.vcproj
index 58203e5ad..cb1f52b1f 100644
--- a/msvc/gtest_unittest.vcproj
+++ b/msvc/gtest_unittest.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
@@ -60,8 +60,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"
+			IntermediateDirectory="$(OutDir)/$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool