diff --git a/tests/kiota.core.tests/KiotaBuilderTests.cs b/tests/kiota.core.tests/KiotaBuilderTests.cs
index 16cf398aa5..027671d7b2 100644
--- a/tests/kiota.core.tests/KiotaBuilderTests.cs
+++ b/tests/kiota.core.tests/KiotaBuilderTests.cs
@@ -1,6 +1,5 @@
-using System;
-using System.IO;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
+using Moq;
 using Xunit;
 
 namespace kiota.core.tests
@@ -11,28 +10,11 @@ public class KiotaBuilderTests
         public void Single_root_node_creates_single_request_builder_class()
         {
             var node = new OpenApiUrlSpaceNode("");
-            var builder = new KiotaBuilder(new MockLogger(), new GenerationConfiguration() { ClientClassName = "Graph" });
+            var mockLogger = new Mock<ILogger<KiotaBuilder>>();
+            var builder = new KiotaBuilder(mockLogger.Object, new GenerationConfiguration() { ClientClassName = "Graph" });
             var codeModel = builder.CreateSourceModel(node);
 
             Assert.Single(codeModel.InnerChildElements);
         }
     }
-
-    public class MockLogger : ILogger<KiotaBuilder>
-    {
-        public IDisposable BeginScope<TState>(TState state)
-        {
-            return new MemoryStream(); // Something harmless that implements IDisposable
-        }
-
-        public bool IsEnabled(LogLevel logLevel)
-        {
-            return false;
-        }
-
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-        {
-            //NOOP
-        }
-    }
 }
diff --git a/tests/kiota.core.tests/kiota.core.tests.csproj b/tests/kiota.core.tests/kiota.core.tests.csproj
index adbd1c3f5c..4dc4591fae 100644
--- a/tests/kiota.core.tests/kiota.core.tests.csproj
+++ b/tests/kiota.core.tests/kiota.core.tests.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="moq" Version="4.15.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>