diff --git a/src/AddIns/BackendBindings/Xaml/Xaml.Tests/Xaml.Tests.csproj b/src/AddIns/BackendBindings/Xaml/Xaml.Tests/Xaml.Tests.csproj
index 8d2589e178..75fac2d2db 100644
--- a/src/AddIns/BackendBindings/Xaml/Xaml.Tests/Xaml.Tests.csproj
+++ b/src/AddIns/BackendBindings/Xaml/Xaml.Tests/Xaml.Tests.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\..\..\bin\UnitTests\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/src/AddIns/BackendBindings/Xaml/Xaml/Xaml.csproj b/src/AddIns/BackendBindings/Xaml/Xaml/Xaml.csproj
index 792291d5d2..3a7a9b2e87 100644
--- a/src/AddIns/BackendBindings/Xaml/Xaml/Xaml.csproj
+++ b/src/AddIns/BackendBindings/Xaml/Xaml/Xaml.csproj
@@ -23,9 +23,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\..\..\AddIns\AddIns\BackendBindings\XamlBinding\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/WpfDesign.Designer.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/WpfDesign.Designer.csproj
index 3b1ed76e65..6bcd3af223 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/WpfDesign.Designer.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/WpfDesign.Designer.csproj
@@ -39,6 +39,10 @@
     <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\</OutputPath>
     <DocumentationFile>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.Designer.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\</OutputPath>
+    <DocumentationFile>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.Designer.xml</DocumentationFile>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
     <Reference Include="PresentationCore">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Tests/WpfDesign.Tests.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Tests/WpfDesign.Tests.csproj
index 3b81d29053..d9c4f8ec1c 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Tests/WpfDesign.Tests.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Tests/WpfDesign.Tests.csproj
@@ -44,6 +44,9 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\..\..\bin\UnitTests\</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\..\..\bin\UnitTests\</OutputPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
     <Reference Include="nunit.framework">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/WpfDesign.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/WpfDesign.csproj
index c4e70725ac..81b214d4cb 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/WpfDesign.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign/WpfDesign.csproj
@@ -44,6 +44,10 @@
     <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\</OutputPath>
     <DocumentationFile>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\</OutputPath>
+    <DocumentationFile>..\..\..\..\..\AddIns\AddIns\DisplayBindings\WpfDesign\ICSharpCode.WpfDesign.xml</DocumentationFile>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <ItemGroup>
     <Reference Include="PresentationCore">