We present a unified view of finite-size scaling (FSS) in dimension above the upper critical dimension, for both free and periodic boundary conditions. We find that the modified FSS proposed some time ago to allow for violation of hyperscaling due to a dangerous irrelevant variable applies only to fluctuations, and “standard” FSS applies to fluctuations. Hence the exponent describing power-law decay of correlations at criticality is unambiguously . With free boundary conditions, the finite-size “shift” is greater than the rounding. Nonetheless, using , where is the finite-size pseudocritical temperature, rather than , as the scaling variable, the data do collapse onto a scaling form that includes the behavior both at , where the susceptibility diverges like , and at the bulk , where it diverges like . These claims are supported by large-scale simulations on the five-dimensional Ising model.