diff --git a/tests/phpstan/base.neon b/tests/phpstan/base.neon
index ab07051c9ad7a..57cf0cf40da15 100644
--- a/tests/phpstan/base.neon
+++ b/tests/phpstan/base.neon
@@ -82,6 +82,8 @@ parameters:
 		- DB_COLLATE
 		- DISALLOW_FILE_EDIT
 		- DISALLOW_UNFILTERED_HTML
+		- DOING_AJAX
+		- DOING_CRON
 		- EMPTY_TRASH_DAYS
 		- ENFORCE_GZIP
 		- FORCE_SSL_LOGIN
@@ -93,6 +95,7 @@ parameters:
 		- MULTISITE
 		- NO_HEADER_TEXT
 		- NOBLOGREDIRECT
+		- REST_REQUEST
 		- SAVEQUERIES
 		- SCRIPT_DEBUG
 		- SECRET_KEY
@@ -106,9 +109,12 @@ parameters:
 		- WP_DEBUG_DISPLAY
 		- WP_DEBUG_LOG
 		- WP_DEVELOPMENT_MODE
+		- WP_INSTALLING
+		- WP_INSTALLING_NETWORK
 		- WP_LANG_DIR
 		- WP_NETWORK_ADMIN
 		- WP_POST_REVISIONS
+		- WP_REPAIRING
 		- WP_SITEURL
 		- WP_USE_THEMES
 		- WP_USER_ADMIN
@@ -116,6 +122,7 @@ parameters:
 		- WPMU_ACCEL_REDIRECT
 		- WPMU_PLUGIN_DIR
 		- WPMU_SENDFILE
+		- XMLRPC_REQUEST
 
 	# What directories and files should be scanned.
 	paths:
diff --git a/tests/phpstan/baselines/booleanAnd.rightAlwaysTrue.neon b/tests/phpstan/baselines/booleanAnd.rightAlwaysTrue.neon
index 64071efcf3d23..6bd091f5adffc 100644
--- a/tests/phpstan/baselines/booleanAnd.rightAlwaysTrue.neon
+++ b/tests/phpstan/baselines/booleanAnd.rightAlwaysTrue.neon
@@ -23,11 +23,6 @@ parameters:
 			identifier: booleanAnd.rightAlwaysTrue
 			count: 1
 			path: ../../../src/wp-admin/includes/class-wp-site-health.php
-		-
-			message: '#^Right side of && is always true\.$#'
-			identifier: booleanAnd.rightAlwaysTrue
-			count: 1
-			path: ../../../src/wp-admin/includes/schema.php
 		-
 			message: '#^Right side of && is always true\.$#'
 			identifier: booleanAnd.rightAlwaysTrue
@@ -46,20 +41,5 @@ parameters:
 		-
 			message: '#^Right side of && is always true\.$#'
 			identifier: booleanAnd.rightAlwaysTrue
-			count: 2
+			count: 1
 			path: ../../../src/wp-includes/functions.php
-		-
-			message: '#^Right side of && is always true\.$#'
-			identifier: booleanAnd.rightAlwaysTrue
-			count: 3
-			path: ../../../src/wp-includes/l10n.php
-		-
-			message: '#^Right side of && is always true\.$#'
-			identifier: booleanAnd.rightAlwaysTrue
-			count: 4
-			path: ../../../src/wp-includes/load.php
-		-
-			message: '#^Right side of && is always true\.$#'
-			identifier: booleanAnd.rightAlwaysTrue
-			count: 2
-			path: ../../../src/wp-includes/user.php