diff --git a/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj b/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj
index 53e9ef2..7eed697 100644
--- a/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj
+++ b/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj
@@ -21,6 +21,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Version="2.0.3" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
diff --git a/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj b/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj
index fba320b..2fa2092 100644
--- a/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj
+++ b/test/EFCore.Jet.FunctionalTests/EFCore.Jet.FunctionalTests.csproj
@@ -25,6 +25,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
diff --git a/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj b/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj
index 9d4b834..0c7688e 100644
--- a/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj
+++ b/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj
@@ -67,6 +67,7 @@
     <Compile Remove="BuiltInFunctionsTest.cs" />
     <Compile Remove="CanonicalFunctionsTest1.cs" />
     <Compile Remove="FunctionTest.cs" />
+    <Compile Remove="Model56_SkipTake\SqlCeTest.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -108,7 +109,7 @@
       <Version>1.1.12</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.DiagnosticSource">
-      <Version>4.5.1</Version>
+      <Version>4.7.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
diff --git a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
index b7d60ee..d812c27 100644
--- a/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
+++ b/test/EFCore.Jet.Tests/EFCore.Jet.Tests.csproj
@@ -24,6 +24,7 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.2.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
diff --git a/test/System.Data.Jet.PerformanceTest/System.Data.Jet.PerformanceTest.csproj b/test/System.Data.Jet.PerformanceTest/System.Data.Jet.PerformanceTest.csproj
index 6729273..baaee99 100644
--- a/test/System.Data.Jet.PerformanceTest/System.Data.Jet.PerformanceTest.csproj
+++ b/test/System.Data.Jet.PerformanceTest/System.Data.Jet.PerformanceTest.csproj
@@ -7,8 +7,9 @@
 
     <Platforms>AnyCPU;x86;x64</Platforms>
   </PropertyGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Remove="System.Data.Jet.PerformanceTest.csproj.DotSettings" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/System.Data.Jet.PerformanceTest/packages.config b/test/System.Data.Jet.PerformanceTest/packages.config
deleted file mode 100644
index c65965a..0000000
--- a/test/System.Data.Jet.PerformanceTest/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="MSTest.TestAdapter" version="1.3.1" targetFramework="net461" />
-  <package id="MSTest.TestFramework" version="1.4.0" targetFramework="net461" />
-</packages>
\ No newline at end of file