diff --git a/src/SamplesApp/Directory.Build.targets b/src/SamplesApp/Directory.Build.targets
index ff4a82ef629e..a65b29f1b9f8 100644
--- a/src/SamplesApp/Directory.Build.targets
+++ b/src/SamplesApp/Directory.Build.targets
@@ -4,11 +4,11 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
   <!-- Ensure that Uno.Samples.UITest.Generator build before all SamplesApp project -->
-  <ItemGroup Condition="'$(IsUITestGenerator)'=='' or '$(IsUITestGenerator)'=='false'">
+  <ItemGroup Condition="'$(MSBuildProjectName)'!='Uno.Samples.UITest.Generator' and '$(DocsGeneration)'==''">
     <ProjectReference Include="$(MSBuildThisFileDirectory)\SamplesApp.UITests.Generator\Uno.Samples.UITest.Generator.csproj">
         <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
         <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-        <UndefineProperties>TargetFramework</UndefineProperties>
+        <UndefineProperties>TargetFramework;RuntimeIdentifier;TargetFrameworks;RuntimeIdentifiers</UndefineProperties>
     </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/src/SamplesApp/SamplesApp.UITests.Generator/Uno.Samples.UITest.Generator.csproj b/src/SamplesApp/SamplesApp.UITests.Generator/Uno.Samples.UITest.Generator.csproj
index 7860ab33a1ec..4340f42a8a97 100644
--- a/src/SamplesApp/SamplesApp.UITests.Generator/Uno.Samples.UITest.Generator.csproj
+++ b/src/SamplesApp/SamplesApp.UITests.Generator/Uno.Samples.UITest.Generator.csproj
@@ -4,7 +4,6 @@
 		<DebugType>portable</DebugType>
 		<DebugSymbols>true</DebugSymbols>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<IsUITestGenerator>true</IsUITestGenerator>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/SamplesApp.UnitTests.targets b/src/SamplesApp/SamplesApp.UnitTests.Shared/SamplesApp.UnitTests.targets
index 45ad51070ca2..0197c8787b0b 100644
--- a/src/SamplesApp/SamplesApp.UnitTests.Shared/SamplesApp.UnitTests.targets
+++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/SamplesApp.UnitTests.targets
@@ -9,12 +9,4 @@
 		<CompilerVisibleProperty Include="RootNamespace" />
 		<CompilerVisibleProperty Include="MSBuildProjectDirectory" />
 	</ItemGroup>
-
-	<ItemGroup Condition="'$(DocsGeneration)'==''">
-		<ProjectReference Include="$(MSBuildThisFileDirectory)..\SamplesApp.UITests.Generator\Uno.Samples.UITest.Generator.csproj">
-			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-			<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-			<UndefineProperties>TargetFramework;RuntimeIdentifier;TargetFrameworks;RuntimeIdentifiers</UndefineProperties>
-		</ProjectReference>
-	</ItemGroup>
 </Project>