Water scarcity constitutes a crucial constraint for agriculture productivity. High-throughput approaches in model plant species identified hundreds of genes potentially involved in survival under drought, but few having beneficial effects on quality and yield. Nonetheless, controlled water deficit may improve fruit quality through higher concentration of flavor compounds. The underlying genetic determinants are still poorly known. In this study, we phenotyped 141 highly diverse small fruit tomato accessions for 27 traits under two contrasting watering conditions. A subset of 55 accessions exhibited increased metabolite contents and maintained yield under water deficit. Using 6100 single nucleotide polymorphisms (SNPs), association mapping revealed 31, 41, and 44 quantitative trait loci (QTLs) under drought, control, and both conditions, respectively. Twenty-five additional QTLs were interactive between conditions, emphasizing the interest in accounting for QTLs by watering regime interactions in fruit quality improvement. Combining our results with the loci previously identified in a biparental progeny resulted in 11 common QTLs and contributed to a first detailed characterization of the genetic determinants of response to water deficit in tomato. Major QTLs for fruit quality traits were dissected and candidate genes were proposed using expression and polymorphism data. The outcomes provide a basis for fruit quality improvement under deficit irrigation while limiting yield losses.