diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 0b701f5dca..fcbcb43444 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,4 +1,9 @@
 <Project>
   <Import Project="$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), '..', 'Directory.Build.props'))" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'opentelemetry-dotnet-contrib.slnx'))\build\Common.nonprod.props" />
+
+  <ItemGroup Condition="$(MSBuildProjectName.EndsWith('.Tests')) or $(MSBuildProjectName.EndsWith('.FuzzTests'))">
+    <Using Include="Xunit" />
+    <Using Include="Xunit.Abstractions" />
+  </ItemGroup>
 </Project>
diff --git a/test/OpenTelemetry.Contrib.Shared.Benchmarks/SqlProcessorBenchmarks.cs b/test/OpenTelemetry.Contrib.Shared.Benchmarks/SqlProcessorBenchmarks.cs
index 5c1892fe39..644655a6c7 100644
--- a/test/OpenTelemetry.Contrib.Shared.Benchmarks/SqlProcessorBenchmarks.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Benchmarks/SqlProcessorBenchmarks.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Diagnosers;
 
 namespace OpenTelemetry.Instrumentation.Benchmarks;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.FuzzTests/SqlProcessorTests.cs b/test/OpenTelemetry.Contrib.Shared.FuzzTests/SqlProcessorTests.cs
index 268bb83270..59d9c78de2 100644
--- a/test/OpenTelemetry.Contrib.Shared.FuzzTests/SqlProcessorTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.FuzzTests/SqlProcessorTests.cs
@@ -4,7 +4,6 @@
 using System.Globalization;
 using FsCheck;
 using FsCheck.Xunit;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/ActivityInstrumentationHelperTest.cs b/test/OpenTelemetry.Contrib.Shared.Tests/ActivityInstrumentationHelperTest.cs
index fd99bee0d2..5821a2804e 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/ActivityInstrumentationHelperTest.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/ActivityInstrumentationHelperTest.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/ActivitySourceFactoryTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/ActivitySourceFactoryTests.cs
index 1285fe2f2a..cc1bacdf12 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/ActivitySourceFactoryTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/ActivitySourceFactoryTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/DatabaseSemanticConventionHelperTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/DatabaseSemanticConventionHelperTests.cs
index 564fff393d..8993b4522c 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/DatabaseSemanticConventionHelperTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/DatabaseSemanticConventionHelperTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using Microsoft.Extensions.Configuration;
-using Xunit;
 using static OpenTelemetry.Internal.DatabaseSemanticConventionHelper;
 
 namespace OpenTelemetry.Internal.Tests;
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/EventSourceTestHelperTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/EventSourceTestHelperTests.cs
index cedca4de25..84517c87ce 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/EventSourceTestHelperTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/EventSourceTestHelperTests.cs
@@ -5,7 +5,6 @@
 
 using System.Diagnostics.Tracing;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/GrpcTagHelperTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/GrpcTagHelperTests.cs
index 88ed2ffaa3..d262f11415 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/GrpcTagHelperTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/GrpcTagHelperTests.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/HttpClientHelpersTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/HttpClientHelpersTests.cs
index 90d9a53491..47b67a0d9e 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/HttpClientHelpersTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/HttpClientHelpersTests.cs
@@ -7,7 +7,6 @@
 using System.IO.Compression;
 using System.Net;
 using System.Text;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/MeterFactoryTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/MeterFactoryTests.cs
index a17546e8d3..c142efac02 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/MeterFactoryTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/MeterFactoryTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/PropertyFetcherTest.cs b/test/OpenTelemetry.Contrib.Shared.Tests/PropertyFetcherTest.cs
index 7434e4d967..f38986a04d 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/PropertyFetcherTest.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/PropertyFetcherTest.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/RedactionHelperTest.cs b/test/OpenTelemetry.Contrib.Shared.Tests/RedactionHelperTest.cs
index 92ec479c72..0a60619610 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/RedactionHelperTest.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/RedactionHelperTest.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Internal.Tests;
 
 public class RedactionHelperTest
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/RenovateSchemaTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/RenovateSchemaTests.cs
index 865273a8ab..3a43a90435 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/RenovateSchemaTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/RenovateSchemaTests.cs
@@ -8,8 +8,6 @@
 using System.Text.RegularExpressions;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Schema;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/RequestDataHelperTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/RequestDataHelperTests.cs
index 10155e84c1..87ba4f38b1 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/RequestDataHelperTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/RequestDataHelperTests.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Internal.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/SqlConnectionDetailsTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/SqlConnectionDetailsTests.cs
index 26f4d51e22..bb7e853ac7 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/SqlConnectionDetailsTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/SqlConnectionDetailsTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Instrumentation.Tests;
 
 public class SqlConnectionDetailsTests
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/SqlParameterProcessorTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/SqlParameterProcessorTests.cs
index 3df841d400..07f63e982c 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/SqlParameterProcessorTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/SqlParameterProcessorTests.cs
@@ -6,7 +6,6 @@
 using System.Data.Common;
 using System.Diagnostics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTestCases.cs b/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTestCases.cs
index 3f767dd0cb..6a50914b9d 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTestCases.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTestCases.cs
@@ -4,8 +4,6 @@
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.Tests;
 
diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTests.cs b/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTests.cs
index c6de6c8987..3efffd3b45 100644
--- a/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTests.cs
+++ b/test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorTests.cs
@@ -1,9 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-using Xunit.Abstractions;
-
 namespace OpenTelemetry.Instrumentation.Tests;
 
 public class SqlProcessorTests
diff --git a/test/OpenTelemetry.Exporter.Geneva.Benchmarks/Exporter/TLDLogExporterBenchmarks.cs b/test/OpenTelemetry.Exporter.Geneva.Benchmarks/Exporter/TLDLogExporterBenchmarks.cs
index 85379506a8..a1b42d14f8 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Benchmarks/Exporter/TLDLogExporterBenchmarks.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Benchmarks/Exporter/TLDLogExporterBenchmarks.cs
@@ -7,7 +7,6 @@
 using OpenTelemetry.Exporter.Geneva.Tld;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
-using OpenTelemetry.Trace;
 
 /*
 BenchmarkDotNet v0.13.10, Windows 11 (10.0.23424.1000)
diff --git a/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MessagePackSerializerTests.cs b/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MessagePackSerializerTests.cs
index e1018f19dc..9fb41a0361 100644
--- a/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MessagePackSerializerTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MessagePackSerializerTests.cs
@@ -4,7 +4,6 @@
 using FsCheck;
 using FsCheck.Xunit;
 using OpenTelemetry.Exporter.Geneva.MsgPack;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MetricSerializerTests.cs b/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MetricSerializerTests.cs
index 69b03c407d..d996d9adc0 100644
--- a/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MetricSerializerTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.FuzzTests/MetricSerializerTests.cs
@@ -3,7 +3,6 @@
 
 using FsCheck;
 using FsCheck.Xunit;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/ConnectionStringBuilderTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/ConnectionStringBuilderTests.cs
index 85a997b51f..f85884bbfc 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/ConnectionStringBuilderTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/ConnectionStringBuilderTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Exporter.Geneva.Transports;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/EventSourceTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/EventSourceTests.cs
index 79727e7730..9e5d16c818 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Exporter.Geneva.Transports;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaCorrelationFixture.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaCorrelationFixture.cs
index 7b5579894a..e6fd46fb95 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaCorrelationFixture.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaCorrelationFixture.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
 [CollectionDefinition(nameof(GenevaCorrelationFixture))]
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterAFDCorrelationTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterAFDCorrelationTests.cs
index 0c5601cdb7..b968a3d091 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterAFDCorrelationTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterAFDCorrelationTests.cs
@@ -9,7 +9,6 @@
 using OpenTelemetry.Context;
 using OpenTelemetry.Exporter.Geneva.MsgPack;
 using OpenTelemetry.Logs;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterTests.cs
index d3491a157d..eccad2173f 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaLogExporterTests.cs
@@ -15,7 +15,6 @@
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterOptionsTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterOptionsTests.cs
index 5ccc866188..b398b75b52 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterOptionsTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterOptionsTests.cs
@@ -3,8 +3,6 @@
 
 #nullable disable
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
 public class GenevaMetricExporterOptionsTests
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs
index d5dd708f33..5e22bac81d 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaMetricExporterTests.cs
@@ -14,8 +14,6 @@
 using OpenTelemetry.Exporter.Geneva.Metrics;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
-using OpenTelemetry.Trace;
-using Xunit;
 using static OpenTelemetry.Exporter.Geneva.Tests.MetricsContract;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaTraceExporterTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaTraceExporterTests.cs
index 0fe1acef4c..313a2edcaa 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaTraceExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/GenevaTraceExporterTests.cs
@@ -13,7 +13,6 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/JsonSerializerTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/JsonSerializerTests.cs
index d578fc2519..8a2c2a0390 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/JsonSerializerTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/JsonSerializerTests.cs
@@ -5,7 +5,6 @@
 
 using System.Text;
 using OpenTelemetry.Exporter.Geneva.Tld;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/LogSerializationTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/LogSerializationTests.cs
index 7f919205f6..287624213e 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/LogSerializationTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/LogSerializationTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Exporter.Geneva.MsgPack;
 using OpenTelemetry.Logs;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/MessagePackSerializerTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/MessagePackSerializerTests.cs
index cbb0135706..2021e9afd6 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/MessagePackSerializerTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/MessagePackSerializerTests.cs
@@ -6,7 +6,6 @@
 using System.Globalization;
 using System.Text;
 using OpenTelemetry.Exporter.Geneva.MsgPack;
-using Xunit;
 using Xunit.Sdk;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/MetricSerializerTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/MetricSerializerTests.cs
index 7b2cc88d41..37ba0dc451 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/MetricSerializerTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/MetricSerializerTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Buffers.Binary;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterTests.cs
index 3d2a63f95a..98db27f2c4 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterTests.cs
@@ -5,7 +5,6 @@
 using System.Runtime.InteropServices;
 using OpenTelemetry.Exporter.Geneva.MsgPack;
 using OpenTelemetry.Resources;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterThreadSafetyTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterThreadSafetyTests.cs
index 84405e6a25..50d9a7c396 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterThreadSafetyTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackLogExporterThreadSafetyTests.cs
@@ -9,7 +9,6 @@
 using OpenTelemetry.Exporter.Geneva.MsgPack;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterTests.cs
index 2c94bcc521..090b241e30 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Exporter.Geneva.MsgPack;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterThreadSafetyTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterThreadSafetyTests.cs
index 57626cb2da..b8b2cdad18 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterThreadSafetyTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/MsgPackTraceExporterThreadSafetyTests.cs
@@ -8,7 +8,6 @@
 using System.Runtime.InteropServices;
 using OpenTelemetry.Exporter.Geneva.MsgPack;
 using OpenTelemetry.Resources;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterTests.cs
index c754fcd1a3..c33a2eedf6 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterTests.cs
@@ -9,8 +9,6 @@
 using Google.Protobuf.Collections;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Resources;
-using OpenTelemetry.Trace;
-using Xunit;
 using OtlpCollector = OpenTelemetry.Proto.Collector.Metrics.V1;
 using OtlpCommon = OpenTelemetry.Proto.Common.V1;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithPrefixTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithPrefixTests.cs
index 9421c8de95..97c0892748 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithPrefixTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithPrefixTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
 [Collection("OtlpProtobufMetricExporterTests")]
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithoutPrefixTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithoutPrefixTests.cs
index f21059620f..a44fb8c30c 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithoutPrefixTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/OtlpProtobufMetricExporterWithoutPrefixTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
 [Collection("OtlpProtobufMetricExporterTests")]
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/TableNameSerializerTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/TableNameSerializerTests.cs
index be20571892..589d8b83d3 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/TableNameSerializerTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/TableNameSerializerTests.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using System.Text;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketDataTransportTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketDataTransportTests.cs
index 5ca76a76b7..287c4e59bb 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketDataTransportTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketDataTransportTests.cs
@@ -7,7 +7,6 @@
 using System.Reflection;
 using OpenTelemetry.Exporter.Geneva.Transports;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketEndPointTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketEndPointTests.cs
index 27cf917b61..dcc1328d0e 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketEndPointTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixDomainSocketEndPointTests.cs
@@ -6,7 +6,6 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs
index 787a41aee5..5ac7241815 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs
@@ -7,8 +7,6 @@
 using Microsoft.LinuxTracepoints.Provider;
 using OpenTelemetry.Exporter.Geneva.Transports;
 using OpenTelemetry.Tests;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Exporter.Geneva.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.InfluxDB.Tests/EventSourceTests.cs b/test/OpenTelemetry.Exporter.InfluxDB.Tests/EventSourceTests.cs
index e6e70d7d07..2f732c35ab 100644
--- a/test/OpenTelemetry.Exporter.InfluxDB.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Exporter.InfluxDB.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.InfluxDB.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.InfluxDB.Tests/InfluxDBMetricsExporterTests.cs b/test/OpenTelemetry.Exporter.InfluxDB.Tests/InfluxDBMetricsExporterTests.cs
index f73b2b326a..2143971a70 100644
--- a/test/OpenTelemetry.Exporter.InfluxDB.Tests/InfluxDBMetricsExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.InfluxDB.Tests/InfluxDBMetricsExporterTests.cs
@@ -5,7 +5,6 @@
 using System.Reflection;
 using OpenTelemetry.Exporter.InfluxDB.Tests.Utils;
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.InfluxDB.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.InfluxDB.Tests/Utils/AssertUtils.cs b/test/OpenTelemetry.Exporter.InfluxDB.Tests/Utils/AssertUtils.cs
index 9d7c81b2b3..7383e9fae2 100644
--- a/test/OpenTelemetry.Exporter.InfluxDB.Tests/Utils/AssertUtils.cs
+++ b/test/OpenTelemetry.Exporter.InfluxDB.Tests/Utils/AssertUtils.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.InfluxDB.Tests.Utils;
 
 internal static class AssertUtils
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationHelperTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationHelperTests.cs
index 0a7c03a61a..d0e69163a4 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationHelperTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationHelperTests.cs
@@ -3,7 +3,6 @@
 
 using System.Text;
 using System.Text.Json;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationStateTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationStateTests.cs
index d0ec17723c..ff05b4e7ec 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationStateTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationStateTests.cs
@@ -3,7 +3,6 @@
 
 using System.Text;
 using System.Text.Json;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/ConnectionStringParserTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/ConnectionStringParserTests.cs
index 797cc7f8db..bc11b619fa 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/ConnectionStringParserTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/ConnectionStringParserTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
 public class ConnectionStringParserTests
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/EventNameManagerTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/EventNameManagerTests.cs
index c3e98fd27f..e87c71e7e2 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/EventNameManagerTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/EventNameManagerTests.cs
@@ -3,7 +3,6 @@
 
 using System.Collections;
 using System.Text;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/EventSourceTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/EventSourceTests.cs
index 3bfa8dea75..1c1371dfb7 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/ExtensionFieldInformationManagerTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/ExtensionFieldInformationManagerTests.cs
index 57e2b3d5c6..656f9c0bc4 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/ExtensionFieldInformationManagerTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/ExtensionFieldInformationManagerTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
 public class ExtensionFieldInformationManagerTests
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/HttpJsonPostTransportTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/HttpJsonPostTransportTests.cs
index e651432c76..6d6506bec7 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/HttpJsonPostTransportTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/HttpJsonPostTransportTests.cs
@@ -8,7 +8,6 @@
 #endif
 using System.Text;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs
index 49ba61addc..23b6ed023d 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/LogRecordCommonSchemaJsonSerializerTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorIntegrationTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorIntegrationTests.cs
index 55af1d7461..21bdfaf044 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorIntegrationTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorIntegrationTests.cs
@@ -9,8 +9,6 @@
 using OpenTelemetry.Logs;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Tests;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLogExporterOptionsTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLogExporterOptionsTests.cs
index 0ff041e465..3967ac4732 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLogExporterOptionsTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLogExporterOptionsTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
 public sealed class OneCollectorLogExporterOptionsTests
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLoggerProviderBuilderExtensionsTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLoggerProviderBuilderExtensionsTests.cs
index 01166308ae..19c60be66b 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLoggerProviderBuilderExtensionsTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorLoggerProviderBuilderExtensionsTests.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorOpenTelemetryLoggerOptionsExtensionsTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorOpenTelemetryLoggerOptionsExtensionsTests.cs
index c0cf3497a4..c1cab28b47 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorOpenTelemetryLoggerOptionsExtensionsTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/OneCollectorOpenTelemetryLoggerOptionsExtensionsTests.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/WriteDirectlyToTransportSinkTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/WriteDirectlyToTransportSinkTests.cs
index 6c7eea94dd..075946cd6d 100644
--- a/test/OpenTelemetry.Exporter.OneCollector.Tests/WriteDirectlyToTransportSinkTests.cs
+++ b/test/OpenTelemetry.Exporter.OneCollector.Tests/WriteDirectlyToTransportSinkTests.cs
@@ -3,7 +3,6 @@
 
 using System.Text;
 using OpenTelemetry.Resources;
-using Xunit;
 
 namespace OpenTelemetry.Exporter.OneCollector.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.AWS.Tests/AWSXRayIdGeneratorTests.cs b/test/OpenTelemetry.Extensions.AWS.Tests/AWSXRayIdGeneratorTests.cs
index 9dbb27664b..567a3e2d8f 100644
--- a/test/OpenTelemetry.Extensions.AWS.Tests/AWSXRayIdGeneratorTests.cs
+++ b/test/OpenTelemetry.Extensions.AWS.Tests/AWSXRayIdGeneratorTests.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Runtime.ExceptionServices;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.AWS.Tests/AssemblyInfo.cs b/test/OpenTelemetry.Extensions.AWS.Tests/AssemblyInfo.cs
index 109f28b5f3..56dceb2fdd 100644
--- a/test/OpenTelemetry.Extensions.AWS.Tests/AssemblyInfo.cs
+++ b/test/OpenTelemetry.Extensions.AWS.Tests/AssemblyInfo.cs
@@ -1,6 +1,4 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/test/OpenTelemetry.Extensions.AWS.Tests/EventSourceTests.cs b/test/OpenTelemetry.Extensions.AWS.Tests/EventSourceTests.cs
index 8e6fcedfac..d70334a700 100644
--- a/test/OpenTelemetry.Extensions.AWS.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Extensions.AWS.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.AWS.Tests/Trace/AWSXRayPropagatorTests.cs b/test/OpenTelemetry.Extensions.AWS.Tests/Trace/AWSXRayPropagatorTests.cs
index cd036b27ba..a6ba57392a 100644
--- a/test/OpenTelemetry.Extensions.AWS.Tests/Trace/AWSXRayPropagatorTests.cs
+++ b/test/OpenTelemetry.Extensions.AWS.Tests/Trace/AWSXRayPropagatorTests.cs
@@ -7,7 +7,6 @@
 using System.Diagnostics;
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Extensions.AWS.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentProviderBuilderExtensionsTests.cs b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentProviderBuilderExtensionsTests.cs
index a16885343f..8b48e9de17 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentProviderBuilderExtensionsTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentProviderBuilderExtensionsTests.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.Options;
 using OpenTelemetry.Instrumentation.AspNetCore;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentServiceCollectionExtensionsTests.cs b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentServiceCollectionExtensionsTests.cs
index df73034160..816a9f5610 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentServiceCollectionExtensionsTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/AspNetCoreTraceEnrichmentServiceCollectionExtensionsTests.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using OpenTelemetry.Instrumentation.AspNetCore;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/EnrichmentTests.cs b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/EnrichmentTests.cs
index 3e18f99d04..0b2fbfe00a 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/EnrichmentTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/EnrichmentTests.cs
@@ -4,10 +4,8 @@
 using System.Diagnostics;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/ConfigureHttpClientTraceInstrumentationOptionsTests.cs b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/ConfigureHttpClientTraceInstrumentationOptionsTests.cs
index af786d3b08..900a2960fa 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/ConfigureHttpClientTraceInstrumentationOptionsTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/ConfigureHttpClientTraceInstrumentationOptionsTests.cs
@@ -6,7 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using OpenTelemetry.Instrumentation.Http;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.Http.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentServiceCollectionExtensionsTests.cs b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentServiceCollectionExtensionsTests.cs
index cdd9237319..cf67062ce9 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentServiceCollectionExtensionsTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentServiceCollectionExtensionsTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using Microsoft.Extensions.DependencyInjection;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.Http.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentTracerProviderBuilderExtensionsTests.cs b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentTracerProviderBuilderExtensionsTests.cs
index d644345eda..a5d42c6d87 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentTracerProviderBuilderExtensionsTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientEnrichmentTracerProviderBuilderExtensionsTests.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.Http.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientTraceEnrichmentAcceptanceTests.cs b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientTraceEnrichmentAcceptanceTests.cs
index 854e29a47b..04eb13ebd6 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientTraceEnrichmentAcceptanceTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/HttpClientTraceEnrichmentAcceptanceTests.cs
@@ -8,7 +8,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.Http.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.Tests/EventSourceTests.cs b/test/OpenTelemetry.Extensions.Enrichment.Tests/EventSourceTests.cs
index ecaae95216..6726684f1b 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentProviderBuilderExtensions.cs b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentProviderBuilderExtensions.cs
index 171b5f787d..4c1c980805 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentProviderBuilderExtensions.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentProviderBuilderExtensions.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentServiceCollectionExtensionsTests.cs b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentServiceCollectionExtensionsTests.cs
index b4037a3d29..3e30bc3180 100644
--- a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentServiceCollectionExtensionsTests.cs
+++ b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetryEnrichmentServiceCollectionExtensionsTests.cs
@@ -8,7 +8,6 @@
 using Microsoft.Extensions.Hosting;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Enrichment.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs b/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs
index b085f2cd14..55ff427cda 100644
--- a/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs
+++ b/test/OpenTelemetry.Extensions.Tests/ActivityEventAttachingLogProcessorTests.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Tests/EventSourceTests.cs b/test/OpenTelemetry.Extensions.Tests/EventSourceTests.cs
index 67aca2d028..665d4f8d6d 100644
--- a/test/OpenTelemetry.Extensions.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Extensions.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Tests;
 
diff --git a/test/OpenTelemetry.Extensions.Tests/Logs/LoggerFactoryBaggageLogRecordProcessorTests.cs b/test/OpenTelemetry.Extensions.Tests/Logs/LoggerFactoryBaggageLogRecordProcessorTests.cs
index 4c3d5e77b2..277f8effe6 100644
--- a/test/OpenTelemetry.Extensions.Tests/Logs/LoggerFactoryBaggageLogRecordProcessorTests.cs
+++ b/test/OpenTelemetry.Extensions.Tests/Logs/LoggerFactoryBaggageLogRecordProcessorTests.cs
@@ -3,11 +3,8 @@
 
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
-using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Tests.Logs;
 
diff --git a/test/OpenTelemetry.Extensions.Tests/Logs/LoggerProviderBuilderBaggageLogRecordProcessorTests.cs b/test/OpenTelemetry.Extensions.Tests/Logs/LoggerProviderBuilderBaggageLogRecordProcessorTests.cs
index 5a8c865c1e..a5c3f22ca2 100644
--- a/test/OpenTelemetry.Extensions.Tests/Logs/LoggerProviderBuilderBaggageLogRecordProcessorTests.cs
+++ b/test/OpenTelemetry.Extensions.Tests/Logs/LoggerProviderBuilderBaggageLogRecordProcessorTests.cs
@@ -6,8 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
-using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Tests.Logs;
 
diff --git a/test/OpenTelemetry.Extensions.Tests/Trace/AutoFlushActivityProcessorTests.cs b/test/OpenTelemetry.Extensions.Tests/Trace/AutoFlushActivityProcessorTests.cs
index 7f96a8f3fa..ba0e97f10d 100644
--- a/test/OpenTelemetry.Extensions.Tests/Trace/AutoFlushActivityProcessorTests.cs
+++ b/test/OpenTelemetry.Extensions.Tests/Trace/AutoFlushActivityProcessorTests.cs
@@ -5,7 +5,6 @@
 using System.Runtime.CompilerServices;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Tests.Trace;
 
diff --git a/test/OpenTelemetry.Extensions.Tests/Trace/BaggageActivityProcessorTests.cs b/test/OpenTelemetry.Extensions.Tests/Trace/BaggageActivityProcessorTests.cs
index 0f43e32d8f..5176c8a560 100644
--- a/test/OpenTelemetry.Extensions.Tests/Trace/BaggageActivityProcessorTests.cs
+++ b/test/OpenTelemetry.Extensions.Tests/Trace/BaggageActivityProcessorTests.cs
@@ -5,7 +5,6 @@
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Tests.Trace;
 
diff --git a/test/OpenTelemetry.Extensions.Tests/Trace/RateLimitingSamplerTests.cs b/test/OpenTelemetry.Extensions.Tests/Trace/RateLimitingSamplerTests.cs
index 29f190ea23..afb24d518e 100644
--- a/test/OpenTelemetry.Extensions.Tests/Trace/RateLimitingSamplerTests.cs
+++ b/test/OpenTelemetry.Extensions.Tests/Trace/RateLimitingSamplerTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Extensions.Tests.Trace;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/AWSClientInstrumentationOptionsTests.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/AWSClientInstrumentationOptionsTests.cs
index 22770d1f08..326f0c4b61 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/AWSClientInstrumentationOptionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/AWSClientInstrumentationOptionsTests.cs
@@ -10,7 +10,6 @@
 using OpenTelemetry.Instrumentation.AWS.Implementation;
 using OpenTelemetry.Instrumentation.AWS.Tests.Tools;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/AssemblyInfo.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/AssemblyInfo.cs
index 9c844391db..7ff7f8bf54 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/AssemblyInfo.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 // Avoid mutations to RuntimePipelineCustomizerRegistry.Instance causing flaky tests
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSMeterProviderTests.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSMeterProviderTests.cs
index 1ad4d32db3..7747f64aa6 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSMeterProviderTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSMeterProviderTests.cs
@@ -4,7 +4,6 @@
 using OpenTelemetry.AWS;
 using OpenTelemetry.Instrumentation.AWS.Implementation.Metrics;
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AWS.Tests.Implementation;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSTracerProviderTests.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSTracerProviderTests.cs
index 224476a2e5..cd44863d9f 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSTracerProviderTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/AWSTracerProviderTests.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using OpenTelemetry.AWS;
 using OpenTelemetry.Instrumentation.AWS.Implementation.Tracing;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AWS.Tests.Implementation;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/RequestContextHelperTests.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/RequestContextHelperTests.cs
index 0beb8e7bf5..df392c9baf 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/RequestContextHelperTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/RequestContextHelperTests.cs
@@ -6,7 +6,6 @@
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Instrumentation.AWS.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 using SNS = Amazon.SimpleNotificationService.Model;
 using SQS = Amazon.SQS.Model;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/TestsHelper.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/TestsHelper.cs
index abe0a1928d..37320e1635 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/TestsHelper.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/Implementation/TestsHelper.cs
@@ -4,7 +4,6 @@
 using Amazon.Runtime;
 using Amazon.Runtime.Internal;
 using OpenTelemetry.Instrumentation.AWS.Implementation;
-using Xunit;
 using SNS = Amazon.SimpleNotificationService.Model;
 using SQS = Amazon.SQS.Model;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
index f978cd3970..eda55c3417 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
@@ -20,7 +20,6 @@
 using Amazon.SQS.Model;
 using OpenTelemetry.Instrumentation.AWS.Tests.Tools;
 using OpenTelemetry.Trace;
-using Xunit;
 using AWSTracingPipelineHandler = OpenTelemetry.Instrumentation.AWS.Implementation.AWSTracingPipelineHandler;
 
 namespace OpenTelemetry.Instrumentation.AWS.Tests;
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientMetricsInstrumentation.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientMetricsInstrumentation.cs
index bd8c61fe92..3e88e7ed37 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientMetricsInstrumentation.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientMetricsInstrumentation.cs
@@ -12,8 +12,6 @@
 using Amazon.SQS.Model;
 using OpenTelemetry.Instrumentation.AWS.Tests.Tools;
 using OpenTelemetry.Metrics;
-using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/AWSLambdaWrapperTests.cs b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/AWSLambdaWrapperTests.cs
index 705556ccc8..e5d99fd539 100644
--- a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/AWSLambdaWrapperTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/AWSLambdaWrapperTests.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AWSLambda.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaHttpUtilsTests.cs b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaHttpUtilsTests.cs
index 240cac3e29..03c3ee0dd2 100644
--- a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaHttpUtilsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaHttpUtilsTests.cs
@@ -7,7 +7,6 @@
 using OpenTelemetry.AWS;
 using OpenTelemetry.Instrumentation.AWSLambda.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AWSLambda.Tests.Implementation;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaUtilsTests.cs b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaUtilsTests.cs
index d458375af1..0241e659ba 100644
--- a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaUtilsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSLambdaUtilsTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Instrumentation.AWSLambda.Implementation;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AWSLambda.Tests.Implementation;
 
diff --git a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSMessagingUtilsTests.cs b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSMessagingUtilsTests.cs
index 967bc3fe77..bf24840e3a 100644
--- a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSMessagingUtilsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/Implementation/AWSMessagingUtilsTests.cs
@@ -4,7 +4,6 @@
 using Amazon.Lambda.SQSEvents;
 using OpenTelemetry.Instrumentation.AWSLambda.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 using static Amazon.Lambda.SQSEvents.SQSEvent;
 
 namespace OpenTelemetry.Instrumentation.AWSLambda.Tests.Implementation;
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs
index 0900b515a3..26aa242f71 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/ActivityHelperTest.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Web;
 using OpenTelemetry.Context.Propagation;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/EventSourceTests.cs
index 81bcf122c1..5eb409e7c3 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigTransformTest.cs b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigTransformTest.cs
index 21406bb974..4c57aafd5a 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigTransformTest.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigTransformTest.cs
@@ -3,7 +3,6 @@
 
 using System.Xml.Linq;
 using Microsoft.Web.XmlTransform;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigWithLocationTagTransformTest.cs b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigWithLocationTagTransformTest.cs
index 7982173dfd..87988c9d62 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigWithLocationTagTransformTest.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/WebConfigWithLocationTagTransformTest.cs
@@ -3,7 +3,6 @@
 
 using System.Xml.Linq;
 using Microsoft.Web.XmlTransform;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/AssemblyInfo.cs b/test/OpenTelemetry.Instrumentation.AspNet.Tests/AssemblyInfo.cs
index 109f28b5f3..56dceb2fdd 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/AssemblyInfo.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/AssemblyInfo.cs
@@ -1,6 +1,4 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/BasicTests.cs b/test/OpenTelemetry.Instrumentation.AspNet.Tests/BasicTests.cs
index b99e182f80..996a666033 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/BasicTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/BasicTests.cs
@@ -6,7 +6,6 @@
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.AspNet.Tests/EventSourceTests.cs
index 701603467f..730d072707 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.AspNet.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInListenerTests.cs b/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInListenerTests.cs
index 57779a767a..51452a6341 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInListenerTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInListenerTests.cs
@@ -11,7 +11,6 @@
 using OpenTelemetry.Instrumentation.AspNet.Implementation;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInMetricsListenerTests.cs b/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInMetricsListenerTests.cs
index b7d5cbd40e..f06803dac4 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInMetricsListenerTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInMetricsListenerTests.cs
@@ -4,7 +4,6 @@
 using System.Web;
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpRequestRouteHelperTests.cs b/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpRequestRouteHelperTests.cs
index 767576e2dc..f707c8fb1c 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpRequestRouteHelperTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpRequestRouteHelperTests.cs
@@ -4,7 +4,6 @@
 using System.Web;
 using System.Web.Routing;
 using OpenTelemetry.Instrumentation.AspNet.Implementation;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/RequestDataHelperExtensionsTests.cs b/test/OpenTelemetry.Instrumentation.AspNet.Tests/RequestDataHelperExtensionsTests.cs
index 7926ec91bc..02addcecda 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/RequestDataHelperExtensionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/RequestDataHelperExtensionsTests.cs
@@ -4,7 +4,6 @@
 using System.Collections.Specialized;
 using System.Web;
 using OpenTelemetry.Instrumentation.AspNet.Implementation;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNet.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
index d470e4e5d9..4ba29391b4 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
@@ -18,7 +18,6 @@
 using OpenTelemetry.Trace;
 using TestApp.AspNetCore;
 using TestApp.AspNetCore.Filters;
-using Xunit;
 using Uri = System.Uri;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Tests;
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs
index 859a53f746..cc6645bb31 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/DependencyInjectionConfigTests.cs
@@ -6,7 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EndToEndTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EndToEndTests.cs
index fa9f27640c..0bc36979d4 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EndToEndTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EndToEndTests.cs
@@ -9,7 +9,6 @@
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EventSourceTests.cs
index 5609c717a5..d458f874fa 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/GrpcTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/GrpcTests.cs
index 609b8deb45..0c2179ae2b 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/GrpcTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/GrpcTests.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Http;
 using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs
index 2d0bc93ebe..40b9729587 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs
@@ -10,7 +10,6 @@
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Trace;
 using TestApp.AspNetCore;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs
index 68853382f2..da9b3a786b 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs
@@ -11,7 +11,6 @@
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.cs
index 09f25c2c51..a04abcb3ff 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestCases.cs
@@ -4,7 +4,6 @@
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Xunit;
 
 namespace RouteTests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestFixture.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestFixture.cs
index 30b43c7539..367548063b 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestFixture.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTestFixture.cs
@@ -5,7 +5,6 @@
 using System.Text;
 using Microsoft.AspNetCore.Builder;
 using RouteTests.TestApplication;
-using Xunit;
 
 namespace RouteTests;
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTests.cs
index 1c63922d68..b99f706476 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTests.cs
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/RoutingTests.cs
@@ -6,7 +6,6 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 using RouteTests.TestApplication;
-using Xunit;
 
 namespace RouteTests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraCollection.cs b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraCollection.cs
index dbf3628727..9cefa3c4fa 100644
--- a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraCollection.cs
+++ b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraCollection.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Instrumentation.Cassandra.Tests;
 
 [CollectionDefinition(Name)]
diff --git a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraInstrumentationTests.cs b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraInstrumentationTests.cs
index e9b352e790..b291e476fa 100644
--- a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraInstrumentationTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/CassandraInstrumentationTests.cs
@@ -6,7 +6,6 @@
 using Cassandra.Metrics;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
-using Xunit;
 using CassandraData = Cassandra.Data.Linq;
 
 namespace OpenTelemetry.Instrumentation.Cassandra.Tests;
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedMeteringTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedMeteringTests.cs
index 80554e42bf..4dbf3fa42c 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedMeteringTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedMeteringTests.cs
@@ -6,8 +6,6 @@
 using Microsoft.Extensions.Hosting;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingAndMeteringTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingAndMeteringTests.cs
index 236c0a8921..731eaeda79 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingAndMeteringTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingAndMeteringTests.cs
@@ -8,8 +8,6 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingTests.cs
index 6970913077..ce47e927a0 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/HostedTracingTests.cs
@@ -7,8 +7,6 @@
 using Microsoft.Extensions.Hosting;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedConsumerTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedConsumerTests.cs
index d87804b88e..9a730f2e69 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedConsumerTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedConsumerTests.cs
@@ -6,7 +6,6 @@
 using Confluent.Kafka;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedProducerTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedProducerTests.cs
index a853cbb28e..bffa7ea4c5 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedProducerTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/InstrumentedProducerTests.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using Confluent.Kafka;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/KafkaCollection.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/KafkaCollection.cs
index cd90326359..68ceafa54b 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/KafkaCollection.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/KafkaCollection.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
 [CollectionDefinition(Name)]
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/MeteringTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/MeteringTests.cs
index b0ee8042a0..e888ad435a 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/MeteringTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/MeteringTests.cs
@@ -4,7 +4,6 @@
 using Confluent.Kafka;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumeResultExtensionsTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumeResultExtensionsTests.cs
index d6c7cbab1e..2059e1d03d 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumeResultExtensionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumeResultExtensionsTests.cs
@@ -5,7 +5,6 @@
 using System.Text;
 using Confluent.Kafka;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumerBuilderExtensionsTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumerBuilderExtensionsTests.cs
index 7ed0bb9731..27b4301bac 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumerBuilderExtensionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryConsumerBuilderExtensionsTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using Confluent.Kafka;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryProducerBuilderExtensionsTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryProducerBuilderExtensionsTests.cs
index c82a5ca12b..f64ad88077 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryProducerBuilderExtensionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetryProducerBuilderExtensionsTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using Confluent.Kafka;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/TracingTests.cs b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/TracingTests.cs
index 933f8af8dc..4e5081adf2 100644
--- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/TracingTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/TracingTests.cs
@@ -5,7 +5,6 @@
 using Confluent.Kafka;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ConfluentKafka.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/DependencyInjectionConfigTests.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/DependencyInjectionConfigTests.cs
index b8a3d14c34..10807f9c18 100644
--- a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/DependencyInjectionConfigTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/DependencyInjectionConfigTests.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs
index 95266c5528..855fb270e8 100644
--- a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/ElasticsearchClientTests.cs
@@ -8,7 +8,6 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/EventSourceTests.cs
index 0adc1d22d0..2361ee08c0 100644
--- a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.ElasticsearchClient.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ElasticsearchClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/DependencyInjectionConfigTests.cs b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/DependencyInjectionConfigTests.cs
index b1512d7d94..a62cd7b512 100644
--- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/DependencyInjectionConfigTests.cs
+++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/DependencyInjectionConfigTests.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs
index 46113811fe..fd130b5891 100644
--- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs
+++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkDiagnosticListenerTests.cs
@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
 using Microsoft.Data.Sqlite;
@@ -9,7 +8,6 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using OpenTelemetry.Instrumentation.EntityFrameworkCore.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkInstrumentationOptionsTests.cs b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkInstrumentationOptionsTests.cs
index 0e163460a1..a289f275b9 100644
--- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkInstrumentationOptionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkInstrumentationOptionsTests.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Internal;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkIntegrationTests.cs b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkIntegrationTests.cs
index 4171922485..4b1a7fee3b 100644
--- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkIntegrationTests.cs
+++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkIntegrationTests.cs
@@ -11,8 +11,6 @@
 using OpenTelemetry.Instrumentation.SqlClient.Tests;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EventSourceTests.cs
index b576b479ec..a83cc045e7 100644
--- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.EntityFrameworkCore.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventCountersMetricsTests.cs b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventCountersMetricsTests.cs
index 2dae52e1f8..da2c326886 100644
--- a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventCountersMetricsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventCountersMetricsTests.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics.Tracing;
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.EventCounters.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventSourceTests.cs
index d6eeb37dc9..ca76c3c650 100644
--- a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.EventCounters.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreClientInterceptorTests.cs b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreClientInterceptorTests.cs
index 79556c2b55..835a51a65a 100644
--- a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreClientInterceptorTests.cs
+++ b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreClientInterceptorTests.cs
@@ -7,7 +7,6 @@
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 using StatusCode = Grpc.Core.StatusCode;
 
 namespace OpenTelemetry.Instrumentation.GrpcCore.Tests;
diff --git a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreServerInterceptorTests.cs b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreServerInterceptorTests.cs
index 5961f6636e..d9644bdb3f 100644
--- a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreServerInterceptorTests.cs
+++ b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/GrpcCoreServerInterceptorTests.cs
@@ -4,7 +4,6 @@
 using Grpc.Core;
 using Grpc.Core.Interceptors;
 using OpenTelemetry.Context.Propagation;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.GrpcCore.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/EventSourceTests.cs
index a378bb4f8c..b5245c5511 100644
--- a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.GrpcNetClient.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Grpc.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs
index 9b95386564..1323ff8f8a 100644
--- a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs
+++ b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.client.cs
@@ -16,7 +16,6 @@
 using OpenTelemetry.Instrumentation.Grpc.Tests.GrpcTestHelpers;
 using OpenTelemetry.Instrumentation.GrpcNetClient;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Grpc.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs
index ff3df90d3e..7c3985f51b 100644
--- a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs
+++ b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/GrpcTests.server.cs
@@ -12,7 +12,6 @@
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Instrumentation.Grpc.Services.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Grpc.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/DependencyInjectionConfigTests.cs b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/DependencyInjectionConfigTests.cs
index bd2a5d5bab..6d2a718304 100644
--- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/DependencyInjectionConfigTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/DependencyInjectionConfigTests.cs
@@ -3,9 +3,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Hangfire.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireFixture.cs b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireFixture.cs
index 26b4244c31..f3f88d74fc 100644
--- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireFixture.cs
+++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireFixture.cs
@@ -5,7 +5,6 @@
 using Hangfire.MemoryStorage;
 using Hangfire.States;
 using Hangfire.Storage;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Hangfire.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireInstrumentationJobFilterAttributeTests.cs b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireInstrumentationJobFilterAttributeTests.cs
index c1065f0f92..adc4a039af 100644
--- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireInstrumentationJobFilterAttributeTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireInstrumentationJobFilterAttributeTests.cs
@@ -13,7 +13,6 @@
 using OpenTelemetry.Context.Propagation;
 using OpenTelemetry.Instrumentation.Hangfire.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Hangfire.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsErrorTests.cs b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsErrorTests.cs
index a729214143..8cd0fc3d14 100644
--- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsErrorTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsErrorTests.cs
@@ -5,7 +5,6 @@
 using OpenTelemetry.Instrumentation.Hangfire.Implementation;
 using OpenTelemetry.Instrumentation.Hangfire.Tests.Utils;
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Hangfire.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsTests.cs b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsTests.cs
index cd476b8737..1b0b12fcc1 100644
--- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireMetricsTests.cs
@@ -6,7 +6,6 @@
 using OpenTelemetry.Instrumentation.Hangfire.Implementation;
 using OpenTelemetry.Instrumentation.Hangfire.Tests.Utils;
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Hangfire.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireQueueLatencyTests.cs b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireQueueLatencyTests.cs
index 9013c81e8f..91dd008053 100644
--- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireQueueLatencyTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/HangfireQueueLatencyTests.cs
@@ -5,7 +5,6 @@
 using OpenTelemetry.Instrumentation.Hangfire.Implementation;
 using OpenTelemetry.Instrumentation.Hangfire.Tests.Utils;
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Hangfire.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/Utils/AssertUtils.cs b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/Utils/AssertUtils.cs
index 8fdc550785..6ec80296aa 100644
--- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/Utils/AssertUtils.cs
+++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/Utils/AssertUtils.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Hangfire.Tests.Utils;
 
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/EventSourceTests.cs
index 5cc8613d76..7b3b56e3a1 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.Http.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Http.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.cs
index 3b6c129e17..eacdd829a0 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.cs
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.cs
@@ -14,8 +14,6 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.Http.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.cs
index 1f0f1cbfe6..d2b0047ed3 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.cs
@@ -10,7 +10,6 @@
 #endif
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Http.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpTestData.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpTestData.cs
index 27df0ebb2b..8535a77c0d 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpTestData.cs
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpTestData.cs
@@ -3,7 +3,6 @@
 
 using System.Reflection;
 using System.Text.Json;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Http.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestActivitySourceTests.netfx.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestActivitySourceTests.netfx.cs
index b703527025..3bd1ebd2b0 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestActivitySourceTests.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestActivitySourceTests.netfx.cs
@@ -11,7 +11,6 @@
 using OpenTelemetry.Instrumentation.Http.Implementation;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Http.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.Basic.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.Basic.cs
index 51869278a8..b3c0831bb3 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.Basic.cs
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.Basic.cs
@@ -9,7 +9,6 @@
 using OpenTelemetry.Instrumentation.Http.Implementation;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 #if !NETFRAMEWORK
 #pragma warning disable SYSLIB0014 // Type or member is obsolete
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.cs
index a7567234ce..5316aee65d 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.cs
@@ -6,7 +6,6 @@
 using System.Text.Json;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 #if !NETFRAMEWORK
 #pragma warning disable SYSLIB0014 // Type or member is obsolete
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
index 5674796e12..7624b70978 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
@@ -8,13 +8,13 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)\src\Shared\ActivityHelperExtensions.cs" Link="Includes\ActivityHelperExtensions.cs" />
-    <Compile Include="$(RepoRoot)\test\Shared\CustomTextMapPropagator.cs" Link="/Includes/CustomTextMapPropagator.cs" />
-    <Compile Include="$(RepoRoot)\test\Shared\EventSourceTestHelper.cs" Link="/Includes/EventSourceTestHelper.cs" />
-    <Compile Include="$(RepoRoot)\test\Shared\InMemoryEventListener.cs" Link="/Includes/InMemoryEventListener.cs" />
-    <Compile Include="$(RepoRoot)\test\Shared\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="/Includes/SkipUnlessEnvVarFoundTheoryAttribute.cs" />
-    <Compile Include="$(RepoRoot)\test\Shared\TcpPortProvider.cs" Link="/Includes/TcpPortProvider.cs" />
-    <Compile Include="$(RepoRoot)\test\Shared\TestEventListener.cs" Link="/Includes/TestEventListener.cs" />
-    <Compile Include="$(RepoRoot)\test\Shared\TestHttpServer.cs" Link="/Includes/TestHttpServer.cs" />
+    <Compile Include="$(RepoRoot)\test\Shared\CustomTextMapPropagator.cs" Link="Includes\CustomTextMapPropagator.cs" />
+    <Compile Include="$(RepoRoot)\test\Shared\EventSourceTestHelper.cs" Link="Includes\EventSourceTestHelper.cs" />
+    <Compile Include="$(RepoRoot)\test\Shared\InMemoryEventListener.cs" Link="Includes\InMemoryEventListener.cs" />
+    <Compile Include="$(RepoRoot)\test\Shared\SkipUnlessEnvVarFoundTheoryAttribute.cs" Link="Includes\SkipUnlessEnvVarFoundTheoryAttribute.cs" />
+    <Compile Include="$(RepoRoot)\test\Shared\TcpPortProvider.cs" Link="Includes\TcpPortProvider.cs" />
+    <Compile Include="$(RepoRoot)\test\Shared\TestEventListener.cs" Link="Includes\TestEventListener.cs" />
+    <Compile Include="$(RepoRoot)\test\Shared\TestHttpServer.cs" Link="Includes\TestHttpServer.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/OpenTelemetry.Instrumentation.Kusto.Tests/DummyKustoTests.cs b/test/OpenTelemetry.Instrumentation.Kusto.Tests/DummyKustoTests.cs
index d3fe714c8c..5572818611 100644
--- a/test/OpenTelemetry.Instrumentation.Kusto.Tests/DummyKustoTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Kusto.Tests/DummyKustoTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Instrumentation.Kusto.Tests;
 
 public class DummyKustoTests
diff --git a/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs b/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs
index b12b0efc0b..917677e183 100644
--- a/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs
@@ -12,7 +12,6 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 using Owin;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Owin.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Owin.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.Owin.Tests/EventSourceTests.cs
index fa7899729f..98d4b8ef05 100644
--- a/test/OpenTelemetry.Instrumentation.Owin.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Owin.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Owin.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Process.Tests/ProcessMetricsTests.cs b/test/OpenTelemetry.Instrumentation.Process.Tests/ProcessMetricsTests.cs
index 2c778e9a04..1ce65bb09c 100644
--- a/test/OpenTelemetry.Instrumentation.Process.Tests/ProcessMetricsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Process.Tests/ProcessMetricsTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Process.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Quartz.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.Quartz.Tests/EventSourceTests.cs
index 03dcf2805a..79fed6872a 100644
--- a/test/OpenTelemetry.Instrumentation.Quartz.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Quartz.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.Quartz.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Quartz.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Quartz.Tests/QuartzDiagnosticListenerTests.cs b/test/OpenTelemetry.Instrumentation.Quartz.Tests/QuartzDiagnosticListenerTests.cs
index 980361f98e..c92b57f453 100644
--- a/test/OpenTelemetry.Instrumentation.Quartz.Tests/QuartzDiagnosticListenerTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Quartz.Tests/QuartzDiagnosticListenerTests.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using OpenTelemetry.Trace;
 using Quartz;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Quartz.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Remoting.Tests/RemotingInstrumentationTests.cs b/test/OpenTelemetry.Instrumentation.Remoting.Tests/RemotingInstrumentationTests.cs
index 2759976dab..c1748dcf3b 100644
--- a/test/OpenTelemetry.Instrumentation.Remoting.Tests/RemotingInstrumentationTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Remoting.Tests/RemotingInstrumentationTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.Extensions.Options;
 using OpenTelemetry.Instrumentation.Remoting.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Remoting.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Runtime.Tests/RuntimeMetricsTests.cs b/test/OpenTelemetry.Instrumentation.Runtime.Tests/RuntimeMetricsTests.cs
index 9d9e5aced7..9c3c318598 100644
--- a/test/OpenTelemetry.Instrumentation.Runtime.Tests/RuntimeMetricsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Runtime.Tests/RuntimeMetricsTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Metrics;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Runtime.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/ServiceFabricRemotingTests.cs b/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/ServiceFabricRemotingTests.cs
index d989ab8917..bfbbf29de7 100644
--- a/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/ServiceFabricRemotingTests.cs
+++ b/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/ServiceFabricRemotingTests.cs
@@ -11,11 +11,9 @@
 using Microsoft.ServiceFabric.Services.Remoting.V2;
 using Microsoft.ServiceFabric.Services.Remoting.V2.Runtime;
 using OpenTelemetry.Context.Propagation;
-using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 using ServiceFabric.Mocks;
 using ServiceFabric.Mocks.RemotingV2;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/EventSourceTests.cs
index 28106a136f..1faa0c7f6b 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.SqlClient.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/MockCommandExecutor.netfx.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/MockCommandExecutor.netfx.cs
index b26cb2977d..3e8fd25219 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/MockCommandExecutor.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/MockCommandExecutor.netfx.cs
@@ -8,7 +8,6 @@
 using Microsoft.Data.SqlClient;
 using OpenTelemetry.Instrumentation.SqlClient.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs
index 0205f5e5da..65b5a69005 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientIntegrationTests.cs
@@ -9,7 +9,6 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs
index f5d24dc73d..04bf45d7b6 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs
@@ -7,7 +7,6 @@
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTraceInstrumentationOptionsTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTraceInstrumentationOptionsTests.cs
index 4c5f31ab05..07d305787d 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTraceInstrumentationOptionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTraceInstrumentationOptionsTests.cs
@@ -9,7 +9,6 @@
 #endif
 using Microsoft.Extensions.DependencyInjection;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlEventSourceTests.netfx.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlEventSourceTests.netfx.cs
index 80eb8d9d80..5d7f7af288 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlEventSourceTests.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlEventSourceTests.netfx.cs
@@ -8,7 +8,6 @@
 using OpenTelemetry.Instrumentation.SqlClient.Implementation;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.SqlClient.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
index 8ff52b54bc..1b5b458771 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
@@ -10,7 +10,6 @@
 #endif
 using OpenTelemetry.Trace;
 using StackExchange.Redis;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.StackExchangeRedis.Implementation;
 
diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/RedisXunitFixture.cs b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/RedisXunitFixture.cs
index 5d03d1e0a1..15bdc131b6 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/RedisXunitFixture.cs
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/RedisXunitFixture.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Instrumentation.StackExchangeRedis.Tests;
 
 public class RedisXunitFixture : RedisFixture, IAsyncLifetime
diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs
index b86d6e9fba..640f70dff2 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisCallsInstrumentationTests.cs
@@ -10,7 +10,6 @@
 using OpenTelemetry.Trace;
 using StackExchange.Redis;
 using StackExchange.Redis.Profiling;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.StackExchangeRedis.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisInstrumentationOptionsTests.cs b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisInstrumentationOptionsTests.cs
index 461b40de20..9e5718357e 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisInstrumentationOptionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/StackExchangeRedisInstrumentationOptionsTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Instrumentation.StackExchangeRedis.Tests;
 
 [Collection("Redis")]
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/AspNetParentSpanCorrectorTests.netfx.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/AspNetParentSpanCorrectorTests.netfx.cs
index 56c8fb518d..6937d86e33 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/AspNetParentSpanCorrectorTests.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/AspNetParentSpanCorrectorTests.netfx.cs
@@ -7,7 +7,6 @@
 using System.Reflection;
 using OpenTelemetry.Instrumentation.Wcf.Implementation;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/EventSourceTests.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/EventSourceTests.cs
index aa8be9d3da..f2978c08a1 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Instrumentation.Wcf.Implementation;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelAsyncCallbackTests.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelAsyncCallbackTests.cs
index 92c934f232..e31ca1c9d2 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelAsyncCallbackTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelAsyncCallbackTests.cs
@@ -4,7 +4,6 @@
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using OpenTelemetry.Instrumentation.Wcf.Implementation;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelFactoryTests.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelFactoryTests.cs
index 458956760e..ddffca9f39 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelFactoryTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/InstrumentedChannelFactoryTests.cs
@@ -4,7 +4,6 @@
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using OpenTelemetry.Instrumentation.Wcf.Implementation;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/RunAsAdminTheoryAttribute.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/RunAsAdminTheoryAttribute.cs
index 0a7a1cbc52..0d21cb04ae 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/RunAsAdminTheoryAttribute.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/RunAsAdminTheoryAttribute.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Security.Principal;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForHttpTests.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForHttpTests.cs
index 0754477ef6..ff4d6d4164 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForHttpTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForHttpTests.cs
@@ -6,7 +6,6 @@
 using System.ServiceModel;
 using OpenTelemetry.Instrumentation.Wcf.Tests.Tools;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForTcpTests.netfx.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForTcpTests.netfx.cs
index 9462487f15..6d9b059000 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForTcpTests.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryBindingElementForTcpTests.netfx.cs
@@ -10,8 +10,6 @@
 using System.ServiceModel.Security;
 using OpenTelemetry.Instrumentation.Wcf.Tests.Tools;
 using OpenTelemetry.Trace;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorForOneWayOperationsTests.netfx.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorForOneWayOperationsTests.netfx.cs
index 390fc54824..f509963919 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorForOneWayOperationsTests.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorForOneWayOperationsTests.netfx.cs
@@ -6,8 +6,6 @@
 using System.ServiceModel;
 using OpenTelemetry.Instrumentation.Wcf.Tests.Tools;
 using OpenTelemetry.Trace;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorTests.netfx.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorTests.netfx.cs
index 176e17d48d..6011d0340a 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorTests.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryDispatchMessageInspectorTests.netfx.cs
@@ -5,8 +5,6 @@
 using System.Diagnostics;
 using System.ServiceModel;
 using OpenTelemetry.Trace;
-using Xunit;
-using Xunit.Abstractions;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryEndpointBehaviorTests.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryEndpointBehaviorTests.cs
index 6f96b9aa08..6ed04eecfc 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryEndpointBehaviorTests.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryEndpointBehaviorTests.cs
@@ -5,7 +5,6 @@
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Dispatcher;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryPropagationTests.netfx.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryPropagationTests.netfx.cs
index 54ac7d8bd2..3c4b4fc8f7 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryPropagationTests.netfx.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/TelemetryPropagationTests.netfx.cs
@@ -7,7 +7,6 @@
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/WcfTestHelpers.cs b/test/OpenTelemetry.Instrumentation.Wcf.Tests/WcfTestHelpers.cs
index d231220fe3..0965d6a318 100644
--- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/WcfTestHelpers.cs
+++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/WcfTestHelpers.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Instrumentation.Wcf.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/AnyValueUnionTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/AnyValueUnionTests.cs
index 7f5815b064..d4e8e0d15d 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/AnyValueUnionTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/AnyValueUnionTests.cs
@@ -7,7 +7,6 @@
 #if NETFRAMEWORK
 using OpenTelemetry.OpAmp.Client.Tests.Tools;
 #endif
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/DataGenerators/FrameBuilderTestData.cs b/test/OpenTelemetry.OpAmp.Client.Tests/DataGenerators/FrameBuilderTestData.cs
index 9fa2b63cc3..71c3dfc64c 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/DataGenerators/FrameBuilderTestData.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/DataGenerators/FrameBuilderTestData.cs
@@ -4,7 +4,6 @@
 using OpAmp.Proto.V1;
 using OpenTelemetry.OpAmp.Client.Internal;
 using OpenTelemetry.OpAmp.Client.Internal.Services.Heartbeat;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests.DataGenerators;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/EventSourceTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/EventSourceTests.cs
index 3387c218b3..7d9a2ef0ec 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/EventSourceTests.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.OpAmp.Client.Internal;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/FrameBuilderTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/FrameBuilderTests.cs
index f1a7c5ea80..1f089e5773 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/FrameBuilderTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/FrameBuilderTests.cs
@@ -5,7 +5,6 @@
 using OpenTelemetry.OpAmp.Client.Internal;
 using OpenTelemetry.OpAmp.Client.Messages;
 using OpenTelemetry.OpAmp.Client.Tests.DataGenerators;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/FrameDispatcherTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/FrameDispatcherTests.cs
index c656aefd6d..d3fff49fab 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/FrameDispatcherTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/FrameDispatcherTests.cs
@@ -6,7 +6,6 @@
 using OpenTelemetry.OpAmp.Client.Internal;
 using OpenTelemetry.OpAmp.Client.Settings;
 using OpenTelemetry.OpAmp.Client.Tests.Mocks;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/FrameProcessorTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/FrameProcessorTests.cs
index 38ae51fee7..9b64d508ea 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/FrameProcessorTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/FrameProcessorTests.cs
@@ -5,7 +5,6 @@
 using OpenTelemetry.OpAmp.Client.Internal;
 using OpenTelemetry.OpAmp.Client.Tests.Mocks;
 using OpenTelemetry.OpAmp.Client.Tests.Tools;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/HeartbeatServiceTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/HeartbeatServiceTests.cs
index 2e31dbb3ce..203b051e98 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/HeartbeatServiceTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/HeartbeatServiceTests.cs
@@ -7,7 +7,6 @@
 using OpenTelemetry.OpAmp.Client.Internal.Services.Heartbeat;
 using OpenTelemetry.OpAmp.Client.Settings;
 using OpenTelemetry.OpAmp.Client.Tests.Mocks;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/IdentificationSettingsTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/IdentificationSettingsTests.cs
index 55459183be..07304b5a2a 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/IdentificationSettingsTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/IdentificationSettingsTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.OpAmp.Client.Settings;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomCapabilitiesMessageTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomCapabilitiesMessageTests.cs
index d851c7812d..e79f51264a 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomCapabilitiesMessageTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomCapabilitiesMessageTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.OpAmp.Client.Tests.Messages;
 
 public class CustomCapabilitiesMessageTests
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomMessageMessageTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomMessageMessageTests.cs
index ab8037a60b..76ebedcb38 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomMessageMessageTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/CustomMessageMessageTests.cs
@@ -3,7 +3,6 @@
 
 using System.Text;
 using Google.Protobuf;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests.Messages;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/EffectiveConfigFileTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/EffectiveConfigFileTests.cs
index 729caa7f02..c6defbff7e 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/EffectiveConfigFileTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/EffectiveConfigFileTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.OpAmp.Client.Messages;
-using Xunit;
 
 #if NET
 using OpenTelemetry.OpAmp.Client.Internal;
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/RemoteConfigMessageTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/RemoteConfigMessageTests.cs
index b9bbb597e1..309d6a16c7 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/Messages/RemoteConfigMessageTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/Messages/RemoteConfigMessageTests.cs
@@ -3,7 +3,6 @@
 
 using System.Text;
 using Google.Protobuf;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests.Messages;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/OpAmpClientTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/OpAmpClientTests.cs
index a48bcb2337..87a9da23b0 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/OpAmpClientTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/OpAmpClientTests.cs
@@ -14,7 +14,6 @@
 using OpenTelemetry.OpAmp.Client.Tests.DataGenerators;
 using OpenTelemetry.OpAmp.Client.Tests.Mocks;
 using OpenTelemetry.OpAmp.Client.Tests.Tools;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/PlainHttpTransportTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/PlainHttpTransportTests.cs
index a6f09047ff..cca6d32633 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/PlainHttpTransportTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/PlainHttpTransportTests.cs
@@ -16,7 +16,6 @@
 using OpenTelemetry.OpAmp.Client.Tests.Mocks;
 using OpenTelemetry.OpAmp.Client.Tests.Tools;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/SequenceHelperTests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/SequenceHelperTests.cs
index 06b992e59e..60c260c653 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/SequenceHelperTests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/SequenceHelperTests.cs
@@ -3,7 +3,6 @@
 
 using System.Buffers;
 using OpenTelemetry.OpAmp.Client.Internal.Utils;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/Varint64Tests.cs b/test/OpenTelemetry.OpAmp.Client.Tests/Varint64Tests.cs
index 51f74f5a03..60dc144c73 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/Varint64Tests.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/Varint64Tests.cs
@@ -4,8 +4,6 @@
 using System.Buffers;
 using OpenTelemetry.OpAmp.Client.Internal.Utils;
 
-using Xunit;
-
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
 public class Varint64Tests
diff --git a/test/OpenTelemetry.OpAmp.Client.Tests/WsTransportTest.cs b/test/OpenTelemetry.OpAmp.Client.Tests/WsTransportTest.cs
index c4d3db5e53..856188d745 100644
--- a/test/OpenTelemetry.OpAmp.Client.Tests/WsTransportTest.cs
+++ b/test/OpenTelemetry.OpAmp.Client.Tests/WsTransportTest.cs
@@ -11,7 +11,6 @@
 using OpenTelemetry.OpAmp.Client.Tests.Mocks;
 using OpenTelemetry.OpAmp.Client.Tests.Tools;
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.OpAmp.Client.Tests;
 
diff --git a/test/OpenTelemetry.PersistentStorage.Abstractions.Tests/EventSourceTests.cs b/test/OpenTelemetry.PersistentStorage.Abstractions.Tests/EventSourceTests.cs
index 79019b12ea..8187a5c425 100644
--- a/test/OpenTelemetry.PersistentStorage.Abstractions.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.PersistentStorage.Abstractions.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.PersistentStorage.Abstractions.Tests;
 
diff --git a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/DirectorySizeTrackerTests.cs b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/DirectorySizeTrackerTests.cs
index e657f5411e..66e085d235 100644
--- a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/DirectorySizeTrackerTests.cs
+++ b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/DirectorySizeTrackerTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.PersistentStorage.FileSystem.Tests;
 
 public class DirectorySizeTrackerTests
diff --git a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/EventSourceTests.cs b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/EventSourceTests.cs
index ae708163c0..3fb61a6bea 100644
--- a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.PersistentStorage.FileSystem.Tests;
 
diff --git a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobProviderTests.cs b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobProviderTests.cs
index 325ac26b61..a4bdd3d7ce 100644
--- a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobProviderTests.cs
+++ b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobProviderTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Text;
-using Xunit;
 
 namespace OpenTelemetry.PersistentStorage.FileSystem.Tests;
 
diff --git a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobTests.cs b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobTests.cs
index 14391cb65c..1aab299e3d 100644
--- a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobTests.cs
+++ b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/FileBlobTests.cs
@@ -3,7 +3,6 @@
 
 using System.Text;
 using OpenTelemetry.PersistentStorage.Abstractions;
-using Xunit;
 
 namespace OpenTelemetry.PersistentStorage.FileSystem.Tests;
 
diff --git a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/PersistentStorageHelperTests.cs b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/PersistentStorageHelperTests.cs
index 489e55d81e..a29f871be0 100644
--- a/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/PersistentStorageHelperTests.cs
+++ b/test/OpenTelemetry.PersistentStorage.FileSystem.Tests/PersistentStorageHelperTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Globalization;
-using Xunit;
 
 namespace OpenTelemetry.PersistentStorage.FileSystem.Tests;
 
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSDetectorTests.cs
index 766b652af9..23c277b8e7 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEBSDetectorTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Resources.AWS.Tests;
 
 public class AWSEBSDetectorTests
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2DetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2DetectorTests.cs
index 0d58e7ff57..4ce27cd46e 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2DetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEC2DetectorTests.cs
@@ -4,7 +4,6 @@
 #if NETFRAMEWORK
 using System.Net.Http;
 #endif
-using Xunit;
 
 namespace OpenTelemetry.Resources.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSECSDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSECSDetectorTests.cs
index 66971a3776..bc76e03e53 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSECSDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSECSDetectorTests.cs
@@ -11,7 +11,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Xunit;
 
 namespace OpenTelemetry.Resources.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSDetectorTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSDetectorTests.cs
index e2795e68fd..7095360ba7 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/AWSEKSDetectorTests.cs
@@ -3,8 +3,6 @@
 
 #if !NETFRAMEWORK
 
-using Xunit;
-
 namespace OpenTelemetry.Resources.AWS.Tests;
 
 public class AWSEKSDetectorTests
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/EventSourceTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/EventSourceTests.cs
index 29cfbb4897..562fc03657 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Resources.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
index f06438c411..532f3670d4 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationHandlerTests.cs
@@ -3,8 +3,6 @@
 
 #if !NETFRAMEWORK
 
-using Xunit;
-
 namespace OpenTelemetry.Resources.AWS.Tests.Http;
 
 public class ServerCertificateValidationHandlerTests
diff --git a/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
index e45c2787c6..5b7b8b8148 100644
--- a/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
+++ b/test/OpenTelemetry.Resources.AWS.Tests/Http/ServerCertificateValidationProviderTests.cs
@@ -4,7 +4,6 @@
 #if !NETFRAMEWORK
 
 using System.Security.Cryptography.X509Certificates;
-using Xunit;
 
 namespace OpenTelemetry.Resources.AWS.Tests.Http;
 
diff --git a/test/OpenTelemetry.Resources.Azure.Tests/AzureResourceDetectorTests.cs b/test/OpenTelemetry.Resources.Azure.Tests/AzureResourceDetectorTests.cs
index cf19a1c2d6..b7c47f34f6 100644
--- a/test/OpenTelemetry.Resources.Azure.Tests/AzureResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.Azure.Tests/AzureResourceDetectorTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Resources.Azure.Tests;
 
diff --git a/test/OpenTelemetry.Resources.Azure.Tests/AzureVmMetaDataRequestorTests.cs b/test/OpenTelemetry.Resources.Azure.Tests/AzureVmMetaDataRequestorTests.cs
index f4d0caae76..a74e14ef42 100644
--- a/test/OpenTelemetry.Resources.Azure.Tests/AzureVmMetaDataRequestorTests.cs
+++ b/test/OpenTelemetry.Resources.Azure.Tests/AzureVmMetaDataRequestorTests.cs
@@ -4,7 +4,6 @@
 #if NETFRAMEWORK
 using System.Net.Http;
 #endif
-using Xunit;
 
 namespace OpenTelemetry.Resources.Azure.Tests;
 
diff --git a/test/OpenTelemetry.Resources.Container.Tests/ContainerDetectorTests.cs b/test/OpenTelemetry.Resources.Container.Tests/ContainerDetectorTests.cs
index 47b43b329b..7753a60642 100644
--- a/test/OpenTelemetry.Resources.Container.Tests/ContainerDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.Container.Tests/ContainerDetectorTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Resources.Container.Tests;
 
 public class ContainerDetectorTests
diff --git a/test/OpenTelemetry.Resources.Container.Tests/EventSourceTests.cs b/test/OpenTelemetry.Resources.Container.Tests/EventSourceTests.cs
index 1dec58f8a0..7699c4a97f 100644
--- a/test/OpenTelemetry.Resources.Container.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Resources.Container.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Resources.Container.Tests;
 
diff --git a/test/OpenTelemetry.Resources.Gcp.Tests/GcpResourceDetectorTests.cs b/test/OpenTelemetry.Resources.Gcp.Tests/GcpResourceDetectorTests.cs
index 1d28be5931..1e6845a34f 100644
--- a/test/OpenTelemetry.Resources.Gcp.Tests/GcpResourceDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.Gcp.Tests/GcpResourceDetectorTests.cs
@@ -3,7 +3,6 @@
 
 using Google.Api.Gax;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Resources.Gcp.Tests;
 
diff --git a/test/OpenTelemetry.Resources.Host.Tests/EventSourceTests.cs b/test/OpenTelemetry.Resources.Host.Tests/EventSourceTests.cs
index 9ceb1d8fb7..dad9205ede 100644
--- a/test/OpenTelemetry.Resources.Host.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Resources.Host.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Resources.Host.Tests;
 
diff --git a/test/OpenTelemetry.Resources.Host.Tests/HostDetectorTests.cs b/test/OpenTelemetry.Resources.Host.Tests/HostDetectorTests.cs
index b3bf541d56..5c2ee66f97 100644
--- a/test/OpenTelemetry.Resources.Host.Tests/HostDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.Host.Tests/HostDetectorTests.cs
@@ -4,7 +4,6 @@
 #if NET
 using System.Runtime.InteropServices;
 #endif
-using Xunit;
 
 namespace OpenTelemetry.Resources.Host.Tests;
 
diff --git a/test/OpenTelemetry.Resources.OperatingSystem.Tests/EventSourceTests.cs b/test/OpenTelemetry.Resources.OperatingSystem.Tests/EventSourceTests.cs
index 19347e75d3..27c3556526 100644
--- a/test/OpenTelemetry.Resources.OperatingSystem.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Resources.OperatingSystem.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Resources.OperatingSystem.Tests;
 
diff --git a/test/OpenTelemetry.Resources.OperatingSystem.Tests/OperatingSystemDetectorTests.cs b/test/OpenTelemetry.Resources.OperatingSystem.Tests/OperatingSystemDetectorTests.cs
index f5c5c5a347..a72e1542af 100644
--- a/test/OpenTelemetry.Resources.OperatingSystem.Tests/OperatingSystemDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.OperatingSystem.Tests/OperatingSystemDetectorTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Runtime.InteropServices;
-using Xunit;
 
 namespace OpenTelemetry.Resources.OperatingSystem.Tests;
 
diff --git a/test/OpenTelemetry.Resources.Process.Tests/ProcessDetectorTests.cs b/test/OpenTelemetry.Resources.Process.Tests/ProcessDetectorTests.cs
index 1c99cae432..b53dad9db5 100644
--- a/test/OpenTelemetry.Resources.Process.Tests/ProcessDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.Process.Tests/ProcessDetectorTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Resources.Process.Tests;
 
 public class ProcessDetectorTests
diff --git a/test/OpenTelemetry.Resources.ProcessRuntime.Tests/ProcessRuntimeDetectorTests.cs b/test/OpenTelemetry.Resources.ProcessRuntime.Tests/ProcessRuntimeDetectorTests.cs
index 8b4bc9dcba..eb4ad47b95 100644
--- a/test/OpenTelemetry.Resources.ProcessRuntime.Tests/ProcessRuntimeDetectorTests.cs
+++ b/test/OpenTelemetry.Resources.ProcessRuntime.Tests/ProcessRuntimeDetectorTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Resources.ProcessRuntime.Tests;
 
 public class ProcessRuntimeDetectorTests
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/EventSourceTests.cs b/test/OpenTelemetry.Sampler.AWS.Tests/EventSourceTests.cs
index 87136d396a..cac86f6dd2 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/EventSourceTests.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/EventSourceTests.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRayRemoteSampler.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRayRemoteSampler.cs
index 0b6ffaf58e..bf94ac473b 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRayRemoteSampler.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRayRemoteSampler.cs
@@ -6,7 +6,6 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRaySamplerClient.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRaySamplerClient.cs
index ddb25f3d87..1f02cb1956 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRaySamplerClient.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestAWSXRaySamplerClient.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Tests;
-using Xunit;
 
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestMatcher.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestMatcher.cs
index 9588f9ce8b..f07126460d 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestMatcher.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestMatcher.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
 public class TestMatcher
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs
index c404f26163..e93e777b14 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
 /// <summary>
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimitingSampler.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimitingSampler.cs
index 2eb3e1710a..63bfd64e66 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimitingSampler.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimitingSampler.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestRulesCache.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestRulesCache.cs
index d24d2457bf..8f00edeaa8 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestRulesCache.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestRulesCache.cs
@@ -3,7 +3,6 @@
 
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestSamplingRuleApplier.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestSamplingRuleApplier.cs
index 47101b564b..74449d19d2 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestSamplingRuleApplier.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestSamplingRuleApplier.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using OpenTelemetry.Trace;
-using Xunit;
 
 namespace OpenTelemetry.Sampler.AWS.Tests;
 
diff --git a/test/Shared/EnabledOnDockerPlatformFactAttribute.cs b/test/Shared/EnabledOnDockerPlatformFactAttribute.cs
index a46ad4a7f2..054245021f 100644
--- a/test/Shared/EnabledOnDockerPlatformFactAttribute.cs
+++ b/test/Shared/EnabledOnDockerPlatformFactAttribute.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Tests;
 
 /// <summary>
diff --git a/test/Shared/EnabledOnDockerPlatformTheoryAttribute.cs b/test/Shared/EnabledOnDockerPlatformTheoryAttribute.cs
index 0f18728000..c3e0fdc1cf 100644
--- a/test/Shared/EnabledOnDockerPlatformTheoryAttribute.cs
+++ b/test/Shared/EnabledOnDockerPlatformTheoryAttribute.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Tests;
 
 /// <summary>
diff --git a/test/Shared/EventSourceTestHelper.cs b/test/Shared/EventSourceTestHelper.cs
index a1baeace22..6c15b2c325 100644
--- a/test/Shared/EventSourceTestHelper.cs
+++ b/test/Shared/EventSourceTestHelper.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics.Tracing;
 using System.Reflection;
-using Xunit;
 
 namespace OpenTelemetry.Tests;
 
diff --git a/test/Shared/PlatformHelpers.cs b/test/Shared/PlatformHelpers.cs
index d83623d9d2..29b7eac24e 100644
--- a/test/Shared/PlatformHelpers.cs
+++ b/test/Shared/PlatformHelpers.cs
@@ -6,7 +6,6 @@
 
 using System.Runtime.InteropServices;
 using System.Security.Principal;
-using Xunit;
 
 namespace OpenTelemetry.Tests;
 
diff --git a/test/Shared/SkipUnlessEnvVarFoundFactAttribute.cs b/test/Shared/SkipUnlessEnvVarFoundFactAttribute.cs
index 88bedacb31..e912a70b5a 100644
--- a/test/Shared/SkipUnlessEnvVarFoundFactAttribute.cs
+++ b/test/Shared/SkipUnlessEnvVarFoundFactAttribute.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Tests;
 
 internal sealed class SkipUnlessEnvVarFoundFactAttribute : FactAttribute
diff --git a/test/Shared/SkipUnlessEnvVarFoundTheoryAttribute.cs b/test/Shared/SkipUnlessEnvVarFoundTheoryAttribute.cs
index 2e43f8cb19..7d9bfba89d 100644
--- a/test/Shared/SkipUnlessEnvVarFoundTheoryAttribute.cs
+++ b/test/Shared/SkipUnlessEnvVarFoundTheoryAttribute.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Tests;
 
 internal sealed class SkipUnlessEnvVarFoundTheoryAttribute : TheoryAttribute
diff --git a/test/Shared/StrongNameTests.cs b/test/Shared/StrongNameTests.cs
index 2716c2bb7d..245b972239 100644
--- a/test/Shared/StrongNameTests.cs
+++ b/test/Shared/StrongNameTests.cs
@@ -1,8 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-using Xunit;
-
 namespace OpenTelemetry.Tests;
 
 // The tests can only be strong named if they only depend on assemblies that are strong named,
diff --git a/test/Shared/TestHttpServer.cs b/test/Shared/TestHttpServer.cs
index 0d53dd0c52..9855bc831d 100644
--- a/test/Shared/TestHttpServer.cs
+++ b/test/Shared/TestHttpServer.cs
@@ -9,7 +9,7 @@ internal static class TestHttpServer
 {
     public static IDisposable RunServer(Action<HttpListenerContext> action, out Uri baseAddress)
     {
-        var uri = new UriBuilder()
+        var uri = new UriBuilder
         {
             Host = "localhost",
             Scheme = Uri.UriSchemeHttp,
diff --git a/test/Shared/XunitContainerFixture{T}.cs b/test/Shared/XunitContainerFixture{T}.cs
index 6686bc6eaf..c8ff492730 100644
--- a/test/Shared/XunitContainerFixture{T}.cs
+++ b/test/Shared/XunitContainerFixture{T}.cs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using DotNet.Testcontainers.Containers;
-using Xunit;
 
 namespace OpenTelemetry.Tests;