diff --git a/src/DynamoCore/Core/NodeModelAssemblyLoader.cs b/src/DynamoCore/Core/NodeModelAssemblyLoader.cs
index fe5cc404f54..bdc8c777d27 100644
--- a/src/DynamoCore/Core/NodeModelAssemblyLoader.cs
+++ b/src/DynamoCore/Core/NodeModelAssemblyLoader.cs
@@ -79,12 +79,8 @@ private void OnAssemblyLoaded(Assembly assem)
             }
         }
 
-        /// <summary>
-        /// Should be used only in tests
-        /// </summary>
-        internal static event Func<string, bool> shouldLoadAssemblyPath;
         #endregion
-
+        
         #region Methods
         /// <summary>
         /// Load all types which inherit from NodeModel whose assemblies are located in
@@ -135,13 +131,6 @@ var assembly in
             var result = new List<TypeLoadData>();
             var result2 = new List<TypeLoadData>();
 
-            if (Models.DynamoModel.IsTestMode)
-            {
-                if (shouldLoadAssemblyPath != null) {
-                    allDynamoAssemblyPaths = allDynamoAssemblyPaths.Where((path) => shouldLoadAssemblyPath(path)).ToList();
-                }
-            }
-            
             foreach (var assemblyPath in allDynamoAssemblyPaths)
             {
                 var fn = Path.GetFileName(assemblyPath);
diff --git a/test/DynamoCoreTests/Setup.cs b/test/DynamoCoreTests/Setup.cs
index 7f9b2a8abd2..51a8589d12b 100644
--- a/test/DynamoCoreTests/Setup.cs
+++ b/test/DynamoCoreTests/Setup.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using Dynamo.Models;
 using Dynamo.Utilities;
 using NUnit.Framework;
 
@@ -10,20 +9,6 @@ public class Setup
     {
         private AssemblyHelper assemblyHelper;
 
-        /// <summary>
-        /// Skip loading WPF nodes during DynamoCore tests because they will fail to load and will generate too many useless logs
-        /// </summary>
-        /// <param name="assemblyPath"></param>
-        /// <returns></returns>
-        private bool NodeModelAssemblyLoader_shouldLoadAssemblyPath(string assemblyPath)
-        {
-            if (assemblyPath.Contains("WPF", StringComparison.OrdinalIgnoreCase) || assemblyPath.Contains("UI", StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-            return true;
-        }
-
         [OneTimeSetUp]
         public void RunBeforeAllTests()
         {
@@ -39,7 +24,6 @@ public void RunBeforeAllTests()
 
             assemblyHelper = new AssemblyHelper(moduleRootFolder.FullName, resolutionPaths);
             AppDomain.CurrentDomain.AssemblyResolve += assemblyHelper.ResolveAssembly;
-            NodeModelAssemblyLoader.shouldLoadAssemblyPath += NodeModelAssemblyLoader_shouldLoadAssemblyPath;
         }
 
         [OneTimeTearDown]
@@ -47,6 +31,5 @@ public void RunAfterAllTests()
         {
             AppDomain.CurrentDomain.AssemblyResolve -= assemblyHelper.ResolveAssembly;
             assemblyHelper = null;
-            NodeModelAssemblyLoader.shouldLoadAssemblyPath -= NodeModelAssemblyLoader_shouldLoadAssemblyPath;
         }
     }