Journal of Systems and Software