New methods have been developed for the analysis of residual solvents and terpenes in cannabis and hemp products using a single 7697A Headspace Sampler/Intuvo 9000 GC/5977B MSD system. Results are approximately 50% and 30% faster for the solvents and terpenes, respectively, compared to the original applications. The single platform-two analyses approach has been successfully implemented in labs across North America.