diff --git a/Tests/ExampleAnalyzers/RoslynAnalyzer298/RoslynAnalyzer298.csproj b/Tests/ExampleAnalyzers/RoslynAnalyzer298/RoslynAnalyzer298.csproj
index 7176c81..cbf3a17 100644
--- a/Tests/ExampleAnalyzers/RoslynAnalyzer298/RoslynAnalyzer298.csproj
+++ b/Tests/ExampleAnalyzers/RoslynAnalyzer298/RoslynAnalyzer298.csproj
@@ -1,16 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IsPackable>false</IsPackable>
 
-    <!-- Avoid ID conflicts with the package project. -->
-    <PackageId>*$(MSBuildProjectFile)*</PackageId>
+    <IsPackable>true</IsPackable>
+    <PackageId>RoslynV298</PackageId>
+    <Version>2.3</Version>
+
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.8" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.8" PrivateAssets="all" ExcludeAssets="analyzers" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" PrivateAssets="all" ExcludeAssets="analyzers" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Tests/ExampleAnalyzers/RoslynAnalyzer333/RoslynAnalyzer333.csproj b/Tests/ExampleAnalyzers/RoslynAnalyzer333/RoslynAnalyzer333.csproj
index 02df7f0..76bd731 100644
--- a/Tests/ExampleAnalyzers/RoslynAnalyzer333/RoslynAnalyzer333.csproj
+++ b/Tests/ExampleAnalyzers/RoslynAnalyzer333/RoslynAnalyzer333.csproj
@@ -2,18 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <IsPackable>false</IsPackable>
 
-    <!-- Avoid ID conflicts with the package project. -->
-    <PackageId>*$(MSBuildProjectFile)*</PackageId>
+    <IsPackable>true</IsPackable>
+    <PackageId>RoslynV333</PackageId>
+    <Version>3.4.5</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" ExcludeAssets="analyzers" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" ExcludeAssets="analyzers" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Tests/IntegrationTests/EndToEndTests.cs b/Tests/IntegrationTests/EndToEndTests.cs
index 3344f05..3da9e80 100644
--- a/Tests/IntegrationTests/EndToEndTests.cs
+++ b/Tests/IntegrationTests/EndToEndTests.cs
@@ -55,6 +55,8 @@ public async Task Execute_MissingArgs_Fails()
         [DataRow("RoslynAnalyzer10:1.0.0")]
         [DataRow("RoslynAnalyzer11:1.0.0")]
         [DataRow("wintellect.analyzers")]
+        //[DataRow("RoslynV298")]
+        //[DataRow("RoslynV333")]
         public async Task Execute_ExampleAnalyzers_Succeeds(string analyzerArg)
         {
             var exeFilePath = GetExeFilePath();
diff --git a/Tests/IntegrationTests/IntegrationTests.csproj b/Tests/IntegrationTests/IntegrationTests.csproj
index 126a692..3c1225e 100644
--- a/Tests/IntegrationTests/IntegrationTests.csproj
+++ b/Tests/IntegrationTests/IntegrationTests.csproj
@@ -27,13 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="SampleNuGetPkgs\RoslynAnalyzer10.1.0.0.nupkg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="SampleNuGetPkgs\RoslynAnalyzer11.1.0.0.nupkg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="SampleNuGetPkgs\wintellect.analyzers.1.0.6.nupkg">
+    <None Update="SampleNuGetPkgs\*.nupkg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/Tests/IntegrationTests/SampleNuGetPkgs/RoslynV298.2.3.0.nupkg b/Tests/IntegrationTests/SampleNuGetPkgs/RoslynV298.2.3.0.nupkg
new file mode 100644
index 0000000..1a815bc
Binary files /dev/null and b/Tests/IntegrationTests/SampleNuGetPkgs/RoslynV298.2.3.0.nupkg differ
diff --git a/Tests/IntegrationTests/SampleNuGetPkgs/RoslynV333.3.4.5.nupkg b/Tests/IntegrationTests/SampleNuGetPkgs/RoslynV333.3.4.5.nupkg
new file mode 100644
index 0000000..d20619a
Binary files /dev/null and b/Tests/IntegrationTests/SampleNuGetPkgs/RoslynV333.3.4.5.nupkg differ
diff --git a/Tests/RoslynPluginGeneratorTests/DiagnosticAssemblyScannerTests.cs b/Tests/RoslynPluginGeneratorTests/DiagnosticAssemblyScannerTests.cs
index eab1140..cdcd1af 100644
--- a/Tests/RoslynPluginGeneratorTests/DiagnosticAssemblyScannerTests.cs
+++ b/Tests/RoslynPluginGeneratorTests/DiagnosticAssemblyScannerTests.cs
@@ -148,8 +148,8 @@ public void InstantiateDiags_MultipleAssemblies_AnalyzersFound()
         [TestMethod]
         [DataRow(typeof(RoslynAnalyzer10.ExampleAnalyzer2), 1)]
         [DataRow(typeof(RoslynAnalyzer11.CSharpAnalyzer), 3)]
-        [DataRow(typeof(RoslynAnalyzer298.RoslynAnalyzer298Analyzer), 1)]
-        [DataRow(typeof(RoslynAnalyzer333.RoslynAnalyzer333Analyzer), 1)]
+        //[DataRow(typeof(RoslynAnalyzer298.RoslynAnalyzer298Analyzer), 1)]
+        //[DataRow(typeof(RoslynAnalyzer333.RoslynAnalyzer333Analyzer), 1)]
         public void InstantiateDiags_DifferentRoslynVersions_AnalyzersFound(Type typeInTargetAssembly, int expectedAnalyzerCount)
         {
             // Arrange
diff --git a/Tests/RoslynPluginGeneratorTests/SonarQube.Plugins.Roslyn.RoslynPluginGeneratorTests.csproj b/Tests/RoslynPluginGeneratorTests/SonarQube.Plugins.Roslyn.RoslynPluginGeneratorTests.csproj
index c3be681..46cf94c 100644
--- a/Tests/RoslynPluginGeneratorTests/SonarQube.Plugins.Roslyn.RoslynPluginGeneratorTests.csproj
+++ b/Tests/RoslynPluginGeneratorTests/SonarQube.Plugins.Roslyn.RoslynPluginGeneratorTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Test packages">
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="2.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
@@ -19,7 +19,11 @@
     <PackageReference Include="NuGet.CommandLine" Version="4.7.0" GeneratePathProperty="true" />
     <Reference Include="$(PkgNuGet_CommandLine)\tools\NuGet.exe" />
   </ItemGroup>
-  
+
+  <!--<ItemGroup>
+    <Reference Include="System.IO.Compression.FileSystem" Private="true" />
+  </ItemGroup>-->
+
   <ItemGroup>
     <ProjectReference Include="..\..\Common\SonarQube.Plugins.Common.csproj" />
     <ProjectReference Include="..\..\PluginGenerator\SonarQube.Plugins.PluginGenerator.csproj" />
@@ -27,7 +31,7 @@
     <ProjectReference Include="..\Common\SonarQube.Plugins.Test.Common.csproj" />
     <ProjectReference Include="..\ExampleAnalyzers\RoslynAnalyzer10\RoslynAnalyzer10\RoslynAnalyzer10.csproj" />
     <ProjectReference Include="..\ExampleAnalyzers\RoslynAnalyzer11\RoslynAnalyzer11\RoslynAnalyzer11.csproj" />
-    <ProjectReference Include="..\ExampleAnalyzers\RoslynAnalyzer298\RoslynAnalyzer298.csproj" />
-    <ProjectReference Include="..\ExampleAnalyzers\RoslynAnalyzer333\RoslynAnalyzer333.csproj" />
+    <!--<ProjectReference Include="..\ExampleAnalyzers\RoslynAnalyzer298\RoslynAnalyzer298.csproj" />
+    <ProjectReference Include="..\ExampleAnalyzers\RoslynAnalyzer333\RoslynAnalyzer333.csproj" />-->
   </ItemGroup>
 </Project>
\ No newline at end of file