This PhD project will provide diversity-based sampling techniques for the analysis and test of variability-aware Cyber-Physical Systems (CPSs). In particular, we will explore 1) formal modelling of the variability space of CPSs, 2) Exploring the notion of diversity, and 3) designing novel diversity-based algorithms. The contributions will be evaluated on a diversity of CPSs including space satellites.