Shot peening is a well-established surface treatment commonly used to improve mechanical properties of material's surfaces. Studies have shown notable enhancement of fatigue strength, wear, scratch and corrosion resistance and fretting properties as a result of an intensive shot peening treatment, the so-called severe shot peening. Nevertheless, this process has some drawbacks including quite high surface roughness and possible embedment of shot residuals at the treated surface, which can have adverse effects depending on the final application. In this paper, electropolishing has been evaluated as a cleaning post-treatment for shot peened surfaces of 316L stainless steel. For this purpose, electropolishing voltage has been varied with the aim of obtaining clean and smoother surfaces without sacrificing the mechanical improvements produced by shot peening. The treated surfaces have been characterized considering surface roughness, morphology, wettability, residual stresses and microhardness evolution after various shot peening treatments combined with electropolishing using different parameter set-ups to identify the most promising combinations.