diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index 6170c5a2638..be5fe5651ac 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -58,12 +58,7 @@ class Install extends Command {
 		$errors = $sysInfo['errors'];
 		if (count($errors) > 0) {
 			$this->printErrors($output, $errors);
-
-			// ignore the OS X setup warning
-			if (count($errors) !== 1
-				|| (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk!') {
-				return 1;
-			}
+			return 1;
 		}
 
 		// validate user input
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 95a4032be32..5f91dc10692 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -186,11 +186,10 @@ class Setup {
 		}
 
 		// Check if running directly on macOS (note: Linux containers on macOS will not trigger this)
-		if (PHP_OS_FAMILY === 'Darwin') {
+		if (!getenv('CI') && PHP_OS_FAMILY === 'Darwin') {
 			$errors[] = [
 				'error' => $this->l10n->t(
-					'macOS is not supported and %s will not work properly on this platform. '
-					. 'Use it at your own risk!',
+					'macOS is not supported and %s will not work properly on this platform.',
 					[$this->defaults->getProductName()]
 				),
 				'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),