diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh
index dca9882eaf7..8de98c55b6a 100755
--- a/tests/queries/0_stateless/02995_new_settings_history.sh
+++ b/tests/queries/0_stateless/02995_new_settings_history.sh
@@ -16,7 +16,8 @@ $CLICKHOUSE_LOCAL --query "
     ),
     new_settings AS
     (
-        select name, default from system.settings order by name
+        -- Ignore settings that depend on the machine config (max_threads and similar)
+        SELECT name, default FROM system.settings WHERE default NOT LIKE '%auto(%'
     )
     SELECT * FROM
     (