Merge testing branch into master

Managing these two branches simultaneously is a pain in the neck, because if I develop some new feature, I need to fork from testing branch, because I want to test it before merging, but then I can't merge everything into testing back and only part of commits into master (without testing script and etc). 
May be it's possible, but I don't know how and overall it doesn't look like a good approach. So I'm going to merge testing branch into master and use only in (besides other small branches).

@eparejatobes do you have any suggestions here?