diff --git a/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets
index 63ad3b5b08..2feb8c652b 100644
--- a/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets
+++ b/src/Adapter/MSTest.TestAdapter/buildTransitive/common/MSTest.TestAdapter.targets
@@ -1,4 +1,10 @@
-<Project>
+<Project InitialTargets="NETStandardCompatError_MSTest_TestAdapter">
+
+    <Target Name="NETStandardCompatError_MSTest_TestAdapter"
+            Condition="'$(SuppressTfmSupportBuildWarnings)' == ''">
+        <Warning Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'"
+                 Text="MSTest.TestAdapter does not support the target framework '$(TargetFramework)' and has not been tested with it. Test libraries (projects that don't directly run tests) should not reference MSTest.TestAdapter or the MSTest metapackage. Instead, reference only MSTest.TestFramework. To suppress this warning and proceed at your own risk, add &lt;SuppressTfmSupportBuildWarnings&gt;true&lt;/SuppressTfmSupportBuildWarnings&gt; to your project file." />
+    </Target>
 
   <!-- Handle the coexistence between testing platform and Microsoft.NET.Test.Sdk  -->
   <PropertyGroup>
diff --git a/src/Package/MSTest.Sdk/Sdk/Sdk.props.template b/src/Package/MSTest.Sdk/Sdk/Sdk.props.template
index 2c6fe5ca7d..73530c9e0d 100644
--- a/src/Package/MSTest.Sdk/Sdk/Sdk.props.template
+++ b/src/Package/MSTest.Sdk/Sdk/Sdk.props.template
@@ -12,6 +12,8 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
+    <!-- If the project targets .NET Standard, it's not supposed to be a test application. So, we default to false. -->
+    <IsTestApplication Condition=" '$(IsTestApplication)' == '' AND '$(TargetFrameworkIdentifier)' == '.NETStandard' ">false</IsTestApplication>
     <IsTestApplication Condition=" '$(IsTestApplication)' == '' ">true</IsTestApplication>
   </PropertyGroup>