diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj
index c0f7d7b8b73ddde8c5f87c8a19bc026cede93d41..7a6a4d894b2a46817607304d4ce492066036fed8 100644
--- a/test/FunctionalTests/FunctionalTests.csproj
+++ b/test/FunctionalTests/FunctionalTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
@@ -8,6 +8,8 @@
     <SignAssembly>false</SignAssembly>
     <PublicSign>false</PublicSign>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs
index 931e14422d4cbde3c4863fbcdfd95200478a50bf..698a598593fefcfbb75dba3560ea2187ba97a23b 100644
--- a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs
+++ b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -71,6 +72,7 @@ namespace FunctionalTests
                 RuntimeArchitecture.x64)
             {
                 ApplicationName = applicationName,
+                ApplicationType = flavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable,
                 PublishApplicationBeforeDeployment = true,
                 Configuration = projectConfiguration,
                 EnvironmentVariables =
diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props
index 2c0a965d5b8a6980a4edef6fe9a1cda8d582caa2..4d776f550dcbcd6e748d6f429385cd5866bcc23d 100644
--- a/testapps/Directory.Build.props
+++ b/testapps/Directory.Build.props
@@ -10,6 +10,9 @@
     <StandardTestAppTfms>$(DeveloperBuildTestAppTfms)</StandardTestAppTfms>
     <StandardTestAppTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.2;netcoreapp2.0</StandardTestAppTfms>
     <StandardTestAppTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestAppTfms);net461</StandardTestAppTfms>
+
+    <!-- Bug in SelfHostDeployer prevents desktop applications from being published without a rid. -->
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/testapps/SimpleApp/SimpleApp.csproj b/testapps/SimpleApp/SimpleApp.csproj
index d484bc0298cbb7fe2caa97d62894ded049fadc96..f330f2386dcd8876bdd713d2be7a14ffb0c3bec5 100644
--- a/testapps/SimpleApp/SimpleApp.csproj
+++ b/testapps/SimpleApp/SimpleApp.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
-    <RuntimeIdentifiers>win7-x86;debian-x64</RuntimeIdentifiers>
-
     <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
   </PropertyGroup>