diff --git a/typo3/sysext/install/Classes/SystemEnvironment/Check.php b/typo3/sysext/install/Classes/SystemEnvironment/Check.php
index 68fcf16dc5ffb83980e371d7323b2480258bb4a3..087d7c60babc118e244cd0d1146635192a1c0574 100644
--- a/typo3/sysext/install/Classes/SystemEnvironment/Check.php
+++ b/typo3/sysext/install/Classes/SystemEnvironment/Check.php
@@ -311,11 +311,8 @@ class Check
     {
         $minimumMaximumExecutionTime = 30;
         $recommendedMaximumExecutionTime = 240;
-        $currentMaximumExecutionTime = (int)ini_get('max_execution_time');
-        if (PHP_SAPI === 'cli' && $currentMaximumExecutionTime === 0) {
-            $status = new Status\NoticeStatus();
-            $status->setTitle('Infinite PHP script execution time detected, which is admissible on the CLI');
-        } elseif ($currentMaximumExecutionTime === 0) {
+        $currentMaximumExecutionTime = ini_get('max_execution_time');
+        if ($currentMaximumExecutionTime == 0) {
             $status = new Status\WarningStatus();
             $status->setTitle('Infinite PHP script execution time');
             $status->setMessage(
@@ -351,7 +348,6 @@ class Check
             $status->setTitle('Maximum PHP script execution time is equal to or more than '
                 . $recommendedMaximumExecutionTime);
         }
-
         return $status;
     }
 
diff --git a/typo3/sysext/install/Classes/SystemEnvironment/SetupCheck.php b/typo3/sysext/install/Classes/SystemEnvironment/SetupCheck.php
index 2479fd150056e20d45aadac5cea738e1dc9468eb..14c19c17d34173336eb4fc7f2d967852832bdc89 100644
--- a/typo3/sysext/install/Classes/SystemEnvironment/SetupCheck.php
+++ b/typo3/sysext/install/Classes/SystemEnvironment/SetupCheck.php
@@ -60,9 +60,6 @@ class SetupCheck
             $status = new Status\WarningStatus();
             $status->setTitle('Trusted hosts pattern is insecure');
             $status->setMessage('Trusted hosts pattern is configured to allow all header values. Check the pattern defined in Install Tool -> All configuration -> System -> trustedHostsPattern and adapt it to expected host value(s).');
-        } elseif (PHP_SAPI === 'cli') {
-            $status = new Status\NoticeStatus();
-            $status->setTitle('Trusted hosts pattern cannot be checked on the CLI');
         } else {
             if (GeneralUtility::hostHeaderValueMatchesTrustedHostsPattern($_SERVER['HTTP_HOST'])) {
                 $status = new Status\OkStatus();
diff --git a/typo3/sysext/install/ext_tables.php b/typo3/sysext/install/ext_tables.php
index 1b3e4bf65c5f99a6e2f4375529b5f433300c68f7..5fef66943327ca50ee764a7309bcd59ee29d812b 100644
--- a/typo3/sysext/install/ext_tables.php
+++ b/typo3/sysext/install/ext_tables.php
@@ -7,7 +7,7 @@ if (TYPO3_MODE === 'BE') {
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['security'][] = \TYPO3\CMS\Install\Report\SecurityStatusReport::class;
 
     // Only add the environment status report if not in CLI mode
-    if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) {
+    if (!(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['system'][] = \TYPO3\CMS\Install\Report\EnvironmentStatusReport::class;
     }