diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06a2829e89..65177c6231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ Bugfixes:
 - `private protected` methods are not intercepted (@CrispyDrone, #535)
 - `System.UIntPtr` unsupported (@stakx, #546)
 - DynamicProxy generates two modules when proceeding from a class proxy's protected method to the target, causing an `InvalidOperationException` when saving the generated assembly to disk (@stakx, #569)
-- Upgrade log4net to v2.0.10 (@jonorossi, #567)
+- Upgrade log4net to v2.0.10 (@jonorossi, @stakx, #574)
 
 Deprecations:
  - Removed support for the .NET Framework < 4.5 and .NET Standard 1.x. (@stakx, #495, #496)
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
index d267ef7272..0ed851d53c 100644
--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj
+++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -19,6 +19,16 @@
 		<StartupObject>Program</StartupObject>
 	</PropertyGroup>
 
+	<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+		<None Include="config\netfx\App.config" />
+		<None Remove="config\netcoreapp\App.config" />
+	</ItemGroup>
+
+	<ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
+		<None Remove="config\netfx\App.config" />
+		<None Include="config\netcoreapp\App.config" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Update="Services.Logging.Tests\log4netIntegration\log4net.xml">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/src/Castle.Core.Tests/App.config b/src/Castle.Core.Tests/config/netcoreapp/App.config
similarity index 85%
rename from src/Castle.Core.Tests/App.config
rename to src/Castle.Core.Tests/config/netcoreapp/App.config
index b685206bfd..4ae491166f 100644
--- a/src/Castle.Core.Tests/App.config
+++ b/src/Castle.Core.Tests/config/netcoreapp/App.config
@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
 <configuration>
+
+	<!--
+		Version for .NET Core.
+
+		The `<system.diagnostics>` section is not preregistered,
+		and must be declared in `<configSections>` before use.
+	-->
+
 	<configSections>
 		<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler" />
 	</configSections>
+
 	<system.diagnostics>
 		<trace autoflush="true"/>
 		<sources>
diff --git a/src/Castle.Core.Tests/config/netfx/App.config b/src/Castle.Core.Tests/config/netfx/App.config
new file mode 100644
index 0000000000..9db1320536
--- /dev/null
+++ b/src/Castle.Core.Tests/config/netfx/App.config
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<configuration>
+
+	<!--
+		Version for the .NET Framework version.
+
+		The `<system.diagnostics>` section is preregistered,
+		and must not be redeclared in `<configSections>`.
+	-->
+
+	<system.diagnostics>
+		<trace autoflush="true"/>
+		<sources>
+			<source name="Default" switchValue="All">
+				<listeners>
+					<add name="default" type="Castle.Core.Logging.Tests.TraceLoggerTests+Listener, Castle.Core.Tests" initializeData="defaultrule"/>
+				</listeners>
+			</source>
+			<source name="Castle.Core.Logging.Tests.TraceLoggerTests" switchValue="All">
+				<listeners>
+					<add name="tests" type="Castle.Core.Logging.Tests.TraceLoggerTests+Listener, Castle.Core.Tests" initializeData="testsrule"/>
+				</listeners>
+			</source>
+			<source name="Castle.Core.Configuration" switchValue="All">
+				<listeners>
+					<add name="config" type="Castle.Core.Logging.Tests.TraceLoggerTests+Listener, Castle.Core.Tests" initializeData="configrule"/>
+				</listeners>
+			</source>
+		</sources>
+	</system.diagnostics>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+	</startup>
+</configuration>
\ No newline at end of file