diff --git a/eng/Subsets.props b/eng/Subsets.props
index b753c4422c1d55..5c918413d1b73d 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -531,6 +531,7 @@
 
   <ItemGroup Condition="$(_subset.Contains('+tools.cdactests+'))">
     <ProjectToBuild Include="$(SharedNativeRoot)managed\cdac\tests\UnitTests\Microsoft.Diagnostics.DataContractReader.Tests.csproj" Test="true" Category="tools"/>
+    <ProjectToBuild Include="$(SharedNativeRoot)managed\cdac\tests\DataGenerator\Microsoft.Diagnostics.DataContractReader.DataGeneratorTests.csproj" Test="true" Category="tools"/>
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+tools.cdacdumptests+'))">
diff --git a/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs b/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs
index e1e9a7e8bd6392..b823054d3b0220 100644
--- a/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs
+++ b/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs
@@ -199,6 +199,9 @@ public override TargetCodePointer ReadCodePointer(ulong address)
     public override TargetNUInt ReadNUInt(ulong address)
         => new TargetNUInt(PointerSize == 8 ? Read<ulong>(address) : Read<uint>(address));
 
+    public override TargetNInt ReadNInt(ulong address)
+        => new TargetNInt(PointerSize == 8 ? Read<long>(address) : Read<int>(address));
+
     public override void Write<T>(ulong address, T value)
     {
         Span<byte> span = GetSpan(address, System.Runtime.CompilerServices.Unsafe.SizeOf<T>());