diff --git a/src/jit-diff/diff.cs b/src/jit-diff/diff.cs
index d2d943d7..97a1334d 100644
--- a/src/jit-diff/diff.cs
+++ b/src/jit-diff/diff.cs
@@ -612,6 +612,7 @@ public class PmiDiffTool : DiffTool
             string m_corerunPath;
             string m_defaultJitName;
             string m_testJitName;
+            string m_testCoreclrName;
 
             public PmiDiffTool(Config config) : base(config)
             {
@@ -619,6 +620,7 @@ public PmiDiffTool(Config config) : base(config)
                 m_commandName = s_asmToolJit;
                 m_corerunPath = Path.Combine(m_config.CoreRoot, GetCorerunExecutableName(m_config.PlatformMoniker));
                 m_defaultJitName = GetJitLibraryName(m_config.PlatformMoniker);
+                m_testCoreclrName = GetCoreClrLibraryName(m_config.PlatformMoniker);
                 if (m_config.AltJit != null)
                 {
                     m_testJitName = m_config.AltJit;
@@ -663,57 +665,45 @@ protected override List<string> ConstructArgs(List<string> commandArgs, string c
                 return dasmArgs;
             }
 
-            void InstallBaseJit()
+            void InstallLibs(string libPath)
             {
-                string existingJitPath = Path.Combine(m_config.CoreRoot, m_testJitName);
-                string backupJitPath = Path.Combine(m_config.CoreRoot, "backup-" + m_testJitName);
-                string testJitPath = Path.Combine(m_config.BasePath, m_testJitName);
-                if (File.Exists(existingJitPath))
+                var libs = new[] { ("jit", m_testJitName), ("coreclr", m_testCoreclrName) };
+                foreach (var (lib, libName) in libs)
                 {
-                    if (m_config.Verbose)
+                    string existingLibPath = Path.Combine(m_config.CoreRoot, libName);
+                    string backupLibPath = Path.Combine(m_config.CoreRoot, "backup-" + libName);
+                    string testLibPath = Path.Combine(libPath, libName);
+                    if (File.Exists(existingLibPath))
                     {
-                        Console.WriteLine($"Saving off existing jit: {existingJitPath} ==> {backupJitPath}");
+                        if (m_config.Verbose)
+                        {
+                            Console.WriteLine($"Saving off existing {lib}: {existingLibPath} ==> {backupLibPath}");
+                        }
+                        File.Copy(existingLibPath, backupLibPath, true);
                     }
-                    File.Copy(existingJitPath, backupJitPath, true);
-                }
-                if (m_config.Verbose)
-                {
-                    Console.WriteLine($"Copying in the test jit: {testJitPath} ==> {existingJitPath}");
-                }
-                File.Copy(testJitPath, existingJitPath, true);
-            }
-
-            void InstallDiffJit()
-            {
-                string exitingJitPath = Path.Combine(m_config.CoreRoot, m_testJitName);
-                string backupJitPath = Path.Combine(m_config.CoreRoot, "backup-" + m_testJitName);
-                string testJitPath = Path.Combine(m_config.DiffPath, m_testJitName);
-                if (File.Exists(exitingJitPath))
-                {
                     if (m_config.Verbose)
                     {
-                        Console.WriteLine($"Saving off existing jit: {exitingJitPath} ==> {backupJitPath}");
+                        Console.WriteLine($"Copying in the test {lib}: {testLibPath} ==> {existingLibPath}");
                     }
-                    File.Copy(exitingJitPath, backupJitPath, true);
-                }
-                if (m_config.Verbose)
-                {
-                    Console.WriteLine($"Copying in the test jit: {testJitPath} ==> {exitingJitPath}");
+                    File.Copy(testLibPath, existingLibPath, true);
                 }
-                File.Copy(testJitPath, exitingJitPath, true);
             }
 
-            void RestoreDefaultJit()
+            void RestoreLibs()
             {
-                string existingJitPath = Path.Combine(m_config.CoreRoot, m_testJitName);
-                string backupJitPath = Path.Combine(m_config.CoreRoot, "backup-" + m_testJitName);
-                if (File.Exists(backupJitPath))
+                var libs = new[] { ("jit", m_testJitName), ("coreclr", m_testCoreclrName) };
+                foreach (var (lib, libName) in libs)
                 {
-                    if (m_config.Verbose)
+                    string existingLibPath = Path.Combine(m_config.CoreRoot, libName);
+                    string backupLibPath = Path.Combine(m_config.CoreRoot, "backup-" + libName);
+                    if (File.Exists(backupLibPath))
                     {
-                        Console.WriteLine($"Restoring existing jit: {backupJitPath} ==> {existingJitPath}");
+                        if (m_config.Verbose)
+                        {
+                            Console.WriteLine($"Restoring existing {lib}: {backupLibPath} ==> {existingLibPath}");
+                        }
+                        File.Copy(backupLibPath, existingLibPath, true);
                     }
-                    File.Copy(backupJitPath, existingJitPath, true);
                 }
             }
 
@@ -727,7 +717,7 @@ protected override void StartDasmWorkBaseDiff(List<string> commandArgs, List<Ass
                 {
                     try
                     {
-                        InstallBaseJit();
+                        InstallLibs(m_config.BasePath);
                         foreach (var assemblyInfo in assemblyWorkList)
                         {
                             StartDasmWorkOne(DasmWorkKind.Base, commandArgs, "base", m_config.BasePath, assemblyInfo);
@@ -737,7 +727,7 @@ protected override void StartDasmWorkBaseDiff(List<string> commandArgs, List<Ass
                     }
                     finally
                     {
-                        RestoreDefaultJit();
+                        RestoreLibs();
                     }
                 }
 
@@ -745,7 +735,7 @@ protected override void StartDasmWorkBaseDiff(List<string> commandArgs, List<Ass
                 {
                     try
                     {
-                        InstallDiffJit();
+                        InstallLibs(m_config.DiffPath);
                         foreach (var assemblyInfo in assemblyWorkList)
                         {
                             StartDasmWorkOne(DasmWorkKind.Diff, commandArgs, "diff", m_config.DiffPath, assemblyInfo);
@@ -755,7 +745,7 @@ protected override void StartDasmWorkBaseDiff(List<string> commandArgs, List<Ass
                     }
                     finally
                     {
-                        RestoreDefaultJit();
+                        RestoreLibs();
                     }
                 }
             }
diff --git a/src/jit-diff/jit-diff.cs b/src/jit-diff/jit-diff.cs
index b44e8260..f6ae2ff7 100755
--- a/src/jit-diff/jit-diff.cs
+++ b/src/jit-diff/jit-diff.cs
@@ -59,6 +59,22 @@ private static string GetJitLibraryName(string platformMoniker)
             }
         }
 
+        private static string GetCoreClrLibraryName(string platformMoniker)
+        {
+            switch (platformMoniker)
+            {
+                case "Windows":
+                    return "coreclr.dll";
+                case "Linux":
+                    return "libcoreclr.so";
+                case "OSX":
+                    return "libcoreclr.dylib";
+                default:
+                    Console.Error.WriteLine("No platform mapping! (Platform moniker = {0})", platformMoniker);
+                    return null;
+            }
+        }
+
         private static string GetCrossgenExecutableName(string platformMoniker)
         {
             switch (platformMoniker)