diff --git a/.globalconfig b/.globalconfig
index a4d4707f9b..c5723daed6 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -46,6 +46,14 @@ dotnet_diagnostic.IDE0130.severity = warning
# IDE1006: Naming style
dotnet_diagnostic.IDE1006.severity = warning
+dotnet_diagnostic.CA1309.severity = warning
+
+# CA2007: Consider calling ConfigureAwait on the awaited task
+dotnet_diagnostic.CA2007.severity = warning
+
+# CA2201: Do not raise reserved exception types
+dotnet_diagnostic.CA2201.severity = warning
+
#Disable operator overloads requiring alternate named methods
dotnet_diagnostic.CA2225.severity = none
diff --git a/CodeAnalysis/osu.ruleset b/CodeAnalysis/osu.ruleset
deleted file mode 100644
index 6a99e230d1..0000000000
--- a/CodeAnalysis/osu.ruleset
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 5ba12b845b..e7e5e4e831 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -20,7 +20,6 @@
- $(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset
true
diff --git a/osu.Game.Tests/CodeAnalysis.tests.globalconfig b/osu.Game.Tests/CodeAnalysis.tests.globalconfig
new file mode 100644
index 0000000000..3f039736ec
--- /dev/null
+++ b/osu.Game.Tests/CodeAnalysis.tests.globalconfig
@@ -0,0 +1,7 @@
+# Higher global_level has higher priority, the default global_level
+# is 100 for root .globalconfig and 0 for others
+# https://learn.microsoft.com/dotnet/fundamentals/code-analysis/configuration-files#precedence
+is_global = true
+global_level = 101
+
+dotnet_diagnostic.CA2007.severity = none
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 28a1d4d021..01d2241650 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -12,9 +12,9 @@
WinExe
net8.0
-
- tests.ruleset
-
+
+
+
diff --git a/osu.Game.Tests/tests.ruleset b/osu.Game.Tests/tests.ruleset
deleted file mode 100644
index a0abb781d3..0000000000
--- a/osu.Game.Tests/tests.ruleset
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/osu.sln b/osu.sln
index 829e43fc65..2d9a4e86d0 100644
--- a/osu.sln
+++ b/osu.sln
@@ -60,7 +60,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Directory.Build.props = Directory.Build.props
osu.Android.props = osu.Android.props
osu.iOS.props = osu.iOS.props
- CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset
+ global.json = global.json
osu.sln.DotSettings = osu.sln.DotSettings
osu.TestProject.props = osu.TestProject.props
EndProjectSection