Methods and systems are provided for diagnosing each of a plurality of engine cooling system components including various valves and grill shutters. Each valve may be individually closed and opened for a specified duration, and corresponding changes in coolant temperature may be monitored. If all the components are functional, the various valves may be adjusted to stagnate coolant at the engine and expedite engine warm-up during a cold-start.