diff --git a/Directory.Build.props b/Directory.Build.props
index c94a78a4ebe..9d4b1cfe5a0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,16 +2,9 @@
   <!-- These properties will be shared for all projects -->
 
   <PropertyGroup>
-    <Product>MassTransit</Product>
-    <Copyright>Copyright 2007-2019 Chris Patterson</Copyright>
-    <Authors>Chris Patterson</Authors>
     <LangVersion>8</LangVersion>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <WarningLevel>4</WarningLevel>
     <NoWarn>CS1587,CS1591,CS1998,NU5105</NoWarn>
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>portable</DebugType>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -24,29 +17,4 @@
     <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(MSBuildProjectName.Contains(Tests))' == false">
-    <!-- Nuget Package Details -->
-    <PackageIcon>mt-logo-small.png</PackageIcon>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <Description>MassTransit is a message-based distributed application framework for .NET http://masstransit-project.com</Description>
-    <IsPackable>True</IsPackable>
-
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-
-    <!-- SourceLink Config, needs nuget package in each csproj Microsoft.SourceLink.GitHub in order to work -->
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(MSBuildProjectName.Contains(Tests))' == false">
-    <None Include="../mt-logo-small.png" Pack="true" Visible="false" PackagePath=""/>
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(MSBuildProjectName.Contains(Tests))' == true">
-    <NoWarn>$(NoWarn),CS0618</NoWarn>
-    <IsTestProject>true</IsTestProject>
-    <IsPackable>False</IsPackable>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 00000000000..a4b412ec2db
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,34 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <Product>MassTransit</Product>
+    <Copyright>Copyright 2007-2019 Chris Patterson</Copyright>
+    <Authors>Chris Patterson</Authors>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <NoWarn>$(NoWarn)</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Nuget Package Details -->
+    <PackageIcon>mt-logo-small.png</PackageIcon>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <Description>MassTransit is a message-based distributed application framework for .NET http://masstransit-project.com</Description>
+    <IsPackable>True</IsPackable>
+
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!-- SourceLink Config, needs nuget package in each csproj Microsoft.SourceLink.GitHub in order to work -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\mt-logo-small.png" Pack="true" Visible="false" PackagePath=""/>
+  </ItemGroup>
+
+</Project>
diff --git a/src/mt-logo-small.png b/src/mt-logo-small.png
new file mode 100644
index 00000000000..282eb322001
Binary files /dev/null and b/src/mt-logo-small.png differ
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
new file mode 100644
index 00000000000..cb78e7a5c7d
--- /dev/null
+++ b/tests/Directory.Build.props
@@ -0,0 +1,13 @@
+<Project>
+
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <LangVersion>8</LangVersion>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>$(NoWarn),CS0618</NoWarn>
+    <IsTestProject>true</IsTestProject>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+</Project>