In this paper, integration of CDIO skills into project-based learning in higher education has been described and discussed. The student-driven ICT project office the FIRMA has been operating in its current form for two years now and the experiences are promising. It seems that the engagement of the students will enhance their learning, motivation and future career prospects. Especially combining larger amount of externally funded R&D projects into learning environment activities has expanded the academia-industry co-operation. In addition, the cooperation with other faculties of TUAS and other universities has strengthened.