diff --git a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj
index cfab5913..2523a71a 100644
--- a/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj
+++ b/Telerik.JustMock.MSTest2.Tests/Telerik.JustMock.MSTest2.Tests.csproj
@@ -59,15 +59,6 @@
   <PropertyGroup Condition="$(NetCoreSupportedVersions.Contains('$(TargetFramework)'))">
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);NETCORE31</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <DefineConstants>$(DefineConstants);NETCORE31;NET50</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <DefineConstants>$(DefineConstants);NETCORE31;NET50;NET70</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Telerik.JustMock.Tests/InteropFixture.cs b/Telerik.JustMock.Tests/InteropFixture.cs
index 32eb5599..d7640a16 100644
--- a/Telerik.JustMock.Tests/InteropFixture.cs
+++ b/Telerik.JustMock.Tests/InteropFixture.cs
@@ -81,7 +81,7 @@ public abstract class UnsafeClassRef
 
         public delegate void DoDelegate(ref IntPtr arg);
 
-#if NET70
+#if NET7_0 || NET7_0_OR_GREATER
 #if XUNIT
         [TestMethod(Skip = SkipReason.Value)]
 #elif NUNIT