diff --git a/TUnit.Core/TestRegistrar.cs b/TUnit.Core/TestRegistrar.cs
index f716955503..ebaa95370f 100644
--- a/TUnit.Core/TestRegistrar.cs
+++ b/TUnit.Core/TestRegistrar.cs
@@ -24,7 +24,7 @@ public static class TestRegistrar
 
 		var methodAttributes = testMetadata.AttributeTypes.SelectMany(x => methodInfo.GetCustomAttributes(x, false)).Distinct().OfType<Attribute>().ToArray();
 		var dataAttributes = testMetadata.DataAttributes;
-		var typeAttributes = testMetadata.AttributeTypes.SelectMany(x => classType.GetCustomAttributes(x, false)).Distinct().OfType<Attribute>().ToArray();
+		var typeAttributes = testMetadata.AttributeTypes.SelectMany(x => classType.GetCustomAttributes(x, true)).Distinct().OfType<Attribute>().Where(x => !x.IsDefaultAttribute()).ToArray();
 		var assemblyAttributes = testMetadata.AttributeTypes.SelectMany(x => classType.Assembly.GetCustomAttributes(x, false)).Distinct().OfType<Attribute>().ToArray();
 		Attribute[] attributes = [..methodAttributes, ..typeAttributes, ..assemblyAttributes];
 		
diff --git a/TUnit.Engine.SourceGenerator/CodeGenerators/Helpers/TestSourceDataModelRetriever.cs b/TUnit.Engine.SourceGenerator/CodeGenerators/Helpers/TestSourceDataModelRetriever.cs
index 3fca89d2a5..d3f5584e79 100644
--- a/TUnit.Engine.SourceGenerator/CodeGenerators/Helpers/TestSourceDataModelRetriever.cs
+++ b/TUnit.Engine.SourceGenerator/CodeGenerators/Helpers/TestSourceDataModelRetriever.cs
@@ -147,7 +147,7 @@ private static TestSourceDataModel GetTestSourceDataModel(TestGenerationContext
             HasTimeoutAttribute = allAttributes.Any(x => x.AttributeClass?.IsOrInherits(WellKnownFullyQualifiedClassNames.TimeoutAttribute.WithGlobalPrefix) == true),
             TestExecutor = allAttributes.FirstOrDefault(x => x.AttributeClass?.IsOrInherits("global::TUnit.Core.Executors.TestExecutorAttribute") == true)?.AttributeClass?.TypeArguments.FirstOrDefault()?.ToDisplayString(DisplayFormats.FullyQualifiedGenericWithGlobalPrefix),
             ParallelLimit = allAttributes.FirstOrDefault(x => x.AttributeClass?.IsOrInherits("global::TUnit.Core.ParallelLimiterAttribute") == true)?.AttributeClass?.TypeArguments.FirstOrDefault()?.ToDisplayString(DisplayFormats.FullyQualifiedGenericWithGlobalPrefix),
-            AttributeTypes = allAttributes.Select(x => x.AttributeClass?.ToDisplayString(DisplayFormats.FullyQualifiedGenericWithGlobalPrefix)).OfType<string>().Distinct().ToArray(),
+            AttributeTypes = allAttributes.Where(x => !x.IsDataSourceAttribute()).Select(x => x.AttributeClass?.ToDisplayString(DisplayFormats.FullyQualifiedGenericWithGlobalPrefix)).OfType<string>().Distinct().ToArray(),
             PropertyAttributeTypes = propertyAttributes.Select(x => x.AttributeClass?.ToDisplayString(DisplayFormats.FullyQualifiedGenericWithGlobalPrefix)).OfType<string>().ToArray(),
             PropertyArguments = testGenerationContext.PropertyArguments,
         };